ready for merge

10 files changed, 12 insertions, 9 deletions

diff --git a/Changes b/Changes
index 5003d80..07d89ae 100644
--- a/Changes
+++ b/Changes
@@ -14,6 +14,9 @@ Revision history for Reaction
         - CRUD functionality is now implemented as roles, so it can be used 
           without needing to use Controller::Collection::CRUD
         - Deprecate redirect_to and move it to an external role
+        - Controllers no longer 'use Reaction::Class' which was causing 
+          problems with metaclass compatibility. 'use Moose' is now the
+          preferred approach.
 0.002000 - 29 Apr 2008
         - Update CheckUniques role to use around instead of overrides
         - Stop using ACCEPT_CONTEXT, use InstancePerContext instead
diff --git a/lib/ComponentUI/Controller/Root.pm b/lib/ComponentUI/Controller/Root.pm
index d88fce3..bc45f33 100644
--- a/lib/ComponentUI/Controller/Root.pm
+++ b/lib/ComponentUI/Controller/Root.pm
@@ -3,7 +3,7 @@ package ComponentUI::Controller::Root;
 use strict;
 use warnings;
 
-use Reaction::Class;
+use Moose;
 BEGIN { extends 'Reaction::UI::Controller::Root'; }
 
 use aliased 'Reaction::UI::ViewPort';
diff --git a/lib/ComponentUI/Controller/TestModel/Bar.pm b/lib/ComponentUI/Controller/TestModel/Bar.pm
index c346480..6c1118c 100644
--- a/lib/ComponentUI/Controller/TestModel/Bar.pm
+++ b/lib/ComponentUI/Controller/TestModel/Bar.pm
@@ -1,6 +1,6 @@
 package ComponentUI::Controller::TestModel::Bar;
 
-use Reaction::Class;
+use Moose;
 BEGIN { extends 'Reaction::UI::Controller::Collection::CRUD'; }
 
 __PACKAGE__->config(
diff --git a/lib/ComponentUI/Controller/TestModel/Baz.pm b/lib/ComponentUI/Controller/TestModel/Baz.pm
index f426780..f5ff875 100644
--- a/lib/ComponentUI/Controller/TestModel/Baz.pm
+++ b/lib/ComponentUI/Controller/TestModel/Baz.pm
@@ -1,6 +1,6 @@
 package ComponentUI::Controller::TestModel::Baz;
 
-use Reaction::Class;
+use Moose;
 BEGIN { extends 'Reaction::UI::Controller::Collection::CRUD'; }
 
 use ComponentUI::UI::ViewPort::Baz::ListView::Member;
diff --git a/lib/ComponentUI/Controller/TestModel/Foo.pm b/lib/ComponentUI/Controller/TestModel/Foo.pm
index d9f3659..50dccde 100644
--- a/lib/ComponentUI/Controller/TestModel/Foo.pm
+++ b/lib/ComponentUI/Controller/TestModel/Foo.pm
@@ -1,6 +1,6 @@
 package ComponentUI::Controller::TestModel::Foo;
 
-use Reaction::Class;
+use Moose;
 BEGIN { extends 'Reaction::UI::Controller::Collection::CRUD'; }
 
 use aliased 'Reaction::UI::ViewPort::SearchableListViewContainer';
diff --git a/lib/Reaction/UI/Controller.pm b/lib/Reaction/UI/Controller.pm
index 58eb03b..764ed4e 100644
--- a/lib/Reaction/UI/Controller.pm
+++ b/lib/Reaction/UI/Controller.pm
@@ -1,6 +1,6 @@
 package Reaction::UI::Controller;
 
-use Reaction::Class;
+use Moose;
 use Scalar::Util 'weaken';
 use namespace::clean -except => [ qw(meta) ];
 
diff --git a/lib/Reaction/UI/Controller/Collection.pm b/lib/Reaction/UI/Controller/Collection.pm
index 15245f4..dd93a10 100644
--- a/lib/Reaction/UI/Controller/Collection.pm
+++ b/lib/Reaction/UI/Controller/Collection.pm
@@ -1,6 +1,6 @@
 package Reaction::UI::Controller::Collection;
 
-use Reaction::Class;
+use Moose;
 BEGIN { extends 'Reaction::UI::Controller'; }
 
 use aliased 'Reaction::UI::ViewPort::Collection::Grid';
diff --git a/lib/Reaction/UI/Controller/Collection/CRUD.pm b/lib/Reaction/UI/Controller/Collection/CRUD.pm
index f37790d..fc7585e 100644
--- a/lib/Reaction/UI/Controller/Collection/CRUD.pm
+++ b/lib/Reaction/UI/Controller/Collection/CRUD.pm
@@ -1,6 +1,6 @@
 package Reaction::UI::Controller::Collection::CRUD;
 
-use Reaction::Class;
+use Moose;
 BEGIN { extends 'Reaction::UI::Controller::Collection'; }
 
 use aliased 'Reaction::UI::ViewPort::ListView';
diff --git a/lib/Reaction/UI/Controller/Collection/CRUD/Search.pm b/lib/Reaction/UI/Controller/Collection/CRUD/Search.pm
index a9aa15f..7d4560f 100644
--- a/lib/Reaction/UI/Controller/Collection/CRUD/Search.pm
+++ b/lib/Reaction/UI/Controller/Collection/CRUD/Search.pm
@@ -1,6 +1,6 @@
 package Reaction::UI::Controller::Collection::CRUD::Search;
 
-use Reaction::Class;
+use Moose;
 BEGIN { extends 'Reaction::UI::Controller::Collection::CRUD'; }
 
 use aliased 'Reaction::UI::ViewPort::SearchableListViewContainer';
diff --git a/lib/Reaction/UI/Controller/Root.pm b/lib/Reaction/UI/Controller/Root.pm
index bea629c..f27ffcf 100644
--- a/lib/Reaction/UI/Controller/Root.pm
+++ b/lib/Reaction/UI/Controller/Root.pm
@@ -1,6 +1,6 @@
 package Reaction::UI::Controller::Root;
 
-use Reaction::Class;
+use Moose;
 use Reaction::UI::Window;
 
 BEGIN { extends 'Reaction::UI::Controller'; }