lib/trinidad/web_app.rb in trinidad-1.0.2 vs lib/trinidad/web_app.rb in trinidad-1.0.3
- old
+ new
@@ -60,11 +60,11 @@
def public_root
@app_config[:public] || @config[:public] || 'public'
end
- %w{context_path web_app_dir libs_dir classes_dir default_web_xml environment
+ %w{context_path web_app_dir libs_dir classes_dir default_web_xml
jruby_min_runtimes jruby_max_runtimes rackup log}.each do |method_name|
define_method method_name do
sym = method_name.to_sym
@app_config[sym] || @config[sym]
end
@@ -78,9 +78,10 @@
end
end
def war?; WebApp.war?(app_config); end
def work_dir; web_app_dir; end
+ def environment; @app_config[:environment] || @config[:environment] || 'development'; end
protected
def add_parameter_unless_exist(param_name, param_value)
@params[param_name] = param_value unless web_context_param(param_name)
end