Merge 70085176-spring-boot-tomcat to master

nebhale · nebhale · commit 9d0293bc5c0e · 2014-04-24T15:57:16.000+01:00
[Completes #70085176]
diff --git a/lib/java_buildpack/buildpack.rb b/lib/java_buildpack/buildpack.rb
@@ -159,8 +159,19 @@ def require_component(component)
     end
 
     def tag_detection(type, components, unique)
-      tags = components.map { |component| component.detect }.compact
-      fail "Application can be run by more than one #{type}: #{names components}" if unique && tags.size > 1
+      detected = []
+      tags     = []
+
+      components.each do |component|
+        result = component.detect
+
+        if result
+          detected << component
+          tags << result
+        end
+      end
+
+      fail "Application can be run by more than one #{type}: #{names detected}" if unique && tags.size > 1
       tags
     end
 
diff --git a/lib/java_buildpack/container/ratpack.rb b/lib/java_buildpack/container/ratpack.rb
@@ -42,7 +42,7 @@ def id
 
       # (see JavaBuildpack::Container::DistZipLike#supports?)
       def supports?
-        @ratpack_utils.is? @application
+        start_script(root) && start_script(root).exist? && @ratpack_utils.is?(@application)
       end
 
       private
diff --git a/lib/java_buildpack/container/spring_boot.rb b/lib/java_buildpack/container/spring_boot.rb
@@ -47,7 +47,7 @@ def id
 
       # (see JavaBuildpack::Container::DistZipLike#supports?)
       def supports?
-        @spring_boot_utils.is? @application
+        start_script(root) && start_script(root).exist? && @spring_boot_utils.is?(@application)
       end
 
       private
