Repository: buildr Updated Branches: refs/heads/master 4bb361e2d -> 6ed9b4395
Enhance ipr.add_glassfish_configuration to use the default naming convention and update it to the latest version of GlassFish Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/6ed9b439 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/6ed9b439 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/6ed9b439 Branch: refs/heads/master Commit: 6ed9b4395a7922ade475b7d7ecda45b6c2ab8b7b Parents: 4bb361e Author: Peter Donald <[email protected]> Authored: Thu Oct 30 13:06:45 2014 +1100 Committer: Peter Donald <[email protected]> Committed: Thu Oct 30 13:06:45 2014 +1100 ---------------------------------------------------------------------- CHANGELOG | 6 ++++++ lib/buildr/ide/idea.rb | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/6ed9b439/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 69bfb29..f3e52e9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,10 @@ 1.4.21 (Pending) +* 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 http://git-wip-us.apache.org/repos/asf/buildr/blob/6ed9b439/lib/buildr/ide/idea.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/ide/idea.rb b/lib/buildr/ide/idea.rb index 2fa659f..c167ae2 100644 --- a/lib/buildr/ide/idea.rb +++ b/lib/buildr/ide/idea.rb @@ -922,7 +922,8 @@ module Buildr #:nodoc: 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}" domain_name = options[:domain] || project.iml.id domain_port = options[:port] || '9009' packaged = options[:packaged] || {}
