From ea652394c78b29e5e04c36756fa68200e22f4555 Mon Sep 17 00:00:00 2001
From: Kyle Robinson Young <kyle@dontkry.com>
Date: Thu, 23 Feb 2012 10:45:32 -0800
Subject: [PATCH] Move DbAcl and IniAcl into Acl subfolder and rename
 Model/DbAclTest to AclNodeTest

---
 .../Controller/Component/{ => Acl}/DbAclTest.php   | 14 +++++++-------
 .../Controller/Component/{ => Acl}/IniAclTest.php  |  4 ++--
 .../Case/Model/{DbAclTest.php => AclNodeTest.php}  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename lib/Cake/Test/Case/Controller/Component/{ => Acl}/DbAclTest.php (97%)
 rename lib/Cake/Test/Case/Controller/Component/{ => Acl}/IniAclTest.php (93%)
 rename lib/Cake/Test/Case/Model/{DbAclTest.php => AclNodeTest.php} (99%)

diff --git a/lib/Cake/Test/Case/Controller/Component/DbAclTest.php b/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php
similarity index 97%
rename from lib/Cake/Test/Case/Controller/Component/DbAclTest.php
rename to lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php
index 57d96da51..f278f7807 100644
--- a/lib/Cake/Test/Case/Controller/Component/DbAclTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Test.Case.Controller.Component
+ * @package       Cake.Test.Case.Controller.Component.Acl
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,7 +25,7 @@ App::uses('AclNode', 'Model');
 /**
  * AclNodeTwoTestBase class
  *
- * @package       Cake.Test.Case.Controller.Component
+ * @package       Cake.Test.Case.Controller.Component.Acl
  */
 class AclNodeTwoTestBase extends AclNode {
 
@@ -47,7 +47,7 @@ class AclNodeTwoTestBase extends AclNode {
 /**
  * AroTwoTest class
  *
- * @package       Cake.Test.Case.Controller.Component
+ * @package       Cake.Test.Case.Controller.Component.Acl
  */
 class AroTwoTest extends AclNodeTwoTestBase {
 
@@ -76,7 +76,7 @@ class AroTwoTest extends AclNodeTwoTestBase {
 /**
  * AcoTwoTest class
  *
- * @package       Cake.Test.Case.Controller.Component
+ * @package       Cake.Test.Case.Controller.Component.Acl
  */
 class AcoTwoTest extends AclNodeTwoTestBase {
 
@@ -105,7 +105,7 @@ class AcoTwoTest extends AclNodeTwoTestBase {
 /**
  * PermissionTwoTest class
  *
- * @package       Cake.Test.Case.Controller.Component
+ * @package       Cake.Test.Case.Controller.Component.Acl
  */
 class PermissionTwoTest extends CakeTestModel {
 
@@ -148,7 +148,7 @@ class PermissionTwoTest extends CakeTestModel {
 /**
  * DbAclTwoTest class
  *
- * @package       Cake.Test.Case.Controller.Component
+ * @package       Cake.Test.Case.Controller.Component.Acl
  */
 class DbAclTwoTest extends DbAcl {
 
@@ -168,7 +168,7 @@ class DbAclTwoTest extends DbAcl {
 /**
  * Test case for AclComponent using the DbAcl implementation.
  *
- * @package       Cake.Test.Case.Controller.Component
+ * @package       Cake.Test.Case.Controller.Component.Acl
  */
 class DbAclTest extends CakeTestCase {
 /**
diff --git a/lib/Cake/Test/Case/Controller/Component/IniAclTest.php b/lib/Cake/Test/Case/Controller/Component/Acl/IniAclTest.php
similarity index 93%
rename from lib/Cake/Test/Case/Controller/Component/IniAclTest.php
rename to lib/Cake/Test/Case/Controller/Component/Acl/IniAclTest.php
index 6713fecdf..5fd20c70a 100644
--- a/lib/Cake/Test/Case/Controller/Component/IniAclTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/Acl/IniAclTest.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Test.Case.Controller.Component
+ * @package       Cake.Test.Case.Controller.Component.Acl
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,7 +21,7 @@ App::uses('IniAcl', 'Controller/Component/Acl');
 /**
  * Test case for the IniAcl implementation
  *
- * @package       Cake.Test.Case.Controller.Component
+ * @package       Cake.Test.Case.Controller.Component.Acl
  */
 class IniAclTest extends CakeTestCase {
 
diff --git a/lib/Cake/Test/Case/Model/DbAclTest.php b/lib/Cake/Test/Case/Model/AclNodeTest.php
similarity index 99%
rename from lib/Cake/Test/Case/Model/DbAclTest.php
rename to lib/Cake/Test/Case/Model/AclNodeTest.php
index 1a91090cc..bb25afa40 100644
--- a/lib/Cake/Test/Case/Model/DbAclTest.php
+++ b/lib/Cake/Test/Case/Model/AclNodeTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * DbAclTest file
+ * AclNodeTest file
  *
  * PHP 5
  *