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

[do...@apache.org]

Author: donaldp
Date: Sun Oct  6 10:10:03 2013
New Revision: 1529605

URL: http://svn.apache.org/r1529605
Log:
Fixed bug in Intellij project file generation when adding a web facet that resulted in jsf facet being added unconditionally by default.

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=1529605&r1=1529604&r2=1529605&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sun Oct  6 10:10:03 2013
@@ -1,4 +1,6 @@
 1.4.14 (Pending)
+* Fixed:  Fixed bug in Intellij project file generation when adding
+          a web facet.
 
 1.4.13 (2013-10-02)
 * Fixed:  BUILDR-439 - Fix java command under windows when supplied

Modified: buildr/trunk/lib/buildr/ide/idea.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/idea.rb?rev=1529605&r1=1529604&r2=1529605&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/idea.rb (original)
+++ buildr/trunk/lib/buildr/ide/idea.rb Sun Oct  6 10:10:03 2013
@@ -328,7 +328,7 @@ module Buildr #:nodoc:
               end
             end
           end
-          default_enable_jsf = webroots.select{|webroot| File.exist?("#{webroot}/WEB-INF/faces-config.xml")}
+          default_enable_jsf = webroots.keys.any?{|webroot| File.exist?("#{webroot}/WEB-INF/faces-config.xml")}
           enable_jsf = options[:enable_jsf].nil? ? default_enable_jsf : options[:enable_jsf]
           enable_jsf = false if root_project.ipr? && root_project.ipr.version >= '13'
           f.facet(:type => 'jsf', :name => 'JSF') do |jsf|