1 files changed, 10 insertions, 6 deletions
diff --git a/actionwebservice/lib/action_web_service.rb b/actionwebservice/lib/action_web_service.rb
index 5cf988a0f8..2865dff633 100644
--- a/actionwebservice/lib/action_web_service.rb
+++ b/actionwebservice/lib/action_web_service.rb
@@ -32,7 +32,10 @@ rescue LoadError
   require_gem 'activerecord', '>= 1.6.0'
 end
 
-$:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__) + "/action_web_service/vendor/")
+
+require 'action_web_service/support/class_inheritable_options'
+require 'action_web_service/vendor/ws'
 
 require 'action_web_service/base'
 require 'action_web_service/client'
@@ -41,20 +44,21 @@ require 'action_web_service/api'
 require 'action_web_service/struct'
 require 'action_web_service/container'
 require 'action_web_service/protocol'
+require 'action_web_service/struct'
 require 'action_web_service/dispatcher'
 
 ActionWebService::Base.class_eval do
-  include ActionWebService::API
+  include ActionWebService::Container::Direct
   include ActionWebService::Invocation
 end
 
 ActionController::Base.class_eval do
-  include ActionWebService::Container
-  include ActionWebService::Protocol::Registry
+  include ActionWebService::Protocol::Discovery
   include ActionWebService::Protocol::Soap
   include ActionWebService::Protocol::XmlRpc
-  include ActionWebService::API
-  include ActionWebService::API::ActionController
+  include ActionWebService::Container::Direct
+  include ActionWebService::Container::Delegated
+  include ActionWebService::Container::ActionController
   include ActionWebService::Dispatcher
   include ActionWebService::Dispatcher::ActionController
 end