Merge 59314610-tomcat-datasource to master

Glyn Normington · Glyn Normington · commit dfe25d689b21 · 2013-10-29T10:26:53.000Z
[Completes #59314610]
diff --git a/lib/java_buildpack/container/tomcat.rb b/lib/java_buildpack/container/tomcat.rb
@@ -47,6 +47,7 @@ def detect
     def compile
       download_tomcat
       download_support
+      link_tomcat_datasource
       link_application
       link_container_libs
       link_extra_applications
@@ -94,6 +95,8 @@ def supports?
 
     KEY_SUPPORT = 'support'.freeze
 
+    TOMCAT_DATASOURCE_JAR = 'tomcat-jdbc.jar'.freeze
+
     WEB_INF_DIRECTORY = 'WEB-INF'.freeze
 
     def container_libs_directory
@@ -130,7 +133,7 @@ def link_application
       @application.children.each { |child| FileUtils.ln_sf child.relative_path_from(root), root }
     end
 
-    # Support for container libs in addition to the users application in temporay and will go away in the future.
+    # Support for container libs in addition to the user's application is temporary and will go away in the future.
     def link_container_libs
       if container_libs_directory.exist?
         container_libs = ContainerUtils.libs(@app_dir, container_libs_directory)
@@ -142,14 +145,14 @@ def link_container_libs
       end
     end
 
-    # Support for extra applications in addition to the users application in temporay and will go away in the future.
+    # Support for extra applications in addition to the user's application is temporary and will go away in the future.
     def link_extra_applications
       if extra_applications_directory.exist?
         extra_applications = ContainerUtils.relative_paths(@app_dir, extra_applications_directory.children) { |file| file.directory? }
 
         if extra_applications
           FileUtils.mkdir_p webapps
-          extra_applications.each { |extra_application| FileUtils.ln_sf(File.join('..', '..',  extra_application), webapps) }
+          extra_applications.each { |extra_application| FileUtils.ln_sf(File.join('..', '..', extra_application), webapps) }
         end
       end
     end
@@ -163,6 +166,18 @@ def link_libs
       end
     end
 
+
+    def link_tomcat_datasource
+      tomcat_datasource_jar = tomcat_lib + TOMCAT_DATASOURCE_JAR
+      if tomcat_datasource_jar.exist?
+        # Link Tomcat datasource JAR into .lib
+        lib_directory_pathname = Pathname.new(@lib_directory)
+        symlink_source = tomcat_datasource_jar.relative_path_from(lib_directory_pathname)
+        symlink_target = lib_directory_pathname + TOMCAT_DATASOURCE_JAR
+        symlink_target.make_symlink symlink_source
+      end
+    end
+
     def root
       webapps + 'ROOT'
     end
diff --git a/spec/fixtures/stub-tomcat7.tar.gz b/spec/fixtures/stub-tomcat7.tar.gz
diff --git a/spec/java_buildpack/container/tomcat_spec.rb b/spec/java_buildpack/container/tomcat_spec.rb
@@ -156,6 +156,70 @@ module JavaBuildpack::Container
       end
     end
 
+    it 'should link the Tomcat datasource JAR to the ROOT webapp when that JAR is present' do
+      Dir.mktmpdir do |root|
+        Dir.mkdir File.join(root, 'WEB-INF')
+        lib_directory = File.join(root, '.lib')
+        Dir.mkdir lib_directory
+
+        JavaBuildpack::Repository::ConfiguredItem.stub(:find_item) { |&block| block.call(TOMCAT_VERSION) if block }
+        .and_return(TOMCAT_DETAILS, SUPPORT_DETAILS)
+
+        JavaBuildpack::Util::ApplicationCache.stub(:new).and_return(application_cache)
+        application_cache.stub(:get).with('test-tomcat-uri').and_yield(File.open('spec/fixtures/stub-tomcat7.tar.gz'))
+        application_cache.stub(:get).with('test-support-uri').and_yield(File.open('spec/fixtures/stub-support.jar'))
+
+        application = JavaBuildpack::Application.new(root)
+
+        Tomcat.new(
+            app_dir: root,
+            application: application,
+            configuration: {},
+            lib_directory: lib_directory
+        ).compile
+
+        root_webapp = File.join root, '.tomcat', 'webapps', 'ROOT'
+
+        tomcat_datasource_jar = File.join root_webapp, 'WEB-INF', 'lib', 'tomcat-jdbc.jar'
+        expect(File.exists?(tomcat_datasource_jar)).to be_true
+        expect(File.readlink(tomcat_datasource_jar)).to eq('../../.lib/tomcat-jdbc.jar')
+
+        tomcat_datasource_link_in_lib_directory = File.join lib_directory, 'tomcat-jdbc.jar'
+        expect(File.exists?(tomcat_datasource_link_in_lib_directory))
+        expect(File.readlink(tomcat_datasource_link_in_lib_directory)).to eq('../.tomcat/lib/tomcat-jdbc.jar')
+      end
+    end
+
+    it 'should not link the Tomcat datasource JAR to the ROOT webapp when that JAR is absent' do
+      Dir.mktmpdir do |root|
+        Dir.mkdir File.join(root, 'WEB-INF')
+        lib_directory = File.join(root, '.lib')
+        Dir.mkdir lib_directory
+
+        JavaBuildpack::Repository::ConfiguredItem.stub(:find_item) { |&block| block.call(TOMCAT_VERSION) if block }
+        .and_return(TOMCAT_DETAILS, SUPPORT_DETAILS)
+
+        JavaBuildpack::Util::ApplicationCache.stub(:new).and_return(application_cache)
+        application_cache.stub(:get).with('test-tomcat-uri').and_yield(File.open('spec/fixtures/stub-tomcat.tar.gz'))
+        application_cache.stub(:get).with('test-support-uri').and_yield(File.open('spec/fixtures/stub-support.jar'))
+
+        application = JavaBuildpack::Application.new(root)
+
+        Tomcat.new(
+            app_dir: root,
+            application: application,
+            configuration: {},
+            lib_directory: lib_directory
+        ).compile
+
+        root_webapp = File.join root, '.tomcat', 'webapps', 'ROOT'
+
+        tomcat_datasource_jar = File.join root_webapp, 'WEB-INF', 'lib', 'tomcat-jdbc.jar'
+        expect(File.exists?(tomcat_datasource_jar)).to be_false
+      end
+    end
+
+
     it 'should link additional libraries to the ROOT webapp' do
       Dir.mktmpdir do |root|
         Dir.mkdir File.join root, 'WEB-INF'
