Changeset 487
- Timestamp:
- 11/09/08 16:27:33 (3 years ago)
- Location:
- branches/Release04x02
- Files:
-
- 17 edited
-
lib/MANIFEST (modified) (3 diffs)
-
lib/TWiki/Users/BaseUserMapping.pm (modified) (5 diffs)
-
test/bin/make_big.pl (modified) (1 diff)
-
tools/TWikiKernel/MANIFEST (modified) (3 diffs)
-
tools/TWikiKernel/build.pl (modified) (3 diffs)
-
tools/build.pl (modified) (4 diffs)
-
tools/buildTWikiRelease.pl (modified) (2 diffs)
-
twikiplugins/BuildContrib/create_new_extension.pl (modified) (1 diff)
-
twikiplugins/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingContribTests.pm (modified) (3 diffs)
-
twikiplugins/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm (modified) (1 diff)
-
twikiplugins/UnitTestContrib/test/unit/AutoAttachTests.pm (modified) (1 diff)
-
twikiplugins/UnitTestContrib/test/unit/Fn_GROUPS.pm (modified) (1 diff)
-
twikiplugins/UnitTestContrib/test/unit/Fn_SEARCH.pm (modified) (1 diff)
-
twikiplugins/UnitTestContrib/test/unit/FuncUsersTests.pm (modified) (1 diff)
-
twikiplugins/UnitTestContrib/test/unit/QueryTests.pm (modified) (1 diff)
-
twikiplugins/UnitTestContrib/test/unit/SaveScriptTests.pm (modified) (1 diff)
-
twikiplugins/UnitTestContrib/test/unit/SemiAutomaticTestCaseTests.pm (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/Release04x02/lib/MANIFEST
r479 r487 53 53 bin/view 0555 54 54 bin/viewfile 0555 55 data/Main/ProjectContributor.txt 0644 55 56 data/Main/TWikiAdminUser.txt 0644 56 data/Main/TWikiContributor.txt 064457 57 data/Main/TWikiGroups.txt 0644 58 58 data/Main/TWikiGuest.txt 0644 … … 126 126 data/TWiki/PreviewBackground.txt 0644 127 127 data/TWiki/PrintSkin.txt 0644 128 data/TWiki/ProjectContributor.txt 0644 128 129 data/TWiki/QuietSave.txt 0644 129 130 data/TWiki/QuerySearch.txt 0644 … … 143 144 data/TWiki/TWikiAccessControl.txt 0644 144 145 data/TWiki/WikiContribs.txt 0644 145 data/TWiki/TWikiContributor.txt 0644146 146 data/TWiki/TWikiCss.txt 0644 147 147 data/TWiki/TWikiDocGraphics.txt 0644 -
branches/Release04x02/lib/TWiki/Users/BaseUserMapping.pm
r21 r487 33 33 * TWikiGuest 34 34 * UnknownUser 35 * TWikiContributor - 1 Jan 200535 * ProjectContributor - 1 Jan 2005 36 36 * TWikiRegistrationAgent - 1 Jan 2005 37 37 … … 69 69 $TWiki::cfg{DefaultUserLogin} => $this->{mapping_id} . '666', 70 70 unknown => $this->{mapping_id} . '999', 71 TWikiContributor => $this->{mapping_id} . '111',71 ProjectContributor => $this->{mapping_id} . '111', 72 72 TWikiRegistrationAgent => $this->{mapping_id} . '222' 73 73 }; … … 76 76 $this->{mapping_id} . '666' => $TWiki::cfg{DefaultUserLogin}, 77 77 $this->{mapping_id} . '999' => 'unknown', 78 $this->{mapping_id} . '111' => ' TWikiContributor',78 $this->{mapping_id} . '111' => 'ProjectContributor', 79 79 $this->{mapping_id} . '222' => 'TWikiRegistrationAgent' 80 80 }; … … 83 83 $this->{mapping_id} . '666' => $TWiki::cfg{DefaultUserWikiName}, 84 84 $this->{mapping_id} . '999' => 'UnknownUser', 85 $this->{mapping_id} . '111' => ' TWikiContributor',85 $this->{mapping_id} . '111' => 'ProjectContributor', 86 86 $this->{mapping_id} . '222' => 'TWikiRegistrationAgent' 87 87 }; … … 90 90 $TWiki::cfg{DefaultUserWikiName} => $this->{mapping_id} . '666', 91 91 UnknownUser => $this->{mapping_id} . '999', 92 TWikiContributor=> $this->{mapping_id} . '111',92 ProjectContributor => $this->{mapping_id} . '111', 93 93 TWikiRegistrationAgent => $this->{mapping_id} . '222' 94 94 }; -
branches/Release04x02/test/bin/make_big.pl
r3 r487 108 108 my $t = time(); 109 109 print TOPIC <<FLUFF; 110 %META:TOPICINFO{author=" TWikiContributor" date="$t" format="1.1" version="1"}%110 %META:TOPICINFO{author="ProjectContributor" date="$t" format="1.1" version="1"}% 111 111 FLUFF 112 112 print TOPIC getWords($opts{size}); -
branches/Release04x02/tools/TWikiKernel/MANIFEST
r3 r487 34 34 COPYRIGHT 0440 35 35 data/Main/NobodyGroup.txt 0660 36 data/Main/ProjectContributor.txt 0660 36 37 data/Main/TWikiAdminGroup.txt 0660 37 data/Main/TWikiContributor.txt 066038 38 data/Main/TWikiGroupTemplate.txt 0660 39 39 data/Main/TWikiGroups.txt 0660 … … 117 117 data/TWiki/PreviewBackground.txt 0660 118 118 data/TWiki/PrintSkin.txt 0660 119 data/TWiki/ProjectContributor.txt 0660 119 120 data/TWiki/QuietSave.txt 0660 120 121 data/TWiki/RegistrationApprovals.txt 0660 … … 134 135 data/TWiki/TWiki.txt 0660 135 136 data/TWiki/TWikiAccessControl.txt 0660 136 data/TWiki/TWikiContributor.txt 0660137 137 data/TWiki/TWikiCss.txt 0660 138 138 data/TWiki/TWikiDocGraphics.txt 0660 -
branches/Release04x02/tools/TWikiKernel/build.pl
r3 r487 3 3 # Build for TWiki 4 4 # Crawford Currie 5 # Copyright (C) TWikiContributors, 2005 5 # Copyright (C) 2006-2008 ProjectContributors. All rights reserved. 6 # ProjectContributors are listed in the AUTHORS file in the root of 7 # the distribution. 6 8 7 9 use strict; … … 80 82 81 83 #check in 82 `ci -mbuildrelease -w TWikiContributor -t-new-topic $new/$file 2>&1`;84 `ci -mbuildrelease -wProjectContributor -t-new-topic $new/$file 2>&1`; 83 85 #get a copy of the latest revsion, no lock 84 86 `co -u -M $new/$file 2>&1`; … … 113 115 print `perl $this->{basedir}/tools/gendocs.pl -debug -root $this->{tmpDir}`; 114 116 $this->cp( "$this->{tmpDir}/AUTHORS", 115 "$this->{tmpDir}/pub/Main/ TWikiContributor/AUTHORS" );117 "$this->{tmpDir}/pub/Main/ProjectContributor/AUTHORS" ); 116 118 $this->cp( "$this->{tmpDir}/AUTHORS", 117 "$this->{tmpDir}/pub/TWiki/ TWikiContributor/AUTHORS" );119 "$this->{tmpDir}/pub/TWiki/ProjectContributor/AUTHORS" ); 118 120 119 121 for my $script qw( view rdiff ) { -
branches/Release04x02/tools/build.pl
r3 r487 3 3 # Build for TWiki 4 4 # Crawford Currie & Sven Dowideit 5 # Copyright (C) TWikiContributors, 2005 5 # Copyright (C) 2006-2008 ProjectContributors. All rights reserved. 6 # ProjectContributors are listed in the AUTHORS file in the root of 7 # the distribution. 6 8 7 9 use strict; … … 184 186 `$cmd`; 185 187 # create rcs file 186 `ci -u -mbuildrelease -w TWikiContributor -t-buildrelease $new/$file 2>&1`;188 `ci -u -mbuildrelease -wProjectContributor -t-buildrelease $new/$file 2>&1`; 187 189 } 188 190 … … 198 200 `$cmd`; 199 201 #check in 200 `ci -mbuildrelease -w TWikiContributor -t-new-topic $new/$file 2>&1`;202 `ci -mbuildrelease -wProjectContributor -t-new-topic $new/$file 2>&1`; 201 203 #get a copy of the latest revsion, no lock 202 204 `co -u -M $new/$file 2>&1`; … … 239 241 print `perl $this->{basedir}/tools/gendocs.pl -debug -root $this->{tmpDir}`; 240 242 $this->cp( "$this->{tmpDir}/AUTHORS", 241 "$this->{tmpDir}/pub/TWiki/ TWikiContributor/AUTHORS" );243 "$this->{tmpDir}/pub/TWiki/ProjectContributor/AUTHORS" ); 242 244 243 245 -
branches/Release04x02/tools/buildTWikiRelease.pl
r410 r487 7 7 # build a release tarball & upload... 8 8 # Sven Dowideit 9 # Copyright (C) TWikiContributors, 2005 9 # Copyright (C) 2006-2008 ProjectContributors. All rights reserved. 10 # ProjectContributors are listed in the AUTHORS file in the root of 11 # the distribution. 10 12 # 11 13 # If you are Sven (used by Sven's automated nightly build system) - call with perl ./buildTWikiRelease.pl -sven … … 82 84 `perlcritic --severity 5 --statistics --top 20 bin/ >> $twikihome/TWiki-PerlCritic.log 2>&1`; 83 85 #`cd tools; perl check_manifest.pl`; 84 #`cd data; grep '%META:TOPICINFO{' */*.txt | grep -v TestCases | grep -v 'author=" TWikiContributor".*version="\$Rev'`;86 #`cd data; grep '%META:TOPICINFO{' */*.txt | grep -v TestCases | grep -v 'author="ProjectContributor".*version="\$Rev'`; 85 87 86 88 #TODO: # fix up release notes with new changelogs - see -
branches/Release04x02/twikiplugins/BuildContrib/create_new_extension.pl
r463 r487 2 2 # Script for TWiki Collaboration Platform, http://TWiki.org/ 3 3 # 4 # Copyright (C) 2006-2008 TWikiContributors. All rights reserved. 4 # Copyright (C) 2006-2008 ProjectContributors. All rights reserved. 5 # ProjectContributors are listed in the AUTHORS file in the root of 6 # the distribution. 5 7 # 6 8 # This program is free software; you can redistribute it and/or -
branches/Release04x02/twikiplugins/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingContribTests.pm
r21 r487 289 289 $basemapping->handlesUser( undef, $TWiki::cfg{DefaultUserLogin} ) ); 290 290 $this->assert( $basemapping->handlesUser( undef, 'unknown' ) ); 291 $this->assert( $basemapping->handlesUser( undef, ' TWikiContributor' ) );291 $this->assert( $basemapping->handlesUser( undef, 'ProjectContributor' ) ); 292 292 $this->assert( 293 293 $basemapping->handlesUser( undef, 'TWikiRegistrationAgent' ) ); … … 305 305 $this->assert( $basemapping->handlesUser( undef, undef, 'UnknownUser' ) ); 306 306 $this->assert( 307 $basemapping->handlesUser( undef, undef, ' TWikiContributor' ) );307 $basemapping->handlesUser( undef, undef, 'ProjectContributor' ) ); 308 308 $this->assert( 309 309 $basemapping->handlesUser( undef, undef, 'TWikiRegistrationAgent' ) ); … … 325 325 $this->assert( 326 326 $basemapping->handlesUser( 327 undef, ' TWikiContributor', 'TWikiContributor'327 undef, 'ProjectContributor', 'ProjectContributor' 328 328 ) 329 329 ); -
branches/Release04x02/twikiplugins/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm
r21 r487 245 245 $this->assert( $k =~ s/^SorryOldMan,//, $k ); 246 246 $this->assert( $k =~ s/^StupidOldMan,//, $k ); 247 $this->assert( $k =~ s/^ TWikiContributor,//,$k );247 $this->assert( $k =~ s/^ProjectContributor,//, $k ); 248 248 $this->assert( $k =~ s/^TWikiGuest,//, $k ); 249 249 $this->assert( $k =~ s/^TWikiRegistrationAgent,//, $k ); -
branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/AutoAttachTests.pm
r21 r487 62 62 size => 2000000, 63 63 date => 2000000, 64 user => " TWikiContributor",64 user => "ProjectContributor", 65 65 comment => $comment, 66 66 attr => '' -
branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/Fn_GROUPS.pm
r21 r487 32 32 | *Group* | *Members* | 33 33 | <nop>AdminGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] | 34 | <nop>TWikiBaseGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] [[TemporaryGROUPSUsersWeb.TWikiGuest][TWikiGuest]] [[TemporaryGROUPSUsersWeb.UnknownUser][UnknownUser]] [[TemporaryGROUPSUsersWeb. TWikiContributor][TWikiContributor]] [[TemporaryGROUPSUsersWeb.TWikiRegistrationAgent][TWikiRegistrationAgent]] |34 | <nop>TWikiBaseGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] [[TemporaryGROUPSUsersWeb.TWikiGuest][TWikiGuest]] [[TemporaryGROUPSUsersWeb.UnknownUser][UnknownUser]] [[TemporaryGROUPSUsersWeb.ProjectContributor][ProjectContributor]] [[TemporaryGROUPSUsersWeb.TWikiRegistrationAgent][TWikiRegistrationAgent]] | 35 35 | [[TemporaryGROUPSUsersWeb.GropeGroup][GropeGroup]] | [[TemporaryGROUPSUsersWeb.ScumBag][ScumBag]] [[TemporaryGROUPSUsersWeb.TWikiGuest][TWikiGuest]] | 36 36 HUMPH -
branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/Fn_SEARCH.pm
r408 r487 583 583 584 584 my $text = <<'HERE'; 585 %META:TOPICINFO{author=" TWikiContributor" date="1169714817" format="1.1" version="1.2"}%585 %META:TOPICINFO{author="ProjectContributor" date="1169714817" format="1.1" version="1.2"}% 586 586 %META:TOPICPARENT{name="TestCaseAutoFormattedSearch"}% 587 587 !MichaelAnchor and !AnnaAnchor lived in Skagen in !DenmarkEurope!. There is a very nice museum you can visit! -
branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/FuncUsersTests.pm
r21 r487 216 216 if ( $TWiki::cfg{UserMappingManager} eq 'TWiki::Users::BaseUserMapping' ) { 217 217 @correctList = 218 qw/ TWikiContributor TWikiGuest TWikiRegistrationAgent UnknownUser/;218 qw/ProjectContributor TWikiGuest TWikiRegistrationAgent UnknownUser/; 219 219 } 220 220 else { 221 221 @correctList = 222 qw/ TWikiContributor TWikiGuest TWikiRegistrationAgent UnknownUser User86A UserA UserA86 UserB UserC UserZ/;222 qw/ProjectContributor TWikiGuest TWikiRegistrationAgent UnknownUser User86A UserA UserA86 UserB UserC UserZ/; 223 223 if ( $TWiki::cfg{Register}{AllowLoginName} == 1 ) { 224 224 push @correctList, 'ScumBag' -
branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/QueryTests.pm
r21 r487 39 39 path => 'anuvver path', 40 40 size => '100', 41 user => ' TWikiContributor',41 user => 'ProjectContributor', 42 42 rev => '105', 43 43 date => '99', -
branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/SaveScriptTests.pm
r408 r487 37 37 38 38 my $testtext1 = <<'HERE'; 39 %META:TOPICINFO{author=" TWikiContributor" date="1111931141" format="1.0" version="$Rev: 4579 $"}%39 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 4579 $"}% 40 40 41 41 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. -
branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/SemiAutomaticTestCaseTests.pm
r408 r487 53 53 my $twiki = new TWiki( $this->{test_user_login}, $query ); 54 54 $twiki->{store} 55 ->saveTopic( $twiki->{user}, $this->{users_web}, ' TWikiContributor',55 ->saveTopic( $twiki->{user}, $this->{users_web}, 'ProjectContributor', 56 56 'none' ); 57 57 my ( $text, $result ) = $this->capture( \&TWiki::UI::View::view, $twiki );
Note: See TracChangeset
for help on using the changeset viewer.
