RubyGems - buildr - Versions diffs - 1.4.20-x86-mswin32 → 1.4.21-x86-mswin32 - Mend

buildr 1.4.20-x86-mswin32 → 1.4.21-x86-mswin32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

checksums.yaml +6 -14
data/CHANGELOG +31 -0
data/Rakefile +5 -3
data/addon/buildr/checkstyle.rb +41 -19
data/addon/buildr/gwt.rb +48 -20
data/addon/buildr/jacoco.rb +2 -4
data/addon/buildr/pmd.rb +33 -18
data/buildr.gemspec +8 -6
data/doc/download.textile +18 -6
data/doc/index.textile +29 -25
data/lib/buildr/ide/idea.rb +172 -135
data/lib/buildr/packaging/archive.rb +15 -1
data/lib/buildr/packaging/tar.rb +1 -1
data/lib/buildr/packaging/ziptask.rb +2 -1
data/lib/buildr/version.rb +1 -1
data/rakelib/stage.rake +1 -1
data/spec/packaging/archive_spec.rb +34 -0
metadata +41 -46

data/doc/download.textile CHANGED

@@ -18,16 +18,28 @@ The source code is included in both source and binary distribution, the Gem dist
 h2(#dist).  Binaries and Source Code
+h3. buildr 1.4.20 (2014-08-23)
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.4.20-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.20/buildr-1.4.20-java.gem | "5c556432d31d1b6a8b7f6dc4d40adfd7":http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20-java.gem.asc |
+| "buildr-1.4.20-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.20/buildr-1.4.20-x86-mswin32.gem | "4db296ff90d82306d80b47c763f771ae":http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20-x86-mswin32.gem.asc |
+| "buildr-1.4.20.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.20/buildr-1.4.20.gem | "78987c8048d9c30c96f07b485df7077c":http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.gem.asc |
+| "buildr-1.4.20.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.20/buildr-1.4.20.tgz | "682d1574dbc9c17db841df6a9632497e":http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.tgz.asc |
+| "buildr-1.4.20.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.20/buildr-1.4.20.zip | "ad04e82d76268ec91a6bc33afcb77490":http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.zip.asc |
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.20/KEYS)
 h3. buildr 1.4.19 (2014-07-06)
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.4.19-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19-java.gem | "bdf35f947eab94766ec4a4ca4b82e73e":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem.asc |
-| "buildr-1.4.19-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem | "9fbe0ac5148e5d3a6f449dfbd5dfc4a2":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem.asc |
-| "buildr-1.4.19.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19.gem | "626af3aabef47a6c55587aaeca5d879d":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem.asc |
-| "buildr-1.4.19.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19.tgz | "f9bc0151a6ed9867c40393cced6195f5":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz.asc |
-| "buildr-1.4.19.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19.zip | "1c88b93901524e236db41ec69a3bc72a":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip.asc |
+| "buildr-1.4.19-java.gem":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem | "bdf35f947eab94766ec4a4ca4b82e73e":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem.asc |
+| "buildr-1.4.19-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem | "9fbe0ac5148e5d3a6f449dfbd5dfc4a2":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem.asc |
+| "buildr-1.4.19.gem":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem | "626af3aabef47a6c55587aaeca5d879d":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem.asc |
+| "buildr-1.4.19.tgz":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz | "f9bc0151a6ed9867c40393cced6195f5":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz.asc |
+| "buildr-1.4.19.zip":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip | "1c88b93901524e236db41ec69a3bc72a":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip.asc |
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.19/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.19/KEYS)
 h3. buildr 1.4.18 (2014-06-24)

data/doc/index.textile CHANGED

@@ -46,31 +46,35 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 h2(#news).  What's New
-Highlights from Buildr 1.4.20 (2014-08-23)
-* Fixed : Work around bug/feature of jruby 1.7.13 that caches Gem::Version
-          objects based on constructor parameters that causes issues with
-          Buildr as we mutate the version objects through monkey patching.
-* Change: Upgrade rjb dependency to 1.4.9.
-* Change: BUILDR-701 - Update to JUnit 4.11. Submitted by Jean-Philippe Caruana.
-* Added:  Support the 'report_level' property on findbugs addon.
-* Change: Update the findbugs addon to use the 3.0.0 version of Findbugs.
-* Change: Update the findbugs addon to use the built-in findbugs stylesheet
-          to generate the html report.
-* Fixed:  Ensure that the 'single_intermediate_layout' addon removes the top
-          level target and reports directories during 'clean' phase.
-* Added:  Enhance idea project generation of ejb facet by looking for ejb
-          descriptors in location compatible with ejb-jars.
-Highlights from Buildr 1.4.19 (2014-07-06)
-* Fixed:  BUILDR-700 - Ensure SNAPSHOT artifacts, constructed using the
-          download(artifact('group:artifact:jar:1-SNAPSHOT') =>
-          'http://example.com/...') construct will correctly download the
-          artifacts from configured URL.
-* Fixed:  BUILDR-700 - Fix bug where buildr was truncating SNAPSHOT files
-          that had not changed since last update check and HTTP was returning
-          "HTTP Not Modified" status.
-* Fixed:  Fix bug introduced in 1.4.18 version of custom_pom addon where
-          poms are created for artifacts that have a classifier.
+Highlights from Buildr 1.4.21 (2014-11-28)
+* Change: Upgrade atoulme-Antwrap to 0.7.5 to remove deprecation warnings in
+          modern JRuby. Suggested by Pepijn Van Eeckhoudt.
+* Fixed:  BUILDR-702 - Retain Unix permission flags when merging
+          zip files into another zip or tar archive. Submitted by Pepijn Van Eeckhoudt.
+* Change: Upgrade jacoco to 0.7.2 to support Java 8. Submitted by neher.
+* Change: Update checkstyle addon to use Checkstyle 6.0.
+* Added:  Update checkstyle addon to support downloading checkstyle checks as an artifact.
+* Added:  Update checkstyle addon to supply checkstyle.config.dir property.
+* Added:  Update pmd addon to support downloading rule files as an artifact.
+* Change: Update pmd addon to use pmd version 5.1.3.
+* Change: Update rjb to version 1.5.1.
+* Change: Update the gwt addon to add the validation dependencies required for GWT
+          compiles without requiring that the user specify the dependency.
+* Added:  Updated the gwt addon to support the GWT 2.7.0 release.
+* Change: Update ipr.add_gwt_configuration method to support GWT 2.7 configuration
+          parameters and IDEA 14 parameters.
+* Change: Enhance ipr.add_glassfish_configuration to support the ability to
+          define the version of GlassFish in uses. Change the default to 4.1.0
+          as that is the latest supported variant.
+* Fixed:  Change the name of the GlassFish install in ipr.add_glassfish_configuration
+          to use the same convention that IDEA uses by default. i.e. Name the
+          installation "GlassFish 4.1.0" rather than "Glassfish 4.1.0".
+* Change: Change the default version of the jdk in IDEA project files to 1.7.
+* Change: Change the default version of the IDEA project files created to the
+          current release version 13. To revert to the older versions specify
+          ipr.version = '12' in your buildfile.
+* Added:  Enhance the IdeaFile class to easily support mixing in of custom
+          components from either the filesystem or from an artifact.
 This is a partial list -- see the "CHANGELOG":CHANGELOG for full details.

data/lib/buildr/ide/idea.rb CHANGED

@@ -21,8 +21,8 @@ module Buildr #:nodoc:
     # Abstract base class for IdeaModule and IdeaProject
     class IdeaFile
-      DEFAULT_SUFFIX = ""
-      DEFAULT_LOCAL_REPOSITORY_ENV_OVERRIDE = "MAVEN_REPOSITORY"
+      DEFAULT_SUFFIX = ''
+      DEFAULT_LOCAL_REPOSITORY_ENV_OVERRIDE = 'MAVEN_REPOSITORY'
       attr_reader :buildr_project
       attr_writer :suffix
@@ -50,6 +50,21 @@ module Buildr #:nodoc:
         self.components << create_component(name, attrs, &xml)
       end
+      def add_component_from_file(filename)
+        self.components << lambda do
+          raise "Unable to locate file #{filename} adding component to idea file" unless File.exist?(filename)
+          Buildr::IntellijIdea.new_document(IO.read(filename)).root
+        end
+      end
+      def add_component_from_artifact(artifact)
+        self.components << lambda do
+          a = Buildr.artifact(artifact)
+          a.invoke
+          Buildr::IntellijIdea.new_document(IO.read(a.to_s)).root
+        end
+      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)
@@ -131,7 +146,7 @@ module Buildr #:nodoc:
         end
         if self.template
           template_doc = load_document(self.template)
-          REXML::XPath.each(template_doc, "//component") do |element|
+          REXML::XPath.each(template_doc, '//component') do |element|
             inject_component(doc, element)
           end
         end
@@ -164,7 +179,7 @@ module Buildr #:nodoc:
     # IdeaModule represents an .iml file
     class IdeaModule < IdeaFile
-      DEFAULT_TYPE = "JAVA_MODULE"
+      DEFAULT_TYPE = 'JAVA_MODULE'
       attr_accessor :type
       attr_accessor :group
@@ -184,11 +199,11 @@ module Buildr #:nodoc:
       end
       def jdk_version
-        @jdk_version || buildr_project.compile.options.source || "1.6"
+        @jdk_version || buildr_project.compile.options.source || '1.7'
       end
       def extension
-        "iml"
+        'iml'
       end
       def main_source_directories
@@ -252,7 +267,7 @@ module Buildr #:nodoc:
       end
       def add_gwt_facet(modules = {}, options = {})
-        name = options[:name] || "GWT"
+        name = options[:name] || 'GWT'
         detected_gwt_version = nil
         if options[:gwt_dev_artifact]
           a = Buildr.artifact(options[:gwt_dev_artifact])
@@ -262,10 +277,10 @@ module Buildr #:nodoc:
         settings =
           {
-            :webFacet => "Web",
-            :compilerMaxHeapSize => "512",
-            :compilerParameters => "-draftCompile -localWorkers 2 -strict",
-            :gwtScriptOutputStyle => "PRETTY"
+            :webFacet => 'Web',
+            :compilerMaxHeapSize => '512',
+            :compilerParameters => '-draftCompile -localWorkers 2 -strict',
+            :gwtScriptOutputStyle => 'PRETTY'
           }.merge(options[:settings] || {})
         buildr_project.compile.dependencies.each do |d|
@@ -277,12 +292,12 @@ module Buildr #:nodoc:
         if detected_gwt_version
           settings[:gwtSdkUrl] = resolve_path(File.dirname(detected_gwt_version))
-          settings[:gwtSdkType] = "maven"
+          settings[:gwtSdkType] = 'maven'
         else
-          settings[:gwtSdkUrl] = "file://$GWT_TOOLS$"
+          settings[:gwtSdkUrl] = 'file://$GWT_TOOLS$'
         end
-        add_facet(name, "gwt") do |f|
+        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
@@ -297,10 +312,10 @@ module Buildr #:nodoc:
       end
       def add_web_facet(options = {})
-        name = options[:name] || "Web"
+        name = options[:name] || 'Web'
         default_webroots = {}
-        default_webroots[buildr_project._(:source, :main, :webapp)] = "/" if File.exist?(buildr_project._(:source, :main, :webapp))
-        buildr_project.assets.paths.each {|p| default_webroots[p] = "/" }
+        default_webroots[buildr_project._(:source, :main, :webapp)] = '/' if File.exist?(buildr_project._(:source, :main, :webapp))
+        buildr_project.assets.paths.each {|p| default_webroots[p] = '/' }
         webroots = options[:webroots] || default_webroots
         default_deployment_descriptors = []
         ['web.xml', 'sun-web.xml', 'glassfish-web.xml', 'jetty-web.xml', 'geronimo-web.xml',
@@ -309,14 +324,14 @@ module Buildr #:nodoc:
          'ibm-web-bnd.xml', 'ibm-web-ext.xml', 'ibm-web-ext-pme.xml'].
           each do |descriptor|
           webroots.each_pair do |path, relative_url|
-            next unless relative_url == "/"
+            next unless relative_url == '/'
             d = "#{path}/WEB-INF/#{descriptor}"
             default_deployment_descriptors << d if File.exist?(d)
           end
         end
         deployment_descriptors = options[:deployment_descriptors] || default_deployment_descriptors
-        add_facet(name, "web") do |f|
+        add_facet(name, 'web') do |f|
           f.configuration do |c|
             c.descriptors do |d|
               deployment_descriptors.each do |deployment_descriptor|
@@ -339,22 +354,22 @@ module Buildr #:nodoc:
       end
       def add_jruby_facet(options = {})
-        name = options[:name] || "JRuby"
+        name = options[:name] || 'JRuby'
         ruby_version_file = buildr_project._('.ruby-version')
         default_jruby_version = File.exist?(ruby_version_file) ? "rbenv: #{IO.read(ruby_version_file).strip}" : 'jruby-1.6.7.2'
         jruby_version = options[:jruby_version] || default_jruby_version
-        add_facet(name, "JRUBY") do |f|
+        add_facet(name, 'JRUBY') do |f|
           f.configuration do |c|
-            c.JRUBY_FACET_CONFIG_ID :NAME => "JRUBY_SDK_NAME", :VALUE => jruby_version
-            c.LOAD_PATH :number => "0"
-            c.I18N_FOLDERS :number => "0"
+            c.JRUBY_FACET_CONFIG_ID :NAME => 'JRUBY_SDK_NAME', :VALUE => jruby_version
+            c.LOAD_PATH :number => '0'
+            c.I18N_FOLDERS :number => '0'
           end
         end
       end
       def add_jpa_facet(options = {})
-        name = options[:name] || "JPA"
+        name = options[:name] || 'JPA'
         source_roots = [buildr_project.iml.main_source_directories, buildr_project.compile.sources, buildr_project.resources.sources].flatten.compact
         default_deployment_descriptors = []
@@ -384,11 +399,11 @@ module Buildr #:nodoc:
           end
         end
-        add_facet(name, "jpa") do |f|
+        add_facet(name, 'jpa') do |f|
           f.configuration do |c|
             if provider
-              c.setting :name => "validation-enabled", :value => validation_enabled
-              c.setting :name => "provider-name", :value => provider
+              c.setting :name => 'validation-enabled', :value => validation_enabled
+              c.setting :name => 'provider-name', :value => provider
             end
             c.tag!('datasource-mapping') do |ds|
               ds.tag!('factory-entry', :name => factory_entry)
@@ -401,7 +416,7 @@ module Buildr #:nodoc:
       end
       def add_ejb_facet(options = {})
-        name = options[:name] || "EJB"
+        name = options[:name] || 'EJB'
         default_ejb_roots = [buildr_project.iml.main_source_directories, buildr_project.compile.sources, buildr_project.resources.sources].flatten.compact
         ejb_roots = options[:ejb_roots] || default_ejb_roots
@@ -420,7 +435,7 @@ module Buildr #:nodoc:
         end
         deployment_descriptors = options[:deployment_descriptors] || default_deployment_descriptors
-        add_facet(name, "ejb") do |facet|
+        add_facet(name, 'ejb') do |facet|
           facet.configuration do |c|
             c.descriptors do |d|
               deployment_descriptors.each do |deployment_descriptor|
@@ -464,7 +479,7 @@ module Buildr #:nodoc:
       def base_document
         target = StringIO.new
-        Builder::XmlMarkup.new(:target => target).module(:version => "4", :relativePaths => "true", :type => self.type)
+        Builder::XmlMarkup.new(:target => target).module(:version => '4', :relativePaths => 'true', :type => self.type)
         Buildr::IntellijIdea.new_document(target.string)
       end
@@ -480,11 +495,11 @@ module Buildr #:nodoc:
       end
       def facet_component
-        create_composite_component("FacetManager", {}, self.facets)
+        create_composite_component('FacetManager', {}, self.facets)
       end
       def module_root_component
-        create_component("NewModuleRootManager", "inherit-compiler-output" => "false") do |xml|
+        create_component('NewModuleRootManager', 'inherit-compiler-output' => 'false') do |xml|
           generate_compile_output(xml)
           generate_content(xml) unless skip_content?
           generate_initial_order_entries(xml)
@@ -535,17 +550,17 @@ module Buildr #:nodoc:
       end
       def resolve_path(path)
-        resolve_path_from_base(path, "$MODULE_DIR$")
+        resolve_path_from_base(path, '$MODULE_DIR$')
       end
       def generate_compile_output(xml)
         xml.output(:url => file_path(self.main_output_dir.to_s))
-        xml.tag!("output-test", :url => file_path(self.test_output_dir.to_s))
-        xml.tag!("exclude-output")
+        xml.tag!('output-test', :url => file_path(self.test_output_dir.to_s))
+        xml.tag!('exclude-output')
       end
       def generate_content(xml)
-        xml.content(:url => "file://$MODULE_DIR$") do
+        xml.content(:url => 'file://$MODULE_DIR$') do
           # Source folders
           {
             :main => self.main_source_directories,
@@ -567,16 +582,16 @@ module Buildr #:nodoc:
       end
       def relative_dir_inside_dir?(dir)
-        !dir.include?("../")
+        !dir.include?('../')
       end
       def generate_initial_order_entries(xml)
-        xml.orderEntry :type => "sourceFolder", :forTests => "false"
-        xml.orderEntry :type => "jdk", :jdkName => jdk_version, :jdkType => "JavaSDK"
+        xml.orderEntry :type => 'sourceFolder', :forTests => 'false'
+        xml.orderEntry :type => 'jdk', :jdkName => jdk_version, :jdkType => 'JavaSDK'
       end
       def generate_project_dependency(xml, other_project, export, test = false)
-        attribs = {:type => 'module', "module-name" => other_project}
+        attribs = {:type => 'module', 'module-name' => other_project}
         attribs[:exported] = '' if export
         attribs[:scope] = 'TEST' if test
         xml.orderEntry attribs
@@ -633,27 +648,29 @@ module Buildr #:nodoc:
       end
       def version
-        @version || "12"
+        @version || '13'
       end
       def jdk_version
-        @jdk_version ||= buildr_project.compile.options.source || "1.6"
+        @jdk_version ||= buildr_project.compile.options.source || '1.7'
       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|
+          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)
+      def add_configuration(name, type, factory_name, default = false, options = {})
         add_to_composite_component(self.configurations) do |xml|
-          options = {:type => type, :factoryName => factory_name}
-          options[:name] = name unless default
-          options[:default] = true if default
-          xml.configuration(options) do |xml|
+          params = options.dup
+          params[:type] = type
+          params[:factoryName] = factory_name
+          params[:name] = name unless default
+          params[:default] = true if default
+          xml.configuration(params) do |xml|
             yield xml if block_given?
           end
         end
@@ -667,15 +684,15 @@ module Buildr #:nodoc:
       def add_postgres_data_source(name, options = {})
         if options[:url].nil? && options[:database]
-         default_url = "jdbc:postgresql://#{(options[:host] || "127.0.0.1")}:#{(options[:port] || "5432")}/#{options[:database]}"
+         default_url = "jdbc:postgresql://#{(options[:host] || '127.0.0.1')}:#{(options[:port] || '5432')}/#{options[:database]}"
         end
         params = {
           :driver => 'org.postgresql.Driver',
           :url => default_url,
-          :username => ENV["USER"],
+          :username => ENV['USER'],
           :dialect => 'PostgreSQL',
-          :classpath => ["org.postgresql:postgresql:jar:9.2-1003-jdbc4"]
+          :classpath => ['org.postgresql:postgresql:jar:9.2-1003-jdbc4']
         }.merge(options)
         add_data_source(name, params)
       end
@@ -683,13 +700,13 @@ module Buildr #:nodoc:
       def add_sql_server_data_source(name, options = {})
         default_url = nil
         if options[:url].nil? && options[:database]
-          default_url = "jdbc:jtds:sqlserver://#{(options[:host] || "127.0.0.1")}:#{(options[:port] || "1433")}/#{options[:database]}"
+          default_url = "jdbc:jtds:sqlserver://#{(options[:host] || '127.0.0.1')}:#{(options[:port] || '1433')}/#{options[:database]}"
         end
         params = {
           :driver => 'net.sourceforge.jtds.jdbc.Driver',
           :url => default_url,
-          :username => ENV["USER"],
+          :username => ENV['USER'],
           :dialect => 'TSQL',
           :classpath => ['net.sourceforge.jtds:jtds:jar:1.2.7']
         }.merge(options)
@@ -708,28 +725,28 @@ module Buildr #:nodoc:
       def add_data_source(name, options = {})
         add_to_composite_component(self.data_sources) do |xml|
           data_source_options = {
-            :source => "LOCAL",
+            :source => 'LOCAL',
             :name => name,
             :uuid => Buildr::Util.uuid
           }
           classpath = options[:classpath] || []
-          xml.tag!("data-source", data_source_options) do |xml|
-            xml.tag!("synchronize", (options[:synchronize]||"true"))
-            xml.tag!("jdbc-driver", options[:driver]) if options[:driver]
-            xml.tag!("jdbc-url", options[:url]) if options[:url]
-            xml.tag!("user-name", options[:username]) if options[:username]
-            xml.tag!("user-password", encrypt(options[:password])) if options[:password]
-            xml.tag!("schema-pattern", options[:schema_pattern]) if options[:schema_pattern]
-            xml.tag!("default-schemas", options[:default_schemas]) if options[:default_schemas]
-            xml.tag!("table-pattern", options[:table_pattern]) if options[:table_pattern]
-            xml.tag!("default-dialect", options[:dialect]) if options[:dialect]
+          xml.tag!('data-source', data_source_options) do |xml|
+            xml.tag!('synchronize', (options[:synchronize]||'true'))
+            xml.tag!('jdbc-driver', options[:driver]) if options[:driver]
+            xml.tag!('jdbc-url', options[:url]) if options[:url]
+            xml.tag!('user-name', options[:username]) if options[:username]
+            xml.tag!('user-password', encrypt(options[:password])) if options[:password]
+            xml.tag!('schema-pattern', options[:schema_pattern]) if options[:schema_pattern]
+            xml.tag!('default-schemas', options[:default_schemas]) if options[:default_schemas]
+            xml.tag!('table-pattern', options[:table_pattern]) if options[:table_pattern]
+            xml.tag!('default-dialect', options[:dialect]) if options[:dialect]
             xml.libraries do |xml|
               classpath.each do |classpath_element|
                 a = Buildr.artifact(classpath_element)
                 a.invoke
                 xml.library do |xml|
-                  xml.tag!("url", resolve_path(a.to_s))
+                  xml.tag!('url', resolve_path(a.to_s))
                 end
               end
             end if classpath.size > 0
@@ -741,17 +758,17 @@ module Buildr #:nodoc:
         artifact_name = to_artifact_name(project, options)
         artifacts = options[:artifacts] || []
-        add_artifact(artifact_name, "exploded-war", build_on_make(options)) do |xml|
+        add_artifact(artifact_name, 'exploded-war', build_on_make(options)) do |xml|
           dependencies = (options[:dependencies] || ([project] + project.compile.dependencies)).flatten
           libraries, projects = partition_dependencies(dependencies)
           emit_output_path(xml, artifact_name, options)
-          xml.root :id => "root" do
-            xml.element :id => "directory", :name => "WEB-INF" do
-              xml.element :id => "directory", :name => "classes" do
+          xml.root :id => 'root' do
+            xml.element :id => 'directory', :name => 'WEB-INF' do
+              xml.element :id => 'directory', :name => 'classes' do
                 artifact_content(xml, project, projects, options)
               end
-              xml.element :id => "directory", :name => "lib" do
+              xml.element :id => 'directory', :name => 'lib' do
                 emit_libraries(xml, libraries)
                 emit_jar_artifacts(xml, artifacts)
               end
@@ -760,16 +777,16 @@ module Buildr #:nodoc:
             if options[:enable_war].nil? || options[:enable_war] || (options[:war_module_names] && options[:war_module_names].size > 0)
               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}"
+                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] || (options[:gwt_module_names] && options[:gwt_module_names].size > 0)
               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}"
+                facet_name = options[:gwt_facet_name] || 'GWT'
+                xml.element :id => 'gwt-compiler-output', :facet => "#{module_name}/gwt/#{facet_name}"
               end
             end
           end
@@ -779,14 +796,14 @@ module Buildr #:nodoc:
       def add_exploded_ear_artifact(project, options ={})
         artifact_name = to_artifact_name(project, options)
-        add_artifact(artifact_name, "exploded-ear", build_on_make(options)) do |xml|
+        add_artifact(artifact_name, 'exploded-ear', build_on_make(options)) do |xml|
           dependencies = (options[:dependencies] || ([project] + project.compile.dependencies)).flatten
           libraries, projects = partition_dependencies(dependencies)
           emit_output_path(xml, artifact_name, options)
-          xml.root :id => "root" do
+          xml.root :id => 'root' do
             emit_module_output(xml, projects)
-            xml.element :id => "directory", :name => "lib" do
+            xml.element :id => 'directory', :name => 'lib' do
               emit_libraries(xml, libraries)
             end
           end
@@ -801,9 +818,9 @@ module Buildr #:nodoc:
         raise "Unable to add non-project dependencies (#{libraries.inspect}) to jar artifact" if libraries.size > 0
         jar_name = "#{artifact_name}.jar"
-        add_artifact(jar_name, "jar", build_on_make(options)) do |xml|
+        add_artifact(jar_name, 'jar', build_on_make(options)) do |xml|
           emit_output_path(xml, artifact_name, options)
-          xml.root(:id => "archive", :name => jar_name) do
+          xml.root(:id => 'archive', :name => jar_name) do
             artifact_content(xml, project, projects, options)
           end
         end
@@ -812,13 +829,13 @@ module Buildr #:nodoc:
       def add_exploded_ejb_artifact(project, options = {})
         artifact_name = to_artifact_name(project, options)
-        add_artifact(artifact_name, "exploded-ejb", build_on_make(options)) do |xml|
+        add_artifact(artifact_name, 'exploded-ejb', build_on_make(options)) do |xml|
           dependencies = (options[:dependencies] || [project]).flatten
           libraries, projects = partition_dependencies(dependencies)
           raise "Unable to add non-project dependencies (#{libraries.inspect}) to ejb artifact" if libraries.size > 0
           emit_output_path(xml, artifact_name, options)
-          xml.root :id => "root" do
+          xml.root :id => 'root' do
             artifact_content(xml, project, projects, options)
           end
         end
@@ -826,7 +843,7 @@ module Buildr #:nodoc:
       def add_java_configuration(project, classname, options = {})
         args = options[:args] || ''
-        dir = options[:dir] || "file://$PROJECT_DIR$/"
+        dir = options[:dir] || 'file://$PROJECT_DIR$/'
         debug_port = options[:debug_port] || 2599
         module_name = options[:module_name] || project.iml.id
         jvm_args = options[:jvm_args] || ''
@@ -888,33 +905,53 @@ module Buildr #:nodoc:
         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"
+      def add_gwt_configuration(project, options = {})
+        launch_page = options[:launch_page]
+        name = options[:name] || (launch_page ? "Run #{launch_page}" : "Run #{project.name} DevMode")
+        shell_parameters = options[:shell_parameters]
+        vm_parameters = options[:vm_parameters] || '-Xmx512m'
+        singleton = options[:singleton].nil? ? true : !!options[:singleton]
+        super_dev = options[:super_dev].nil? ? true : !!options[:super_dev]
+        gwt_module = options[:gwt_module]
+        start_javascript_debugger = options[:start_javascript_debugger].nil? ? true : !!options[:start_javascript_debugger]
-        add_configuration(name, "GWT.ConfigurationType", "GWT Configuration") do |xml|
+        add_configuration(name, 'GWT.ConfigurationType', 'GWT Configuration', false, :singleton => singleton) 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.option(:name => 'VM_PARAMETERS', :value => vm_parameters)
+          xml.option(:name => 'RUN_PAGE', :value => launch_page) if launch_page
+          xml.option(:name => 'GWT_MODULE', :value => gwt_module) if gwt_module
+          xml.option(:name => 'START_JAVASCRIPT_DEBUGGER', :value => start_javascript_debugger)
+          xml.option(:name => 'USE_SUPER_DEV_MODE', :value => super_dev)
+          xml.option(:name => 'SHELL_PARAMETERS', :value => shell_parameters) if shell_parameters
+          xml.RunnerSettings(:RunnerId => 'Debug') do |xml|
+            xml.option(:name => 'DEBUG_PORT', :value => '')
+            xml.option(:name => 'TRANSPORT', :value => 0)
+            xml.option(:name => 'LOCAL', :value => true)
+          end
+          xml.RunnerSettings(:RunnerId => 'Run')
+          xml.ConfigurationWrapper(:RunnerId => 'Run')
+          xml.ConfigurationWrapper(:RunnerId => 'Debug')
           xml.method()
         end
       end
       def add_glassfish_configuration(project, options = {})
         artifact_name = options[:name] || project.iml.id
-        server_name = options[:server_name] || 'Glassfish 4.0.0'
+        version = options[:version] || '4.1.0'
+        server_name = options[:server_name] || "GlassFish #{version}"
+        configuration_name = options[:configuration_name] || server_name
         domain_name = options[:domain] || project.iml.id
         domain_port = options[:port] || '9009'
         packaged = options[:packaged] || {}
         exploded = options[:exploded] || {}
         add_to_composite_component(self.configurations) do |xml|
-          xml.configuration(:name => server_name, :type => 'GlassfishConfiguration', :factoryName => 'Local', :default => false, :APPLICATION_SERVER_NAME => server_name) do |xml|
+          xml.configuration(:name => configuration_name, :type => 'GlassfishConfiguration', :factoryName => 'Local', :default => false, :APPLICATION_SERVER_NAME => server_name) do |xml|
             xml.option(:name => 'OPEN_IN_BROWSER', :value => 'false')
             xml.option(:name => 'UPDATING_POLICY', :value => 'restart-server')
@@ -1041,12 +1078,12 @@ module Buildr #:nodoc:
       end
       def extension
-        "ipr"
+        'ipr'
       end
       def base_document
         target = StringIO.new
-        Builder::XmlMarkup.new(:target => target).project(:version => "4")
+        Builder::XmlMarkup.new(:target => target).project(:version => '4')
         Buildr::IntellijIdea.new_document(target.string)
       end
@@ -1076,25 +1113,25 @@ module Buildr #:nodoc:
       def project_root_manager_component
         attribs = {}
-        attribs["version"] = "2"
-        attribs["languageLevel"] = "JDK_#{self.jdk_version.gsub('.', '_')}"
-        attribs["assert-keyword"] = "true"
-        attribs["jdk-15"] = (jdk_version >= "1.5").to_s
-        attribs["project-jdk-name"] = self.jdk_version
-        attribs["project-jdk-type"] = "JavaSDK"
-        create_component("ProjectRootManager", attribs) do |xml|
-          xml.output("url" => file_path(buildr_project._(:target, :idea, :project_out)))
+        attribs['version'] = '2'
+        attribs['languageLevel'] = "JDK_#{self.jdk_version.gsub('.', '_')}"
+        attribs['assert-keyword'] = 'true'
+        attribs['jdk-15'] = (jdk_version >= '1.5').to_s
+        attribs['project-jdk-name'] = self.jdk_version
+        attribs['project-jdk-type'] = 'JavaSDK'
+        create_component('ProjectRootManager', attribs) do |xml|
+          xml.output('url' => file_path(buildr_project._(:target, :idea, :project_out)))
         end
       end
       def project_details_component
-        create_component("ProjectDetails") do |xml|
-          xml.option("name" => "projectName", "value" => self.name)
+        create_component('ProjectDetails') do |xml|
+          xml.option('name' => 'projectName', 'value' => self.name)
         end
       end
       def modules_component
-        create_component("ProjectModuleManager") do |xml|
+        create_component('ProjectModuleManager') do |xml|
           xml.modules do
             buildr_project.projects.select { |subp| subp.iml? }.each do |subproject|
               module_path = subproject.base_dir.gsub(/^#{buildr_project.base_dir}\//, '')
@@ -1131,15 +1168,15 @@ module Buildr #:nodoc:
         project_directories.each do |dir|
           if File.directory?("#{dir}/.git")
-            mappings[dir] = "Git"
+            mappings[dir] = 'Git'
           elsif File.directory?("#{dir}/.svn")
-            mappings[dir] = "svn"
+            mappings[dir] = 'svn'
           end
         end
         return nil if 0 == mappings.size
-        create_component("VcsDirectoryMappings") do |xml|
+        create_component('VcsDirectoryMappings') do |xml|
           mappings.each_pair do |dir, vcs_type|
             resolved_dir = resolve_path(dir)
             mapped_dir = resolved_dir == '$PROJECT_DIR$/.' ? buildr_project.base_dir : resolved_dir
@@ -1149,19 +1186,19 @@ module Buildr #:nodoc:
       end
       def data_sources_component
-        create_composite_component("DataSourceManagerImpl", {:format => "xml", :hash => "3208837817"}, self.data_sources)
+        create_composite_component('DataSourceManagerImpl', {:format => 'xml', :hash => '3208837817'}, self.data_sources)
       end
       def artifacts_component
-        create_composite_component("ArtifactManager", {}, self.artifacts)
+        create_composite_component('ArtifactManager', {}, self.artifacts)
       end
       def configurations_component
-        create_composite_component("ProjectRunConfigurationManager", {}, self.configurations)
+        create_composite_component('ProjectRunConfigurationManager', {}, self.configurations)
       end
       def resolve_path(path)
-        resolve_path_from_base(path, "$PROJECT_DIR$")
+        resolve_path_from_base(path, '$PROJECT_DIR$')
       end
     private
@@ -1176,19 +1213,19 @@ module Buildr #:nodoc:
       def emit_jar_artifacts(xml, artifacts)
         artifacts.each do |p|
-          xml.element :id => "artifact", 'artifact-name' => "#{p}.jar"
+          xml.element :id => 'artifact', 'artifact-name' => "#{p}.jar"
         end
       end
       def emit_libraries(xml, libraries)
         libraries.each(&:invoke).map(&:to_s).each do |dependency_path|
-          xml.element :id => "file-copy", :path => resolve_path(dependency_path)
+          xml.element :id => 'file-copy', :path => resolve_path(dependency_path)
         end
       end
       def emit_module_output(xml, projects)
         projects.each do |p|
-          xml.element :id => "module-output", :name => p.iml.id
+          xml.element :id => 'module-output', :name => p.iml.id
         end
       end
@@ -1202,8 +1239,8 @@ module Buildr #:nodoc:
         if options[:enable_ejb] || (options[:ejb_module_names] && options[:ejb_module_names].size > 0)
           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}"
+            facet_name = options[:ejb_facet_name] || 'EJB'
+            xml.element :id => 'javaee-facet-resources', :facet => "#{module_name}/ejb/#{facet_name}"
           end
         end
       end
@@ -1212,14 +1249,14 @@ module Buildr #:nodoc:
         if options[:enable_jpa] || (options[:jpa_module_names] && options[:jpa_module_names].size > 0)
           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}"
+            facet_name = options[:jpa_facet_name] || 'JPA'
+            xml.element :id => 'jpa-descriptors', :facet => "#{module_name}/jpa/#{facet_name}"
           end
         end
       end
       def encrypt(password)
-        password.bytes.inject("") { |x, y| x + (y ^ 0xdfaa).to_s(16) }
+        password.bytes.inject('') { |x, y| x + (y ^ 0xdfaa).to_s(16) }
       end
       def partition_dependencies(dependencies)
@@ -1229,7 +1266,7 @@ module Buildr #:nodoc:
         dependencies.each do |dependency|
           artifacts = Buildr.artifacts(dependency)
           artifacts_as_strings = artifacts.map(&:to_s)
-          all_projects = Buildr::Project.instance_variable_get("@projects").keys
+          all_projects = Buildr::Project.instance_variable_get('@projects').keys
           project = Buildr.projects(all_projects).detect do |project|
             [project.packages, project.compile.target, project.resources.target, project.test.compile.target, project.test.resources.target].flatten.
               detect { |component| artifacts_as_strings.include?(component.to_s) }
@@ -1248,20 +1285,20 @@ module Buildr #:nodoc:
       include Extension
       first_time do
-        desc "Generate Intellij IDEA artifacts for all projects"
-        Project.local_task "idea" => "artifacts"
+        desc 'Generate Intellij IDEA artifacts for all projects'
+        Project.local_task 'idea' => 'artifacts'
-        desc "Delete the generated Intellij IDEA artifacts"
-        Project.local_task "idea:clean"
+        desc 'Delete the generated Intellij IDEA artifacts'
+        Project.local_task 'idea:clean'
       end
       before_define do |project|
-        project.recursive_task("idea")
-        project.recursive_task("idea:clean")
+        project.recursive_task('idea')
+        project.recursive_task('idea:clean')
       end
       after_define do |project|
-        idea = project.task("idea")
+        idea = project.task('idea')
         files = [
           (project.iml if project.iml?),
@@ -1273,10 +1310,10 @@ module Buildr #:nodoc:
           idea.enhance do |task|
             mkdir_p module_dir
             info "Writing #{ideafile.filename}"
-            t = Tempfile.open("buildr-idea")
+            t = Tempfile.open('buildr-idea')
             temp_filename = t.path
             t.close!
-            File.open(temp_filename, "w") do |f|
+            File.open(temp_filename, 'w') do |f|
               ideafile.write f
             end
             mv temp_filename, ideafile.filename
@@ -1287,7 +1324,7 @@ module Buildr #:nodoc:
           end
         end
-        project.task("idea:clean") do
+        project.task('idea:clean') do
           files.each do |f|
             info "Removing #{f.filename}" if File.exist?(f.filename)
             rm_rf f.filename
@@ -1299,7 +1336,7 @@ module Buildr #:nodoc:
         if ipr?
           @ipr ||= IdeaProject.new(self)
         else
-          raise "Only the root project has an IPR"
+          raise 'Only the root project has an IPR'
         end
       end