Commit for Basic Site

vendor/built_in_modules/announcement/app/models/bulletin.rb

@@ -3,7 +3,9 @@ class Bulletin
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::MultiParameterAttributes
-  include Sunspot::Mongo
+  # include Mongoid::FullTextSearch
+  include Mongoid::Search
+  include Sunspot::Mongoid2
   include Impressionist::Impressionable
 
   include OrbitCategory::Categorizable
@@ -37,6 +39,7 @@ class Bulletin
   
   validates :title, :at_least_one => true
 
+  search_in :title, :subtitle, :text
   #before_save :clean_values, :save_bulletin_links, :save_bulletin_files
 
   searchable do

vendor/built_in_modules/archive/app/models/archive_file.rb

@@ -4,7 +4,7 @@ class ArchiveFile
   include Mongoid::Timestamps
   include Mongoid::MultiParameterAttributes
   include Mongoid::Sortable
-  include Sunspot::Mongo
+  include Sunspot::Mongoid2
 
   include OrbitCategory::Categorizable
   include OrbitModel::LanguageRestrict

vendor/built_in_modules/web_resource/app/models/web_link.rb

@@ -3,7 +3,7 @@ class WebLink
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::MultiParameterAttributes
-  include Sunspot::Mongo
+  include Sunspot::Mongoid2
 
   include OrbitCategory::Categorizable
   include OrbitModel::LanguageRestrict