Skip to content
Permalink
Browse files

Item109: 2nd wave of renaming TWikiContributor to ProjectContributor

Michael may want to look at ldap contrib
I added ProjectContributor but did not remove TWikiContributor to the list
of excluded names in case some TWiki use wants to use the extension.
Please check I did it right 


git-svn-id: http://svn.foswiki.org/trunk@492 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
KennethLavrsen KennethLavrsen
KennethLavrsen authored and KennethLavrsen committed Nov 9, 2008
1 parent 4f50bc8 commit e076100b423c2e5c2e7749478d9a099e7ab4436c
@@ -1,7 +1,9 @@
#!/usr/bin/perl -w
# Script for TWiki Collaboration Platform, http://TWiki.org/
#
# Copyright (C) 2006-2008 TWikiContributors. All rights reserved.
# Copyright (C) 2006-2008 ProjectContributors. All rights reserved.
# ProjectContributors are listed in the AUTHORS file in the root of
# the distribution.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -56,7 +56,7 @@ sub addMissingAttachment {
path => $file,
size => 2000000,
date => 2000000,
user => "TWikiContributor",
user => "ProjectContributor",
comment => $comment,
attr => ''
}
@@ -31,7 +31,7 @@ sub test_basic {
$this->assert_str_equals(<<HUMPH, "$ui\n");
| *Group* | *Members* |
| <nop>AdminGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] |
| <nop>TWikiBaseGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] [[TemporaryGROUPSUsersWeb.TWikiGuest][TWikiGuest]] [[TemporaryGROUPSUsersWeb.UnknownUser][UnknownUser]] [[TemporaryGROUPSUsersWeb.TWikiContributor][TWikiContributor]] [[TemporaryGROUPSUsersWeb.TWikiRegistrationAgent][TWikiRegistrationAgent]] |
| <nop>TWikiBaseGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] [[TemporaryGROUPSUsersWeb.TWikiGuest][TWikiGuest]] [[TemporaryGROUPSUsersWeb.UnknownUser][UnknownUser]] [[TemporaryGROUPSUsersWeb.ProjectContributor][ProjectContributor]] [[TemporaryGROUPSUsersWeb.TWikiRegistrationAgent][TWikiRegistrationAgent]] |
| [[TemporaryGROUPSUsersWeb.GropeGroup][GropeGroup]] | [[TemporaryGROUPSUsersWeb.ScumBag][ScumBag]] [[TemporaryGROUPSUsersWeb.TWikiGuest][TWikiGuest]] |
HUMPH
}
@@ -529,7 +529,7 @@ sub set_up_for_formatted_search {
my $this = shift;

my $text = <<'HERE';
%META:TOPICINFO{author="TWikiContributor" date="1169714817" format="1.1" version="1.2"}%
%META:TOPICINFO{author="ProjectContributor" date="1169714817" format="1.1" version="1.2"}%
%META:TOPICPARENT{name="TestCaseAutoFormattedSearch"}%
!MichaelAnchor and !AnnaAnchor lived in Skagen in !DenmarkEurope!. There is a very nice museum you can visit!
@@ -195,9 +195,9 @@ sub verify_eachUser {

my @correctList;
if ($TWiki::cfg{UserMappingManager} eq 'TWiki::Users::BaseUserMapping') {
@correctList = qw/TWikiContributor TWikiGuest TWikiRegistrationAgent UnknownUser/;
@correctList = qw/ProjectContributor TWikiGuest TWikiRegistrationAgent UnknownUser/;
} else {
@correctList = qw/TWikiContributor TWikiGuest TWikiRegistrationAgent UnknownUser User86A UserA UserA86 UserB UserC UserZ/;
@correctList = qw/ProjectContributor TWikiGuest TWikiRegistrationAgent UnknownUser User86A UserA UserA86 UserB UserC UserZ/;
if ($TWiki::cfg{Register}{AllowLoginName} == 1) {
push @correctList, 'ScumBag'; # this user is created in the base class with the assumption of AllowLoginName
} else {
@@ -33,7 +33,7 @@ sub set_up {
comment=>"Too",
path=>'anuvver path',
size=>'100',
user=>'TWikiContributor',
user=>'ProjectContributor',
rev=>'105',
date=>'99',
});
@@ -35,7 +35,7 @@ my $testform4 = $testform1 . <<'HERE';
HERE

my $testtext1 = <<'HERE';
%META:TOPICINFO{author="TWikiContributor" date="1111931141" format="1.0" version="$Rev: 4579 $"}%
%META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 4579 $"}%
A guest of this TWiki web, not unlike yourself. You can leave your trace behind you, just add your name in %SYSTEMWEB%.TWikiRegistration and create your own page.
@@ -46,7 +46,7 @@ sub run_testcase {
$TWiki::cfg{Plugins}{TestFixturePlugin}{Enabled} = 1;
my $twiki = new TWiki( $this->{test_user_login}, $query );
$twiki->{store}->saveTopic(
$twiki->{user}, $this->{users_web}, 'TWikiContributor', 'none');
$twiki->{user}, $this->{users_web}, 'ProjectContributor', 'none');
my ($text, $result) = $this->capture( \&TWiki::UI::View::view, $twiki);
unless( $text =~ m#<font color="green">ALL TESTS PASSED</font># ) {
open(F,">${testcase}_run.html");
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="TWikiContributor" date="1123279665" format="1.0" version="$Rev: 15171 $"}%
%META:TOPICINFO{author="ProjectContributor" date="1123279665" format="1.0" version="$Rev: 15171 $"}%
---+!! %MAKETEXT{"Local customisations of site-wide preferences"}%

<div class="twikiHelp">%ICON{"info"}% %MAKETEXT{"Site-level preferences are located in [_1], however this [_2] prefs topic has override priority and should be used for local customisations. This allows for easier upgrades as you don't need to worry about the shipped preferences clobbering yours. It's easier to keep a handle on if you only copy over the settings you actually change." args="[[%SYSTEMWEB%.%TOPIC%]], [[%USERSWEB%.%TOPIC%]]"}% </div>
@@ -1,4 +1,4 @@
!%META:TOPICINFO{author="TWikiContributor" date="1176595196" format="1.1" version="$Rev: 15706 $"}%
!%META:TOPICINFO{author="ProjectContributor" date="1176595196" format="1.1" version="$Rev: 15706 $"}%
---+!! <nop>%WIKITOOLNAME% Site-Level Preferences

This topic defines __site-level__ settings that apply to all users and webs on this TWikiSite.
@@ -56,8 +56,8 @@ bin/upload 0555
bin/view 0555
bin/viewauth 0555
bin/viewfile 0555
data/Main/ProjectContributor.txt 0644
data/Main/TWikiAdminUser.txt 0644
data/Main/TWikiContributor.txt 0644
data/Main/TWikiGroups.txt 0644
data/Main/TWikiGuest.txt 0644
data/Main/TWikiPreferences.txt 0644
@@ -129,6 +129,7 @@ data/TWiki/PeterThoeny.txt 0644
data/TWiki/PlainSkin.txt 0644
data/TWiki/PreviewBackground.txt 0644
data/TWiki/PrintSkin.txt 0644
data/TWiki/ProjectContributor.txt 0644
data/TWiki/QuietSave.txt 0644
data/TWiki/QuerySearch.txt 0644
data/TWiki/RegistrationApprovals.txt 0644
@@ -145,7 +146,6 @@ data/TWiki/StandardColors.txt 0644
data/TWiki/StartingPoints.txt 0644
data/TWiki/StaticMethod.txt 0644
data/TWiki/TWikiAccessControl.txt 0644
data/TWiki/TWikiContributor.txt 0644
data/TWiki/TWikiCss.txt 0644
data/TWiki/TWikiDocGraphics.txt 0644
data/TWiki/TWikiDocumentation.txt 0644
@@ -32,7 +32,7 @@ prefix 'BaseUserMapping_'.
* TWikiAdmin - uses the password that was set in Configure (IF its not null)
* TWikiGuest
* UnknownUser
* TWikiContributor - 1 Jan 2005
* ProjectContributor - 1 Jan 2005
* TWikiRegistrationAgent - 1 Jan 2005
---+++ Groups
@@ -68,28 +68,28 @@ sub new {
$TWiki::cfg{AdminUserLogin} => $this->{mapping_id} . '333',
$TWiki::cfg{DefaultUserLogin} => $this->{mapping_id} . '666',
unknown => $this->{mapping_id} . '999',
TWikiContributor => $this->{mapping_id} . '111',
ProjectContributor => $this->{mapping_id} . '111',
TWikiRegistrationAgent => $this->{mapping_id} . '222'
};
$this->{U2L} = {
$this->{mapping_id} . '333' => $TWiki::cfg{AdminUserLogin},
$this->{mapping_id} . '666' => $TWiki::cfg{DefaultUserLogin},
$this->{mapping_id} . '999' => 'unknown',
$this->{mapping_id} . '111' => 'TWikiContributor',
$this->{mapping_id} . '111' => 'ProjectContributor',
$this->{mapping_id} . '222' => 'TWikiRegistrationAgent'
};
$this->{U2W} = {
$this->{mapping_id} . '333' => $TWiki::cfg{AdminUserWikiName},
$this->{mapping_id} . '666' => $TWiki::cfg{DefaultUserWikiName},
$this->{mapping_id} . '999' => 'UnknownUser',
$this->{mapping_id} . '111' => 'TWikiContributor',
$this->{mapping_id} . '111' => 'ProjectContributor',
$this->{mapping_id} . '222' => 'TWikiRegistrationAgent'
};
$this->{W2U} = {
$TWiki::cfg{AdminUserWikiName} => $this->{mapping_id} . '333',
$TWiki::cfg{DefaultUserWikiName} => $this->{mapping_id} . '666',
UnknownUser => $this->{mapping_id} . '999',
TWikiContributor => $this->{mapping_id} . '111',
ProjectContributor => $this->{mapping_id} . '111',
TWikiRegistrationAgent => $this->{mapping_id} . '222'
};
$this->{U2E} =
@@ -107,7 +107,7 @@ sub getWords {
open(TOPIC, ">data/$web/$topic.txt") || die $!;
my $t = time();
print TOPIC <<FLUFF;
%META:TOPICINFO{author="TWikiContributor" date="$t" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="$t" format="1.1" version="1"}%
FLUFF
print TOPIC getWords($opts{size});
close(TOPIC);
@@ -33,8 +33,8 @@ bin/LocalLib.cfg.txt 440
COPYING 0440
COPYRIGHT 0440
data/Main/NobodyGroup.txt 0660
data/Main/ProjectContributor.txt 0660
data/Main/TWikiAdminGroup.txt 0660
data/Main/TWikiContributor.txt 0660
data/Main/TWikiGroupTemplate.txt 0660
data/Main/TWikiGroups.txt 0660
data/Main/TWikiGuest.txt 0660
@@ -116,6 +116,7 @@ data/TWiki/PeterThoeny.txt 0660
data/TWiki/PlainSkin.txt 0660
data/TWiki/PreviewBackground.txt 0660
data/TWiki/PrintSkin.txt 0660
data/TWiki/ProjectContributor.txt 0660
data/TWiki/QuietSave.txt 0660
data/TWiki/RegistrationApprovals.txt 0660
data/TWiki/RegularExpression.txt 0660
@@ -133,7 +134,6 @@ data/TWiki/StartingPoints.txt 0660
data/TWiki/StaticMethod.txt 0660
data/TWiki/TWiki.txt 0660
data/TWiki/TWikiAccessControl.txt 0660
data/TWiki/TWikiContributor.txt 0660
data/TWiki/TWikiCss.txt 0660
data/TWiki/TWikiDocGraphics.txt 0660
data/TWiki/TWikiDocumentation.txt 0660
@@ -2,7 +2,9 @@
#
# Build for TWiki
# Crawford Currie
# Copyright (C) TWikiContributors, 2005
# Copyright (C) 2006-2008 ProjectContributors. All rights reserved.
# ProjectContributors are listed in the AUTHORS file in the root of
# the distribution.

use strict;

@@ -79,7 +81,7 @@ sub _checkInFile {
`$cmd`;

#check in
`ci -mbuildrelease -wTWikiContributor -t-new-topic $new/$file 2>&1`;
`ci -mbuildrelease -wProjectContributor -t-new-topic $new/$file 2>&1`;
#get a copy of the latest revsion, no lock
`co -u -M $new/$file 2>&1`;
print "\n";
@@ -112,9 +114,9 @@ sub stage_gendocs {
print "Building automatic documentation to $this->{tmpDir}...";
print `perl $this->{basedir}/tools/gendocs.pl -debug -root $this->{tmpDir}`;
$this->cp( "$this->{tmpDir}/AUTHORS",
"$this->{tmpDir}/pub/Main/TWikiContributor/AUTHORS" );
"$this->{tmpDir}/pub/Main/ProjectContributor/AUTHORS" );
$this->cp( "$this->{tmpDir}/AUTHORS",
"$this->{tmpDir}/pub/TWiki/TWikiContributor/AUTHORS" );
"$this->{tmpDir}/pub/TWiki/ProjectContributor/AUTHORS" );

for my $script qw( view rdiff ) {
$this->cp( "$this->{tmpDir}/bin/$script",
@@ -2,7 +2,9 @@
#
# Build for TWiki
# Crawford Currie & Sven Dowideit
# Copyright (C) TWikiContributors, 2005
# Copyright (C) 2006-2008 ProjectContributors. All rights reserved.
# ProjectContributors are listed in the AUTHORS file in the root of
# the distribution.

use strict;

@@ -183,7 +185,7 @@ sub _checkInFile {
my $cmd = 'perl -pi -e \'s/^(%META:TOPICINFO{.*version=)\"[^\"]*\"(.*)$/$1\"'.($currentRevision+1).'\"$2/\' '.$new.'/'.$file;
`$cmd`;
# create rcs file
`ci -u -mbuildrelease -wTWikiContributor -t-buildrelease $new/$file 2>&1`;
`ci -u -mbuildrelease -wProjectContributor -t-buildrelease $new/$file 2>&1`;
}

#only do a checkin, if the files are different (fake the rev number to be the same)
@@ -197,7 +199,7 @@ sub _checkInFile {
my $cmd = 'perl -pi -e \'s/^(%META:TOPICINFO{.*version=)\"[^\"]*\"(.*)$/$1\"'.($currentRevision+1).'\"$2/\' '.$new.'/'.$file;
`$cmd`;
#check in
`ci -mbuildrelease -wTWikiContributor -t-new-topic $new/$file 2>&1`;
`ci -mbuildrelease -wProjectContributor -t-new-topic $new/$file 2>&1`;
#get a copy of the latest revsion, no lock
`co -u -M $new/$file 2>&1`;
print "\n";
@@ -238,7 +240,7 @@ sub stage_gendocs {
print "Building automatic documentation to $this->{tmpDir}...";
print `perl $this->{basedir}/tools/gendocs.pl -debug -root $this->{tmpDir}`;
$this->cp( "$this->{tmpDir}/AUTHORS",
"$this->{tmpDir}/pub/TWiki/TWikiContributor/AUTHORS" );
"$this->{tmpDir}/pub/TWiki/ProjectContributor/AUTHORS" );

for my $script qw( view rdiff ) {
$this->cp( "$this->{tmpDir}/bin/$script",
@@ -6,7 +6,9 @@
# run other tests
# build a release tarball & upload...
# Sven Dowideit
# Copyright (C) TWikiContributors, 2005
# Copyright (C) 2006-2008 ProjectContributors. All rights reserved.
# ProjectContributors are listed in the AUTHORS file in the root of
# the distribution.
#
# If you are Sven (used by Sven's automated nightly build system) - call with perl ./buildTWikiRelease.pl -sven
# everyone else, can just run perl ./buildTWikiRelease.pl
@@ -82,7 +84,7 @@
`perlcritic --severity 5 --statistics --top 20 lib/ 2>&1 > $twikihome/TWiki-PerlCritic.log`;
`perlcritic --severity 5 --statistics --top 20 bin/ 2>&1 >> $twikihome/TWiki-PerlCritic.log`;
#`cd tools; perl check_manifest.pl`;
#`cd data; grep '%META:TOPICINFO{' */*.txt | grep -v TestCases | grep -v 'author="TWikiContributor".*version="\$Rev'`;
#`cd data; grep '%META:TOPICINFO{' */*.txt | grep -v TestCases | grep -v 'author="ProjectContributor".*version="\$Rev'`;

#TODO: # fix up release notes with new changelogs - see
#

0 comments on commit e076100

Please sign in to comment.
You can’t perform that action at this time.