Merge branch 'feature/rails3_consistent_naming' into feature/rails3

Conflicts:
	lib/openproject_meeting/version.rb

lib/open_project/meeting.rb

@@ -0,0 +1,5 @@
+module OpenProject
+  module Meeting
+    require "open_project/meeting/engine"
+  end
+end

lib/open_project/meeting/engine.rb

@@ -1,8 +1,7 @@
 require 'rails/engine'
 
-module MeetingsPlugin
+module OpenProject::Meeting
   class Engine < ::Rails::Engine
-    isolate_namespace MeetingsPlugin
 
     initializer 'openproject_meeting.precompile_assets' do |app|
       app.config.assets.precompile += ["openproject_meeting.css"]
@@ -15,7 +14,7 @@ module MeetingsPlugin
     config.before_configuration do |app|
       # This is required for the routes to be loaded first
       # as the routes should be prepended so they take precedence over the core.
-      app.config.paths['config/routes'].unshift File.join(File.dirname(__FILE__), "..", "..", "config", "routes.rb")
+      app.config.paths['config/routes'].unshift File.join(File.dirname(__FILE__), "..", "..", "..", "config", "routes.rb")
     end
 
     initializer "remove_duplicate_meeting_routes", :after => "add_routing_paths" do |app|
@@ -34,8 +33,8 @@ module MeetingsPlugin
     config.to_prepare do
       require 'redmine/plugin'
 
-      require_dependency 'openproject_meeting/hooks'
-      require 'openproject_meeting/patches/project_patch'
+      require_dependency 'open_project/meeting/hooks'
+      require 'open_project/meeting/patches/project_patch'
       Project.send(:include, Patches::ProjectPatch)
 
       # load classes so that all User.before_destroy filters are loaded
@@ -44,15 +43,16 @@ module MeetingsPlugin
       require_dependency 'meeting_minutes'
       require_dependency 'meeting_participant'
 
-      spec = Bundler.environment.specs['openproject_meeting'][0]
+      spec = Bundler.environment.specs['openproject-meeting'][0]
 
-      unless Redmine::Plugin.registered_plugins.include?(:redmine_meeting)
-        Redmine::Plugin.register :redmine_meeting do
-          name 'OpenProject Meeting Plugin'
+      unless Redmine::Plugin.registered_plugins.include?(:openproject_meeting)
+        Redmine::Plugin.register :openproject_meeting do
+          name 'OpenProject Meeting'
           author ((spec.authors.kind_of? Array) ? spec.authors[0] : spec.authors)
           author_url spec.homepage
           description spec.description
           version spec.version
+          url 'https://www.openproject.org/projects/plugin-meetings'
 
           requires_openproject ">= 3.0.0beta1"
 

lib/open_project/meeting/hooks.rb

@@ -1,4 +1,4 @@
-module MeetingsPlugin
+module OpenProject::Meeting
   class Hooks < Redmine::Hook::ViewListener
     render_on :activity_index_head,
               :partial => 'hooks/activity_index_head'

lib/open_project/meeting/patches/project_patch.rb

@@ -1,4 +1,4 @@
-module MeetingsPlugin
+module OpenProject::Meeting
   module Patches
     module ProjectPatch
       def self.included(receiver)

lib/open_project/meeting/version.rb

@@ -0,0 +1,5 @@
+module OpenProject
+  module Meeting
+    VERSION = "2.5.1.pre2"
+  end
+end

lib/openproject-meeting.rb

@@ -0,0 +1 @@
+require 'open_project/meeting'

lib/openproject_meeting.rb

@@ -1,4 +0,0 @@
-require 'openproject_meeting/engine'
-
-module MeetingsPlugin
-end

lib/openproject_meeting/version.rb

@@ -1,3 +0,0 @@
-module MeetingsPlugin
-  VERSION = "2.5.1.pre2"
-end

openproject-meeting.gemspec

@@ -2,12 +2,12 @@
 $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
-require "openproject_meeting/version"
+require "open_project/meeting/version"
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = "openproject_meeting"
-  s.version     = MeetingsPlugin::VERSION
+  s.name        = "openproject-meeting"
+  s.version     = OpenProject::Meeting::VERSION
   s.authors     = "Finn GmbH"
   s.email       = "info@finn.de"
   s.homepage    = "http://www.finn.de"