Remove Use of Endorsed Directory

nebhale · nebhale · commit cf14da46d2ca · 2018-02-12T12:07:47.000-08:00
Previously, the tomcat logging support was added to Tomcat via an endorsed directory. In Java 9, the endorsed directory concept has been removed, so another strategy was necessary to add JARs to the Tomcat classpath. This change moves that functionality to the `setenv.sh` file for all Tomcat instances. [resolves cloudfoundry#530]
diff --git a/lib/java_buildpack/container/tomcat/tomcat_logging_support.rb b/lib/java_buildpack/container/tomcat/tomcat_logging_support.rb
@@ -25,14 +25,12 @@ class TomcatLoggingSupport < JavaBuildpack::Component::VersionedDependencyCompon
 
       # (see JavaBuildpack::Component::BaseComponent#compile)
       def compile
-        download_jar(jar_name, endorsed)
+        download_jar(jar_name, bin)
+        write_set_env
       end
 
       # (see JavaBuildpack::Component::BaseComponent#release)
-      def release
-        @droplet.java_opts.add_system_property 'java.endorsed.dirs',
-                                               "$PWD/#{endorsed.relative_path_from(@droplet.root)}"
-      end
+      def release; end
 
       protected
 
@@ -43,14 +41,28 @@ def supports?
 
       private
 
-      def endorsed
-        @droplet.sandbox + 'endorsed'
+      def bin
+        @droplet.sandbox + 'bin'
       end
 
       def jar_name
         "tomcat_logging_support-#{@version}.jar"
       end
 
+      def setenv
+        bin + 'setenv.sh'
+      end
+
+      def write_set_env
+        setenv.open('w') do |f|
+          f.write <<~SH
+            #!/bin/sh
+
+            CLASSPATH=$CLASSPATH:#{(bin + jar_name).relative_path_from(@droplet.root)}
+          SH
+        end
+      end
+
     end
 
   end
diff --git a/spec/java_buildpack/container/tomcat/tomcat_logging_support_spec.rb b/spec/java_buildpack/container/tomcat/tomcat_logging_support_spec.rb
@@ -33,13 +33,20 @@
 
     component.compile
 
-    expect(sandbox + "endorsed/tomcat_logging_support-#{version}.jar").to exist
+    expect(sandbox + "bin/tomcat_logging_support-#{version}.jar").to exist
   end
 
-  it 'sets java.endorsed.dirs during release' do
-    component.release
+  it 'creates setenv.sh',
+     cache_fixture: 'stub-logging-support.jar' do
+
+    component.compile
+
+    expect(sandbox + 'bin/setenv.sh').to exist
+    expect((sandbox + 'bin/setenv.sh').read).to eq <<~SH
+      #!/bin/sh
 
-    expect(java_opts).to include('-Djava.endorsed.dirs=$PWD/.java-buildpack/tomcat/endorsed')
+      CLASSPATH=$CLASSPATH:#{(sandbox + "bin/tomcat_logging_support-#{version}.jar").relative_path_from(app_dir)}
+    SH
   end
 
 end
