Changeset 632


Ignore:
Timestamp:
11/14/08 07:06:08 (4 years ago)
Author:
SvenDowideit
Message:

Item109: more renaming of TWikiUserMapping

Location:
branches/Release04x02
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/Release04x02/data/TWiki/ReleaseNotes01x00.txt

    r617 r632  
    2323 
    2424   * *Plugins:* !CommentPlugin, !EditTablePlugin, !EmptyPlugin, !InterwikiPlugin, !PreferencesPlugin, !RenderListPlugin, !SlideShowPlugin, !SmiliesPlugin, !SpreadSheetPlugin, !TablePlugin, !TinyMCEPlugin, !TwistyPlugin, !WysiwygPlugin 
    25    * *Contribs:* !BehaviourContrib, !JSCalendarContrib, !MailerContrib, !TipsContrib, !TWikiUserMappingContrib, !TwistyContrib 
     25   * *Contribs:* !BehaviourContrib, !JSCalendarContrib, !MailerContrib, !TipsContrib, !TopicUserMappingContrib, !TwistyContrib 
    2626   * *Skins:* !ClassicSkin, !PatternSkin 
    2727 
    … …  
    5555      * Many new functions in the API for plugin developers. 
    5656      * Table of Content (TOC) feature enhanced  
    57       * User Mapping (mapping between login name and !WikiName) code has been extended to allow pluggable modules to integrate with all sorts of alternative authentication and Management schemes. For normal cases you use the default !TWikiUserMapping which is using the !Main.TWikiUsers topic to map between login and !WikiName. A new !BaseUserMapping is provided for TWikis where you only have guests and an administrator. In this case you use the login and password given in configure to login as an admin. 
     57      * User Mapping (mapping between login name and !WikiName) code has been extended to allow pluggable modules to integrate with all sorts of alternative authentication and Management schemes. For normal cases you use the default !TopicUserMapping which is using the !Main.TWikiUsers topic to map between login and !WikiName. A new !BaseUserMapping is provided for TWikis where you only have guests and an administrator. In this case you use the login and password given in configure to login as an admin. 
    5858 
    5959---++ Important Changes since 4.2.3 
    … …  
    225225| [[%BUGS%/Item5246][Item5246]] | When using SERVERTIME with $week in template TWIki fails on missing CPAN lib dependency | 
    226226| [[%BUGS%/Item5245][Item5245]] | adding missing docs for NEWLINKFORMAT - introduced in 2006 | 
    227 | [[%BUGS%/Item5226][Item5226]] | TWikiUserMapping speed re-enhancements | 
     227| [[%BUGS%/Item5226][Item5226]] | TopicUserMapping speed re-enhancements | 
    228228| [[%BUGS%/Item5210][Item5210]] | EDITTABLE with a simple text input in which the user has put %BR gets trunkated at the first BR | 
    229229| [[%BUGS%/Item5123][Item5123]] | missing fetchUsers method in Password.pm | 
    … …  
    276276| [[%BUGS%/Item4713][Item4713]] | Repackage native search as a conrib, remove from 4.2 | 
    277277| [[%BUGS%/Item4702][Item4702]] | Lighter top bar background image | 
    278 | [[%BUGS%/Item4694][Item4694]] | Standard user topics of !TWikiUserMapping are referenced, but not defined | 
     278| [[%BUGS%/Item4694][Item4694]] | Standard user topics of !TopicUserMapping are referenced, but not defined | 
    279279| [[%BUGS%/Item4692][Item4692]] | Forking search algorithm throws error if topic is nonexistent | 
    280280| [[%BUGS%/Item4680][Item4680]] | Print view seems weird in both pattern skin and default skin | 
    … …  
    671671| [[%BUGS%/Item5547][Item5547]] | "action" parameter for "edit" script fail in 4.2 | 
    672672| [[%BUGS%/Item5542][Item5542]] | After you enable {UserInterfaceInternationalisation} first view shows an error | 
    673 | [[%BUGS%/Item5540][Item5540]] | TWikiUserMapping: single character erroneously reported as a group | 
     673| [[%BUGS%/Item5540][Item5540]] | TopicUserMapping: single character erroneously reported as a group | 
    674674| [[%BUGS%/Item5536][Item5536]] | robots.txt is missing some obvious scripts - like login | 
    675675| [[%BUGS%/Item5535][Item5535]] | IF{"$BANNER" does not really work. | 

  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/TopicUserMappingContrib.txt

    r628 r632  
    1 ---+!! !TWikiUserMappingContrib 
     1---+!! !TopicUserMappingContrib 
    22<!-- 
    33One line description, required for extensions repository catalog. 
    … …  
    1010The _User Mapping Manager_ interface provides services for mapping between a 'user identity' as used when talking to an external authentication provider, 
    1111an internal TWiki canonical user ID, and the displayed name used to identify the user in TWiki.  
    12 This is the default <nop>TWikiUserMapping in which user information is stored in TWiki topics - one per user, and then any mapping needed is done using the 
     12This is the default <nop>TopicUserMapping in which user information is stored in TWiki topics - one per user, and then any mapping needed is done using the 
    1313<nop>TWikiUsers topic in the %MAINWEB%. 
    1414 
    … …  
    5151 
    5252---++ Settings 
    53 The TWikiUserMappingContrib specific settings have not yet been moved out of the standard TWiki.spec. This will be done in a future release. 
     53The TopicUserMappingContrib specific settings have not yet been moved out of the standard TWiki.spec. This will be done in a future release. 
    5454 
    5555---++ Installation Instructions 
    … …  
    6767|  4.2.0 | 22 Jan 2008 - Distributed with TWiki 4.2.0 | 
    6868|  Dependencies: | %$DEPENDENCIES% | 
    69 |  Contrib Home: | http://twiki.org/cgi-bin/view/Plugins/TWikiUserMappingContrib | 
    70 |  Feedback: | http://twiki.org/cgi-bin/view/Plugins/TWikiUserMappingContribDev | 
    71 |  Appraisal: | http://twiki.org/cgi-bin/view/Plugins/TWikiUserMappingContribAppraisal | 
     69|  Contrib Home: | http://twiki.org/cgi-bin/view/Plugins/TopicUserMappingContrib | 
     70|  Feedback: | http://twiki.org/cgi-bin/view/Plugins/TopicUserMappingContribDev | 
     71|  Appraisal: | http://twiki.org/cgi-bin/view/Plugins/TopicUserMappingContribAppraisal | 
    7272 
    7373<!-- Do _not_ attempt to edit this topic; it is auto-generated. Please add comments/questions/remarks to the Dev topic instead. --> 

  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/lib/TWiki/Users/TopicUserMapping.pm

    r629 r632  
    2020=begin twiki 
    2121 
    22 ---+ package TWiki::Users::TWikiUserMapping 
     22---+ package TWiki::Users::TopicUserMapping 
    2323 
    2424The User mapping is the process by which TWiki maps from a username (a login name) 
    … …  
    4040=cut 
    4141 
    42 package TWiki::Users::TWikiUserMapping; 
     42package TWiki::Users::TopicUserMapping; 
    4343use base 'TWiki::UserMapping'; 
    4444 
    … …  
    4848 
    4949#use Monitor; 
    50 #Monitor::MonitorMethod('TWiki::Users::TWikiUserMapping'); 
     50#Monitor::MonitorMethod('TWiki::Users::TopicUserMapping'); 
    5151 
    5252=begin twiki 
    … …  
    8484    { 
    8585        $session->writeWarning( 
    86 'TWikiUserMapping has TURNED OFF EnableNewUserRegistration, because the password file is read only.' 
     86'TopicUserMapping has TURNED OFF EnableNewUserRegistration, because the password file is read only.' 
    8787        ); 
    8888        $TWiki::cfg{Register}{EnableNewUserRegistration} = 0; 
    … …  
    144144first, then login, then wikiname. This mapping is special - for backwards 
    145145compatibility, it assumes responsibility for _all_ non BaseMapping users. 
    146 If you're needing to mix the TWikiuserMapping with other mappings, 
    147 define $this->{mapping_id} = 'TWikiUserMapping_'; 
     146If you're needing to mix the TopicUserMapping with other mappings, 
     147define $this->{mapping_id} = 'TopicUserMapping_'; 
    148148 
    149149=cut 
    … …  
    159159    else { 
    160160 
    161         # Used when (if) TWikiUserMapping is subclassed 
     161        # Used when (if) TopicUserMapping is subclassed 
    162162        return 1 if ( defined $cUID && $cUID =~ /^($this->{mapping_id})/ ); 
    163163    } 
    … …  
    10511051sub _getListOfGroups { 
    10521052    my $this = shift; 
    1053     ASSERT( ref($this) eq 'TWiki::Users::TWikiUserMapping' ) if DEBUG; 
     1053    ASSERT( ref($this) eq 'TWiki::Users::TopicUserMapping' ) if DEBUG; 
    10541054 
    10551055    unless ( $this->{groupsList} ) { 

  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/test/unit/TopicUserMappingContrib/TopicUserMappingContribSuite.pm

    r629 r632  
    1 package TWikiUserMappingContribSuite; 
     1package TopicUserMappingContribSuite; 
    22use base 'Unit::TestSuite'; 
    33 
    44sub include_tests { 
    5     return qw(TWikiUserMappingContribTests TWikiUserMappingTests); 
     5    return qw(TopicUserMappingContribTests TopicUserMappingTests); 
    66} 
    77 

  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/test/unit/TopicUserMappingContrib/TopicUserMappingContribTests.pm

    r629 r632  
    22 
    33# 
    4 # Tests the TWikiUserMappingContrib, including dealing with legacy login 
     4# Tests the TopicUserMappingContrib, including dealing with legacy login 
    55# names and wiki names stored in topics, in TOPICINFO and FILEATTACHMENT 
    66# meta-data. 
    … …  
    88# Only works with the RCS store. 
    99# 
    10 package TWikiUserMappingContribTests; 
     10package TopicUserMappingContribTests; 
    1111 
    1212use base qw( TWikiFnTestCase ); 
    … …  
    2424 
    2525sub new { 
    26     my $self = shift()->SUPER::new( 'TWikiuserMappingContribTests', @_ ); 
     26    my $self = shift()->SUPER::new( 'TopicUserMappingContribTests', @_ ); 
    2727    return $self; 
    2828} 
    2929 
    3030sub fixture_groups { 
    31     return ( [ 'NormalTWikiUserMapping', 'NamedTWikiUserMapping', ] ); 
    32 } 
    33  
    34 sub NormalTWikiUserMapping { 
    35     my $this = shift; 
    36     $TWiki::Users::TWikiUserMapping::TWIKI_USER_MAPPING_ID = ''; 
     31    return ( [ 'NormalTopicUserMapping', 'NamedTopicUserMapping', ] ); 
     32} 
     33 
     34sub NormalTopicUserMapping { 
     35    my $this = shift; 
     36    $TWiki::Users::TopicUserMapping::TWIKI_USER_MAPPING_ID = ''; 
    3737    $this->set_up_for_verify(); 
    3838} 
    3939 
    40 sub NamedTWikiUserMapping { 
     40sub NamedTopicUserMapping { 
    4141    my $this = shift; 
    4242 
    4343    # Set a mapping ID for purposes of testing named mappings 
    44     $TWiki::Users::TWikiUserMapping::TWIKI_USER_MAPPING_ID = 'TestMapping_'; 
     44    $TWiki::Users::TopicUserMapping::TWIKI_USER_MAPPING_ID = 'TestMapping_'; 
    4545    $this->set_up_for_verify(); 
    4646} 
    … …  
    6464    #default settings 
    6565    $TWiki::cfg{LoginManager}       = 'TWiki::LoginManager::TemplateLogin'; 
    66     $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TWikiUserMapping'; 
     66    $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TopicUserMapping'; 
    6767    $TWiki::cfg{UseClientSessions}  = 1; 
    6868    $TWiki::cfg{PasswordManager}    = "TWiki::Users::HtPasswdUser"; 
    … …  
    116116} 
    117117 
    118 #TODO: add tests for when you're not using TWikiUserMapping at all... 
     118#TODO: add tests for when you're not using TopicUserMapping at all... 
    119119#New 4.2 cUID based topics 
    120 sub verify_WikiNameTWikiUserMapping { 
     120sub verify_WikiNameTopicUserMapping { 
    121121    my $this = shift; 
    122122    $this->setup_new_session(); 
    … …  
    126126} 
    127127 
    128 sub verify_LoginNameTWikiUserMapping { 
     128sub verify_LoginNameTopicUserMapping { 
    129129    my $this = shift; 
    130130    $TWiki::cfg{Register}{AllowLoginName} = 1; 
    … …  
    265265<div class="twikiAttachments"> 
    266266| *I* | *%MAKETEXT{"Attachment"}%* | *%MAKETEXT{"Action"}%* | *%MAKETEXT{"Size"}%* | *%MAKETEXT{"Date"}%* | *%MAKETEXT{"Who"}%* | *%MAKETEXT{"Comment"}%* | 
    267 | <img width="16" alt="png" align="top" src="%PUBURLPATH%/TWiki/DocumentGraphics/png.gif" height="16" border="0" /><span class="twikiHidden">png</span> | <a href="%ATTACHURLPATH%/%ENCODE{home.org.au.png}%">home.org.au.png</a> | <a href="%SCRIPTURLPATH{"attach"}%/%WEB%/%TOPIC%?filename=%ENCODE{"home.org.au.png"}%;revInfo=1" title="%MAKETEXT{"change, update, previous revisions, move, delete..."}%" rel="nofollow">%MAKETEXT{"manage"}%</a> |  4.1&nbsp;K|<span class="twikiNoBreak">31 May 2007 - 21:58</span> |TemporaryTWikiuserMappingContribTestsUsersWeb.JoeDoe  |&nbsp;  | 
     267| <img width="16" alt="png" align="top" src="%PUBURLPATH%/TWiki/DocumentGraphics/png.gif" height="16" border="0" /><span class="twikiHidden">png</span> | <a href="%ATTACHURLPATH%/%ENCODE{home.org.au.png}%">home.org.au.png</a> | <a href="%SCRIPTURLPATH{"attach"}%/%WEB%/%TOPIC%?filename=%ENCODE{"home.org.au.png"}%;revInfo=1" title="%MAKETEXT{"change, update, previous revisions, move, delete..."}%" rel="nofollow">%MAKETEXT{"manage"}%</a> |  4.1&nbsp;K|<span class="twikiNoBreak">31 May 2007 - 21:58</span> |TemporaryTopicUserMappingContribTestsUsersWeb.JoeDoe  |&nbsp;  | 
    268268</div> 
    269269THIS 

  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/test/unit/TopicUserMappingContrib/TopicUserMappingTests.pm

    r629 r632  
    11use strict; 
    22 
    3 package TWikiUserMappingTests; 
    4  
    5 # Some basic tests for TWiki::Users::TWikiUserMapping 
     3package TopicUserMappingTests; 
     4 
     5# Some basic tests for TWiki::Users::TopicUserMapping 
    66# 
    77# The tests are performed using the APIs published by the facade class, 
    8 # TWiki:Users, not the actual TWiki::Users::TWikiuserMapping 
     8# TWiki:Users, not the actual TWiki::Users::TopicUserMapping 
    99 
    1010use base qw(TWikiTestCase); 
    … …  
    1212use TWiki; 
    1313use TWiki::Users; 
    14 use TWiki::Users::TWikiUserMapping; 
     14use TWiki::Users::TopicUserMapping; 
    1515use Error qw( :try ); 
    1616 
    … …  
    1919my $ttpath; 
    2020 
    21 my $testSysWeb    = 'TemporaryTWikiUserMappingTestsSystemWeb'; 
    22 my $testNormalWeb = "TemporaryTWikiUserMappingTestsNormalWeb"; 
    23 my $testUsersWeb  = "TemporaryTWikiUserMappingTestsUsersWeb"; 
     21my $testSysWeb    = 'TemporaryTopicUserMappingTestsSystemWeb'; 
     22my $testNormalWeb = "TemporaryTopicUserMappingTestsNormalWeb"; 
     23my $testUsersWeb  = "TemporaryTopicUserMappingTestsUsersWeb"; 
    2424my $testUser; 
    2525 
    2626sub fixture_groups { 
    27     return ( [ 'NormalTWikiUserMapping', 'NamedTWikiUserMapping', ] ); 
    28 } 
    29  
    30 sub NormalTWikiUserMapping { 
    31     my $this = shift; 
    32     $TWiki::Users::TWikiUserMapping::TWIKI_USER_MAPPING_ID = ''; 
     27    return ( [ 'NormalTopicUserMapping', 'NamedTopicUserMapping', ] ); 
     28} 
     29 
     30sub NormalTopicUserMapping { 
     31    my $this = shift; 
     32    $TWiki::Users::TopicUserMapping::TWIKI_USER_MAPPING_ID = ''; 
    3333    $this->set_up_for_verify(); 
    3434} 
    3535 
    36 sub NamedTWikiUserMapping { 
     36sub NamedTopicUserMapping { 
    3737    my $this = shift; 
    3838 
    3939    # Set a mapping ID for purposes of testing named mappings 
    40     $TWiki::Users::TWikiUserMapping::TWIKI_USER_MAPPING_ID = 'TestMapping_'; 
     40    $TWiki::Users::TopicUserMapping::TWIKI_USER_MAPPING_ID = 'TestMapping_'; 
    4141    $this->set_up_for_verify(); 
    4242} 
    … …  
    5858    $TWiki::cfg{SystemWebName}        = $testSysWeb; 
    5959    $TWiki::cfg{LocalSitePreferences} = "$testUsersWeb.SitePreferences"; 
    60     $TWiki::cfg{UserMappingManager}   = 'TWiki::Users::TWikiUserMapping'; 
     60    $TWiki::cfg{UserMappingManager}   = 'TWiki::Users::TopicUserMapping'; 
    6161    $TWiki::cfg{Register}{AllowLoginName}            = 1; 
    6262    $TWiki::cfg{Register}{EnableNewUserRegistration} = 1; 

  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/tools/upgrade_emails.pl

    r3 r632  
    1818 
    1919use TWiki; 
    20 use TWiki::Users::TWikiUserMapping; # required to get email addresses 
     20use TWiki::Users::TopicUserMapping; # required to get email addresses 
    2121 
    2222my $twiki = new TWiki(); 
    … …  
    6262                } else { 
    6363                    # Get emails *from the TWiki user mapping manager* 
    64                     @em = TWiki::Users::TWikiUserMapping::mapper_getEmails( 
     64                    @em = TWiki::Users::TopicUserMapping::mapper_getEmails( 
    6565                        $twiki, $cUID); 
    6666                    if( scalar( @em )) { 

  • branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/ClientTests.pm

    r624 r632  
    5050} 
    5151 
    52 sub TWikiUserMapping { 
    53     my $this = shift; 
    54     $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TWikiUserMapping'; 
     52sub TopicUserMapping { 
     53    my $this = shift; 
     54    $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TopicUserMapping'; 
    5555    $this->set_up_for_verify(); 
    5656} 
    … …  
    5959sub fixture_groups { 
    6060    return ( [ 'TemplateLoginManager', 'ApacheLoginManager', 'NoLoginManager' ], 
    61         [ 'TWikiUserMapping', 'BaseUserMapping' ] ); 
     61        [ 'TopicUserMapping', 'BaseUserMapping' ] ); 
    6262} 
    6363 

  • branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/Fn_SEARCH.pm

    r487 r632  
    630630    my $this = shift; 
    631631    my $text = <<'HERE'; 
    632 %META:TOPICINFO{author="TWikiUserMapping_guest" date="1178612772" format="1.1" version="1.1"}% 
     632%META:TOPICINFO{author="TopicUserMapping_guest" date="1178612772" format="1.1" version="1.1"}% 
    633633%META:TOPICPARENT{name="WebHome"}% 
    634634something before. Another 
    … …  
    640640%META:FIELD{name="Firstname" attributes="" title="First Name" value="Emma"}% 
    641641%META:FIELD{name="Lastname" attributes="" title="First Name" value="Peel"}% 
    642 %META:TOPICMOVED{by="TWikiUserMapping_guest" date="1176311052" from="Sandbox.TestETP" to="Sandbox.TestEarlyTimeProtocol"}% 
     642%META:TOPICMOVED{by="TopicUserMapping_guest" date="1176311052" from="Sandbox.TestETP" to="Sandbox.TestEarlyTimeProtocol"}% 
    643643%META:FILEATTACHMENT{name="README" comment="Blah Blah" date="1157965062" size="5504"}% 
    644644HERE 
    … …  
    647647 
    648648    $text = <<'HERE'; 
    649 %META:TOPICINFO{author="TWikiUserMapping_guest" date="12" format="1.1" version="1.2"}% 
     649%META:TOPICINFO{author="TopicUserMapping_guest" date="12" format="1.1" version="1.2"}% 
    650650first line 
    651651This is QueryTopicTwo SMONG 
    … …  
    866866        my $vE = ( $n == 2 )   ? 'A' : 'B'; 
    867867        my $text = <<HERE; 
    868 %META:TOPICINFO{author="TWikiUserMapping_guest" date="12" format="1.1" version="1.2"}% 
     868%META:TOPICINFO{author="TopicUserMapping_guest" date="12" format="1.1" version="1.2"}% 
    869869---+ Progressive Sexuality 
    870870A Symbol Interpreted In American Architecture. Meta-Physics Of Marxism & Poverty In The American Landscape. Exploration Of Crime In Mexican Sculptures: A Study Seen In American Literature. Brief Survey Of Suicide In Italian Art: The Big Picture. Special Studies In Bisexual Female Architecture. Brief Survey Of Suicide In Polytheistic Literature: Analysis, Analysis, and Critical Thinking. Radical Paganism: Modern Theories. Liberal Mexican Religion In The Modern Age. Selected Topics In Global Warming: $vD Policy In Modern America. Survey Of The Aesthetic Minority Revolution In The American Landscape. Populist Perspectives: Myth & Reality. Ethnicity In Modern America: The Bisexual Latino Condition. Postmodern Marxism In Modern America. Female Literature As A Progressive Genre. Horror & Life In Recent Times. The Universe Of Female Values In The Postmodern Era. 

  • branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/FuncUsersTests.pm

    r624 r632  
    6767} 
    6868 
    69 sub TWikiUserMapping { 
    70     my $this = shift; 
    71     $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TWikiUserMapping'; 
     69sub TopicUserMapping { 
     70    my $this = shift; 
     71    $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TopicUserMapping'; 
    7272    $this->set_up_for_verify(); 
    7373} 
    … …  
    8686        [ 'NoLoginManager', 'ApacheLoginManager', 'TemplateLoginManager' ], 
    8787        [ 'AllowLoginName', 'DontAllowLoginName' ], 
    88         ['TWikiUserMapping'], 
     88        ['TopicUserMapping'], 
    8989        [ 'NonePasswordManager', 'HtPasswordPasswordManager' ] 
    9090    ); 
    … …  
    9595        [ 'TemplateLoginManager', 'ApacheLoginManager', 'NoLoginManager' ], 
    9696        [ 'AllowLoginName', 'DontAllowLoginName'], 
    97 #        [ 'TWikiUserMapping', 'BaseUserMapping' ] ); 
    98         [ 'TWikiUserMapping' ] ); 
     97#        [ 'TopicUserMapping', 'BaseUserMapping' ] ); 
     98        [ 'TopicUserMapping' ] ); 
    9999 
    100100=cut 
    … …  
    641641    #$TWiki::cfg{RenderLoggedInButUnknownUsers} is false, or undefined 
    642642 
    643     $this->assert_str_equals( 'TWikiUserMapping_NonExistantUser', 
    644         TWiki::Func::getWikiName('TWikiUserMapping_NonExistantUser') ); 
     643    $this->assert_str_equals( 'TopicUserMapping_NonExistantUser', 
     644        TWiki::Func::getWikiName('TopicUserMapping_NonExistantUser') ); 
    645645    my $nonexistantuser_cUID = 
    646646      $this->{twiki}->{users} 
    … …  
    925925    #TODO: consider how to render unkown user's 
    926926    $this->assert_null( 
    927         TWiki::Func::wikiToUserName('TWikiUserMapping_NonExistantUser') ); 
     927        TWiki::Func::wikiToUserName('TopicUserMapping_NonExistantUser') ); 
    928928    $this->assert_null( 
    929929        TWiki::Func::wikiToUserName( $loginname{NonExistantuser} ) ); 
    … …  
    996996    #TODO: consider how to render unkown user's 
    997997    $this->assert( 
    998         !TWiki::Func::isAnAdmin('TWikiUserMapping_NonExistantUser') ); 
     998        !TWiki::Func::isAnAdmin('TopicUserMapping_NonExistantUser') ); 
    999999    my $nonexistantuser_cUID = 
    10001000      $this->{twiki}->{users} 

  • branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/HierarchicalWebsTests.pm

    r408 r632  
    2121    $TWiki::cfg{Htpasswd}{FileName}     = '$TWiki::cfg{TempfileDir}/junkpasswd'; 
    2222    $TWiki::cfg{PasswordManager}        = 'TWiki::Users::HtPasswdUser'; 
    23     $TWiki::cfg{UserMappingManager}     = 'TWiki::Users::TWikiUserMapping'; 
     23    $TWiki::cfg{UserMappingManager}     = 'TWiki::Users::TopicUserMapping'; 
    2424    $TWiki::cfg{LoginManager}           = 'TWiki::LoginManager::TemplateLogin'; 
    2525    $TWiki::cfg{Register}{EnableNewUserRegistration} = 1; 

  • branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/RegisterTests.pm

    r408 r632  
    213213} 
    214214 
    215 sub TWikiUserMapping { 
    216     my $this = shift; 
    217     $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TWikiUserMapping'; 
     215sub TopicUserMapping { 
     216    my $this = shift; 
     217    $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TopicUserMapping'; 
    218218    $this->set_up_for_verify(); 
    219219} 
    … …  
    230230        ], 
    231231        [ 
    232             'TWikiUserMapping', 
     232            'TopicUserMapping', 
    233233 
    234234            #'BaseUserMapping', 

  • branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/TWikiFnTestCase.pm

    r408 r632  
    4444    $TWiki::cfg{Htpasswd}{FileName}       = "$TWiki::cfg{WorkingDir}/htpasswd"; 
    4545    $TWiki::cfg{PasswordManager}          = 'TWiki::Users::HtPasswdUser'; 
    46     $TWiki::cfg{UserMappingManager}       = 'TWiki::Users::TWikiUserMapping'; 
     46    $TWiki::cfg{UserMappingManager}       = 'TWiki::Users::TopicUserMapping'; 
    4747    $TWiki::cfg{LoginManager} = 'TWiki::LoginManager::TemplateLogin'; 
    4848    $TWiki::cfg{Register}{EnableNewUserRegistration} = 1; 

  • branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/VariableTests.pm

    r408 r632  
    132132$this->{users_web}.ScumBag 
    133133scum, $this->{users_web}.ScumBag, scumbag\@example.com 
    134 ${TWiki::Users::TWikiUserMapping::TWIKI_USER_MAPPING_ID}scum,scumbag\@example.com,scum,ScumBag,$this->{users_web}.ScumBag 
     134${TWiki::Users::TopicUserMapping::TWIKI_USER_MAPPING_ID}scum,scumbag\@example.com,scum,ScumBag,$this->{users_web}.ScumBag 
    135135BaseUserMapping_666,,guest,TWikiGuest,$this->{users_web}.TWikiGuest 
    136136END 
Note: See TracChangeset for help on using the changeset viewer.