fix log4j again

Dockerfile

@@ -93,7 +93,10 @@ COPY container_files/usr-local-bin/ /usr/local/bin/
 RUN chmod +x /usr/local/bin/*.sh
 COPY container_files/httpd/* /etc/httpd/conf.d/
 COPY container_files/shibboleth/* /etc/shibboleth/
-RUN cp /dev/null /etc/httpd/conf.d/ssl.conf 
+RUN cp /dev/null /etc/httpd/conf.d/ssl.conf
+RUN rm -f /opt/tomee/bin/log4j-*
+COPY container_files/tier-support/log4j_fix/* /opt/tomee/bin/
+
 
 # this is to improve openshift
 RUN touch /opt/grouper/grouperEnv.sh \

container_files/usr-local-bin/librarySetupFilesTomcat.sh

@@ -2,7 +2,6 @@
 
 setupFilesTomcat() {
   setupFilesTomcat_loggingSlf4j
-  setupFilesTomcat_log4j
   setupFilesTomcat_turnOnAjp
   setupFilesTomcat_supervisor
   setupFilesTomcat_authn
@@ -219,20 +218,6 @@ setupFilesTomcat_loggingSlf4j() {
 
 }
 
-setupFilesTomcat_log4j() {
-
-  rm -f /opt/tomee/bin/log4j-*
-  returnCode=$?
-  echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_log4j) rm -f /opt/tomee/bin/log4j-* , result: $returnCode"
-  if [ $returnCode != 0 ]; then exit $returnCode; fi
-
-  cp /opt/tier-support/log4j_fix/*.jar /opt/tomee/bin/
-  returnCode=$?
-  echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_log4j) cp /opt/tier-support/log4j_fix/*.jar /opt/tomee/bin/ , result: $returnCode"
-  if [ $returnCode != 0 ]; then exit $returnCode; fi
-
-}
-
 setupFilesTomcat_supervisor() {
 
   if [ "$GROUPER_RUN_TOMEE" = "true" ] && [ "$GROUPER_RUN_TOMCAT_NOT_SUPERVISOR" != "true" ]
@@ -289,7 +274,6 @@ setupFilesTomcat_unsetAll() {
   unset -f setupFilesTomcat_unsetAll
   unset -f setupFilesTomcat_accessLogs
   unset -f setupFilesTomcat_loggingSlf4j
-  unset -f setupFilesTomcat_log4j
   unset -f setupFilesTomcat_sessionTimeout
   unset -f setupFilesTomcat_turnOnAjp
 
@@ -306,7 +290,6 @@ setupFilesTomcat_exportAll() {
   export -f setupFilesTomcat_unsetAll
   export -f setupFilesTomcat_accessLogs
   export -f setupFilesTomcat_loggingSlf4j
-  export -f setupFilesTomcat_log4j
   export -f setupFilesTomcat_sessionTimeout
   export -f setupFilesTomcat_turnOnAjp
 }