Repository: buildr Updated Branches: refs/heads/master d125ec00a -> 762241885
Enhance idea project generation of ejb facet by looking for ejb descriptors in location compatible with ejb-jars. Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/350a46d4 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/350a46d4 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/350a46d4 Branch: refs/heads/master Commit: 350a46d49d6539d791dbdeb9317e09877a3d2797 Parents: 472da42 Author: Peter Donald <[email protected]> Authored: Wed Aug 6 19:30:10 2014 +1000 Committer: Peter Donald <[email protected]> Committed: Wed Aug 6 19:30:10 2014 +1000 ---------------------------------------------------------------------- CHANGELOG | 2 ++ lib/buildr/ide/idea.rb | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/350a46d4/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index a1f4fd2..de0cac1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,8 @@ in the findbugs addon does not contain arrays or nils. * 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. * Fixed: Ensure that the 'source_paths' property in the pmd addon does not contain arrays or nils. http://git-wip-us.apache.org/repos/asf/buildr/blob/350a46d4/lib/buildr/ide/idea.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/ide/idea.rb b/lib/buildr/ide/idea.rb index 1234857..2aefb74 100644 --- a/lib/buildr/ide/idea.rb +++ b/lib/buildr/ide/idea.rb @@ -414,6 +414,8 @@ module Buildr #:nodoc: ejb_roots.each do |path| d = "#{path}/WEB-INF/#{descriptor}" default_deployment_descriptors << d if File.exist?(d) + d = "#{path}/META-INF/#{descriptor}" + default_deployment_descriptors << d if File.exist?(d) end end deployment_descriptors = options[:deployment_descriptors] || default_deployment_descriptors
