buildr 1.4.6-java → 1.4.7-java

data/lib/buildr/core/linux.rb

@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 # Let's see if we can use notify-send.  Must be running from console in verbose mode.
 if $stdout.isatty && verbose
   system("which notify-send > /dev/null 2>/dev/null")

data/lib/buildr/core/osx.rb

@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 # Let's see if we can use Growl.  Must be running from console in verbose mode.
 if $stdout.isatty && verbose
   def growl_notify(type, title, message)

data/lib/buildr/core/project.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/util'
-
-
 module Buildr
 
   # Symbolic mapping for directory layout.  Used for both the default and custom layouts.

data/lib/buildr/core/run.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'buildr/run'
-require 'buildr/java/commands'
-require 'buildr/core/util'
-
 module Buildr
   module Run
 
@@ -27,7 +23,7 @@ module Buildr
 
       def run(task)
         fail "Missing :main option" unless task.options[:main]
-        cp = project.compile.dependencies + [project.path_to(:target, :classes)] + task.classpath
+        cp = project.compile.dependencies + [project.path_to(:target, :classes), project.path_to(:target, :resources)] + task.classpath
         Java::Commands.java(task.options[:main], {
           :properties => jrebel_props(project).merge(task.options[:properties] || {}),
           :classpath => cp,

data/lib/buildr/core/shell.rb

@@ -13,11 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/shell'
-require 'buildr/java/commands'
-require 'buildr/core/util'
-
 module Buildr
 
   module Shell
@@ -120,7 +115,7 @@ module Buildr
 
     private
       def jruby_home
-        @jruby_home ||= RUBY_PLATFORM =~ /java/ ? Config::CONFIG['prefix'] : ENV['JRUBY_HOME']
+        @jruby_home ||= RUBY_PLATFORM =~ /java/ ? RbConfig::CONFIG['prefix'] : ENV['JRUBY_HOME']
       end
 
       def jruby_artifact

data/lib/buildr/core/test.rb

@@ -13,12 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-require 'buildr/core/build'
-require 'buildr/core/compile'
-
-
 module Buildr
 
   # The underlying test framework used by TestTask.
@@ -145,7 +139,7 @@ module Buildr
   # cases are written in Java, then JUnit is selected as the test framework.  You can also select
   # a specific test framework, for example, to use TestNG instead of JUnit:
   #   test.using :testng
-  class TestTask < Rake::Task
+  class TestTask < ::Rake::Task
 
     class << self
 

data/lib/buildr/core/transports.rb

@@ -13,20 +13,16 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'uri'
 require 'net/http'
 # PATCH:  On Windows, Net::SSH 2.0.2 attempts to load the Pageant DLLs which break on JRuby.
 $LOADED_FEATURES << 'net/ssh/authentication/pageant.rb' if RUBY_PLATFORM =~ /java/
-gem 'net-ssh' ; Net.autoload :SSH, 'net/ssh'
-gem 'net-sftp' ; Net.autoload :SFTP, 'net/sftp'
+Net.autoload :SSH, 'net/ssh'
+Net.autoload :SFTP, 'net/sftp'
 autoload :CGI, 'cgi'
 require 'digest/md5'
 require 'digest/sha1'
-require 'stringio'
 autoload :ProgressBar, 'buildr/core/progressbar'
 
-
 # Not quite open-uri, but similar. Provides read and write methods for the resource represented by the URI.
 # Currently supports reads for URI::HTTP and writes for URI::SFTP. Also provides convenience methods for
 # downloads and uploads.
@@ -308,6 +304,8 @@ module URI
               end
             end
             return result
+          when Net::HTTPUnauthorized
+            raise NotFoundError, "Looking for #{self} but repository says Unauthorized/401."
           when Net::HTTPNotFound
             raise NotFoundError, "Looking for #{self} and all I got was a 404!"
           else

data/lib/buildr/core/util.rb

@@ -13,17 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'rbconfig'
-require 'pathname'
-autoload :Tempfile, 'tempfile'
-autoload :YAML, 'yaml'
-autoload :REXML, 'rexml/document'
-gem 'xml-simple' ; autoload :XmlSimple, 'xmlsimple'
-gem 'builder' ; autoload :Builder, 'builder' # A different kind of buildr, one we use to create XML.
-require 'highline/import'
-
-
 module Buildr
 
   module Util
@@ -43,7 +32,7 @@ module Buildr
     # For JRuby, the value for RUBY_PLATFORM will always be 'java'
     # That's why this function checks on Config::CONFIG['host_os']
     def win_os?
-      Config::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
+      RbConfig::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
     end
 
     # Runs Ruby with these command line arguments.  The last argument may be a hash,
@@ -54,7 +43,7 @@ module Buildr
     def ruby(*args)
       options = Hash === args.last ? args.pop : {}
       cmd = []
-      ruby_bin = normalize_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
+      ruby_bin = normalize_path(RbConfig::CONFIG['ruby_install_name'], RbConfig::CONFIG['bindir'])
       if options.delete(:sudo) && !(win_os? || Process.uid == File.stat(ruby_bin).uid)
         cmd << 'sudo' << '-u' << "##{File.stat(ruby_bin).uid}"
       end
@@ -131,58 +120,6 @@ module Buildr
       end
     end
 
-    # Utility methods for running gem commands
-    module Gems #:nodoc:
-      extend self
-
-      # Install gems specified by each Gem::Dependency if they are missing. This method prompts the user
-      # for permission before installing anything.
-      #
-      # Returns the installed Gem::Dependency objects or fails if permission not granted or when buildr
-      # is not running interactively (on a tty)
-      def install(*dependencies)
-        raise ArgumentError, "Expected at least one argument" if dependencies.empty?
-        not_found_deps = []
-        to_install = []
-        remote = dependencies.each do |dep|
-          if spec = Gem.source_index.search(dep).last
-            # Found in local repo
-            to_install << spec
-          elsif (spec = Gem::SpecFetcher.fetcher.fetch(dep, true).map { |spec, source| spec }.last)
-            # Found in remote repo
-            to_install << spec
-          else
-            # Not found anywhere
-            not_found_deps << "#{dep.name} #{dep.requirement}"
-          end
-        end
-        fail Gem::LoadError, "Build requires the gems #{not_found_deps.join(', ')}, which cannot be found in local or remote repository." unless not_found_deps.empty?
-        uses = "This build requires the gems #{to_install.map(&:full_name).join(', ')}:"
-        fail Gem::LoadError, "#{uses} to install, run Buildr interactively." unless $stdout.isatty
-        unless agree("#{uses} do you want me to install them? [Y/n]", true)
-          fail Gem::LoadError, 'Cannot build without these gems.'
-        end
-        to_install.each do |spec|
-          say "Installing #{spec.full_name} ... " if verbose
-          command 'install', spec.name, '-v', spec.version.to_s, :verbose => false
-          Gem.source_index.load_gems_in Gem::SourceIndex.installed_spec_directories
-        end
-        to_install
-      end
-
-      # Execute a GemRunner command
-      def command(cmd, *args)
-        options = Hash === args.last ? args.pop : {}
-        gem_home = ENV['GEM_HOME'] || Gem.path.find { |f| File.writable?(f) }
-        options[:sudo] = :root unless Util.win_os? || gem_home
-        options[:command] = 'gem'
-        args << options
-        args.unshift '-i', gem_home if cmd == 'install' && gem_home && !args.any?{ |a| a[/-i|--install-dir/] }
-        Util.ruby cmd, *args
-      end
-
-    end # Gems
-
   end # Util
 end
 

data/lib/buildr/groovy/doc.rb

@@ -13,9 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'buildr/core/doc'
-require 'buildr/groovy/compiler'   # ensure Groovy dependencies are ready
-
 module Buildr
   module Doc
 

data/lib/buildr/groovy/shell.rb

@@ -13,8 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'buildr/shell'
-
 module Buildr
   module Groovy
     class GroovySH < Buildr::Shell::Base

data/lib/buildr/ide/eclipse.rb

@@ -13,11 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-require 'buildr/packaging'
-
-
 module Buildr
   module Eclipse #:nodoc:
     include Extension
@@ -255,16 +250,16 @@ module Buildr
                     classpathentry.src project.test.resources
                   end
 
+                  project.eclipse.classpath_containers.each { |container|
+                    classpathentry.con container
+                  }
+
                   # Classpath elements from other projects
                   classpathentry.src_projects project_libs
 
                   classpathentry.output project.compile.target if project.compile.target
                   classpathentry.lib libs
                   classpathentry.var vars
-
-                  project.eclipse.classpath_containers.each { |container|
-                    classpathentry.con container
-                  }
                 end
               end
             end
@@ -426,8 +421,4 @@ class Buildr::Project
   include Buildr::Eclipse
 end
 
-# Order is significant for auto-detection, from most specific to least
-require 'buildr/ide/eclipse/plugin'
-require 'buildr/ide/eclipse/scala'
-require 'buildr/ide/eclipse/java'
 

data/lib/buildr/ide/eclipse/java.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-require 'buildr/core/common'
-
 module Buildr
   module Eclipse
     module Java

data/lib/buildr/ide/eclipse/plugin.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-require 'buildr/core/common'
-
 module Buildr
   module Eclipse
     module Plugin

data/lib/buildr/ide/eclipse/scala.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-require 'buildr/core/common'
-
 module Buildr
   module Eclipse
     module Scala

data/lib/buildr/ide/idea.rb

@@ -13,12 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-require 'buildr/packaging'
-require 'stringio'
-
-
 module Buildr
   module IntellijIdea
     def self.new_document(value)
@@ -28,11 +22,17 @@ module Buildr
     # Abstract base class for IdeaModule and IdeaProject
     class IdeaFile
       DEFAULT_SUFFIX = ""
+      DEFAULT_LOCAL_REPOSITORY_ENV_OVERRIDE = "MAVEN_REPOSITORY"
 
       attr_reader :buildr_project
       attr_writer :suffix
       attr_writer :id
       attr_accessor :template
+      attr_accessor :local_repository_env_override
+
+      def initialize
+        @local_repository_env_override = DEFAULT_LOCAL_REPOSITORY_ENV_OVERRIDE
+      end
 
       def suffix
         @suffix ||= DEFAULT_SUFFIX
@@ -50,8 +50,10 @@ module Buildr
         self.components << create_component(name, attrs, &xml)
       end
 
+      # IDEA can not handle text content with indents so need to removing indenting
+      # Can not pass true as third argument as the ruby library seems broken
       def write(f)
-        document.write(f, 2, false, true)
+        document.write(f, -1, false, true)
       end
 
       protected
@@ -60,6 +62,32 @@ module Buildr
         "#{self.id}#{suffix}"
       end
 
+      def relative(path)
+        ::Buildr::Util.relative_path(File.expand_path(path.to_s), self.base_directory)
+      end
+
+      def base_directory
+        buildr_project.path_to
+      end
+
+      def resolve_path_from_base(path, base_variable)
+        m2repo = Buildr::Repositories.instance.local
+        if path.to_s.index(m2repo) == 0 && !self.local_repository_env_override.nil?
+          return path.sub(m2repo, "$#{self.local_repository_env_override}$")
+        else
+          begin
+            return "#{base_variable}/#{relative(path)}"
+          rescue ArgumentError
+            # ArgumentError happens on windows when self.base_directory and path are on different drives
+            return path
+          end
+        end
+      end
+
+      def file_path(path)
+        "file://#{resolve_path(path)}"
+      end
+
       def create_component(name, attrs = {})
         target = StringIO.new
         Builder::XmlMarkup.new(:target => target, :indent => 2).component(attrs.merge({:name => name})) do |xml|
@@ -72,6 +100,24 @@ module Buildr
         @components ||= self.default_components.compact
       end
 
+      def create_composite_component(name, components)
+        return nil if components.empty?
+        component = self.create_component(name)
+        components.each do |element|
+          element = element.call if element.is_a?(Proc)
+          component.add_element element
+        end
+        component
+      end
+
+      def add_to_composite_component(components)
+        components << lambda do
+          target = StringIO.new
+          yield Builder::XmlMarkup.new(:target => target, :indent => 2)
+          Buildr::IntellijIdea.new_document(target.string).root
+        end
+      end
+
       def load_document(filename)
         Buildr::IntellijIdea.new_document(File.read(filename))
       end
@@ -111,16 +157,14 @@ module Buildr
     # IdeaModule represents an .iml file
     class IdeaModule < IdeaFile
       DEFAULT_TYPE = "JAVA_MODULE"
-      DEFAULT_LOCAL_REPOSITORY_ENV_OVERRIDE = "MAVEN_REPOSITORY"
 
       attr_accessor :type
-      attr_accessor :local_repository_env_override
       attr_accessor :group
       attr_reader :facets
 
       def initialize
+        super()
         @type = DEFAULT_TYPE
-        @local_repository_env_override = DEFAULT_LOCAL_REPOSITORY_ENV_OVERRIDE
       end
 
       def buildr_project=(buildr_project)
@@ -161,13 +205,13 @@ module Buildr
       attr_writer :main_output_dir
 
       def main_output_dir
-        @main_output_dir ||= buildr_project._(:target, :main, :java)
+        @main_output_dir ||= buildr_project._(:target, :main, :idea, :classes)
       end
 
       attr_writer :test_output_dir
 
       def test_output_dir
-        @test_output_dir ||= buildr_project._(:target, :test, :java)
+        @test_output_dir ||= buildr_project._(:target, :test, :idea, :classes)
       end
 
       def main_dependencies
@@ -179,11 +223,11 @@ module Buildr
       end
 
       def add_facet(name, type)
-        target = StringIO.new
-        Builder::XmlMarkup.new(:target => target, :indent => 2).facet(:name => name, :type => type) do |xml|
-          yield xml if block_given?
+        add_to_composite_component(self.facets) do |xml|
+          xml.facet(:name => name, :type => type) do |xml|
+            yield xml if block_given?
+          end
         end
-        self.facets << Buildr::IntellijIdea.new_document(target.string).root
       end
 
       def skip_content?
@@ -194,6 +238,113 @@ module Buildr
         @skip_content = true
       end
 
+      def add_gwt_facet(modules = {}, options = {})
+        name = options[:name] || "GWT"
+        settings =
+          {
+            :webFacet => "Web",
+            :compilerMaxHeapSize => "512",
+            :compilerParameters => "-draftCompile -localWorkers 2 -strict",
+            :gwtSdkUrl => "file://$GWT_TOOLS$",
+            :gwtScriptOutputStyle => "PRETTY"
+          }.merge(options[:settings] || {})
+
+        add_facet(name, "gwt") do |f|
+          f.configuration do |c|
+            settings.each_pair do |k, v|
+              c.setting :name => k.to_s, :value => v.to_s
+            end
+            c.packaging do |d|
+              modules.each_pair do |k, v|
+                d.module :name => k, :enabled => v
+              end
+            end
+          end
+        end
+      end
+
+      def add_web_facet(options = {})
+        name = options[:name] || "Web"
+        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"
+        version = options[:version] || "3.0"
+
+        add_facet(name, "web") do |f|
+          f.configuration do |c|
+            c.descriptors do |d|
+              if File.exist?(web_xml) || default_web_xml != web_xml
+                d.deploymentDescriptor :name => 'web.xml', :url => file_path(web_xml), :optional => "true", :version => version
+              end
+            end
+            c.webroots do |w|
+              webroots.each do |webroot|
+                w.root :url => file_path(webroot), :relative => url_base
+              end
+            end
+          end
+        end
+      end
+
+      def add_jruby_facet(options = {})
+        name = options[:name] || "JRuby"
+        jruby_version = options[:jruby_version] || "jruby-1.5.2-p249"
+        add_facet(name, "JRUBY") do |f|
+          f.configuration(:number => 0) do |c|
+            c.JRUBY_FACET_CONFIG_ID :NAME => "JRUBY_SDK_NAME", :VALUE => jruby_version
+          end
+        end
+      end
+
+      def add_jpa_facet(options = {})
+        name = options[:name] || "JPA"
+        factory_entry = options[:factory_entry] || buildr_project.name.to_s
+        validation_enabled = options[:validation_enabled].nil? ? true : options[:validation_enabled]
+        provider_enabled = options[:provider_enabled] || 'Hibernate'
+        default_persistence_xml = buildr_project._(:source, :main, :resources, "META-INF/persistence.xml")
+        persistence_xml = options[:persistence_xml] || default_persistence_xml
+        default_orm_xml = buildr_project._(:source, :main, :resources, "META-INF/orm.xml")
+        orm_xml = options[:orm_xml] || default_orm_xml
+        add_facet(name, "jpa") do |f|
+          f.configuration do |c|
+            c.setting :name => "validation-enabled", :value => validation_enabled
+            c.setting :name => "provider-name", :value => provider_enabled
+            c.tag!('datasource-mapping') do |ds|
+              ds.tag!('factory-entry', :name => factory_entry)
+            end
+            if File.exist?(persistence_xml) || default_persistence_xml != persistence_xml
+              c.deploymentDescriptor :name => 'persistence.xml', :url => file_path(persistence_xml)
+            end
+            if File.exist?(orm_xml) || default_orm_xml != orm_xml
+              c.deploymentDescriptor :name => 'orm.xml', :url => file_path(orm_xml)
+            end
+          end
+        end
+      end
+
+      def add_ejb_facet(options = {})
+        name = options[:name] || "EJB"
+        default_ejb_xml = buildr_project._(:source, :main, :resources, "WEB-INF/ejb-jar.xml")
+        ejb_xml = options[:ejb_xml] || default_ejb_xml
+        ejb_roots = options[:ejb_roots] || [buildr_project.compile.sources, buildr_project.resources.sources].flatten
+
+        add_facet(name, "ejb") do |facet|
+          facet.configuration do |c|
+            c.descriptors do |d|
+              if File.exist?(ejb_xml) || default_ejb_xml != ejb_xml
+                d.deploymentDescriptor :name => 'ejb-jar.xml', :url => file_path(ejb_xml)
+              end
+            end
+            c.ejbRoots do |e|
+              ejb_roots.each do |ejb_root|
+                e.root :url => file_path(ejb_root)
+              end
+            end
+          end
+        end
+      end
+
       protected
 
       def test_dependency_details
@@ -212,10 +363,6 @@ module Buildr
         end
       end
 
-      def base_directory
-        buildr_project.path_to
-      end
-
       def base_document
         target = StringIO.new
         Builder::XmlMarkup.new(:target => target).module(:version => "4", :relativePaths => "true", :type => self.type)
@@ -234,12 +381,7 @@ module Buildr
       end
 
       def facet_component
-        return nil if self.facets.empty?
-        fm = self.create_component("FacetManager")
-        self.facets.each do |facet|
-          fm.add_element facet
-        end
-        fm
+        create_composite_component("FacetManager", self.facets)
       end
 
       def module_root_component
@@ -285,10 +427,6 @@ module Buildr
         "jar://#{resolve_path(path)}!/"
       end
 
-      def file_path(path)
-        "file://#{resolve_path(path)}"
-      end
-
       def url_for_path(path)
         if path =~ /jar$/i
           jar_path(path)
@@ -298,21 +436,7 @@ module Buildr
       end
 
       def resolve_path(path)
-        m2repo = Buildr::Repositories.instance.local
-        if path.to_s.index(m2repo) == 0 && !self.local_repository_env_override.nil?
-          return path.sub(m2repo, "$#{self.local_repository_env_override}$")
-        else
-          begin
-            return "$MODULE_DIR$/#{relative(path)}"
-          rescue ArgumentError
-            # ArgumentError happens on windows when self.base_directory and path are on different drives
-            return path
-          end
-        end
-      end
-
-      def relative(path)
-        ::Buildr::Util.relative_path(File.expand_path(path.to_s), self.base_directory)
+        resolve_path_from_base(path, "$MODULE_DIR$")
       end
 
       def generate_compile_output(xml)
@@ -395,18 +519,115 @@ module Buildr
     class IdeaProject < IdeaFile
       attr_accessor :vcs
       attr_accessor :extra_modules
+      attr_accessor :artifacts
+      attr_accessor :configurations
       attr_writer :jdk_version
 
       def initialize(buildr_project)
+        super()
         @buildr_project = buildr_project
         @vcs = detect_vcs
         @extra_modules = []
+        @artifacts = []
+        @configurations = []
       end
 
       def jdk_version
         @jdk_version ||= buildr_project.compile.options.source || "1.6"
       end
 
+      def add_artifact(name, type, build_on_make = false)
+        add_to_composite_component(self.artifacts) do |xml|
+          xml.artifact(:name => name, :type => type, :"build-on-make" => build_on_make) do |xml|
+            yield xml if block_given?
+          end
+        end
+      end
+
+      def add_configuration(name, type, factory_name, default = false)
+        add_to_composite_component(self.configurations) do |xml|
+          xml.configuration(:name => name, :type => type, :factoryName => factory_name, :default => default) do |xml|
+            yield xml if block_given?
+          end
+        end
+      end
+
+      def add_exploded_war_artifact(project, options = {})
+        artifact_name = options[:name] || project.iml.id
+        build_on_make = options[:build_on_make].nil? ? false : options[:build_on_make]
+
+        add_artifact(artifact_name, "exploded-war", build_on_make) do |xml|
+          dependencies = (options[:dependencies] || ([project] + project.compile.dependencies)).flatten
+          libraries, projects = partition_dependencies(dependencies)
+
+          ## The content here can not be indented
+          output_dir = options[:output_dir] || project._(:artifacts, artifact_name)
+          xml.tag!('output-path', output_dir)
+
+          xml.root :id => "root" do
+            xml.element :id => "directory", :name => "WEB-INF" do
+              xml.element :id => "directory", :name => "classes" do
+                projects.each do |p|
+                  xml.element :id => "module-output", :name => p.iml.id
+                end
+                if options[:enable_jpa]
+                  module_names = options[:jpa_module_names] || [project.iml.id]
+                  module_names.each do |module_name|
+                    facet_name = options[:jpa_facet_name] || "JPA"
+                    xml.element :id => "jpa-descriptors", :facet => "#{module_name}/jpa/#{facet_name}"
+                  end
+                end
+                if options[:enable_ejb]
+                  module_names = options[:ejb_module_names] || [project.iml.id]
+                  module_names.each do |module_name|
+                    facet_name = options[:ejb_facet_name] || "EJB"
+                    xml.element :id => "javaee-facet-resources", :facet => "#{module_name}/ejb/#{facet_name}"
+                  end
+                end
+              end
+              xml.element :id => "directory", :name => "lib" do
+                libraries.each(&:invoke).map(&:to_s).each do |dependency_path|
+                  xml.element :id => "file-copy", :path => resolve_path(dependency_path)
+                end
+              end
+            end
+
+            if options[:enable_war].nil? || options[:enable_war]
+              module_names = options[:war_module_names] || [project.iml.id]
+              module_names.each do |module_name|
+                facet_name = options[:war_facet_name] || "Web"
+                xml.element :id => "javaee-facet-resources", :facet => "#{module_name}/web/#{facet_name}"
+              end
+            end
+
+            if options[:enable_gwt]
+              module_names = options[:gwt_module_names] || [project.iml.id]
+              module_names.each do |module_name|
+                facet_name = options[:gwt_facet_name] || "GWT"
+                xml.element :id => "gwt-compiler-output", :facet => "#{module_name}/gwt/#{facet_name}"
+              end
+            end
+          end
+        end
+      end
+
+      def add_gwt_configuration(launch_page, project, options = {})
+        name = options[:name] || "Run #{launch_page}"
+        shell_parameters = options[:shell_parameters] || ""
+        vm_parameters = options[:vm_parameters] || "-Xmx512m"
+
+        add_configuration(name, "GWT.ConfigurationType", "GWT Configuration") do |xml|
+          xml.module(:name => project.iml.id)
+          xml.option(:name => "RUN_PAGE", :value => launch_page)
+          xml.option(:name => "SHELL_PARAMETERS", :value => shell_parameters)
+          xml.option(:name => "VM_PARAMETERS", :value => vm_parameters)
+
+          xml.RunnerSettings(:RunnerId => "Run")
+          xml.ConfigurationWrapper(:RunnerId => "Run")
+          xml.method()
+        end
+      end
+
       protected
 
       def extension
@@ -430,7 +651,9 @@ module Buildr
       def default_components
         [
           lambda { modules_component },
-          vcs_component
+          vcs_component,
+          artifacts_component,
+          configurations_component
         ]
       end
 
@@ -469,7 +692,7 @@ module Buildr
               if subproject.iml.group == true
                 attribs[:group] = subproject.parent.name.gsub(':', '/')
               elsif !subproject.iml.group.nil?
-                attribs[:group] = subproject.group.to_s
+                attribs[:group] = subproject.iml.group.to_s
               end
               xml.module attribs
             end
@@ -492,6 +715,18 @@ module Buildr
           end
         end
       end
+
+      def artifacts_component
+        create_composite_component("ArtifactManager", self.artifacts)
+      end
+
+      def configurations_component
+        create_composite_component("ProjectRunConfigurationManager", self.configurations)
+      end
+
+      def resolve_path(path)
+        resolve_path_from_base(path, "$PROJECT_DIR$")
+      end
     end
 
     module ProjectExtension
@@ -520,12 +755,9 @@ module Buildr
 
         files.each do |ideafile|
           module_dir =  File.dirname(ideafile.filename)
-          # Need to clear the actions else the extension included as part of buildr will run
-          file(ideafile.filename).clear_actions
-          idea.enhance [file(ideafile.filename)]
-          file(ideafile.filename => [Buildr.application.buildfile]) do |task|
+          idea.enhance do |task|
             mkdir_p module_dir
-            info "Writing #{task.name}"
+            info "Writing #{ideafile.filename}"
             t = Tempfile.open("buildr-idea")
             temp_filename = t.path
             t.close!