This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new aa647c9 Use library routine
aa647c9 is described below
commit aa647c912d61fca7ecf9888f47ec7f03dbf14e1c
Author: Sebb <[email protected]>
AuthorDate: Mon Jul 20 17:49:09 2020 +0100
Use library routine
---
www/board/agenda/models/minutes.rb | 2 +-
www/board/agenda/views/pages/report.js.rb | 2 +-
www/brand/replylist.cgi | 4 ++--
www/brand/replyui.cgi | 4 ++--
www/committers/subscribe.cgi | 2 +-
www/incubator/graduated.cgi | 4 ++--
www/incubator/podling-crosscheck.cgi | 2 +-
www/members/inactive.cgi | 4 ++--
www/members/index.cgi | 2 +-
www/members/meeting.cgi | 5 ++---
www/members/namediff.cgi | 2 +-
www/members/nominations.cgi | 2 +-
www/members/subscriptions.cgi | 4 ++--
www/members/watch.cgi | 5 ++---
www/officers/index.cgi | 2 +-
www/officers/surveys.cgi | 2 +-
www/secretary/emeritus_check.cgi | 4 ++--
www/secretary/icla-lint.cgi | 6 +++---
www/secretary/ldap-check-committers.cgi | 2 +-
www/secretary/ldap-check.cgi | 2 +-
www/secretary/ldap-names.cgi | 2 +-
www/secretary/memapp_check.cgi | 4 ++--
www/secretary/public-names.cgi | 4 ++--
23 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/www/board/agenda/models/minutes.rb
b/www/board/agenda/models/minutes.rb
index d134b91..5bb8304 100755
--- a/www/board/agenda/models/minutes.rb
+++ b/www/board/agenda/models/minutes.rb
@@ -152,7 +152,7 @@ class Minutes
minutes.sub! 'Minutes (in Subversion) are found under the URL:',
'Published minutes can be found at:'
- minutes.sub! 'https://svn.apache.org/repos/private/foundation/board/',
+ minutes.sub! ASF::SVN.svnpath!('board'),
'http://www.apache.org/foundation/board/calendar.html'
minutes.sub!(/ \d\. Committee Reports.*?\n\s+A\./m) do |heading|
diff --git a/www/board/agenda/views/pages/report.js.rb
b/www/board/agenda/views/pages/report.js.rb
index aea8c17..72d050a 100644
--- a/www/board/agenda/views/pages/report.js.rb
+++ b/www/board/agenda/views/pages/report.js.rb
@@ -269,7 +269,7 @@ class Report < Vue
def linkMinutes(text)
text.gsub! /board_minutes_(\d+)_\d+_\d+\.txt/ do |match, year|
if Server.drafts.include? match
- link = "https://svn.apache.org/repos/private/foundation/board/#{match}";
+ link = ASF::SVN.svnpath!('board', match)
else
link = "http://apache.org/foundation/records/minutes/#{year}/#{match}";
end
diff --git a/www/brand/replylist.cgi b/www/brand/replylist.cgi
index b854be2..5f305cc 100755
--- a/www/brand/replylist.cgi
+++ b/www/brand/replylist.cgi
@@ -12,7 +12,7 @@ _html do
title: PAGETITLE,
related: {
"https://www.apache.org/foundation/marks/resources"; => "Trademark Site
Map",
- "https://svn.apache.org/repos/private/foundation/Brand/runbook.txt"; =>
"Members-only Trademark runbook",
+ ASF::SVN.svnpath!('foundation', 'Brand', 'runbook.txt') =>
"Members-only Trademark runbook",
"https://lists.apache.org/[email protected]"; =>
"Ponymail interface to trademarks@"
},
helpblock: -> {
@@ -22,7 +22,7 @@ _html do
_ ' of a proposed tool to allow ASF Members to review incoming
questions on a private mailing list, and then select a '
_em 'boilerplate reply'
_ ' to send to an original questioner. See '
- _a 'Proposed how to reply guide', href:
'https://svn.apache.org/repos/private/foundation/Brand/replies-readme.md'
+ _a 'Proposed how to reply guide', href:
ASF::SVN.svnpath!('foundation', 'Brand', 'replies-readme.md')
end
_p do
_ 'This list would display the last 30 (or so) days of messages on a
private list, and have UI that shows info about the messages, plus action
buttons to create a reply, see: '
diff --git a/www/brand/replyui.cgi b/www/brand/replyui.cgi
index 16a679c..55a0b5e 100755
--- a/www/brand/replyui.cgi
+++ b/www/brand/replyui.cgi
@@ -12,7 +12,7 @@ _html do
title: PAGETITLE,
related: {
"https://www.apache.org/foundation/marks/resources"; => "Trademark Site
Map",
- "https://svn.apache.org/repos/private/foundation/Brand/runbook.txt"; =>
"Members-only Trademark runbook",
+ ASF::SVN.svnpath!('foundation', 'Brand', 'runbook.txt') =>
"Members-only Trademark runbook",
"https://lists.apache.org/[email protected]"; =>
"Ponymail interface to trademarks@"
},
helpblock: -> {
@@ -20,7 +20,7 @@ _html do
_ 'This is a wireframe '
_strong 'DEMO'
_ ' of a proposed dialog/popup way to Choose a specific Boilerplate
Reply to a previously selected question. See '
- _a 'Proposed how to reply guide', href:
'https://svn.apache.org/repos/private/foundation/Brand/replies-readme.md'
+ _a 'Proposed how to reply guide', href:
ASF::SVN.svnpath!('foundation', 'Brand', 'replies-readme.md')
end
_p do
_ 'This would be some listing of available Boilerplates with
descriptions about each, so the user could choose one; that would then open it
for editing as a Reply-All message to save. '
diff --git a/www/committers/subscribe.cgi b/www/committers/subscribe.cgi
index 1994b98..3f69eb6 100755
--- a/www/committers/subscribe.cgi
+++ b/www/committers/subscribe.cgi
@@ -237,7 +237,7 @@ _html do
_pre request
end
- SUBREQ =
'https://svn.apache.org/repos/infra/infrastructure/trunk/subreq/'
+ SUBREQ = ASF::SVN.svnpath!('subreq')
SUBREQ.sub! '/subreq', '/unsubreq' if @request == 'unsub'
rc = 999
diff --git a/www/incubator/graduated.cgi b/www/incubator/graduated.cgi
index 7a2a9ba..0b8937d 100755
--- a/www/incubator/graduated.cgi
+++ b/www/incubator/graduated.cgi
@@ -45,10 +45,10 @@ _html do
href: 'https://whimsy.apache.org/board/minutes/'
_ ', '
_a 'committee-info.txt',
- href:
'https://svn.apache.org/repos/private/committers/board/committee-info.txt'
+ href: ASF::SVN.svnpath!('board', 'committee-info.txt')
_ ', and '
_a 'podlings.xml',
- href:
'https://svn.apache.org/repos/asf/incubator/public/trunk/content/podlings.xml'
+ href: ASF::SVN.svnpath!('incubator-content', 'podlings.xml')
_ '.'
_p do
_ul do
diff --git a/www/incubator/podling-crosscheck.cgi
b/www/incubator/podling-crosscheck.cgi
index 853889e..c27e228 100755
--- a/www/incubator/podling-crosscheck.cgi
+++ b/www/incubator/podling-crosscheck.cgi
@@ -31,7 +31,7 @@ _html do
href: '../../roster/committee/incubator'
_ ', '
_a 'mentor lists in podlings.xml',
- href:
'https://svn.apache.org/repos/asf/incubator/public/trunk/content/podlings.xml'
+ href: ASF::SVN.svnpath!('incubator-content', 'podlings.xml')
_ ', and '
_a 'Podling lists in LDAP',
href: '../../roster/ppmc'
diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi
index b9a0977..7d5a0ab 100755
--- a/www/members/inactive.cgi
+++ b/www/members/inactive.cgi
@@ -53,7 +53,7 @@ _html do
'https://www.apache.org/foundation/governance/meetings' => 'How
Meetings & Voting Works',
'/members/proxy' => 'Assign A Proxy For Next Meeting',
'/members/non-participants' => 'Members Not Participating',
- 'https://svn.apache.org/repos/private/foundation/members.txt' => 'See
Official Members.txt File',
+ ASF::SVN.svnpath!('foundation','members.txt') => 'See Official
Members.txt File',
MeetingUtil::RECORDS => 'Official Past Meeting Records'
},
helpblock: -> {
@@ -176,7 +176,7 @@ _html do
_tr_ class: color do
_td do
_a date, href:
- 'https://svn.apache.org/repos/private/foundation/Meetings/'
+ date
+ ASF::SVN.svnpath!('Meetings') + date
end
case status
when 'A'
diff --git a/www/members/index.cgi b/www/members/index.cgi
index a741fb9..1e08a2e 100755
--- a/www/members/index.cgi
+++ b/www/members/index.cgi
@@ -43,7 +43,7 @@ _html do
relatedtitle: 'More Useful Links',
related: {
"/committers/tools" => "Whimsy All Available Tools Listing",
- "https://svn.apache.org/repos/private/foundation/"; => "Checkout the
private 'foundation' repo for Members",
+ ASF::SVN.svnpath!('foundation') => "Checkout the private 'foundation'
repo for Members",
"https://github.com/apache/whimsy/blob/master/www#{ENV['SCRIPT_NAME']}" => "See
This Source Code",
"mailto:[email protected]?subject=[FEEDBACK] members/index
idea" => "Email Feedback To dev@whimsical"
},
diff --git a/www/members/meeting.cgi b/www/members/meeting.cgi
index 13faec5..ad08a51 100755
--- a/www/members/meeting.cgi
+++ b/www/members/meeting.cgi
@@ -8,7 +8,6 @@ require 'date'
require 'json'
require 'wunderbar/jquery/stupidtable'
require_relative 'meeting-util'
-FOUNDATION_SVN = 'https://svn.apache.org/repos/private/foundation/'
DTFORMAT = '%A, %d %B %Y at %H:%M %z'
TADFORMAT = '%Y%m%dT%H%M%S'
@@ -157,7 +156,7 @@ _html do
_p do
_span.text_warning 'REMINDER: '
_ "Voting ballots are sent to your official email address as found
in members.txt, please double-check it is correct!"
- _a 'See members.txt', href: "#{FOUNDATION_SVN}members.txt"
+ _a 'See members.txt', href: ASF::SVN.svnpath!('foundation',
'members.txt')
end
end
@@ -290,7 +289,7 @@ _html do
_ ' You '
_b 'must'
_ ' send an email with '
- _a 'foundation/membership-application-email.txt', href:
"#{FOUNDATION_SVN}membership-application-email.txt"
+ _a 'foundation/membership-application-email.txt', href:
ASF::SVN.svnpath!('foundation', 'membership-application-email.txt')
_ ' to formally invite the new member to fill out the application
form. Applications must be signed and submitted to the secretary within 30
days of the meeting to be valid.'
end
end
diff --git a/www/members/namediff.cgi b/www/members/namediff.cgi
index 6516fe3..2620506 100755
--- a/www/members/namediff.cgi
+++ b/www/members/namediff.cgi
@@ -12,7 +12,7 @@ _html do
title: PAGETITLE,
related: {
'/roster/members' => 'Listing Of All Members',
- 'https://svn.apache.org/repos/private/foundation/officers/iclas.txt'
=> 'ICLA.txt Listing',
+ ASF::SVN.svnpath!('officers', 'iclas.txt') => 'ICLA.txt Listing',
},
helpblock: -> {
_p_ do
diff --git a/www/members/nominations.cgi b/www/members/nominations.cgi
index 3f2e716..96fd18b 100755
--- a/www/members/nominations.cgi
+++ b/www/members/nominations.cgi
@@ -70,7 +70,7 @@ _html do
related: {
'/members/memberless-pmcs' => 'PMCs with no/few ASF Members',
'/members/watch' => 'Watch list for potential Member candidates',
- 'https://svn.apache.org/repos/private/foundation/Meetings/' =>
'Official Meeting Agenda Directory'
+ ASF::SVN.svnpath!('Meetings') => 'Official Meeting Agenda Directory'
},
helpblock: -> {
_ 'This script checks new member nomination statements from members@
against the official meeting ballot files, and highlights differences. '
diff --git a/www/members/subscriptions.cgi b/www/members/subscriptions.cgi
index efd9779..af378ad 100755
--- a/www/members/subscriptions.cgi
+++ b/www/members/subscriptions.cgi
@@ -25,9 +25,9 @@ _html do
_a '[email protected]', href:
'https://mail-search.apache.org/members/private-arch/members/'
_br
_ 'These are matched against '
- _a 'members.txt', href:
'https://svn.apache.org/repos/private/foundation/members.txt'
+ _a 'members.txt', href: ASF::SVN.svnpath!('foundation',
'members.txt')
_ ', '
- _a 'iclas.txt', href:
'https://svn.apache.org/repos/private/foundation/officers/iclas.txt'
+ _a 'iclas.txt', href: ASF::SVN.svnpath!('officers', 'iclas.txt')
_ ', and '
_code 'ldapsearch mail'
_ ' to attempt to match the email address to an Apache ID.'
diff --git a/www/members/watch.cgi b/www/members/watch.cgi
index dc82ff3..39727bc 100755
--- a/www/members/watch.cgi
+++ b/www/members/watch.cgi
@@ -9,7 +9,6 @@ require 'date'
require 'wunderbar/bootstrap'
require 'wunderbar/jquery/stupidtable'
-SVN_BOARD = "https://svn.apache.org/repos/private/foundation/board";
meetings = ASF::SVN['Meetings']
_html do
@@ -23,7 +22,7 @@ _html do
related: {
'/members/memberless-pmcs' => 'PMCs with no/few ASF Members',
'/members/nominations' => 'Members Meeting Nomination Crosscheck',
- 'https://svn.apache.org/repos/private/foundation/Meetings/' =>
'Official Meeting Agenda Directory'
+ ASF::SVN.svnpath!('Meetings') => 'Official Meeting Agenda Directory'
},
helpblock: -> {
_ 'To help evaluate potential Member candidates, here are a number of
ways to see where non-Members are participating broadly at the ASF.'
@@ -277,7 +276,7 @@ _html do
Dir[File.join(board, 'board_agenda_*')].sort.each do |agenda|
agenda.untaint
if File.read(agenda).include? search_string
- minutes = File.join(SVN_BOARD, File.basename(agenda))
+ minutes = ASF::SVN.svnpath!('board',
File.basename(agenda))
date = agenda.gsub('_','-')[/(\d+-\d+-\d+)/,1]
break
end
diff --git a/www/officers/index.cgi b/www/officers/index.cgi
index bb052aa..7ba36f0 100755
--- a/www/officers/index.cgi
+++ b/www/officers/index.cgi
@@ -28,7 +28,7 @@ _html do
relatedtitle: 'More Useful Links',
related: {
"/committers/tools" => "Whimsy All Available Tools Listing",
- "https://svn.apache.org/repos/private/foundation/"; => "Checkout the
private 'foundation/officers' repo for Officers",
+ ASF::SVN.svnpath!('foundation', 'officers') => "Checkout the private
'foundation/officers' repo for Officers",
"https://github.com/apache/whimsy/blob/master/www#{ENV['SCRIPT_NAME']}" => "See
This Source Code",
"mailto:[email protected]?subject=[FEEDBACK] members/index
idea" => "Email Feedback To dev@whimsical"
},
diff --git a/www/officers/surveys.cgi b/www/officers/surveys.cgi
index 44225a2..647258d 100755
--- a/www/officers/surveys.cgi
+++ b/www/officers/surveys.cgi
@@ -36,7 +36,7 @@ def get_survey_root(asfsvn = false)
if asfsvn
return 'officers_surveys'
else
- return 'https://svn.apache.org/repos/private/foundation/officers/surveys/'
+ return ASF::SVN.svnpath!('officers','surveys')
end
end
diff --git a/www/secretary/emeritus_check.cgi b/www/secretary/emeritus_check.cgi
index 86aa16a..74c7188 100755
--- a/www/secretary/emeritus_check.cgi
+++ b/www/secretary/emeritus_check.cgi
@@ -49,7 +49,7 @@ _html do
files.select {|k,v| v == 'NAK'}.sort_by{|k| k[0].split('-').pop}.each do
|k,v|
_tr do
_td do
- _a k, href:
"https://svn.apache.org/repos/private/documents/emeritus/#{k}";, target: '_blank'
+ _a k, href: ASF::SVN.svnpath!('emeritus', k), target: '_blank'
end
end
end
@@ -77,7 +77,7 @@ _table_ do
if person.icla && person.icla.claRef
file = ASF::ICLAFiles.match_claRef(person.icla.claRef.untaint)
if file
- _a person.icla.claRef, href:
"https://svn.apache.org/repos/private/documents/iclas/#{file}";, target: '_blank'
+ _a person.icla.claRef, href: ASF::SVN.svnpath!('iclas', file),
target: '_blank'
else
_ ''
end
diff --git a/www/secretary/icla-lint.cgi b/www/secretary/icla-lint.cgi
index 986b701..353cbc4 100755
--- a/www/secretary/icla-lint.cgi
+++ b/www/secretary/icla-lint.cgi
@@ -211,7 +211,7 @@ _html do
_td icla
_td do
paths.each do |path|
- _a path, href:
"https://svn.apache.org/repos/private/documents/iclas/#{path}";
+ _a path, href: ASF::SVN.svnpath!('iclas', path)
end
end
end
@@ -258,7 +258,7 @@ _html do
v.each do |p|
_tr do
_td do
- _a k, href:
"https://svn.apache.org/repos/private/documents/iclas/#{p}";
+ _a k, href: ASF::SVN.svnpath!('iclas', p)
end
end
end
@@ -334,7 +334,7 @@ _html do
_td do
file = ASF::ICLAFiles.match_claRef(icla_)
if file
- _a icla_, href:
"https://svn.apache.org/repos/private/documents/iclas/#{file}";
+ _a icla_, href: ASF::SVN.svnpath!('iclas', file)
else
_ icla_
end
diff --git a/www/secretary/ldap-check-committers.cgi
b/www/secretary/ldap-check-committers.cgi
index fd67d79..029c37e 100755
--- a/www/secretary/ldap-check-committers.cgi
+++ b/www/secretary/ldap-check-committers.cgi
@@ -52,7 +52,7 @@ _html do
if icla
if icla.claRef
_td do
- _a icla.claRef, href:
"https://svn.apache.org/repos/private/documents/iclas/#{icla.claRef}";
+ _a icla.claRef, href: ASF::SVN.svnpath!('iclas', icla.claRef)
end
else
_td icla.form
diff --git a/www/secretary/ldap-check.cgi b/www/secretary/ldap-check.cgi
index 463eb4a..9930469 100755
--- a/www/secretary/ldap-check.cgi
+++ b/www/secretary/ldap-check.cgi
@@ -140,7 +140,7 @@ _html do
if icla
if icla.claRef
_td do
- _a icla.claRef, href:
"https://svn.apache.org/repos/private/documents/iclas/#{icla.claRef}";
+ _a icla.claRef, href: ASF::SVN.svnpath!('iclas',
ASF::ICLAFiles.match_claRef(icla.claRef))
end
else
_td icla.form
diff --git a/www/secretary/ldap-names.cgi b/www/secretary/ldap-names.cgi
index ce15604..e74e119 100755
--- a/www/secretary/ldap-names.cgi
+++ b/www/secretary/ldap-names.cgi
@@ -149,7 +149,7 @@ _html do
_td do
file = ASF::ICLAFiles.match_claRef(claRef.untaint)
if file
- _a claRef, href:
"https://svn.apache.org/repos/private/documents/iclas/#{file}";
+ _a claRef, href: ASF::SVN.svnpath!('iclas', file)
else
_ claRef
end
diff --git a/www/secretary/memapp_check.cgi b/www/secretary/memapp_check.cgi
index 3bd87f6..605615b 100755
--- a/www/secretary/memapp_check.cgi
+++ b/www/secretary/memapp_check.cgi
@@ -59,7 +59,7 @@ _html do
files.select {|k,v| v == 'NAK'}.sort_by{|k| k[0].split('-').pop}.each do
|k,v|
_tr do
_td do
- _a k, href:
"https://svn.apache.org/repos/private/documents/member_apps/#{k}";, target:
'_blank'
+ _a k, href: ASF::SVN.svnpath!('member_apps', k), target: '_blank'
end
end
end
@@ -85,7 +85,7 @@ _table_ do
if person.icla && person.icla.claRef
file = ASF::ICLAFiles.match_claRef(person.icla.claRef.untaint)
if file
- _a person.icla.claRef, href:
"https://svn.apache.org/repos/private/documents/iclas/#{file}";, target: '_blank'
+ _a person.icla.claRef, href: ASF::SVN.svnpath!('iclas', file),
target: '_blank'
else
_ ''
end
diff --git a/www/secretary/public-names.cgi b/www/secretary/public-names.cgi
index fd042fc..359dfb2 100755
--- a/www/secretary/public-names.cgi
+++ b/www/secretary/public-names.cgi
@@ -141,7 +141,7 @@ _html do
_h2_!.present! do
_ 'Present in '
_a 'iclas.txt',
- href:
'https://svn.apache.org/repos/private/foundation/officers/iclas.txt'
+ href: ASF::SVN.svnpath!('officers', 'iclas.txt')
_ ':'
end
@@ -184,7 +184,7 @@ _html do
_td do
file = ASF::ICLAFiles.match_claRef(icla.claRef.untaint)
if file
- _a icla.claRef, href:
"https://svn.apache.org/repos/private/documents/iclas/#{file}";
+ _a icla.claRef, href: ASF::SVN.svnpath!('iclas', file)
else
_ icla.claRef || 'unknown'
end
