From e0f384e2bb538b0fb2640d9fe3c79cc7bc1a60ad Mon Sep 17 00:00:00 2001 From: mchyzer Date: Thu, 17 Nov 2022 10:03:11 -0500 Subject: [PATCH] 2.6.18 mulligan --- .../docker-build-bin/containerDockerfileInstall.sh | 5 ----- .../{api => grouperWebapp/WEB-INF/classes}/log4j.properties | 0 .../WEB-INF/classes}/log4j2.additionalAppenders.xml.txt | 0 .../WEB-INF/classes}/log4j2.additionalLoggers.xml.txt | 0 .../{api => grouperWebapp/WEB-INF/classes}/log4j2.xml | 0 5 files changed, 5 deletions(-) rename container_files/{api => grouperWebapp/WEB-INF/classes}/log4j.properties (100%) rename container_files/{api => grouperWebapp/WEB-INF/classes}/log4j2.additionalAppenders.xml.txt (100%) rename container_files/{api => grouperWebapp/WEB-INF/classes}/log4j2.additionalLoggers.xml.txt (100%) rename container_files/{api => grouperWebapp/WEB-INF/classes}/log4j2.xml (100%) diff --git a/container_files/docker-build-bin/containerDockerfileInstall.sh b/container_files/docker-build-bin/containerDockerfileInstall.sh index bf44d170..4d768ec3 100644 --- a/container_files/docker-build-bin/containerDockerfileInstall.sh +++ b/container_files/docker-build-bin/containerDockerfileInstall.sh @@ -85,11 +85,6 @@ returnCode=$? echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp -R /opt/container_files/grouperWebapp/* /opt/grouper/grouperWebapp, result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi -cp -R /opt/container_files/api/* /opt/grouper/grouperWebapp/WEB-INF/classes/ -returnCode=$? -echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp -R /opt/container_files/api/* /opt/grouper/grouperWebapp/WEB-INF/classes/, result: $returnCode" -if [ $returnCode != 0 ]; then exit $returnCode; fi - cp -R /opt/container_files/tomee/* /opt/tomee/ returnCode=$? echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp -R /opt/container_files/tomee/* /opt/tomee/, result: $returnCode" diff --git a/container_files/api/log4j.properties b/container_files/grouperWebapp/WEB-INF/classes/log4j.properties similarity index 100% rename from container_files/api/log4j.properties rename to container_files/grouperWebapp/WEB-INF/classes/log4j.properties diff --git a/container_files/api/log4j2.additionalAppenders.xml.txt b/container_files/grouperWebapp/WEB-INF/classes/log4j2.additionalAppenders.xml.txt similarity index 100% rename from container_files/api/log4j2.additionalAppenders.xml.txt rename to container_files/grouperWebapp/WEB-INF/classes/log4j2.additionalAppenders.xml.txt diff --git a/container_files/api/log4j2.additionalLoggers.xml.txt b/container_files/grouperWebapp/WEB-INF/classes/log4j2.additionalLoggers.xml.txt similarity index 100% rename from container_files/api/log4j2.additionalLoggers.xml.txt rename to container_files/grouperWebapp/WEB-INF/classes/log4j2.additionalLoggers.xml.txt diff --git a/container_files/api/log4j2.xml b/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml similarity index 100% rename from container_files/api/log4j2.xml rename to container_files/grouperWebapp/WEB-INF/classes/log4j2.xml