Bumped version to 3.3.0. Use ActiveSupport::Concern for Hydra::Catalog

HISTORY.textile

@@ -1,3 +1,8 @@
+h3. 3.3.0
+* HYDRA-737: fixes to work with Ruby Enterprise Edition 2011.12 and ruby-1.8.7-p357.
+* Update ActiveFedora to 3.3.0
+* Separating Hydra::Controller from Hydra::UI::Controller
+
 h3. 3.2.3
 * HYDRA-736: hydra-head should not define a rake task called 'spec'
 

lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.2.2"
+  VERSION = "3.3.0"
 end
 

lib/hydra/catalog.rb

@@ -6,20 +6,21 @@
 # Include this module into any of your Blacklight Catalog classes (ie. CatalogController) to add Hydra functionality.
 #
 module Hydra::Catalog
+  extend ActiveSupport::Concern
 
-  def self.included(klass)
+
+  included do
     # Other modules to auto-include
-    klass.send(:include, Hydra::Controller)
-    klass.send(:include, Hydra::UI::Controller)
-
+    include Hydra::Controller
+    include Hydra::UI::Controller
 
     # Controller filters
     # Also see the generator (or generated CatalogController) to see more before_filters in action
-    klass.before_filter :load_fedora_document, :only=>[:show,:edit]
+    before_filter :load_fedora_document, :only=>[:show,:edit]
 
     # View Helpers
-    klass.helper :hydra_uploader
-    klass.helper :article_metadata
+    helper :hydra_uploader
+    helper :article_metadata
   end
 
   def edit