[Jifty-commit] r2996 - in jifty/trunk/plugins: AuthCASOnly/lib/Jifty/Plugin AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly/Model AuthLDAPOnly AuthLDAPOnly/lib/Jifty/Plugin AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly/Model AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Fri Mar 16 13:19:47 EDT 2007


Author: yves
Date: Fri Mar 16 13:19:44 2007
New Revision: 2996

Added:
   jifty/trunk/plugins/AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly/Model/User.pm
      - copied, changed from r2988, /jifty/trunk/plugins/AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly/Model/CASUser.pm
   jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly/Model/User.pm
      - copied, changed from r2988, /jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly/Model/LDAPUser.pm
Removed:
   jifty/trunk/plugins/AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly/Model/CASUser.pm
   jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly/Model/LDAPUser.pm
Modified:
   jifty/trunk/plugins/AuthCASOnly/MANIFEST
   jifty/trunk/plugins/AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly.pm
   jifty/trunk/plugins/AuthLDAPOnly/MANIFEST
   jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly.pm
   jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm

Log:
keep old LDAP and CAS plugins usable, 
 THIS COULD BREAK APP MODELS NAME
LDAPUser and CASUser models are now User


Modified: jifty/trunk/plugins/AuthCASOnly/MANIFEST
==============================================================================
--- jifty/trunk/plugins/AuthCASOnly/MANIFEST	(original)
+++ jifty/trunk/plugins/AuthCASOnly/MANIFEST	Fri Mar 16 13:19:44 2007
@@ -9,7 +9,7 @@
 lib/Jifty/Plugin/AuthCASOnly/Action/CASLogout.pm
 lib/Jifty/Plugin/AuthCASOnly/CurrentUser.pm
 lib/Jifty/Plugin/AuthCASOnly/Dispatcher.pm
-lib/Jifty/Plugin/AuthCASOnly/Model/CASUser.pm
+lib/Jifty/Plugin/AuthCASOnly/Model/User.pm
 Makefile.PL
 MANIFEST			This list of files
 META.yml

Modified: jifty/trunk/plugins/AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly.pm
==============================================================================
--- jifty/trunk/plugins/AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly.pm	(original)
+++ jifty/trunk/plugins/AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly.pm	Fri Mar 16 13:19:44 2007
@@ -37,7 +37,7 @@
         $CurrentCASUserClass = $args{CurrentUserClass}
             || "${appname}::CurrentUser";
         $AuthCASUserClass = $args{AuthCASUserClass}
-            || "${appname}::Model::CASUser";
+            || "${appname}::Model::User";
 
 	my ($conf, $cafile, $casserver);
     	foreach (@{Jifty->config->framework('Plugins')}) {

Copied: jifty/trunk/plugins/AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly/Model/User.pm (from r2988, /jifty/trunk/plugins/AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly/Model/CASUser.pm)
==============================================================================
--- /jifty/trunk/plugins/AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly/Model/CASUser.pm	(original)
+++ jifty/trunk/plugins/AuthCASOnly/lib/Jifty/Plugin/AuthCASOnly/Model/User.pm	Fri Mar 16 13:19:44 2007
@@ -1,4 +1,4 @@
-package Jifty::Plugin::AuthCASOnly::Model::CASUser;
+package Jifty::Plugin::AuthCASOnly::Model::User;
 use base qw/Jifty::Record/;
 use Jifty::DBI::Schema;
 use Scalar::Defer;

Modified: jifty/trunk/plugins/AuthLDAPOnly/MANIFEST
==============================================================================
--- jifty/trunk/plugins/AuthLDAPOnly/MANIFEST	(original)
+++ jifty/trunk/plugins/AuthLDAPOnly/MANIFEST	Fri Mar 16 13:19:44 2007
@@ -3,7 +3,7 @@
 lib/Jifty/Plugin/AuthLDAPOnly/Action/LDAPLogout.pm
 lib/Jifty/Plugin/AuthLDAPOnly/CurrentUser.pm
 lib/Jifty/Plugin/AuthLDAPOnly/Dispatcher.pm
-lib/Jifty/Plugin/AuthLDAPOnly/Model/LDAPUser.pm
+lib/Jifty/Plugin/AuthLDAPOnly/Model/User.pm
 Makefile.PL
 MANIFEST
 share/po/en.po

Modified: jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly.pm
==============================================================================
--- jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly.pm	(original)
+++ jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly.pm	Fri Mar 16 13:19:44 2007
@@ -50,7 +50,7 @@
         $CurrentLDAPUserClass = $args{CurrentUserClass}
             || "${appname}::CurrentUser";
         $AuthLDAPUserClass = $args{AuthLDAPUserClass}
-            || "${appname}::Model::LDAPUser";
+            || "${appname}::Model::User";
 
     	$params{'Hostname'} = $args{LDAPhost};
     	$params{'base'} = $args{LDAPbase};

Copied: jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly/Model/User.pm (from r2988, /jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly/Model/LDAPUser.pm)
==============================================================================
--- /jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly/Model/LDAPUser.pm	(original)
+++ jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly/Model/User.pm	Fri Mar 16 13:19:44 2007
@@ -1,4 +1,4 @@
-package Jifty::Plugin::AuthLDAPOnly::Model::LDAPUser;
+package Jifty::Plugin::AuthLDAPOnly::Model::User;
 use base qw/Jifty::Record/;
 use Jifty::DBI::Schema;
 use Scalar::Defer;

Modified: jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm
==============================================================================
--- jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm	(original)
+++ jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm	Fri Mar 16 13:19:44 2007
@@ -1,7 +1,8 @@
-package Jifty::Plugin::AuthzLDAP::Model::LDAPFilter::Schema;
+package Jifty::Plugin::AuthzLDAP::Model::LDAPFilter;
 use Jifty::DBI::Schema;
 use Scalar::Defer;
 
+use Jifty::Record schema {
 column
   name => type is 'text',
   label is 'Name',
@@ -22,10 +23,7 @@
   is immutable,
   default is defer { DateTime->now },
   filters are 'Jifty::DBI::Filter::DateTime';
-
-
-package Jifty::Plugin::AuthzLDAP::Model::LDAPFilter;
-use base qw/Jifty::Record/;
+};
 
 sub create {
     my $self  = shift;


More information about the Jifty-commit mailing list