Item10304: Move AdminGroup topic into Foswiki core

git-svn-id: http://svn.foswiki.org/branches/Release01x01@10653 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Feb 3, 2011 · 926e712 · 926e712
1 parent bc0fca4
commit 926e712
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/TopicUserMappingContrib/data/System/TopicUserMappingContrib.txt b/TopicUserMappingContrib/data/System/TopicUserMappingContrib.txt
@@ -67,6 +67,7 @@ It's a part of the default distribution of the Foswiki Core.
 |  Version: | %$VERSION% |
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  4.3.2 | Foswikitask:Item10304 - %USERSWEB%.AdminGroup moved from this extension to Foswiki core |
 |  4.3.1 | Foswikitask:Item9415 - Documentation updates |
 |  4.3 | 13 Mar 2010 - Made !UserRegistration customizable. |
 |  4.2.4 | 25 Feb 2010 - Updated documentation in !UserForm. |

diff --git a/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib.pm b/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib.pm
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 
 our $VERSION          = '$Rev$';
-our $RELEASE          = '4.3.1';
+our $RELEASE          = '4.3.2';
 our $SHORTDESCRIPTION = 'User management using data stored in topics';
 
 __END__

diff --git a/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib/MANIFEST b/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib/MANIFEST
@@ -10,7 +10,6 @@ data/Main/UserListHeader.txt 0644
 data/Main/NobodyGroup.txt 0644
 data/Main/UserList.txt 0644
 data/Main/UserListByDateJoined.txt 0644
-data/Main/AdminGroup.txt 0644 Wiki internal admin group
 data/Main/UserHomepageHeader.txt 0644
 data/Main/UserListByLocation.txt 0644
 data/Main/GroupTemplate.txt 0644

diff --git a/...erMappingContrib/data/Main/AdminGroup.txt → core/data/Main/AdminGroup.txt b/...erMappingContrib/data/Main/AdminGroup.txt → core/data/Main/AdminGroup.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="BaseUserMapping_333" comment="save topic" date="1282246509" format="1.1" reprev="3" version="3"}%
+%META:TOPICINFO{author="BaseUserMapping_333" comment="save topic" date="1282246509" format="1.1" reprev="1" version="1"}%
 %META:TOPICPARENT{name="WikiGroups"}%
 
 %INCLUDE{"%USERSWEB%.AdminUser" section="sudo_login"}%

diff --git a/core/lib/Foswiki/Contrib/core/MANIFEST b/core/lib/Foswiki/Contrib/core/MANIFEST
@@ -30,6 +30,7 @@ bin/view 0555
 bin/viewauth 0555
 bin/viewfile 0555
 data/Main/AdminUser.txt 0644
+data/Main/AdminGroup.txt 0644
 data/Main/GroupViewTemplate.txt 0644
 data/Main/ProjectContributor.txt 0644
 data/Main/SitePreferences.txt 0644