4 files changed, 26 insertions, 16 deletions
diff --git a/chef-server/config/dependencies.rb b/chef-server/config/dependencies.rb
index bb15302631..37c02f1e54 100644
--- a/chef-server/config/dependencies.rb
+++ b/chef-server/config/dependencies.rb
@@ -1,13 +1,24 @@
 # dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
 merb_gems_version = "> 1.0"
 
+%w{chef chef-server-api chef-solr}.each do |dep|
+  $: << File.join(File.dirname(__FILE__), "..", "..", dep, "lib")
+end
+
+begin
+  require 'chef'
+  require 'chef-server-api'
+rescue
+end
+  
 # For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
 dependency "merb-core", merb_gems_version 
 dependency "merb-assets", merb_gems_version  
 dependency "merb-helpers", merb_gems_version 
 dependency "merb-slices", merb_gems_version  
 if defined?(CHEF_SERVER_VERSION)
-  dependency "chef-server-slice", CHEF_SERVER_VERSION unless defined?(ChefServerSlice)
+  dependency "chef-server-api", CHEF_SERVER_VERSION unless defined?(ChefServerApi)
 else
-  dependency "chef-server-slice" unless defined?(ChefServerSlice)
+  dependency "chef-server-api" unless defined?(ChefServerSlice)
 end
+
diff --git a/chef-server/config/init.rb b/chef-server/config/init.rb
index 4af56589d0..b3ba2bf418 100644
--- a/chef-server/config/init.rb
+++ b/chef-server/config/init.rb
@@ -1,5 +1,5 @@
 # Go to http://wiki.merbivore.com/pages/init-rb
- 
+
 require 'config/dependencies.rb'
 unless defined?(Chef)
   gem "chef", "=" + CHEF_SERVER_VERSION if CHEF_SERVER_VERSION
@@ -17,7 +17,9 @@ Merb::Config.use do |c|
   c[:exception_details] = true
   c[:reload_classes] = false
   c[:log_level] = Chef::Config[:log_level]
-  c[:log_stream] = Chef::Config[:log_location]
+  if Chef::Config[:log_location].kind_of?(String)
+    c[:log_file] = Chef::Config[:log_location]
+  end
 end
  
 Merb::BootLoader.before_app_loads do
@@ -25,6 +27,6 @@ Merb::BootLoader.before_app_loads do
 end
  
 Merb::BootLoader.after_app_loads do
-  # This will get executed after your app's classes have been loaded.
-  OpenID::Util.logger = Merb.logger
+  # This will get executed after your app's classes have been loaded.  OpenID::Util.logger = Merb.logger
 end
+
diff --git a/chef-server/config/rack.rb b/chef-server/config/rack.rb
index e6bde4d226..4ed0f70b55 100644
--- a/chef-server/config/rack.rb
+++ b/chef-server/config/rack.rb
@@ -1,3 +1,5 @@
+$: << File.join(File.dirname(__FILE__))
+
 # use PathPrefix Middleware if :path_prefix is set in Merb::Config
 if prefix = ::Merb::Config[:path_prefix]
   use Merb::Rack::PathPrefix, prefix
diff --git a/chef-server/config/router.rb b/chef-server/config/router.rb
index 9123858cfa..cefef0c79a 100644
--- a/chef-server/config/router.rb
+++ b/chef-server/config/router.rb
@@ -29,16 +29,11 @@ Merb.logger.info("Compiling routes...")
 Merb::Router.prepare do
   # RESTful routes
   # resources :posts
-  
+ 
   # Adds the required routes for merb-auth using the password slice
   # slice(:merb_auth_slice_password, :name_prefix => nil, :path_prefix => "")
-  slice(:chef_server_slice)
-  # This is the default route for /:controller/:action/:id
-  # This is fine for most cases.  If you're heavily using resource-based
-  # routes, you may want to comment/remove this line to prevent
-  # clients from calling your create or destroy actions with a GET
-  default_routes
-  
-  # Change this for your home page to be available at /
-  # match('/').to(:controller => 'whatever', :action =>'index')
+
+  slice(:chef_server_api)
+  # slice(:chef_server_webui, :path_prefix => "html")
+
 end