server.rb in trinidad-1.3.0

- old
+ new

@@ -1,102 +1,118 @@
 module Trinidad
 
   class Server
     attr_reader :tomcat, :config
 
-    def default_options
-      {
-        :environment => 'development',
-        :context_path => '/',
-        :libs_dir => 'lib',
-        :classes_dir => 'classes',
-        :default_web_xml => 'config/web.xml',
-        :port => 3000,
-        :jruby_min_runtimes => 1,
-        :jruby_max_runtimes => 5,
-        :address => 'localhost',
-        :log => 'INFO',
-        :trap => true
-      }
-    end
-
-    def initialize(config = {})
+    def initialize(config = Trinidad.configuration)
       load_config(config)
       load_tomcat_server
       apps = create_web_apps
       load_host_monitor(apps)
     end
 
     def load_config(config)
-      @config = default_options.deep_merge(config).symbolize!
-      add_default_web_app!(@config)
+      @config = config
+      add_default_web_app!(config)
     end
 
     def load_tomcat_server
       @tomcat = Trinidad::Tomcat::Tomcat.new
       @tomcat.base_dir = Dir.pwd
-      @tomcat.hostname = @config[:address]
+      @tomcat.hostname = @config[:address] || 'localhost'
       @tomcat.server.address = @config[:address]
       @tomcat.port = @config[:port].to_i
-      @tomcat.host.app_base = @config[:apps_base] || Dir.pwd
+      create_hosts
       @tomcat.enable_naming
 
       add_http_connector if http_configured?
       add_ssl_connector if ssl_enabled?
       add_ajp_connector if ajp_enabled?
 
       @tomcat = Trinidad::Extensions.configure_server_extensions(@config[:extensions], @tomcat)
     end
 
+    def create_hosts
+      if @config[:hosts]
+        @config[:hosts].each do |apps_base, names|
+          create_host(apps_base, names)
+        end
+
+        set_default_host
+      elsif @config[:web_apps]
+        # create the hosts when they are specified for each app into
+        # web_apps. We must create them before creating the
+        # applications.
+        @config[:web_apps].each do |name, app_config|
+          if host_names = app_config.delete(:hosts)
+            dir = app_config[:web_app_dir] || Dir.pwd
+            apps_base = File.dirname(dir) == '.' ? dir : File.dirname(dir)
+            app_config[:host] = create_host(apps_base, host_names)
+          end
+
+          set_default_host
+        end
+      else
+        @tomcat.host.app_base = @config[:apps_base] || Dir.pwd
+      end
+    end
+
     def create_web_apps
       apps = []
       apps << create_from_web_apps
       apps << create_from_apps_base
 
       apps.flatten.compact
     end
 
     def load_host_monitor(apps)
-      @tomcat.host.add_lifecycle_listener(Trinidad::Lifecycle::Host.new(@tomcat, *apps))
+      @tomcat.engine.find_children.each do |host|
+        host.add_lifecycle_listener(Trinidad::Lifecycle::Host.new(@tomcat, *apps))
+      end
     end
 
     def create_from_web_apps
       if @config[:web_apps]
         @config[:web_apps].map do |name, app_config|
           app_config[:context_path] ||= (name.to_s == 'default' ? '' : "/#{name.to_s}")
-          app_config[:web_app_dir] ||= Dir.pwd
+          app_config[:web_app_dir]  ||= Dir.pwd
 
           create_web_app(app_config)
         end
       end
     end
 
     def create_from_apps_base
-      if @config[:apps_base]
-        apps_path = Dir.glob(File.join(@config[:apps_base], '*')).
-          select {|path| !(path =~ /tomcat\.\d+$/) }
+      if @config[:apps_base] || @config[:hosts]
+        @tomcat.engine.find_children.map do |host|
+          apps_base = host.app_base
 
-        apps_path.reject! {|path| apps_path.include?(path + '.war') }
+          apps_path = Dir.glob(File.join(apps_base, '*')).
+            select {|path| !(path =~ /tomcat\.\d+$/) }
 
-        apps_path.map do |path|
-          if (File.directory?(path) || path =~ /\.war$/)
-            name = File.basename(path)
-            app_config = {
-              :context_path => (name == 'default' ? '' : "/#{name.to_s}"),
-              :web_app_dir => File.expand_path(path)
-            }
+          apps_path.reject! {|path| apps_path.include?(path + '.war') }
 
-            create_web_app(app_config)
+          apps_path.map do |path|
+            if (File.directory?(path) || path =~ /\.war$/)
+              name = File.basename(path)
+              app_config = {
+                :context_path => (name == 'default' ? '' : "/#{name.to_s}"),
+                :web_app_dir  => File.expand_path(path),
+                :host         => host
+              }
+
+              create_web_app(app_config)
+            end
           end
-        end
+        end.flatten
       end
     end
 
     def create_web_app(app_config)
       web_app = WebApp.create(@config, app_config)
 
-      app_context = @tomcat.addWebapp(web_app.context_path, web_app.web_app_dir)
+      app_context = @tomcat.addWebapp(app_config[:host] || @tomcat.host, web_app.context_path, web_app.web_app_dir)
 
       Trinidad::Extensions.configure_webapp_extensions(web_app.extensions, @tomcat, app_context)
 
       app_context.add_lifecycle_listener(web_app.define_lifecycle)
 
@@ -156,19 +172,19 @@
       connector = add_service_connector(options, options[:protocol_handler] || 'HTTP/1.1')
       @tomcat.connector = connector
     end
 
     def ssl_enabled?
-      @config.has_key?(:ssl)
+      @config[:ssl] && !@config[:ssl].empty?
     end
 
     def ajp_enabled?
-      @config.has_key?(:ajp)
+      @config[:ajp] && !@config[:ajp].empty?
     end
 
     def http_configured?
-      @config.has_key?(:http) || @config[:address] != 'localhost'
+      (@config[:http] && !@config[:http].empty?) || @config[:address] != 'localhost'
     end
 
     def create_default_keystore(config)
       keystore_file = java.io.File.new(config[:keystoreFile])
 
@@ -202,17 +218,37 @@
       @tomcat.destroy
     end
 
     private
 
+    def create_host(apps_base, names)
+      host_names = Array(names)
+      host_name = host_names.shift
+      unless host = @tomcat.engine.find_child(host_name)
+        host = Trinidad::Tomcat::StandardHost.new
+        host.name = host_name
+        host.app_base = apps_base || Dir.pwd
+        host_names.each {|h| host.add_alias(h) } unless host_names.empty?
+
+        @tomcat.engine.add_child host
+      end
+      host
+    end
+
+    def set_default_host
+      # FIXME: Remove when the issue below is solved.
+      # workaround to solve this Tomcat issue: https://issues.apache.org/bugzilla/show_bug.cgi?id=52387
+      @tomcat.host = @tomcat.engine.find_children.first
+    end
+
     def add_default_web_app!(config)
-      if (!config.has_key?(:web_apps) && !config.has_key?(:apps_base))
+      if (!config[:web_apps] && !config[:apps_base] && !config[:hosts])
         default_app = {
           :context_path => config[:context_path],
           :web_app_dir => config[:web_app_dir] || Dir.pwd,
           :log => config[:log]
         }
-        default_app[:rackup] = config[:rackup] if (config.has_key?(:rackup))
+        default_app[:rackup] = config[:rackup] if config[:rackup]
 
         config[:web_apps] = { :default => default_app }
       end
     end
 