browsercms 3.4.2 → 3.5.0.rc1

data/config/routes.rb

@@ -37,7 +37,7 @@ Cms::Engine.routes.draw do
     resources :tasks
   end
   get '/pages/:id/version/:version', :to=>'pages#version', :as=>'version_cms_page'
-  put '/pages/:id/revert_to/:version', :to=>'pages#revert_to', :as=>'revert_to_cms_page'
+  put '/pages/:id/revert_to/:version', :to=>'pages#revert_to', :as=>'revert_page'
   resources :tasks do
     member do
       put :complete
@@ -60,7 +60,8 @@ Cms::Engine.routes.draw do
       put :move_to_root
     end
   end
-  match '/attachments/:id', :to => 'attachments#show', :as=>'attachment'
+
+  resources :attachments, :only=>[:show, :create, :destroy]
 
   match '/content_library', :to=>'html_blocks#index', :as=>'content_library'
   content_blocks :html_blocks

data/db/browsercms.seeds.rb

@@ -4,7 +4,7 @@ extend Cms::DataLoader
 if %w[development test dev local].include?(Rails.env)
   pwd = "cmsadmin"
 else
-  pwd = (0..8).inject("") { |s, i| s << (('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a).rand }
+  pwd = (0..8).inject("") { |s, i| s << (('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a).sample }
 end
 Cms::User.current = create_user(:cmsadmin, :login => "cmsadmin", :first_name => "CMS", :last_name => "Administrator", :email => "cmsadmin@example.com", :password => pwd, :password_confirmation => pwd)
 
@@ -20,6 +20,7 @@ create_permission(:publish_content, :name => "publish_content", :full_name => "P
 create_group_type(:guest_group_type, :name => "Guest", :guest => true)
 create_group_type(:registered_public_user, :name => "Registered Public User")
 create_group_type(:cms_user, :name => "CMS User", :cms_access => true)
+
 group_types(:cms_user).permissions<<permissions(:edit_content)
 group_types(:cms_user).permissions<<permissions(:publish_content)
 

data/db/migrate/20111130221145_browsercms340.rb

@@ -4,7 +4,7 @@ class Browsercms340 < ActiveRecord::Migration
   include Cms::Upgrades::V3_4_0::SchemaStatements
 
   def change
-    # Prefix the correct namespace where class_names are not prefixed
+    # Namespace class_names where they are not namespaced.
     %w[HtmlBlock Category CategoryType Portlet FileBlock ImageBlock Tag].each do |content_type|
       update_content_types(content_type)
       update_connectors_table(content_type)
@@ -15,7 +15,6 @@ class Browsercms340 < ActiveRecord::Migration
     standardize_foreign_keys_from_versions_tables_to_original_table
   end
 
-
   private
 
   def namespace_model(name)
@@ -24,7 +23,7 @@ class Browsercms340 < ActiveRecord::Migration
 
   def update_files
     %w[FileBlock ImageBlock].each do |content_type|
-      Cms::AbstractFileBlock.update_all("type = '#{prefix(content_type)}'", "type = '#{content_type}'")
+      Cms::AbstractFileBlock.update_all("type = '#{namespace_model(content_type)}'", "type = '#{content_type}'")
     end
   end
 
@@ -46,8 +45,10 @@ class Browsercms340 < ActiveRecord::Migration
   end
 
   def update_connectors_table(name)
+    namespaced_class = namespace_model(name)
+    puts "Update connectors for #{name} to #{namespaced_class}"
     Cms::Connector.where(:connectable_type => name).each do |connector|
-      connector.connectable_type = prefix(name)
+      connector.connectable_type = namespaced_class
       connector.save!
     end
   end

data/db/migrate/20120329144406_browsercms350.rb

@@ -0,0 +1,32 @@
+require 'cms/upgrades/v3_5_0'
+
+class Browsercms350 < ActiveRecord::Migration
+  def change
+    migrate_attachments_table
+    migrate_attachment_for(Cms::ImageBlock)
+    migrate_attachment_for(Cms::FileBlock)
+    migrate_attachment_files_to_new_location
+
+  end
+
+
+  private
+
+  def migrate_attachments_table
+    rename_table :attachments, :cms_attachments if table_exists?(:attachments)
+    rename_table :attachment_versions, :cms_attachment_versions if table_exists?(:attachment_versions)
+
+    rename_content_column :cms_attachments, :file_path, :data_file_path
+    rename_content_column :cms_attachments, :file_size, :data_file_size
+    rename_content_column :cms_attachments, :file_type, :data_content_type
+    rename_content_column :cms_attachments, :name, :data_file_name
+    remove_content_column :cms_attachments, :file_extension
+
+    add_content_column :cms_attachments, :data_fingerprint, :string
+    add_content_column :cms_attachments, :attachable_type, :string
+    add_content_column :cms_attachments, :attachment_name, :string
+    add_content_column :cms_attachments, :attachable_id, :integer
+    add_content_column :cms_attachments, :attachable_version, :integer
+    add_content_column :cms_attachments, :cardinality, :string
+  end
+end

data/{test/dummy/db → db}/schema.rb

@@ -11,10 +11,10 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111228141250) do
+ActiveRecord::Schema.define(:version => 20100705083859) do
 
-  create_table "cms_attachment_versions", :force => true do |t|
-    t.integer  "original_record_id"
+  create_table "attachment_versions", :force => true do |t|
+    t.integer  "attachment_id"
     t.integer  "version"
     t.string   "file_path"
     t.string   "file_location"
@@ -24,17 +24,17 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "name"
-    t.boolean  "published",          :default => false
-    t.boolean  "deleted",            :default => false
-    t.boolean  "archived",           :default => false
+    t.boolean  "published",       :default => false
+    t.boolean  "deleted",         :default => false
+    t.boolean  "archived",        :default => false
     t.string   "version_comment"
     t.integer  "created_by_id"
     t.integer  "updated_by_id"
   end
 
-  add_index "cms_attachment_versions", ["original_record_id"], :name => "index_cms_attachment_versions_on_original_record_id"
+  add_index "attachment_versions", ["attachment_id"], :name => "index_attachment_versions_on_attachment_id"
 
-  create_table "cms_attachments", :force => true do |t|
+  create_table "attachments", :force => true do |t|
     t.integer  "version"
     t.integer  "lock_version",   :default => 0
     t.string   "file_path"
@@ -52,7 +52,7 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.integer  "updated_by_id"
   end
 
-  create_table "cms_categories", :force => true do |t|
+  create_table "categories", :force => true do |t|
     t.integer  "category_type_id"
     t.integer  "parent_id"
     t.string   "name"
@@ -60,13 +60,13 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  create_table "cms_category_types", :force => true do |t|
+  create_table "category_types", :force => true do |t|
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "cms_connectors", :force => true do |t|
+  create_table "connectors", :force => true do |t|
     t.integer  "page_id"
     t.integer  "page_version"
     t.integer  "connectable_id"
@@ -78,18 +78,18 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_connectors", ["connectable_type"], :name => "index_cms_connectors_on_connectable_type"
-  add_index "cms_connectors", ["connectable_version"], :name => "index_cms_connectors_on_connectable_version"
-  add_index "cms_connectors", ["page_id"], :name => "index_cms_connectors_on_page_id"
-  add_index "cms_connectors", ["page_version"], :name => "index_cms_connectors_on_page_version"
+  add_index "connectors", ["connectable_type"], :name => "index_connectors_on_connectable_type"
+  add_index "connectors", ["connectable_version"], :name => "index_connectors_on_connectable_version"
+  add_index "connectors", ["page_id"], :name => "index_connectors_on_page_id"
+  add_index "connectors", ["page_version"], :name => "index_connectors_on_page_version"
 
-  create_table "cms_content_type_groups", :force => true do |t|
+  create_table "content_type_groups", :force => true do |t|
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "cms_content_types", :force => true do |t|
+  create_table "content_types", :force => true do |t|
     t.string   "name"
     t.integer  "content_type_group_id"
     t.integer  "priority",              :default => 2
@@ -97,11 +97,11 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_content_types", ["content_type_group_id"], :name => "index_cms_content_types_on_content_type_group_id"
-  add_index "cms_content_types", ["name"], :name => "index_cms_content_types_on_name"
+  add_index "content_types", ["content_type_group_id"], :name => "index_content_types_on_content_type_group_id"
+  add_index "content_types", ["name"], :name => "index_content_types_on_name"
 
-  create_table "cms_dynamic_view_versions", :force => true do |t|
-    t.integer  "original_record_id"
+  create_table "dynamic_view_versions", :force => true do |t|
+    t.integer  "dynamic_view_id"
     t.integer  "version"
     t.string   "type"
     t.string   "name"
@@ -110,15 +110,15 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.text     "body"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "published",          :default => false
-    t.boolean  "deleted",            :default => false
-    t.boolean  "archived",           :default => false
+    t.boolean  "published",       :default => false
+    t.boolean  "deleted",         :default => false
+    t.boolean  "archived",        :default => false
     t.string   "version_comment"
     t.integer  "created_by_id"
     t.integer  "updated_by_id"
   end
 
-  create_table "cms_dynamic_views", :force => true do |t|
+  create_table "dynamic_views", :force => true do |t|
     t.integer  "version"
     t.integer  "lock_version",  :default => 0
     t.string   "type"
@@ -135,7 +135,7 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.integer  "updated_by_id"
   end
 
-  create_table "cms_email_messages", :force => true do |t|
+  create_table "email_messages", :force => true do |t|
     t.string   "sender"
     t.text     "recipients"
     t.text     "subject"
@@ -148,8 +148,8 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  create_table "cms_file_block_versions", :force => true do |t|
-    t.integer  "original_record_id"
+  create_table "file_block_versions", :force => true do |t|
+    t.integer  "file_block_id"
     t.integer  "version"
     t.string   "type"
     t.string   "name"
@@ -165,10 +165,10 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_file_block_versions", ["original_record_id"], :name => "index_cms_file_block_versions_on_original_record_id"
-  add_index "cms_file_block_versions", ["version"], :name => "index_cms_file_block_versions_on_version"
+  add_index "file_block_versions", ["file_block_id"], :name => "index_file_block_versions_on_file_block_id"
+  add_index "file_block_versions", ["version"], :name => "index_file_block_versions_on_version"
 
-  create_table "cms_file_blocks", :force => true do |t|
+  create_table "file_blocks", :force => true do |t|
     t.integer  "version"
     t.integer  "lock_version",       :default => 0
     t.string   "type"
@@ -184,32 +184,32 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_file_blocks", ["deleted"], :name => "index_cms_file_blocks_on_deleted"
-  add_index "cms_file_blocks", ["type"], :name => "index_cms_file_blocks_on_type"
+  add_index "file_blocks", ["deleted"], :name => "index_file_blocks_on_deleted"
+  add_index "file_blocks", ["type"], :name => "index_file_blocks_on_type"
 
-  create_table "cms_group_permissions", :force => true do |t|
+  create_table "group_permissions", :force => true do |t|
     t.integer "group_id"
     t.integer "permission_id"
   end
 
-  add_index "cms_group_permissions", ["group_id", "permission_id"], :name => "index_cms_group_permissions_on_group_id_and_permission_id"
-  add_index "cms_group_permissions", ["group_id"], :name => "index_cms_group_permissions_on_group_id"
-  add_index "cms_group_permissions", ["permission_id"], :name => "index_cms_group_permissions_on_permission_id"
+  add_index "group_permissions", ["group_id", "permission_id"], :name => "index_group_permissions_on_group_id_and_permission_id"
+  add_index "group_permissions", ["group_id"], :name => "index_group_permissions_on_group_id"
+  add_index "group_permissions", ["permission_id"], :name => "index_group_permissions_on_permission_id"
 
-  create_table "cms_group_sections", :force => true do |t|
+  create_table "group_sections", :force => true do |t|
     t.integer "group_id"
     t.integer "section_id"
   end
 
-  add_index "cms_group_sections", ["group_id"], :name => "index_cms_group_sections_on_group_id"
-  add_index "cms_group_sections", ["section_id"], :name => "index_cms_group_sections_on_section_id"
+  add_index "group_sections", ["group_id"], :name => "index_group_sections_on_group_id"
+  add_index "group_sections", ["section_id"], :name => "index_group_sections_on_section_id"
 
-  create_table "cms_group_type_permissions", :force => true do |t|
+  create_table "group_type_permissions", :force => true do |t|
     t.integer "group_type_id"
     t.integer "permission_id"
   end
 
-  create_table "cms_group_types", :force => true do |t|
+  create_table "group_types", :force => true do |t|
     t.string   "name"
     t.boolean  "guest",      :default => false
     t.boolean  "cms_access", :default => false
@@ -217,9 +217,9 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_group_types", ["cms_access"], :name => "index_cms_group_types_on_cms_access"
+  add_index "group_types", ["cms_access"], :name => "index_group_types_on_cms_access"
 
-  create_table "cms_groups", :force => true do |t|
+  create_table "groups", :force => true do |t|
     t.string   "name"
     t.string   "code"
     t.integer  "group_type_id"
@@ -227,17 +227,17 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_groups", ["code"], :name => "index_cms_groups_on_code"
-  add_index "cms_groups", ["group_type_id"], :name => "index_cms_groups_on_group_type_id"
+  add_index "groups", ["code"], :name => "index_groups_on_code"
+  add_index "groups", ["group_type_id"], :name => "index_groups_on_group_type_id"
 
-  create_table "cms_html_block_versions", :force => true do |t|
-    t.integer  "original_record_id"
+  create_table "html_block_versions", :force => true do |t|
+    t.integer  "html_block_id"
     t.integer  "version"
     t.string   "name"
-    t.text     "content",            :limit => 16777215
-    t.boolean  "published",                              :default => false
-    t.boolean  "deleted",                                :default => false
-    t.boolean  "archived",                               :default => false
+    t.text     "content",         :limit => 16777215
+    t.boolean  "published",                           :default => false
+    t.boolean  "deleted",                             :default => false
+    t.boolean  "archived",                            :default => false
     t.string   "version_comment"
     t.integer  "created_by_id"
     t.integer  "updated_by_id"
@@ -245,10 +245,10 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_html_block_versions", ["original_record_id"], :name => "index_cms_html_block_versions_on_original_record_id"
-  add_index "cms_html_block_versions", ["version"], :name => "index_cms_html_block_versions_on_version"
+  add_index "html_block_versions", ["html_block_id"], :name => "index_html_block_versions_on_html_block_id"
+  add_index "html_block_versions", ["version"], :name => "index_html_block_versions_on_version"
 
-  create_table "cms_html_blocks", :force => true do |t|
+  create_table "html_blocks", :force => true do |t|
     t.integer  "version"
     t.integer  "lock_version",                      :default => 0
     t.string   "name"
@@ -262,25 +262,25 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_html_blocks", ["deleted"], :name => "index_cms_html_blocks_on_deleted"
+  add_index "html_blocks", ["deleted"], :name => "index_html_blocks_on_deleted"
 
-  create_table "cms_link_versions", :force => true do |t|
-    t.integer  "original_record_id"
+  create_table "link_versions", :force => true do |t|
+    t.integer  "link_id"
     t.integer  "version"
     t.string   "name"
     t.string   "url"
-    t.boolean  "new_window",         :default => false
+    t.boolean  "new_window",      :default => false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "published",          :default => false
-    t.boolean  "deleted",            :default => false
-    t.boolean  "archived",           :default => false
+    t.boolean  "published",       :default => false
+    t.boolean  "deleted",         :default => false
+    t.boolean  "archived",        :default => false
     t.string   "version_comment"
     t.integer  "created_by_id"
     t.integer  "updated_by_id"
   end
 
-  create_table "cms_links", :force => true do |t|
+  create_table "links", :force => true do |t|
     t.integer  "version"
     t.integer  "lock_version",   :default => 0
     t.string   "name"
@@ -296,7 +296,7 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.integer  "latest_version"
   end
 
-  create_table "cms_page_route_options", :force => true do |t|
+  create_table "page_route_options", :force => true do |t|
     t.integer  "page_route_id"
     t.string   "type"
     t.string   "name"
@@ -305,7 +305,7 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  create_table "cms_page_routes", :force => true do |t|
+  create_table "page_routes", :force => true do |t|
     t.string   "name"
     t.string   "pattern"
     t.integer  "page_id"
@@ -314,8 +314,8 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  create_table "cms_page_versions", :force => true do |t|
-    t.integer  "original_record_id"
+  create_table "page_versions", :force => true do |t|
+    t.integer  "page_id"
     t.integer  "version"
     t.string   "name"
     t.string   "title"
@@ -336,9 +336,9 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_page_versions", ["original_record_id"], :name => "index_cms_page_versions_on_original_record_id"
+  add_index "page_versions", ["page_id"], :name => "index_page_versions_on_page_id"
 
-  create_table "cms_pages", :force => true do |t|
+  create_table "pages", :force => true do |t|
     t.integer  "version"
     t.integer  "lock_version",       :default => 0
     t.string   "name"
@@ -360,11 +360,11 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.integer  "latest_version"
   end
 
-  add_index "cms_pages", ["deleted"], :name => "index_cms_pages_on_deleted"
-  add_index "cms_pages", ["path"], :name => "index_cms_pages_on_path"
-  add_index "cms_pages", ["version"], :name => "index_cms_pages_on_version"
+  add_index "pages", ["deleted"], :name => "index_pages_on_deleted"
+  add_index "pages", ["path"], :name => "index_pages_on_path"
+  add_index "pages", ["version"], :name => "index_pages_on_version"
 
-  create_table "cms_permissions", :force => true do |t|
+  create_table "permissions", :force => true do |t|
     t.string   "name"
     t.string   "full_name"
     t.string   "description"
@@ -373,15 +373,15 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  create_table "cms_portlet_attributes", :force => true do |t|
+  create_table "portlet_attributes", :force => true do |t|
     t.integer "portlet_id"
     t.string  "name"
     t.text    "value"
   end
 
-  add_index "cms_portlet_attributes", ["portlet_id"], :name => "index_cms_portlet_attributes_on_portlet_id"
+  add_index "portlet_attributes", ["portlet_id"], :name => "index_portlet_attributes_on_portlet_id"
 
-  create_table "cms_portlets", :force => true do |t|
+  create_table "portlets", :force => true do |t|
     t.string   "type"
     t.string   "name"
     t.boolean  "archived",      :default => false
@@ -392,18 +392,18 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_portlets", ["name"], :name => "index_cms_portlets_on_name"
+  add_index "portlets", ["name"], :name => "index_portlets_on_name"
 
-  create_table "cms_redirects", :force => true do |t|
+  create_table "redirects", :force => true do |t|
     t.string   "from_path"
     t.string   "to_path"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "cms_redirects", ["from_path"], :name => "index_cms_redirects_on_from_path"
+  add_index "redirects", ["from_path"], :name => "index_redirects_on_from_path"
 
-  create_table "cms_section_nodes", :force => true do |t|
+  create_table "section_nodes", :force => true do |t|
     t.string   "node_type"
     t.integer  "node_id"
     t.integer  "position"
@@ -412,10 +412,10 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.string   "ancestry"
   end
 
-  add_index "cms_section_nodes", ["ancestry"], :name => "index_cms_section_nodes_on_ancestry"
-  add_index "cms_section_nodes", ["node_type"], :name => "index_cms_section_nodes_on_node_type"
+  add_index "section_nodes", ["ancestry"], :name => "index_section_nodes_on_ancestry"
+  add_index "section_nodes", ["node_type"], :name => "index_section_nodes_on_node_type"
 
-  create_table "cms_sections", :force => true do |t|
+  create_table "sections", :force => true do |t|
     t.string   "name"
     t.string   "path"
     t.boolean  "root",       :default => false
@@ -424,9 +424,9 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_sections", ["path"], :name => "index_cms_sections_on_path"
+  add_index "sections", ["path"], :name => "index_sections_on_path"
 
-  create_table "cms_sites", :force => true do |t|
+  create_table "sites", :force => true do |t|
     t.string   "name"
     t.string   "domain"
     t.boolean  "the_default"
@@ -434,7 +434,7 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  create_table "cms_taggings", :force => true do |t|
+  create_table "taggings", :force => true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
     t.string   "taggable_type"
@@ -443,13 +443,13 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  create_table "cms_tags", :force => true do |t|
+  create_table "tags", :force => true do |t|
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "cms_tasks", :force => true do |t|
+  create_table "tasks", :force => true do |t|
     t.integer  "assigned_by_id"
     t.integer  "assigned_to_id"
     t.integer  "page_id"
@@ -460,19 +460,19 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.datetime "updated_at"
   end
 
-  add_index "cms_tasks", ["assigned_to_id"], :name => "index_cms_tasks_on_assigned_to_id"
-  add_index "cms_tasks", ["completed_at"], :name => "index_cms_tasks_on_completed_at"
-  add_index "cms_tasks", ["page_id"], :name => "index_cms_tasks_on_page_id"
+  add_index "tasks", ["assigned_to_id"], :name => "index_tasks_on_assigned_to_id"
+  add_index "tasks", ["completed_at"], :name => "index_tasks_on_completed_at"
+  add_index "tasks", ["page_id"], :name => "index_tasks_on_page_id"
 
-  create_table "cms_user_group_memberships", :force => true do |t|
+  create_table "user_group_memberships", :force => true do |t|
     t.integer "user_id"
     t.integer "group_id"
   end
 
-  add_index "cms_user_group_memberships", ["group_id"], :name => "index_cms_user_group_memberships_on_group_id"
-  add_index "cms_user_group_memberships", ["user_id"], :name => "index_cms_user_group_memberships_on_user_id"
+  add_index "user_group_memberships", ["group_id"], :name => "index_user_group_memberships_on_group_id"
+  add_index "user_group_memberships", ["user_id"], :name => "index_user_group_memberships_on_user_id"
 
-  create_table "cms_users", :force => true do |t|
+  create_table "users", :force => true do |t|
     t.string   "login",                     :limit => 40
     t.string   "first_name",                :limit => 40
     t.string   "last_name",                 :limit => 40
@@ -487,38 +487,7 @@ ActiveRecord::Schema.define(:version => 20111228141250) do
     t.string   "reset_token"
   end
 
-  add_index "cms_users", ["expires_at"], :name => "index_cms_users_on_expires_at"
-  add_index "cms_users", ["login"], :name => "index_cms_users_on_login", :unique => true
-
-  create_table "product_versions", :force => true do |t|
-    t.integer  "original_record_id"
-    t.integer  "version"
-    t.string   "name"
-    t.integer  "price"
-    t.integer  "category_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "published",          :default => false
-    t.boolean  "deleted",            :default => false
-    t.boolean  "archived",           :default => false
-    t.string   "version_comment"
-    t.integer  "created_by_id"
-    t.integer  "updated_by_id"
-  end
-
-  create_table "products", :force => true do |t|
-    t.integer  "version"
-    t.integer  "lock_version",  :default => 0
-    t.string   "name"
-    t.integer  "price"
-    t.integer  "category_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "published",     :default => false
-    t.boolean  "deleted",       :default => false
-    t.boolean  "archived",      :default => false
-    t.integer  "created_by_id"
-    t.integer  "updated_by_id"
-  end
+  add_index "users", ["expires_at"], :name => "index_users_on_expires_at"
+  add_index "users", ["login"], :name => "index_users_on_login", :unique => true
 
 end