[Catalyst-commits] r7663 - / trunk/examples/NewAuthApp trunk/examples/NewAuthApp/lib trunk/examples/NewAuthApp/lib/NewAuthApp/Model

[zarquon at dev.catalyst.perl.org]

Author: zarquon
Date: 2008-05-01 01:52:30 +0100 (Thu, 01 May 2008)
New Revision: 7663

Modified:
   /
   trunk/examples/NewAuthApp/lib/NewAuthApp.pm
   trunk/examples/NewAuthApp/lib/NewAuthApp/Model/AuthSchema.pm
   trunk/examples/NewAuthApp/newauthapp_dbic_store.conf
Log:
 r13019 at zaphod:  kd | 2008-05-01 10:51:35 +1000
 still broken dbix::class store



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - 1b129c88-ebf4-0310-add9-f09427935aba:/local/catalyst:4278
1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst:13015
3b9770f9-e80c-0410-a7de-cd203d167417:/local/catalyst:3514
dd8ad9ea-0304-0410-a433-df5f223e7bc0:/local/Catalyst:6909
   + 1b129c88-ebf4-0310-add9-f09427935aba:/local/catalyst:4278
1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst:13019
3b9770f9-e80c-0410-a7de-cd203d167417:/local/catalyst:3514
dd8ad9ea-0304-0410-a433-df5f223e7bc0:/local/Catalyst:6909

Modified: trunk/examples/NewAuthApp/lib/NewAuthApp/Model/AuthSchema.pm
===================================================================
--- trunk/examples/NewAuthApp/lib/NewAuthApp/Model/AuthSchema.pm	2008-04-30 19:56:26 UTC (rev 7662)
+++ trunk/examples/NewAuthApp/lib/NewAuthApp/Model/AuthSchema.pm	2008-05-01 00:52:30 UTC (rev 7663)
@@ -1,9 +1,5 @@
 package NewAuthApp::Model::AuthSchema;
-
 use strict;
 use warnings;
 use base 'Catalyst::Model::DBIC::Schema';
-__PACKAGE__->config(
-    schema_class => 'Schema',
-    connect_info => [ "dbi:SQLite:auth.db",'','',{AutoCommit => 1},]);
 1;

Modified: trunk/examples/NewAuthApp/lib/NewAuthApp.pm
===================================================================
--- trunk/examples/NewAuthApp/lib/NewAuthApp.pm	2008-04-30 19:56:26 UTC (rev 7662)
+++ trunk/examples/NewAuthApp/lib/NewAuthApp.pm	2008-05-01 00:52:30 UTC (rev 7663)
@@ -14,25 +14,7 @@
                Session::Store::FastMmap
                /;
 
-__PACKAGE__->config->{'Plugin::Authentication'} = {
-    default_realm => 'members',
-    realms => {
-        members => {
-            credential => {
-                class => 'Password',
-                password_field => 'password',
-                password_type => 'clear'
-            },
-            store => {
-                class => 'DBIx::Class',
-                user_class => 'NewAuthApp::Users',
-                role_column => 'roles'
-            }
-        }
-    }
-};
 
-
 our $VERSION = '0.01';
 
 

Modified: trunk/examples/NewAuthApp/newauthapp_dbic_store.conf
===================================================================
--- trunk/examples/NewAuthApp/newauthapp_dbic_store.conf	2008-04-30 19:56:26 UTC (rev 7662)
+++ trunk/examples/NewAuthApp/newauthapp_dbic_store.conf	2008-05-01 00:52:30 UTC (rev 7663)
@@ -1,19 +1,25 @@
 name NewAuthApp
 admin me at example.com
-<Plugin::Authentication>
-    <realms>
-        <members>
-            <store>
-                role_column   roles
-                class   DBIx::Class
-                user_class   NewAuthApp::Users
-            </store>
-            <credential>
-                password_field   password
-                password_type   clear
-                class   Password
-            </credential>
-        </members>
-    </realms>
-    default_realm   members
-</Plugin::Authentication>
+<authentication>
+  <realms>
+    default_realm  users
+    <users>
+      <credential>
+        password_field   password
+        password_type   clear
+        class   Password
+      </credential>
+      <store>
+        role_column   roles
+        class   DBIx::Class
+        user_class  AuthSchema::User
+      </store>
+    </users>
+  </realms>
+</authentication>
+<Model::AuthSchema>
+    schema_class Schema
+    connect_info dbi:SQLite:__path_to(auth.db)__
+    connect_info user
+    connect_info passwd # keep these here for dsns that need 'em
+</Model::AuthSchema>
\ No newline at end of file