From 9fb4f63fd59808ef1ee2bf1650fbd3856257f0eb Mon Sep 17 00:00:00 2001
From: Ton <github.com@snelweg.net>
Date: Sat, 28 Jan 2012 19:34:00 +0100
Subject: [PATCH 1/3] modified the AppController classes for CakePhp 2.1
 Signed-off-by:Ton <github.com@snelweg.net>

---
 Controller/UmdashboardController.php                          | 4 ++--
 Controller/UmpermissionsController.php                        | 4 ++--
 Controller/UmrolesController.php                              | 4 ++--
 Controller/UmusersController.php                              | 4 ++--
 .../{UserminAppController.php => UserminController.php}       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename Controller/{UserminAppController.php => UserminController.php} (71%)

diff --git a/Controller/UmdashboardController.php b/Controller/UmdashboardController.php
index 213c5c6..ea2f191 100644
--- a/Controller/UmdashboardController.php
+++ b/Controller/UmdashboardController.php
@@ -1,11 +1,11 @@
 <?php
 
-App::uses('UserminAppController', 'Usermin.Controller');
+App::uses('UserminController', 'Usermin.Controller');
 
 /**
  * Dashboard for user management
  */
-class UmdashboardController extends UserminAppController {
+class UmdashboardController extends UserminController {
 
     public $uses = array('Usermin.Umuser', 'Usermin.Umpermission', 'Usermin.Umrole');
     public function index() {
diff --git a/Controller/UmpermissionsController.php b/Controller/UmpermissionsController.php
index 8e21167..40ffb06 100644
--- a/Controller/UmpermissionsController.php
+++ b/Controller/UmpermissionsController.php
@@ -1,11 +1,11 @@
 <?php
-App::uses('UserminAppController', 'Usermin.Controller');
+App::uses('UserminController', 'Usermin.Controller');
 /**
  * Umpermissions Controller
  *
  * @property Umpermission $Umpermission
  */
-class UmpermissionsController extends UserminAppController {
+class UmpermissionsController extends UserminController {
 
 
 /**
diff --git a/Controller/UmrolesController.php b/Controller/UmrolesController.php
index 86cd872..497ccb9 100644
--- a/Controller/UmrolesController.php
+++ b/Controller/UmrolesController.php
@@ -1,11 +1,11 @@
 <?php
-App::uses('UserminAppController', 'Usermin.Controller');
+App::uses('UserminController', 'Usermin.Controller');
 /**
  * Umroles Controller
  *
  * @property Umrole $Umrole
  */
-class UmrolesController extends UserminAppController {
+class UmrolesController extends UserminController {
 
 
 /**
diff --git a/Controller/UmusersController.php b/Controller/UmusersController.php
index 009ee6b..7026bf5 100644
--- a/Controller/UmusersController.php
+++ b/Controller/UmusersController.php
@@ -1,13 +1,13 @@
 <?php
 
-App::uses('UserminAppController', 'Usermin.Controller');
+App::uses('UserminController', 'Usermin.Controller');
 
 /**
  * Umusers Controller
  *
  * @property Umuser $Umuser
  */
-class UmusersController extends UserminAppController {
+class UmusersController extends UserminController {
 
     public function beforeFilter() {
         parent::beforeFilter();
diff --git a/Controller/UserminAppController.php b/Controller/UserminController.php
similarity index 71%
rename from Controller/UserminAppController.php
rename to Controller/UserminController.php
index d7b2e6b..bc9be63 100644
--- a/Controller/UserminAppController.php
+++ b/Controller/UserminController.php
@@ -1,6 +1,6 @@
 <?php
 
-class UserminAppController extends AppController {
+class UserminController extends AppController {
 
 	public $components = array('Session');	
 

From e0a2630458303402f87de95a84208328b9b2315f Mon Sep 17 00:00:00 2001
From: Ton <github.com@snelweg.net>
Date: Sat, 28 Jan 2012 19:38:47 +0100
Subject: [PATCH 2/3] modified documentation for CakePhp 2.1 Signed-off-by:Ton
 <github.com@snelweg.net>

---
 README | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README b/README
index 1dd7fc0..d9a58bb 100644
--- a/README
+++ b/README
@@ -1,3 +1,25 @@
+if you are using 2.1 then the Consolescript won't work right out of the box.
+
+You wil have to place a short script in the app/Console directory as described here:
+
+
+http://book.cakephp.org/2.0/en/appendices/2-1-migration-guide.html?highlight=appshell
+
+Basicaly you add a file called app/Console/Command/AppShell.php to your application dir.
+Contents of that file:
+
+<?php
+App::uses('Shell', 'Console');
+class AppShell extends Shell {
+}
+?>
+
+All the classes have been upgraded to CakePhp 2.1
+
+
+Ton
+
+
  ---------------------------------------------------
 | Usermin is a simple auth plugin for cakephp 2.0.x |
  ---------------------------------------------------

From 4ffe201a3c19bd1befe01f8a6d8dec6b0ba036eb Mon Sep 17 00:00:00 2001
From: Ton <github.com@snelweg.net>
Date: Sat, 28 Jan 2012 19:47:12 +0100
Subject: [PATCH 3/3] removed empty 'empty' file

---
 Config/Schema/empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Config/Schema/empty

diff --git a/Config/Schema/empty b/Config/Schema/empty
deleted file mode 100644
index e69de29..0000000