Title: [661] trunk/rails-integration/plugins/goldspike-snapshot/lib/war_config.rb: 11610 - More configuration control, submitted by Anonymous?
Revision
661
Author
tantalon
Date
2007-07-01 17:47:20 -0400 (Sun, 01 Jul 2007)

Log Message

11610 - More configuration control, submitted by Anonymous?

Modified Paths


Diff

Modified: trunk/rails-integration/plugins/goldspike-snapshot/lib/war_config.rb (660 => 661)


--- trunk/rails-integration/plugins/goldspike-snapshot/lib/war_config.rb	2007-06-29 15:08:25 UTC (rev 660)
+++ trunk/rails-integration/plugins/goldspike-snapshot/lib/war_config.rb	2007-07-01 21:47:20 UTC (rev 661)
@@ -149,7 +149,7 @@
     end
 
     def load_user_configuration
-      user_config = File.join(RAILS_ROOT, 'config', 'war.rb')
+      user_config = ENV['WAR_CONFIG'] || File.join(RAILS_ROOT, 'config', 'war.rb')
       if File.exists?(user_config)
         begin
           War::Configuration::DSL.evaluate(user_config, self)
@@ -263,6 +263,11 @@
         @result.datasource_jndi_name = val[0]
       end
 
+      def staging(*val)
+          puts "Warning: staging takes only one argument" if val.size > 1
+          @result.staging = val[0]
+      end
+
       # method hook for library property
       def include_library(name, properties)
         if properties == nil or properties[:version] == nil or properties[:locations] == nil
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel

Reply via email to