svn commit: r1354954 - in /buildr/trunk: CHANGELOG lib/buildr/ide/idea.rb

[do...@apache.org]

Author: donaldp
Date: Thu Jun 28 11:47:14 2012
New Revision: 1354954

URL: http://svn.apache.org/viewvc?rev=1354954&view=rev
Log:
Fix the undefined default_web_xml variable in the add_web_facet method on the idea project.

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/ide/idea.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1354954&r1=1354953&r2=1354954&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Thu Jun 28 11:47:14 2012
@@ -2,6 +2,7 @@
 * Fixed:  Fix the add_exploded_war_artifact method on the idea project by adding in missing method
           `partition_dependencies`.
 * Fixed:  Fix the extension of the gwt plugin so that it can be required as an addon.
+* Fixed:  Fix the undefined default_web_xml variable in the add_web_facet method on the idea project.
 
 1.4.7 (2012-05-29)
 * Added:  BUILDR-618 pom properties feature does not support hierarchy (kafka liu)

Modified: buildr/trunk/lib/buildr/ide/idea.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/idea.rb?rev=1354954&r1=1354953&r2=1354954&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/idea.rb (original)
+++ buildr/trunk/lib/buildr/ide/idea.rb Thu Jun 28 11:47:14 2012
@@ -268,7 +268,8 @@ module Buildr
         url_base = options[:url_base] || "/"
         default_webroots = [buildr_project._(:source, :main, :webapp)]
         webroots = options[:webroots] || default_webroots
-        web_xml = options[:web_xml] || "#{buildr_project._(:source, :main, :webapp)}/WEB-INF/web.xml"
+        default_web_xml = "#{buildr_project._(:source, :main, :webapp)}/WEB-INF/web.xml"
+        web_xml = options[:web_xml] || default_web_xml
         version = options[:version] || "3.0"
 
         add_facet(name, "web") do |f|