diff --git a/container_files/docker-build-bin/containerDockerfileInstall.sh b/container_files/docker-build-bin/containerDockerfileInstall.sh
index 9410893d..2afec74d 100644
--- a/container_files/docker-build-bin/containerDockerfileInstall.sh
+++ b/container_files/docker-build-bin/containerDockerfileInstall.sh
@@ -40,9 +40,9 @@ returnCode=$?
echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) chmod g+rwxs /opt/grouper/logs/, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-mkdir -p /opt/tomee/
+mkdir -p /opt/tomcat/
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomcat/, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
mv /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar /opt/grouper/
@@ -50,19 +50,19 @@ returnCode=$?
echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar /opt/grouper/, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-mv /opt/grouper/$GROUPER_VERSION/container/tomee/* /opt/tomee/
+mv /opt/grouper/$GROUPER_VERSION/container/tomcat/* /opt/tomcat/
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$GROUPER_VERSION/container/tomee/* /opt/tomee/, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$GROUPER_VERSION/container/tomcat/* /opt/tomcat/, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-mkdir -p /opt/tomee/temp
+mkdir -p /opt/tomcat/temp
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/temp, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomcat/temp, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-mkdir -p /opt/tomee/work
+mkdir -p /opt/tomcat/work
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/work, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomcat/work, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
mv /opt/grouper/$GROUPER_VERSION/container/webapp/* /opt/grouper/grouperWebapp/
@@ -75,9 +75,9 @@ returnCode=$?
echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -rf /opt/grouper/$GROUPER_VERSION, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-rm -rf /opt/tomee/webapps/docs/ /opt/tomee/webapps/host-manager/ /opt/tomee/webapps/manager/ /opt/tomee/logs/* /opt/tomee/temp/* /opt/tomee/work/* /opt/tomee/conf/logging.properties
+rm -rf /opt/tomcat/webapps/docs/ /opt/tomcat/webapps/host-manager/ /opt/tomcat/webapps/manager/ /opt/tomcat/logs/* /opt/tomcat/temp/* /opt/tomcat/work/* /opt/tomcat/conf/logging.properties
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -rf /opt/tomee/webapps/docs/ /opt/tomee/webapps/host-manager/ /opt/tomee/webapps/manager/ /opt/tomee/logs/* /opt/tomee/temp/* /opt/tomee/work/*\ /opt/tomee/conf/logging.properties, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -rf /opt/tomcat/webapps/docs/ /opt/tomcat/webapps/host-manager/ /opt/tomcat/webapps/manager/ /opt/tomcat/logs/* /opt/tomcat/temp/* /opt/tomcat/work/*\ /opt/tomcat/conf/logging.properties, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
cp -R /opt/container_files/grouperWebapp/* /opt/grouper/grouperWebapp
@@ -85,14 +85,14 @@ 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/tomee/* /opt/tomee/
+cp -R /opt/container_files/tomcat/* /opt/tomcat/
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp -R /opt/container_files/tomee/* /opt/tomee/, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp -R /opt/container_files/tomcat/* /opt/tomcat/, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-mkdir -p /opt/tomee/conf/Catalina/localhost/
+mkdir -p /opt/tomcat/conf/Catalina/localhost/
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/conf/Catalina/localhost/, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomcat/conf/Catalina/localhost/, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
ln -sf /usr/share/zoneinfo/UTC /etc/localtime
@@ -130,24 +130,24 @@ returnCode=$?
echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /dev/null /etc/httpd/conf.d/ssl.conf, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-rm -f /opt/tomee/bin/log4j-*
+rm -f /opt/tomcat/bin/log4j-*
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -f /opt/tomee/bin/log4j-*, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -f /opt/tomcat/bin/log4j-*, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-mv /opt/tier-support/log4j_fix/tomeeBin/log4j-* /opt/tomee/bin/
+mv /opt/tier-support/log4j_fix/tomcatBin/log4j-* /opt/tomcat/bin/
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/tier-support/log4j_fix/tomeeBin/log4j-* /opt/tomee/bin/, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/tier-support/log4j_fix/tomcatBin/log4j-* /opt/tomcat/bin/, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-rm -f /opt/tomee/lib/slf4j-*
+rm -f /opt/tomcat/lib/slf4j-*
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -f /opt/tomee/lib/slf4j-*, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -f /opt/tomcat/lib/slf4j-*, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-mv /opt/tier-support/log4j_fix/tomeeLib/slf4j-* /opt/tomee/lib/
+mv /opt/tier-support/log4j_fix/tomcatLib/slf4j-* /opt/tomcat/lib/
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/tier-support/log4j_fix/tomeeLib/slf4j-* /opt/tomee/lib/, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/tier-support/log4j_fix/tomcatLib/slf4j-* /opt/tomcat/lib/, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
rm -f /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-api-*
@@ -165,9 +165,9 @@ returnCode=$?
echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) touch /opt/grouper/grouperEnv.sh, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-mkdir -p /opt/tomee/work/Catalina/localhost/
+mkdir -p /opt/tomcat/work/Catalina/localhost/
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/work/Catalina/localhost/, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomcat/work/Catalina/localhost/, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
mkdir -p /opt/grouper/certs/client
@@ -224,14 +224,14 @@ if [ -f /etc/httpd/conf.d/shib.conf ]; then
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
-cp /opt/tomee/conf/server.xml /opt/tier-support/originalFiles 2>/dev/null
+cp /opt/tomcat/conf/server.xml /opt/tier-support/originalFiles 2>/dev/null
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /opt/tomee/conf/server.xml /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /opt/tomcat/conf/server.xml /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
-cp /opt/tomee/conf/Catalina/localhost/grouper.xml /opt/tier-support/originalFiles 2>/dev/null
+cp /opt/tomcat/conf/Catalina/localhost/grouper.xml /opt/tier-support/originalFiles 2>/dev/null
returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /opt/tomee/conf/Catalina/localhost/grouper.xml /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /opt/tomcat/conf/Catalina/localhost/grouper.xml /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
cp /opt/grouper/grouperWebapp/WEB-INF/web.xml /opt/tier-support/originalFiles 2>/dev/null
diff --git a/container_files/docker-build-bin/containerDockerfileInstallPermissions.sh b/container_files/docker-build-bin/containerDockerfileInstallPermissions.sh
index 541307ee..2f8c49d0 100644
--- a/container_files/docker-build-bin/containerDockerfileInstallPermissions.sh
+++ b/container_files/docker-build-bin/containerDockerfileInstallPermissions.sh
@@ -11,67 +11,67 @@ group=$2
# this needs to exist
mkdir -p /opt/tier
-lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -user $user -print | wc -l)
+lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -user $user -print | wc -l)
if [ $lines -ne 0 ]; then
- chown $user:$group $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -user $user -print)
+ chown $user:$group $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -user $user -print)
returnCode=$?
- echo "grouperDockerfile; INFO: ($0) chown $user:$group \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -user $user -print), result: $returnCode"
+ echo "grouperDockerfile; INFO: ($0) chown $user:$group \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -user $user -print), result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
-lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -group $group -print | wc -l)
+lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -group $group -print | wc -l)
if [ $lines -ne 0 ]; then
- chown $user:$group $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -group $group -print)
+ chown $user:$group $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -group $group -print)
returnCode=$?
- echo "grouperDockerfile; INFO: ($0) chown $user:$group \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -group $group -print), result: $returnCode"
+ echo "grouperDockerfile; INFO: ($0) chown $user:$group \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o ! -group $group -print), result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
-lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type d ! -perm -g+rwxs -print | wc -l)
+lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type d ! -perm -g+rwxs -print | wc -l)
if [ $lines -ne 0 ]; then
- chmod g+rwxs $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type d ! -perm -g+rwxs -print)
+ chmod g+rwxs $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type d ! -perm -g+rwxs -print)
returnCode=$?
- echo "grouperDockerfile; INFO: ($0) chmod g+rwxs \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type d ! -perm -g+rwxs -print), result: $returnCode"
+ echo "grouperDockerfile; INFO: ($0) chmod g+rwxs \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type d ! -perm -g+rwxs -print), result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
-lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f ! -perm -g+rw -print | wc -l)
+lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f ! -perm -g+rw -print | wc -l)
if [ $lines -ne 0 ]; then
- chmod g+rw $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f ! -perm -g+rw -print)
+ chmod g+rw $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f ! -perm -g+rw -print)
returnCode=$?
- echo "grouperDockerfile; INFO: ($0) chmod g+rw \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f ! -perm -g+rw -print), result: $returnCode"
+ echo "grouperDockerfile; INFO: ($0) chmod g+rw \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f ! -perm -g+rw -print), result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
-lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -perm -o+w -print | wc -l)
+lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -perm -o+w -print | wc -l)
if [ $lines -ne 0 ]; then
- chmod o-w $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -perm -o+w -print)
+ chmod o-w $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -perm -o+w -print)
returnCode=$?
- echo "grouperDockerfile; INFO: ($0) chmod o-w \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -perm -o+w -print), result: $returnCode"
+ echo "grouperDockerfile; INFO: ($0) chmod o-w \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /usr/local/bin /etc/httpd/conf.d $JAVA_HOME/lib/security/cacerts -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -perm -o+w -print), result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
-lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -g+x -print -print | wc -l)
+lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -g+x -print -print | wc -l)
if [ $lines -ne 0 ]; then
- chmod +x $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -g+x -print)
+ chmod +x $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -g+x -print)
returnCode=$?
- echo "grouperDockerfile; INFO: ($0) chmod +x \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name \"*.sh\" ! -perm -g+x -print), result: $returnCode"
+ echo "grouperDockerfile; INFO: ($0) chmod +x \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name \"*.sh\" ! -perm -g+x -print), result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
-lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -u+x -print | wc -l)
+lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -u+x -print | wc -l)
if [ $lines -ne 0 ]; then
- chmod +x $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -u+x -print)
+ chmod +x $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -u+x -print)
returnCode=$?
- echo "grouperDockerfile; INFO: ($0) chmod +x \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name \"*.sh\" ! -perm -u+x -print), result: $returnCode"
+ echo "grouperDockerfile; INFO: ($0) chmod +x \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name \"*.sh\" ! -perm -u+x -print), result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
-lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -o+x -print | wc -l)
+lines=$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -o+x -print | wc -l)
if [ $lines -ne 0 ]; then
- chmod +x $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -o+x -print)
+ chmod +x $(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name "*.sh" ! -perm -o+x -print)
returnCode=$?
- echo "grouperDockerfile; INFO: ($0) chmod +x \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomee /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name \"*.sh\" ! -perm -o+x -print), result: $returnCode"
+ echo "grouperDockerfile; INFO: ($0) chmod +x \$(find /home/$user /opt/container_files /opt/grouper /opt/tier /opt/tier-support /opt/tomcat /etc/httpd/conf /home/tomcat /etc/httpd/conf.d -path /opt/grouper/slashRoot -prune -o -path /opt/grouper/logs -prune -o -type f -name \"*.sh\" ! -perm -o+x -print), result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
diff --git a/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml b/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml
index 152fd05c..967ee508 100644
--- a/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml
+++ b/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml
@@ -63,7 +63,7 @@
__FILEEND__
__LOGPIPESTART__
-
+
@@ -175,4 +175,4 @@
-
\ No newline at end of file
+
diff --git a/container_files/httpd/grouper-www.conf b/container_files/httpd/grouper-www.conf
index 47f2ff6e..546a5778 100644
--- a/container_files/httpd/grouper-www.conf
+++ b/container_files/httpd/grouper-www.conf
@@ -7,14 +7,11 @@ ProxyBadHeader Ignore
# the variable for _ _THE_AJP_URL_ _ (no spaces) will be replaced with something like: ajp://localhost:port/grouper on startup
# the variable for _ _GROUPER_PROXY_PASS_ _ (no spaces) will be replaced with comment or blank on startup if running grouper url
# the variable for _ _GROUPERWS_PROXY_PASS_ _ (no spaces) will be replaced with comment or blank on startup if running grouper-ws url
-# the variable for _ _GROUPERSCIM_PROXY_PASS_ _ (no spaces) will be replaced with comment of blank on startup if running grouper-ws-scim url
# the variable for _ _GROUPER_TOMCAT_CONTEXT_ _ (no spaces) will be replaced with the env var $GROUPER_TOMCAT_CONTEXT
# the variable for _ _GROUPER_URL_CONTEXT_ _ (no spaces) will be replaced with the env var $GROUPER_URL_CONTEXT
# the variable for _ _GROUPERWS_URL_CONTEXT_ _ (no spaces) will be replaced with the env var $GROUPERWS_URL_CONTEXT
-# the variable for _ _GROUPERSCIM_URL_CONTEXT_ _ (no spaces) will be replaced with the env var $GROUPERSCIM_URL_CONTEXT
__GROUPER_PROXY_PASS__ProxyPass /__GROUPER_URL_CONTEXT__ ajp://localhost:8009/__GROUPER_TOMCAT_CONTEXT__ timeout=__GROUPER_APACHE_AJP_TIMEOUT_SECONDS__ retry=5
__GROUPERWS_PROXY_PASS__ProxyPass /__GROUPERWS_URL_CONTEXT__ ajp://localhost:8009/__GROUPER_TOMCAT_CONTEXT__ timeout=__GROUPER_APACHE_AJP_TIMEOUT_SECONDS__ retry=5
-__GROUPERSCIM_PROXY_PASS__ProxyPass /__GROUPERSCIM_URL_CONTEXT__ ajp://localhost:8009/__GROUPER_TOMCAT_CONTEXT__ timeout=__GROUPER_APACHE_AJP_TIMEOUT_SECONDS__ retry=5
__GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER__RewriteEngine on
__GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER__RewriteRule "^/$" "/__GROUPER_URL_CONTEXT__/" [R]
diff --git a/container_files/tier-support/log4j_fix/tomeeBin/log4j-api-2.17.1.jar b/container_files/tier-support/log4j_fix/tomcatBin/log4j-api-2.17.1.jar
similarity index 100%
rename from container_files/tier-support/log4j_fix/tomeeBin/log4j-api-2.17.1.jar
rename to container_files/tier-support/log4j_fix/tomcatBin/log4j-api-2.17.1.jar
diff --git a/container_files/tier-support/log4j_fix/tomeeBin/log4j-core-2.17.1.jar b/container_files/tier-support/log4j_fix/tomcatBin/log4j-core-2.17.1.jar
similarity index 100%
rename from container_files/tier-support/log4j_fix/tomeeBin/log4j-core-2.17.1.jar
rename to container_files/tier-support/log4j_fix/tomcatBin/log4j-core-2.17.1.jar
diff --git a/container_files/tier-support/log4j_fix/tomeeBin/log4j-jul-2.17.1.jar b/container_files/tier-support/log4j_fix/tomcatBin/log4j-jul-2.17.1.jar
similarity index 100%
rename from container_files/tier-support/log4j_fix/tomeeBin/log4j-jul-2.17.1.jar
rename to container_files/tier-support/log4j_fix/tomcatBin/log4j-jul-2.17.1.jar
diff --git a/container_files/tier-support/log4j_fix/tomeeLib/slf4j-api-1.7.32.jar b/container_files/tier-support/log4j_fix/tomcatLib/slf4j-api-1.7.32.jar
similarity index 100%
rename from container_files/tier-support/log4j_fix/tomeeLib/slf4j-api-1.7.32.jar
rename to container_files/tier-support/log4j_fix/tomcatLib/slf4j-api-1.7.32.jar
diff --git a/container_files/tier-support/log4j_fix/tomeeLib/slf4j-jdk14-1.7.32.jar b/container_files/tier-support/log4j_fix/tomcatLib/slf4j-jdk14-1.7.32.jar
similarity index 100%
rename from container_files/tier-support/log4j_fix/tomeeLib/slf4j-jdk14-1.7.32.jar
rename to container_files/tier-support/log4j_fix/tomcatLib/slf4j-jdk14-1.7.32.jar
diff --git a/container_files/tier-support/supervisord-tomee.conf b/container_files/tier-support/supervisord-tomcat.conf
similarity index 76%
rename from container_files/tier-support/supervisord-tomee.conf
rename to container_files/tier-support/supervisord-tomcat.conf
index 473b78ad..fd17f0fa 100644
--- a/container_files/tier-support/supervisord-tomee.conf
+++ b/container_files/tier-support/supervisord-tomcat.conf
@@ -1,6 +1,6 @@
-[program:tomee]
+[program:tomcat]
__GROUPER_RUN_PROCESSES_AS_USERS__user=tomcat
-command=/opt/tomee/bin/catalina.sh run
+command=/opt/tomcat/bin/catalina.sh run
stderr_logfile = /tmp/logtomcat
stderr_logfile_maxbytes=0
stdout_logfile = /tmp/logtomcat
diff --git a/container_files/tier-support/test/grouperContainerUnitTest.sh b/container_files/tier-support/test/grouperContainerUnitTest.sh
index 8305ad4f..7068abc0 100644
--- a/container_files/tier-support/test/grouperContainerUnitTest.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTest.sh
@@ -27,7 +27,6 @@ export failureCount=0
. ./grouperContainerUnitTestUiDifferentPorts.sh
. ./grouperContainerUnitTestSlashRoot.sh
. ./grouperContainerUnitTestSelfSigned.sh
-. ./grouperContainerUnitTestScim.sh
. ./grouperContainerUnitTestWs.sh
. ./grouperContainerUnitTestWsAuthn.sh
. ./grouperContainerUnitTestQuickstart.sh
@@ -41,7 +40,6 @@ testContainerUiNoSslOrClient
testContainerSlashRoot
testContainerSelfSigned
testContainerUiDifferentPorts
-testContainerScim
testContainerWs
testContainerWsAuthn
testContainerQuickstart
@@ -77,7 +75,6 @@ unset -f testContainerUiNoSsl
unset -f testContainerUiDifferentPorts
unset -f testContainerSlashRoot
unset -f testContainerSelfSigned
-unset -f testContainerScim
unset -f testContainerWs
unset -f successCount
unset -f failureCount
diff --git a/container_files/tier-support/test/grouperContainerUnitTestDaemon.sh b/container_files/tier-support/test/grouperContainerUnitTestDaemon.sh
index 765dd709..75960991 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestDaemon.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestDaemon.sh
@@ -21,13 +21,12 @@ testContainerDaemon() {
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libWs/axis2-kernel-1.6.4.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/axis2-kernel-1.6.4.jar
- assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libScim/stax-api-1.0-2.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/stax-api-1.0-2.jar
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/lib/grouper-messaging-activemq-$grouperVersion.jar"
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/grouper-messaging-activemq-$grouperVersion.jar"
assertFileNotContains /opt/tier-support/supervisord.conf "program:shibbolethsp"
- assertFileContains /opt/tier-support/supervisord.conf "program:tomee"
+ assertFileContains /opt/tier-support/supervisord.conf "program:tomcat"
assertFileNotContains /opt/tier-support/supervisord.conf "program:httpd"
assertFileNotContains /opt/tier-support/supervisord.conf "user=shibd"
assertFileNotContains /opt/tier-support/supervisord.conf "__"
@@ -35,8 +34,6 @@ testContainerDaemon() {
assertFileContains /etc/httpd/conf.d/grouper-www.conf "3600"
assertFileNotContains /etc/httpd/conf.d/grouper-www.conf "__"
- assertEnvVar GROUPERSCIM_PROXY_PASS "#"
- assertEnvVar GROUPERSCIM_URL_CONTEXT "grouper-ws-scim"
assertEnvVar GROUPERWS_PROXY_PASS "#"
assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
assertEnvVar GROUPER_APACHE_AJP_TIMEOUT_SECONDS "3600"
@@ -54,9 +51,7 @@ testContainerDaemon() {
assertEnvVarNot GROUPER_RUN_APACHE "true"
assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
assertEnvVarNot GROUPER_RUN_SHIB_SP "true"
- assertEnvVar GROUPER_RUN_TOMEE "true"
- assertEnvVar GROUPER_SCIM "false"
- assertEnvVar GROUPER_SCIM_GROUPER_AUTH "false"
+ assertEnvVar GROUPER_RUN_TOMCAT "true"
assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
assertEnvVar GROUPER_UI "false"
assertEnvVar GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES "127.0.0.1/32"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh b/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh
index 393af457..6b46af94 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh
@@ -24,7 +24,6 @@ testContainerQuickstart() {
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libWs/axis2-kernel-1.6.4.jar
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/lib/axis2-kernel-1.6.4.jar
- assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libScim/stax-api-1.0-2.jar
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/lib/stax-api-1.0-2.jar
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/lib/grouper-messaging-activemq-$grouperVersion.jar"
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/grouper-messaging-activemq-$grouperVersion.jar"
@@ -33,7 +32,7 @@ testContainerQuickstart() {
assertFileNotContains /etc/httpd/conf.d/ssl-enabled.conf "__"
assertFileContains /etc/httpd/conf/httpd.conf "Listen 80"
assertFileNotContains /opt/tier-support/supervisord.conf "program:shibbolethsp"
- assertFileContains /opt/tier-support/supervisord.conf "program:tomee"
+ assertFileContains /opt/tier-support/supervisord.conf "program:tomcat"
assertFileContains /opt/tier-support/supervisord.conf "program:httpd"
assertFileNotContains /opt/tier-support/supervisord.conf "user=shibd"
assertFileNotContains /opt/tier-support/supervisord.conf "__"
@@ -49,8 +48,6 @@ testContainerQuickstart() {
assertFileContains /etc/httpd/conf.d/grouper-www.conf "3600"
assertFileNotContains /etc/httpd/conf.d/grouper-www.conf "__"
- assertEnvVar GROUPERSCIM_PROXY_PASS ""
- assertEnvVar GROUPERSCIM_URL_CONTEXT "grouper-ws-scim"
assertEnvVar GROUPERWS_PROXY_PASS ""
assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
assertEnvVar GROUPER_APACHE_AJP_TIMEOUT_SECONDS "3600"
@@ -68,9 +65,7 @@ testContainerQuickstart() {
assertEnvVar GROUPER_RUN_APACHE "true"
assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
assertEnvVar GROUPER_RUN_SHIB_SP "false"
- assertEnvVar GROUPER_RUN_TOMEE "true"
- assertEnvVar GROUPER_SCIM "true"
- assertEnvVar GROUPER_SCIM_GROUPER_AUTH "true"
+ assertEnvVar GROUPER_RUN_TOMCAT "true"
assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
assertEnvVar GROUPER_UI "true"
assertEnvVar GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES "0.0.0.0/0"
@@ -112,15 +107,6 @@ testContainerQuickstart() {
curl -L -k -u GrouperSystem:thisPassIsCopyrightedDontUse https://localhost/grouper-ws/servicesRest/v2_4_000/subjects/GrouperSystem -o index.html
assertLocalFileContains index.html '"resultCode":"SUCCESS"'
- curl -L -k https://localhost/grouper-ws-scim/v2/Groups/ -o index.html
- assertLocalFileContains index.html 'HTTP Status 401'
-
- curl -L -k -u GrouperSystem:XthisPassIsCopyrightedDontUse https://localhost/grouper-ws-scim/v2/Groups/ -o index.html
- assertLocalFileContains index.html 'HTTP Status 401'
-
- curl -L -k -u GrouperSystem:thisPassIsCopyrightedDontUse https://localhost/grouper-ws-scim/v2/Groups/ -o index.html
- assertLocalFileContains index.html 'etc:workflowEditors'
-
docker stop $containerName
docker start $containerName
@@ -145,7 +131,7 @@ testContainerQuickstart() {
containerCommandResultEquals "ps -ef | grep root | grep awk | grep supervisord | wc -l" 1
containerCommandResultEquals "ps -ef | grep root | grep awk | grep grouper | wc -l" 1
containerCommandResultEquals "ps -ef | grep root | grep awk | grep httpd | wc -l" 1
- containerCommandResultEquals "ps -ef | grep root | grep awk | grep tomee | wc -l" 1
+ containerCommandResultEquals "ps -ef | grep root | grep awk | grep tomcat | wc -l" 1
docker-compose down
rm docker-compose.yaml
diff --git a/container_files/tier-support/test/grouperContainerUnitTestScim.sh b/container_files/tier-support/test/grouperContainerUnitTestScim.sh
deleted file mode 100644
index 26637757..00000000
--- a/container_files/tier-support/test/grouperContainerUnitTestScim.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-testContainerScim() {
-
- if [ "$#" -ne 0 ]; then
- echo "You must enter exactly 0 command line arguments"
- exit 1
- fi
-
- dockerRemoveContainer
-
- echo
- echo '################'
- echo Running container as scim
- echo "docker run --detach --name $containerName --publish 443:443 -e GROUPER_SELF_SIGNED_CERT=true $imageName scim"
- echo '################'
- echo
-
- docker run --detach --name $containerName --publish 443:443 -e GROUPER_SELF_SIGNED_CERT=true $imageName scim
- sleep $globalSleepSecondsAfterRun
-
- assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libWs/axis2-kernel-1.6.4.jar
- assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/axis2-kernel-1.6.4.jar
- assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libScim/stax-api-1.0-2.jar
- assertFileExists /opt/grouper/grouperWebapp/WEB-INF/lib/stax-api-1.0-2.jar
- assertFileNotExists "/opt/grouper/grouperWebapp/WEB-INF/lib/grouper-messaging-activemq-$grouperVersion.jar"
- assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/grouper-messaging-activemq-$grouperVersion.jar"
-
- assertFileContains /etc/httpd/conf.d/ssl-enabled.conf "Listen 443 https"
- assertFileNotContains /etc/httpd/conf.d/ssl-enabled.conf "__"
- assertFileContains /etc/httpd/conf/httpd.conf "Listen 80"
- assertFileNotContains /opt/tier-support/supervisord.conf "program:shibbolethsp"
- assertFileContains /opt/tier-support/supervisord.conf "program:tomee"
- assertFileContains /opt/tier-support/supervisord.conf "program:httpd"
- assertFileNotContains /opt/tier-support/supervisord.conf "user=shibd"
- assertFileNotContains /opt/tier-support/supervisord.conf "__"
- assertFileNotContains /etc/httpd/conf.d/ssl-enabled.conf cachain.pem
- assertFileContains /etc/httpd/conf.d/ssl-enabled.conf /etc/pki/tls/certs/localhost.crt
-
- assertFileContains /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml "grouper-scim;"
-
- assertFileContains /etc/httpd/conf.d/grouper-www.conf "3600"
- assertFileNotContains /etc/httpd/conf.d/grouper-www.conf "__"
-
- assertEnvVar GROUPERSCIM_PROXY_PASS ""
- assertEnvVar GROUPERSCIM_URL_CONTEXT "grouper-ws-scim"
- assertEnvVar GROUPERWS_PROXY_PASS "#"
- assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
- assertEnvVar GROUPER_APACHE_AJP_TIMEOUT_SECONDS "3600"
- assertEnvVar GROUPER_APACHE_NONSSL_PORT "80"
- assertEnvVar GROUPER_APACHE_SSL_PORT "443"
- assertEnvVar GROUPER_CHOWN_DIRS "true"
- assertEnvVar GROUPER_CONTAINER_VERSION "$containerVersion"
- assertEnvVar GROUPER_DAEMON "false"
- assertEnvVar GROUPER_GSH_CHECK_USER "true"
- assertEnvVar GROUPER_GSH_USER "tomcat"
- assertEnvVar GROUPER_HOME "/opt/grouper/grouperWebapp/WEB-INF"
- assertEnvVar GROUPER_LOG_PREFIX "grouper-scim"
- assertEnvVar GROUPER_MAX_MEMORY "1500m"
- assertEnvVar GROUPER_PROXY_PASS "#"
- assertEnvVar GROUPER_RUN_APACHE "true"
- assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
- assertEnvVarNot GROUPER_RUN_SHIB_SP "true"
- assertEnvVar GROUPER_RUN_TOMEE "true"
- assertEnvVar GROUPER_SCIM "true"
- assertEnvVar GROUPER_SCIM_GROUPER_AUTH "false"
- assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper-ws-scim"
- assertEnvVar GROUPER_UI "false"
- assertEnvVar GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES "127.0.0.1/32"
- assertEnvVar GROUPER_UI_GROUPER_AUTH "false"
- assertEnvVar GROUPER_URL_CONTEXT "grouper"
- assertEnvVar GROUPER_USE_SSL "true"
- assertEnvVar GROUPER_WS "false"
- assertEnvVar GROUPER_WS_GROUPER_AUTH "false"
- assertEnvVarNot GROUPER_WS_ONLY "true"
-
- assertNumberOfTomcatProcesses 1
- assertNumberOfApacheProcesses 5
- assertNumberOfShibProcesses 0
-
- assertListeningOnPort 443
- assertListeningOnPort 80
- assertListeningOnPort 8009
- assertNotListeningOnPort 9001
-
-
-}
-export -f testContainerScim
diff --git a/container_files/tier-support/test/grouperContainerUnitTestSelfSigned.sh b/container_files/tier-support/test/grouperContainerUnitTestSelfSigned.sh
index 148b61d3..e977534c 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestSelfSigned.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestSelfSigned.sh
@@ -35,15 +35,12 @@ testContainerSelfSigned() {
assertFileContains /etc/httpd/conf.d/grouper-www.conf "ProxyPass /grouper ajp://localhost:8009/grouper timeout=3600"
assertFileContains /etc/httpd/conf.d/grouper-www.conf "#ProxyPass /grouper-ws ajp://localhost:8009/grouper timeout=3600"
- assertFileContains /etc/httpd/conf.d/grouper-www.conf "#ProxyPass /grouper-ws-scim ajp://localhost:8009/grouper timeout=3600"
assertFileContains /etc/httpd/conf.d/grouper-www.conf "\"/grouper/\""
assertFileNotContains /etc/httpd/conf.d/grouper-www.conf "__"
assertFileContains /etc/httpd/conf.d/grouper-www.conf "RemoteIPHeader myRemoteIpHeader"
assertFileContains /etc/httpd/conf.d/grouper-www.conf "RemoteIPTrustedProxy 10.0.2.16/28"
- assertEnvVar GROUPERSCIM_PROXY_PASS "#"
- assertEnvVar GROUPERSCIM_URL_CONTEXT "grouper-ws-scim"
assertEnvVar GROUPERWS_PROXY_PASS "#"
assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
assertEnvVar GROUPER_APACHE_NONSSL_PORT "80"
@@ -60,9 +57,7 @@ testContainerSelfSigned() {
assertEnvVar GROUPER_RUN_APACHE "true"
assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
assertEnvVar GROUPER_RUN_SHIB_SP "true"
- assertEnvVar GROUPER_RUN_TOMEE "true"
- assertEnvVar GROUPER_SCIM "false"
- assertEnvVar GROUPER_SCIM_GROUPER_AUTH "false"
+ assertEnvVar GROUPER_RUN_TOMCAT "true"
assertEnvVar GROUPER_SELF_SIGNED_CERT "true"
assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
assertEnvVar GROUPER_UI "true"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUi.sh b/container_files/tier-support/test/grouperContainerUnitTestUi.sh
index 21d757ee..c1ac11e7 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUi.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUi.sh
@@ -20,19 +20,18 @@ testContainerUi() {
sleep $globalSleepSecondsAfterRun
- assertFileContains /opt/tomee/conf/server.xml 'address="0.0.0.0"'
- assertFileContains /opt/tomee/conf/server.xml 'allowedRequestAttributesPattern=".*"'
+ assertFileContains /opt/tomcat/conf/server.xml 'address="0.0.0.0"'
+ assertFileContains /opt/tomcat/conf/server.xml 'allowedRequestAttributesPattern=".*"'
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libWs/axis2-kernel-1.6.4.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/axis2-kernel-1.6.4.jar
- assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libScim/stax-api-1.0-2.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/stax-api-1.0-2.jar
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/lib/grouper-messaging-activemq-$grouperVersion.jar"
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/grouper-messaging-activemq-$grouperVersion.jar"
assertFileContains /etc/httpd/conf/httpd.conf "Listen 80"
assertFileContains /opt/tier-support/supervisord.conf "program:shibbolethsp"
- assertFileContains /opt/tier-support/supervisord.conf "program:tomee"
+ assertFileContains /opt/tier-support/supervisord.conf "program:tomcat"
assertFileContains /opt/tier-support/supervisord.conf "program:httpd"
assertFileContains /opt/tier-support/supervisord.conf "user=shibd"
assertFileNotContains /opt/tier-support/supervisord.conf "__"
@@ -56,12 +55,12 @@ testContainerUi() {
assertEnvVarNot GROUPER_SSL_CHAIN_FILE "/etc/pki/tls/certs/cachain.pem"
assertEnvVar GROUPER_SSL_USE_STAPLING "true"
- assertFileContains /opt/tomee/conf/Catalina/localhost/grouper.xml 'cookies="true"'
+ assertFileContains /opt/tomcat/conf/Catalina/localhost/grouper.xml 'cookies="true"'
assertFileNotContains /etc/httpd/conf/httpd.conf "Options Indexes"
assertFileContains /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.properties "/tmp/logpipe"
- assertFileContains /opt/tomee/conf/web.xml "600"
+ assertFileContains /opt/tomcat/conf/web.xml "600"
assertFileContains /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.properties "grouper-ui;"
assertFileNotContains /opt/grouper/grouperWebapp/WEB-INF/classes/grouper.hibernate.properties grouperPasswordConfigOverride_UI_GrouperSystem_pass.elConfig
@@ -75,18 +74,16 @@ testContainerUi() {
assertFileNotContains /etc/httpd/conf.d/grouper-www.conf "RemoteIPHeader"
assertFileNotContains /etc/httpd/conf.d/grouper-www.conf "RemoteIPTrustedProxy"
- assertFileNotContains /opt/tomee/conf/server.xml "AccessLogValve"
+ assertFileNotContains /opt/tomcat/conf/server.xml "AccessLogValve"
- assertFileContains /opt/tomee/conf/server.xml "maxHeaderCount"
- assertFileContains /opt/tomee/conf/server.xml "200"
- assertFileNotContains /opt/tomee/conf/server.xml "1235"
+ assertFileContains /opt/tomcat/conf/server.xml "maxHeaderCount"
+ assertFileContains /opt/tomcat/conf/server.xml "200"
+ assertFileNotContains /opt/tomcat/conf/server.xml "1235"
- assertFileContains /opt/tomee/conf/server.xml "tomcatAuthentication"
+ assertFileContains /opt/tomcat/conf/server.xml "tomcatAuthentication"
assertEnvVarNot GROUPER_APACHE_SERVER_NAME https://a.b.c:443
assertEnvVar GROUPER_TOMCAT_LOG_ACCESS "false"
- assertEnvVar GROUPERSCIM_PROXY_PASS "#"
- assertEnvVar GROUPERSCIM_URL_CONTEXT "grouper-ws-scim"
assertEnvVar GROUPERWS_PROXY_PASS "#"
assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
assertEnvVar GROUPER_APACHE_AJP_TIMEOUT_SECONDS "3600"
@@ -104,9 +101,7 @@ testContainerUi() {
assertEnvVar GROUPER_RUN_APACHE "true"
assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
assertEnvVar GROUPER_RUN_SHIB_SP "true"
- assertEnvVar GROUPER_RUN_TOMEE "true"
- assertEnvVar GROUPER_SCIM "false"
- assertEnvVar GROUPER_SCIM_GROUPER_AUTH "false"
+ assertEnvVar GROUPER_RUN_TOMCAT "true"
assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
assertEnvVar GROUPER_UI "true"
assertEnvVar GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES "127.0.0.1/32"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUi2.sh b/container_files/tier-support/test/grouperContainerUnitTestUi2.sh
index 01acfece..6bc0fdb5 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUi2.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUi2.sh
@@ -20,25 +20,24 @@ testContainerUi2() {
sleep $globalSleepSecondsAfterRun
- assertFileContains /opt/tomee/conf/server.xml 'address="0.0.0.0"'
- assertFileContains /opt/tomee/conf/server.xml 'allowedRequestAttributesPattern=".*"'
+ assertFileContains /opt/tomcat/conf/server.xml 'address="0.0.0.0"'
+ assertFileContains /opt/tomcat/conf/server.xml 'allowedRequestAttributesPattern=".*"'
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libWs/axis2-kernel-1.6.4.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/axis2-kernel-1.6.4.jar
- assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libScim/stax-api-1.0-2.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/stax-api-1.0-2.jar
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/lib/grouper-messaging-activemq-$grouperVersion.jar"
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/grouper-messaging-activemq-$grouperVersion.jar"
assertFileContains /etc/httpd/conf/httpd.conf "Listen 80"
assertFileContains /opt/tier-support/supervisord.conf "program:shibbolethsp"
- assertFileContains /opt/tier-support/supervisord.conf "program:tomee"
+ assertFileContains /opt/tier-support/supervisord.conf "program:tomcat"
assertFileContains /opt/tier-support/supervisord.conf "program:httpd"
assertFileContains /opt/tier-support/supervisord.conf "user=shibd"
assertFileNotContains /opt/tier-support/supervisord.conf "__"
- assertFileContains /opt/tomee/conf/server.xml "maxHeaderCount"
- assertFileContains /opt/tomee/conf/server.xml "1235"
+ assertFileContains /opt/tomcat/conf/server.xml "maxHeaderCount"
+ assertFileContains /opt/tomcat/conf/server.xml "1235"
assertFileContains /etc/httpd/conf.d/ssl-enabled.conf "SSLUseStapling off"
assertFileContains /etc/httpd/conf.d/ssl-enabled.conf "SSLCertificateFile /a/b/cert"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUiNoSsl.sh b/container_files/tier-support/test/grouperContainerUnitTestUiNoSsl.sh
index 0a729f9e..4aa5a635 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUiNoSsl.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUiNoSsl.sh
@@ -28,21 +28,19 @@ testContainerUiNoSsl() {
assertFileContains /etc/httpd/conf/httpd.conf "Listen 80"
assertFileContains /opt/tier-support/supervisord.conf "program:shibbolethsp"
- assertFileContains /opt/tier-support/supervisord.conf "program:tomee"
+ assertFileContains /opt/tier-support/supervisord.conf "program:tomcat"
assertFileContains /opt/tier-support/supervisord.conf "program:httpd"
assertFileContains /opt/tier-support/supervisord.conf "user=shibd"
assertFileNotContains /opt/tier-support/supervisord.conf "__"
- assertFileContains /opt/tomee/conf/server.xml "AccessLogValve"
- assertFileContains /opt/tomee/conf/server.xml 'secure="true"'
- assertFileContains /opt/tomee/conf/server.xml 'scheme="https"'
- assertFileNotContains /opt/tomee/conf/server.xml 'scheme="http"'
- assertFileContains /opt/tomee/conf/web.xml "30"
+ assertFileContains /opt/tomcat/conf/server.xml "AccessLogValve"
+ assertFileContains /opt/tomcat/conf/server.xml 'secure="true"'
+ assertFileContains /opt/tomcat/conf/server.xml 'scheme="https"'
+ assertFileNotContains /opt/tomcat/conf/server.xml 'scheme="http"'
+ assertFileContains /opt/tomcat/conf/web.xml "30"
- assertFileNotContains /opt/tomee/conf/server.xml "maxHeaderCount"
+ assertFileNotContains /opt/tomcat/conf/server.xml "maxHeaderCount"
assertEnvVar GROUPER_TOMCAT_LOG_ACCESS "true"
- assertEnvVar GROUPERSCIM_PROXY_PASS "#"
- assertEnvVar GROUPERSCIM_URL_CONTEXT "grouper-ws-scim"
assertEnvVar GROUPERWS_PROXY_PASS "#"
assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
assertEnvVar GROUPER_APACHE_NONSSL_PORT "80"
@@ -59,9 +57,7 @@ testContainerUiNoSsl() {
assertEnvVar GROUPER_RUN_APACHE "true"
assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
assertEnvVar GROUPER_RUN_SHIB_SP "true"
- assertEnvVar GROUPER_RUN_TOMEE "true"
- assertEnvVar GROUPER_SCIM "false"
- assertEnvVar GROUPER_SCIM_GROUPER_AUTH "false"
+ assertEnvVar GROUPER_RUN_TOMCAT "true"
assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
assertEnvVar GROUPER_UI "true"
assertEnvVar GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES "127.0.0.1/32"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUiNoSslOrClient.sh b/container_files/tier-support/test/grouperContainerUnitTestUiNoSslOrClient.sh
index 5718c9d0..5e397897 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUiNoSslOrClient.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUiNoSslOrClient.sh
@@ -24,9 +24,9 @@ testContainerUiNoSslOrClient() {
assertFileNotExists /etc/httpd/conf.d/ssl-enabled.conf
assertFileNotExists /etc/httpd/conf.d/ssl.conf
- assertFileNotContains /opt/tomee/conf/server.xml 'secure="true"'
- assertFileNotContains /opt/tomee/conf/server.xml 'scheme="https"'
- assertFileContains /opt/tomee/conf/server.xml 'scheme="http"'
+ assertFileNotContains /opt/tomcat/conf/server.xml 'secure="true"'
+ assertFileNotContains /opt/tomcat/conf/server.xml 'scheme="https"'
+ assertFileContains /opt/tomcat/conf/server.xml 'scheme="http"'
assertEnvVar GROUPER_USE_SSL "false"
assertEnvVar GROUPER_WEBCLIENT_IS_SSL "false"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUiSubimage.sh b/container_files/tier-support/test/grouperContainerUnitTestUiSubimage.sh
index daafec7e..c0572ce7 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUiSubimage.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUiSubimage.sh
@@ -35,7 +35,6 @@ testContainerUiSubimage() {
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libWs/axis2-kernel-1.6.4.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/axis2-kernel-1.6.4.jar
- assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libScim/stax-api-1.0-2.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/stax-api-1.0-2.jar
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/lib/grouper-messaging-activemq-$grouperVersion.jar"
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/grouper-messaging-activemq-$grouperVersion.jar"
@@ -44,7 +43,7 @@ testContainerUiSubimage() {
assertFileNotContains /etc/httpd/conf.d/ssl-enabled.conf "__"
assertFileContains /etc/httpd/conf/httpd.conf "Listen 80"
assertFileContains /opt/tier-support/supervisord.conf "program:shibbolethsp"
- assertFileContains /opt/tier-support/supervisord.conf "program:tomee"
+ assertFileContains /opt/tier-support/supervisord.conf "program:tomcat"
assertFileContains /opt/tier-support/supervisord.conf "program:httpd"
assertFileContains /opt/tier-support/supervisord.conf "user=shibd"
assertFileNotContains /opt/tier-support/supervisord.conf "__"
@@ -60,8 +59,6 @@ testContainerUiSubimage() {
assertFileContains /etc/httpd/conf.d/grouper-www.conf "3600"
assertFileNotContains /etc/httpd/conf.d/grouper-www.conf "__"
- assertEnvVar GROUPERSCIM_PROXY_PASS "#"
- assertEnvVar GROUPERSCIM_URL_CONTEXT "grouper-ws-scim"
assertEnvVar GROUPERWS_PROXY_PASS "#"
assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
assertEnvVar GROUPER_APACHE_AJP_TIMEOUT_SECONDS "3600"
@@ -79,9 +76,7 @@ testContainerUiSubimage() {
assertEnvVar GROUPER_RUN_APACHE "true"
assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
assertEnvVar GROUPER_RUN_SHIB_SP "true"
- assertEnvVar GROUPER_RUN_TOMEE "true"
- assertEnvVar GROUPER_SCIM "false"
- assertEnvVar GROUPER_SCIM_GROUPER_AUTH "false"
+ assertEnvVar GROUPER_RUN_TOMCAT "true"
assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
assertEnvVar GROUPER_UI "true"
assertEnvVar GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES "1.1.1.1/32"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUiSubimageNonroot.sh b/container_files/tier-support/test/grouperContainerUnitTestUiSubimageNonroot.sh
index 9bbf34e1..cfa2327b 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUiSubimageNonroot.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUiSubimageNonroot.sh
@@ -36,7 +36,6 @@ testContainerUiSubimageNonroot() {
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libWs/axis2-kernel-1.6.4.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/axis2-kernel-1.6.4.jar
- assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libScim/stax-api-1.0-2.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/stax-api-1.0-2.jar
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/lib/grouper-messaging-activemq-$grouperVersion.jar"
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/grouper-messaging-activemq-$grouperVersion.jar"
@@ -47,8 +46,6 @@ testContainerUiSubimageNonroot() {
assertFileNotContains /opt/grouper/grouperWebapp/WEB-INF/classes/grouper.hibernate.properties grouperPasswordConfigOverride_UI_GrouperSystem_pass.elConfig
assertFileNotContains /opt/grouper/grouperWebapp/WEB-INF/classes/grouper.hibernate.properties thisPassIsCopyrightedDontUse
- assertEnvVar GROUPERSCIM_PROXY_PASS "#"
- assertEnvVar GROUPERSCIM_URL_CONTEXT "grouper-ws-scim"
assertEnvVar GROUPERWS_PROXY_PASS "#"
assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
assertEnvVar GROUPER_APACHE_AJP_TIMEOUT_SECONDS "3600"
@@ -66,9 +63,7 @@ testContainerUiSubimageNonroot() {
assertEnvVarNot GROUPER_RUN_APACHE "true"
assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
assertEnvVarNot GROUPER_RUN_SHIB_SP "true"
- assertEnvVar GROUPER_RUN_TOMEE "true"
- assertEnvVar GROUPER_SCIM "false"
- assertEnvVar GROUPER_SCIM_GROUPER_AUTH "false"
+ assertEnvVar GROUPER_RUN_TOMCAT "true"
assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
assertEnvVar GROUPER_UI "true"
assertEnvVar GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES "127.0.0.1/32"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestWs.sh b/container_files/tier-support/test/grouperContainerUnitTestWs.sh
index 433ea3dc..a82d8e84 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestWs.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestWs.sh
@@ -21,28 +21,27 @@ testContainerWs() {
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libWs/axis2-kernel-1.6.4.jar
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/lib/axis2-kernel-1.6.4.jar
- assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libScim/stax-api-1.0-2.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/stax-api-1.0-2.jar
assertFileNotExists "/opt/grouper/grouperWebapp/WEB-INF/lib/grouper-messaging-activemq-$grouperVersion.jar"
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/grouper-messaging-activemq-$grouperVersion.jar"
assertFileNotContains /opt/grouper/grouperWebapp/WEB-INF/web.xml "BASIC"
- assertFileNotContains /opt/tomee/conf/server.xml 'tomcatAuthentication="true"'
- assertFileContains /opt/tomee/conf/server.xml 'tomcatAuthentication="false"'
+ assertFileNotContains /opt/tomcat/conf/server.xml 'tomcatAuthentication="true"'
+ assertFileContains /opt/tomcat/conf/server.xml 'tomcatAuthentication="false"'
assertFileContains /etc/httpd/conf.d/ssl-enabled.conf "Listen 443 https"
assertFileNotContains /etc/httpd/conf.d/ssl-enabled.conf "__"
assertFileContains /etc/httpd/conf/httpd.conf "Listen 80"
assertFileNotContains /opt/tier-support/supervisord.conf "program:shibbolethsp"
- assertFileContains /opt/tier-support/supervisord.conf "program:tomee"
+ assertFileContains /opt/tier-support/supervisord.conf "program:tomcat"
assertFileContains /opt/tier-support/supervisord.conf "program:httpd"
assertFileNotContains /opt/tier-support/supervisord.conf "user=shibd"
assertFileNotContains /opt/tier-support/supervisord.conf "__"
assertFileNotContains /etc/httpd/conf.d/ssl-enabled.conf cachain.pem
assertFileContains /etc/httpd/conf.d/ssl-enabled.conf /etc/pki/tls/certs/localhost.crt
- assertFileContains /opt/tomee/conf/Catalina/localhost/grouper-ws.xml 'cookies="false"'
- assertFileContains /opt/tomee/conf/web.xml "1"
+ assertFileContains /opt/tomcat/conf/Catalina/localhost/grouper-ws.xml 'cookies="false"'
+ assertFileContains /opt/tomcat/conf/web.xml "1"
assertFileContains /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml "grouper-ws;"
@@ -53,8 +52,6 @@ testContainerWs() {
assertFileContains /etc/httpd/conf.d/grouper-www.conf "UseCanonicalName On"
assertEnvVar GROUPER_APACHE_SERVER_NAME https://a.b.c:443
- assertEnvVar GROUPERSCIM_PROXY_PASS "#"
- assertEnvVar GROUPERSCIM_URL_CONTEXT "grouper-ws-scim"
assertEnvVar GROUPERWS_PROXY_PASS ""
assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
assertEnvVar GROUPER_APACHE_AJP_TIMEOUT_SECONDS "3600"
@@ -72,9 +69,7 @@ testContainerWs() {
assertEnvVar GROUPER_RUN_APACHE "true"
assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
assertEnvVarNot GROUPER_RUN_SHIB_SP "true"
- assertEnvVar GROUPER_RUN_TOMEE "true"
- assertEnvVar GROUPER_SCIM "false"
- assertEnvVar GROUPER_SCIM_GROUPER_AUTH "false"
+ assertEnvVar GROUPER_RUN_TOMCAT "true"
assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper-ws"
assertEnvVar GROUPER_UI "false"
assertEnvVar GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES "127.0.0.1/32"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestWsAuthn.sh b/container_files/tier-support/test/grouperContainerUnitTestWsAuthn.sh
index a89fab85..3834ad6e 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestWsAuthn.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestWsAuthn.sh
@@ -21,28 +21,27 @@ testContainerWsAuthn() {
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libWs/axis2-kernel-1.6.4.jar
assertFileExists /opt/grouper/grouperWebapp/WEB-INF/lib/axis2-kernel-1.6.4.jar
- assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libScim/stax-api-1.0-2.jar
assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/stax-api-1.0-2.jar
assertFileNotExists "/opt/grouper/grouperWebapp/WEB-INF/lib/grouper-messaging-activemq-$grouperVersion.jar"
assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/grouper-messaging-activemq-$grouperVersion.jar"
assertFileContains /opt/grouper/grouperWebapp/WEB-INF/web.xml "BASIC"
- assertFileContains /opt/tomee/conf/server.xml 'tomcatAuthentication="true"'
- assertFileNotContains /opt/tomee/conf/server.xml 'tomcatAuthentication="false"'
+ assertFileContains /opt/tomcat/conf/server.xml 'tomcatAuthentication="true"'
+ assertFileNotContains /opt/tomcat/conf/server.xml 'tomcatAuthentication="false"'
assertFileContains /etc/httpd/conf.d/ssl-enabled.conf "Listen 443 https"
assertFileNotContains /etc/httpd/conf.d/ssl-enabled.conf "__"
assertFileContains /etc/httpd/conf/httpd.conf "Listen 80"
assertFileNotContains /opt/tier-support/supervisord.conf "program:shibbolethsp"
- assertFileContains /opt/tier-support/supervisord.conf "program:tomee"
+ assertFileContains /opt/tier-support/supervisord.conf "program:tomcat"
assertFileContains /opt/tier-support/supervisord.conf "program:httpd"
assertFileNotContains /opt/tier-support/supervisord.conf "user=shibd"
assertFileNotContains /opt/tier-support/supervisord.conf "__"
assertFileNotContains /etc/httpd/conf.d/ssl-enabled.conf cachain.pem
assertFileContains /etc/httpd/conf.d/ssl-enabled.conf /etc/pki/tls/certs/localhost.crt
- assertFileContains /opt/tomee/conf/Catalina/localhost/grouper-ws.xml 'cookies="false"'
- assertFileContains /opt/tomee/conf/web.xml "1"
+ assertFileContains /opt/tomcat/conf/Catalina/localhost/grouper-ws.xml 'cookies="false"'
+ assertFileContains /opt/tomcat/conf/web.xml "1"
assertFileContains /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml "grouper-ws;"
@@ -53,8 +52,6 @@ testContainerWsAuthn() {
assertFileContains /etc/httpd/conf.d/grouper-www.conf "UseCanonicalName On"
assertEnvVar GROUPER_APACHE_SERVER_NAME https://a.b.c:443
- assertEnvVar GROUPERSCIM_PROXY_PASS "#"
- assertEnvVar GROUPERSCIM_URL_CONTEXT "grouper-ws-scim"
assertEnvVar GROUPERWS_PROXY_PASS ""
assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
assertEnvVar GROUPER_APACHE_AJP_TIMEOUT_SECONDS "3600"
@@ -72,9 +69,7 @@ testContainerWsAuthn() {
assertEnvVar GROUPER_RUN_APACHE "true"
assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
assertEnvVarNot GROUPER_RUN_SHIB_SP "true"
- assertEnvVar GROUPER_RUN_TOMEE "true"
- assertEnvVar GROUPER_SCIM "false"
- assertEnvVar GROUPER_SCIM_GROUPER_AUTH "false"
+ assertEnvVar GROUPER_RUN_TOMCAT "true"
assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper-ws"
assertEnvVar GROUPER_UI "false"
assertEnvVar GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES "127.0.0.1/32"
diff --git a/container_files/tier-support/test/rebuildTestContainer.sh b/container_files/tier-support/test/rebuildTestContainer.sh
index 01c548b1..c458f47b 100644
--- a/container_files/tier-support/test/rebuildTestContainer.sh
+++ b/container_files/tier-support/test/rebuildTestContainer.sh
@@ -26,11 +26,11 @@ rsync -avzpl $grouperContainerGitPath/container_files/httpd/ssl-enabled.conf sla
rsync -avzpl $grouperContainerGitPath/container_files/tier-support/test/grouper*.sh $reldir
-#mkdir -p slashRoot/opt/tomee/conf
-#rsync -avzpl $grouperContainerGitPath/container_files/tomee/conf/* slashRoot/opt/tomee/conf/
+#mkdir -p slashRoot/opt/tomcat/conf
+#rsync -avzpl $grouperContainerGitPath/container_files/tomcat/conf/* slashRoot/opt/tomcat/conf/
sed -i "s|__BASE_CONTAINER__|$grouperBaseImageName|g" "testContainer.Dockerfile"
docker build -f testContainer.Dockerfile -t $subimageName --build-arg GROUPER_VERSION=$grouperBaseContainerVersion $reldir
-echo "Run tests with: ./grouperContainerUnitTest.sh grouper-test $subimageName:latest $grouperBaseContainerVersion $grouperBaseContainerVersion"
\ No newline at end of file
+echo "Run tests with: ./grouperContainerUnitTest.sh grouper-test $subimageName:latest $grouperBaseContainerVersion $grouperBaseContainerVersion"
diff --git a/container_files/tomcat/bin/setenv.sh b/container_files/tomcat/bin/setenv.sh
new file mode 100755
index 00000000..8de0fd72
--- /dev/null
+++ b/container_files/tomcat/bin/setenv.sh
@@ -0,0 +1,4 @@
+CLASSPATH=/opt/tomcat/bin/*
+#JAVA_OPTS="-Dlog4j.configurationFile=/opt/tomcat/conf/log4j2.xml -DENV=$ENV -DUSERTOKEN=$USERTOKEN"
+CATALINA_OPTS="-Xmx$GROUPER_MAX_MEMORY -XX:+UseG1GC -XX:+UseStringDeduplication -Dlog4j.configurationFile=/opt/tomcat/conf/log4j2.xml -DENV='$ENV' -DUSERTOKEN='$USERTOKEN' -Dfile.encoding=UTF-8 -Djavax.net.ssl.trustStore=/etc/pki/java/cacerts $GROUPER_EXTRA_CATALINA_OPTS"
+LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
diff --git a/container_files/tomee/conf/Catalina/localhost/grouper.xml b/container_files/tomcat/conf/Catalina/localhost/grouper.xml
similarity index 100%
rename from container_files/tomee/conf/Catalina/localhost/grouper.xml
rename to container_files/tomcat/conf/Catalina/localhost/grouper.xml
diff --git a/container_files/tomee/conf/server.xml.loggingpipe b/container_files/tomcat/conf/server.xml.loggingpipe
similarity index 100%
rename from container_files/tomee/conf/server.xml.loggingpipe
rename to container_files/tomcat/conf/server.xml.loggingpipe
diff --git a/container_files/tomee/conf/server.xml.loggingpipe.patch b/container_files/tomcat/conf/server.xml.loggingpipe.patch
similarity index 100%
rename from container_files/tomee/conf/server.xml.loggingpipe.patch
rename to container_files/tomcat/conf/server.xml.loggingpipe.patch
diff --git a/container_files/tomee/conf/server.xml.nologging b/container_files/tomcat/conf/server.xml.nologging
similarity index 100%
rename from container_files/tomee/conf/server.xml.nologging
rename to container_files/tomcat/conf/server.xml.nologging
diff --git a/container_files/tomee/conf/server.xml.nologging.patch b/container_files/tomcat/conf/server.xml.nologging.patch
similarity index 100%
rename from container_files/tomee/conf/server.xml.nologging.patch
rename to container_files/tomcat/conf/server.xml.nologging.patch
diff --git a/container_files/tomee/conf/server.xml.original b/container_files/tomcat/conf/server.xml.original
similarity index 100%
rename from container_files/tomee/conf/server.xml.original
rename to container_files/tomcat/conf/server.xml.original
diff --git a/container_files/tomee/conf/server.xml.turnOnAjp b/container_files/tomcat/conf/server.xml.turnOnAjp
similarity index 100%
rename from container_files/tomee/conf/server.xml.turnOnAjp
rename to container_files/tomcat/conf/server.xml.turnOnAjp
diff --git a/container_files/tomee/conf/server.xml.turnOnAjp.patch b/container_files/tomcat/conf/server.xml.turnOnAjp.patch
similarity index 100%
rename from container_files/tomee/conf/server.xml.turnOnAjp.patch
rename to container_files/tomcat/conf/server.xml.turnOnAjp.patch
diff --git a/container_files/tomee/conf/server.xml.v2_5_29 b/container_files/tomcat/conf/server.xml.v2_5_29
similarity index 100%
rename from container_files/tomee/conf/server.xml.v2_5_29
rename to container_files/tomcat/conf/server.xml.v2_5_29
diff --git a/container_files/tomee/conf/tomcat-users.xml b/container_files/tomcat/conf/tomcat-users.xml
similarity index 91%
rename from container_files/tomee/conf/tomcat-users.xml
rename to container_files/tomcat/conf/tomcat-users.xml
index f1484fc2..8ee7d63c 100644
--- a/container_files/tomee/conf/tomcat-users.xml
+++ b/container_files/tomcat/conf/tomcat-users.xml
@@ -43,9 +43,4 @@
-->
-
-
-
\ No newline at end of file
+
diff --git a/container_files/tomee/bin/setenv.sh b/container_files/tomee/bin/setenv.sh
deleted file mode 100755
index bf08bddf..00000000
--- a/container_files/tomee/bin/setenv.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-CLASSPATH=/opt/tomee/bin/*
-#JAVA_OPTS="-Dlog4j.configurationFile=/opt/tomee/conf/log4j2.xml -DENV=$ENV -DUSERTOKEN=$USERTOKEN"
-CATALINA_OPTS="-Xmx$GROUPER_MAX_MEMORY -XX:+UseG1GC -XX:+UseStringDeduplication -Dlog4j.configurationFile=/opt/tomee/conf/log4j2.xml -DENV='$ENV' -DUSERTOKEN='$USERTOKEN' -Dfile.encoding=UTF-8 -Djavax.net.ssl.trustStore=/etc/pki/java/cacerts $GROUPER_EXTRA_CATALINA_OPTS"
-LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh
index 44639952..130f9bf3 100644
--- a/container_files/usr-local-bin/libraryPrep.sh
+++ b/container_files/usr-local-bin/libraryPrep.sh
@@ -60,10 +60,6 @@ prep_quickstart() {
echo "grouperContainer; INFO: (libraryPrep.sh-prep_quickstart) export GROUPER_WS_GROUPER_AUTH='true'"
export GROUPER_WS_GROUPER_AUTH='true'
fi
- if [ -z "$GROUPER_SCIM_GROUPER_AUTH" ] ; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_quickstart) export GROUPER_SCIM_GROUPER_AUTH=true"
- export GROUPER_SCIM_GROUPER_AUTH=true
- fi
if [ -z "$GROUPER_QUICKSTART" ]; then
echo "grouperContainer; INFO: (libraryPrep.sh-prep_quickstart) export GROUPER_QUICKSTART=true"
export GROUPER_QUICKSTART=true
@@ -77,25 +73,9 @@ prep_daemon() {
echo "grouperContainer; INFO: (libraryPrep.sh-prep_daemon) export GROUPER_DAEMON=true"
export GROUPER_DAEMON=true
fi
- if [ -z "$GROUPER_RUN_TOMEE" ]; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_daemon) export GROUPER_RUN_TOMEE=true"
- export GROUPER_RUN_TOMEE=true
- fi
-}
-
-prep_scim() {
-
- if [ -z "$GROUPER_SCIM" ]; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_scim) export GROUPER_SCIM=true"
- export GROUPER_SCIM=true
- fi
- if [ -z "$GROUPER_RUN_APACHE" ] && [ "$GROUPER_RUN_TOMCAT_NOT_SUPERVISOR" != "true" ] && [ "$GROUPER_OPENSHIFT" != "true" ]; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_scim) export GROUPER_RUN_APACHE=true"
- export GROUPER_RUN_APACHE=true
- fi
- if [ -z "$GROUPER_RUN_TOMEE" ]; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_scim) export GROUPER_RUN_TOMEE=true"
- export GROUPER_RUN_TOMEE=true
+ if [ -z "$GROUPER_RUN_TOMCAT" ]; then
+ echo "grouperContainer; INFO: (libraryPrep.sh-prep_daemon) export GROUPER_RUN_TOMCAT=true"
+ export GROUPER_RUN_TOMCAT=true
fi
}
@@ -113,9 +93,9 @@ prep_ui() {
echo "grouperContainer; INFO: (libraryPrep.sh-prep_ui) export GROUPER_RUN_SHIB_SP=true"
export GROUPER_RUN_SHIB_SP=true
fi
- if [ -z "$GROUPER_RUN_TOMEE" ]; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_ui) export GROUPER_RUN_TOMEE=true"
- export GROUPER_RUN_TOMEE=true
+ if [ -z "$GROUPER_RUN_TOMCAT" ]; then
+ echo "grouperContainer; INFO: (libraryPrep.sh-prep_ui) export GROUPER_RUN_TOMCAT=true"
+ export GROUPER_RUN_TOMCAT=true
fi
}
@@ -147,21 +127,6 @@ prep_runWs() {
fi
}
-prep_runScim() {
- if [ -z "$GROUPERSCIM_PROXY_PASS" ]
- then
- if [ "$GROUPER_SCIM" == 'true' ]
- then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_runScim) export GROUPER_PROXY_PASS="
- export GROUPERSCIM_PROXY_PASS=
- else
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_runScim) export GROUPER_PROXY_PASS=#"
- export GROUPERSCIM_PROXY_PASS=#
- fi
-
- fi
-}
-
prep_ws() {
@@ -173,9 +138,9 @@ prep_ws() {
echo "grouperContainer; INFO: (libraryPrep.sh-prep_ws) export GROUPER_RUN_APACHE=true"
export GROUPER_RUN_APACHE=true
fi
- if [ -z "$GROUPER_RUN_TOMEE" ]; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_ws) export GROUPER_RUN_TOMEE=true"
- export GROUPER_RUN_TOMEE=true
+ if [ -z "$GROUPER_RUN_TOMCAT" ]; then
+ echo "grouperContainer; INFO: (libraryPrep.sh-prep_ws) export GROUPER_RUN_TOMCAT=true"
+ export GROUPER_RUN_TOMCAT=true
fi
}
@@ -220,10 +185,10 @@ prep_initDeprecatedEnvVars() {
export GROUPER_RUN_SHIB_SP="$RUN_SHIB_SP"
fi
- if [ ! -z "$RUN_TOMEE" ] && [ -z "$GROUPER_RUN_TOMEE" ]
+ if [ ! -z "$RUN_TOMCAT" ] && [ -z "$GROUPER_RUN_TOMCAT" ]
then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_initDeprecatedEnvVars) export GROUPER_RUN_TOMEE=$RUN_TOMEE"
- export GROUPER_RUN_TOMEE="$RUN_TOMEE"
+ echo "grouperContainer; INFO: (libraryPrep.sh-prep_initDeprecatedEnvVars) export GROUPER_RUN_TOMCAT=$RUN_TOMCAT"
+ export GROUPER_RUN_TOMCAT="$RUN_TOMCAT"
fi
if [ ! -z "$SELF_SIGNED_CERT" ] && [ -z "$GROUPER_SELF_SIGNED_CERT" ]
@@ -248,10 +213,6 @@ prep_finishBegin() {
echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_WS_GROUPER_AUTH=false"
export GROUPER_WS_GROUPER_AUTH=false
fi
- if [ -z "$GROUPER_SCIM_GROUPER_AUTH" ] ; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_SCIM_GROUPER_AUTH=false"
- export GROUPER_SCIM_GROUPER_AUTH=false
- fi
if [ -z "$GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES" ]; then
echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES='127.0.0.1/32'"
export GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES='127.0.0.1/32'
@@ -262,10 +223,6 @@ prep_finishBegin() {
echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) GROUPER_UI=false"
export GROUPER_UI=false
fi
- if [ -z "$GROUPER_SCIM" ] ; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_SCIM=false"
- export GROUPER_SCIM=false
- fi
if [ -z "$GROUPER_WS" ] ; then
echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_WS=false"
export GROUPER_WS=false
@@ -370,10 +327,6 @@ prep_finishBegin() {
echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPERWS_URL_CONTEXT=grouper-ws"
export GROUPERWS_URL_CONTEXT=grouper-ws
fi
- if [ -z "$GROUPERSCIM_URL_CONTEXT" ] ; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPERSCIM_URL_CONTEXT=grouper-ws-scim"
- export GROUPERSCIM_URL_CONTEXT=grouper-ws-scim
- fi
if [ -z "$GROUPER_APACHE_AJP_TIMEOUT_SECONDS" ] ; then
echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_APACHE_AJP_TIMEOUT_SECONDS=3600"
export GROUPER_APACHE_AJP_TIMEOUT_SECONDS=3600
@@ -542,7 +495,6 @@ prep_finish() {
prepOnly
- prep_runScim
prep_runUi
prep_runWs
@@ -568,10 +520,8 @@ prep_unsetAll() {
unset -f prep_initDeprecatedEnvVars
unset -f prep_openshift
unset -f prep_quickstart
- unset -f prep_runScim
unset -f prep_runUi
unset -f prep_runWs
- unset -f prep_scim
unset -f prep_unsetAll
unset -f prep_unsetAllAndFromFiles
unset -f prep_ui
@@ -588,10 +538,8 @@ prep_exportAll() {
export -f prep_initDeprecatedEnvVars
export -f prep_openshift
export -f prep_quickstart
- export -f prep_runScim
export -f prep_runUi
export -f prep_runWs
- export -f prep_scim
export -f prep_unsetAll
export -f prep_unsetAllAndFromFiles
export -f prep_ui
diff --git a/container_files/usr-local-bin/libraryPrepOnly.sh b/container_files/usr-local-bin/libraryPrepOnly.sh
index 79ec4f44..5895f982 100644
--- a/container_files/usr-local-bin/libraryPrepOnly.sh
+++ b/container_files/usr-local-bin/libraryPrepOnly.sh
@@ -1,7 +1,7 @@
#!/bin/bash
prepOnly_component() {
- if [ "$GROUPER_WS" = "true" ] && [ "$GROUPER_UI" != "true" ] && [ "$GROUPER_SCIM" != "true" ] && [ "$GROUPER_DAEMON" != "true" ]
+ if [ "$GROUPER_WS" = "true" ] && [ "$GROUPER_UI" != "true" ] && [ "$GROUPER_DAEMON" != "true" ]
then
if [ -z "$GROUPER_WS_ONLY" ] ; then
echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_component) export GROUPER_WS_ONLY=true"
@@ -9,15 +9,7 @@ prepOnly_component() {
fi
fi
- if [ "$GROUPER_WS" != "true" ] && [ "$GROUPER_UI" != "true" ] && [ "$GROUPER_SCIM" = "true" ] && [ "$GROUPER_DAEMON" != "true" ]
- then
- if [ -z "$GROUPER_SCIM_ONLY" ] ; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_component) export GROUPER_SCIM_ONLY=true"
- export GROUPER_SCIM_ONLY=true
- fi
- fi
-
- if [ "$GROUPER_WS" != "true" ] && [ "$GROUPER_UI" = "true" ] && [ "$GROUPER_SCIM" != "true" ] && [ "$GROUPER_DAEMON" != "true" ]
+ if [ "$GROUPER_WS" != "true" ] && [ "$GROUPER_UI" = "true" ] && [ "$GROUPER_DAEMON" != "true" ]
then
if [ -z "$GROUPER_UI_ONLY" ] ; then
echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_component) export GROUPER_UI_ONLY=true"
@@ -25,7 +17,7 @@ prepOnly_component() {
fi
fi
- if [ "$GROUPER_WS" != "true" ] && [ "$GROUPER_UI" != "true" ] && [ "$GROUPER_SCIM" != "true" ] && [ "$GROUPER_DAEMON" = "true" ]
+ if [ "$GROUPER_WS" != "true" ] && [ "$GROUPER_UI" != "true" ] && [ "$GROUPER_DAEMON" = "true" ]
then
if [ -z "$GROUPER_DAEMON_ONLY" ] ; then
echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_component) export GROUPER_DAEMON_ONLY=true"
@@ -63,25 +55,6 @@ prepOnly_ws() {
fi
}
-prepOnly_scim() {
- if [ "$GROUPER_SCIM_ONLY" = "true" ]
- then
- if [ -z "$GROUPER_LOG_PREFIX" ]; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_scim) GROUPER_LOG_PREFIX=grouper-scim"
- export GROUPER_LOG_PREFIX=grouper-scim
- fi
- if [ -z "$GROUPER_CONTEXT_COOKIES" ]; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_scim) GROUPER_CONTEXT_COOKIES=false"
- export GROUPER_CONTEXT_COOKIES=false
- fi
- # default to whatever scim context is
- if [ -z "$GROUPER_TOMCAT_CONTEXT" ] ; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_scim) GROUPER_TOMCAT_CONTEXT=$GROUPERSCIM_URL_CONTEXT"
- export GROUPER_TOMCAT_CONTEXT="$GROUPERSCIM_URL_CONTEXT"
- fi
- fi
-}
-
prepOnly_daemon() {
if [ "$GROUPER_DAEMON_ONLY" = "true" ]
then
@@ -97,8 +70,6 @@ prepOnly() {
prepOnly_ws
- prepOnly_scim
-
prepOnly_ui
prepOnly_daemon
@@ -109,7 +80,6 @@ prepOnly_unsetAll() {
unset -f prepOnly
unset -f prepOnly_component
unset -f prepOnly_daemon
- unset -f prepOnly_scim
unset -f prepOnly_ui
unset -f prepOnly_unsetAll
unset -f prepOnly_ws
@@ -119,11 +89,10 @@ prepOnly_exportAll() {
export -f prepOnly
export -f prepOnly_component
export -f prepOnly_daemon
- export -f prepOnly_scim
export -f prepOnly_ui
export -f prepOnly_unsetAll
export -f prepOnly_ws
}
# export everything
-prepOnly_exportAll
\ No newline at end of file
+prepOnly_exportAll
diff --git a/container_files/usr-local-bin/libraryRunCommand.sh b/container_files/usr-local-bin/libraryRunCommand.sh
index d859e088..878c61b7 100644
--- a/container_files/usr-local-bin/libraryRunCommand.sh
+++ b/container_files/usr-local-bin/libraryRunCommand.sh
@@ -14,7 +14,7 @@ runCommand() {
if [ "$GROUPER_RUN_TOMCAT_NOT_SUPERVISOR" = "true" ]
then
echo "grouperContainer; INFO: (libraryRunCommand.sh-runCommand) Starting tomcat not supervisor"
- /opt/tomee/bin/catalina.sh run
+ /opt/tomcat/bin/catalina.sh run
else
echo "grouperContainer; INFO: (libraryRunCommand.sh-runCommand) Starting supervisor"
exec /usr/bin/supervisord -c /opt/tier-support/supervisord.conf
diff --git a/container_files/usr-local-bin/librarySetupFiles.sh b/container_files/usr-local-bin/librarySetupFiles.sh
index 114d4f61..02461a72 100644
--- a/container_files/usr-local-bin/librarySetupFiles.sh
+++ b/container_files/usr-local-bin/librarySetupFiles.sh
@@ -131,8 +131,8 @@ setupFiles_loggingPrefix() {
sed -i "s|__GROUPER_LOG_PREFIX__|$GROUPER_LOG_PREFIX|g" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_loggingPrefix) Changing log prefix to $GROUPER_LOG_PREFIX in log4j2.xml, result: $?"
- cp /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml /opt/tomee/conf/log4j2.xml
- echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_loggingPrefix) cp /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml /opt/tomee/conf/log4j2.xml, result: $?"
+ cp /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml /opt/tomcat/conf/log4j2.xml
+ echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_loggingPrefix) cp /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml /opt/tomcat/conf/log4j2.xml, result: $?"
}
setupFiles_chownDirs() {
@@ -239,7 +239,7 @@ setupFiles_originalFile() {
setupFiles_analyzeOriginalFiles() {
- setupFiles_originalFile /opt/tomee/conf/Catalina/localhost/grouper.xml
+ setupFiles_originalFile /opt/tomcat/conf/Catalina/localhost/grouper.xml
original_file=$?
if [ -z "$GROUPER_ORIGFILE_GROUPER_XML" ] && [[ $original_file -eq 0 ]]
then
@@ -251,7 +251,7 @@ setupFiles_analyzeOriginalFiles() {
export GROUPER_ORIGFILE_GROUPER_XML=false
fi
- setupFiles_originalFile /opt/tomee/conf/server.xml
+ setupFiles_originalFile /opt/tomcat/conf/server.xml
original_file=$?
if [ -z "$GROUPER_ORIGFILE_SERVER_XML" ] && [[ $original_file -eq 0 ]]
then
@@ -323,7 +323,7 @@ setupFiles_analyzeOriginalFiles() {
export GROUPER_ORIGFILE_SHIB_CONF=false
fi
- setupFiles_originalFile /opt/tomee/conf/Catalina/localhost/grouper.xml
+ setupFiles_originalFile /opt/tomcat/conf/Catalina/localhost/grouper.xml
original_file=$?
if [ -z "$GROUPER_ORIGFILE_GROUPER_XML" ] && [[ $original_file -eq 0 ]]
then
diff --git a/container_files/usr-local-bin/librarySetupFilesForComponent.sh b/container_files/usr-local-bin/librarySetupFilesForComponent.sh
index 63fb95db..c116e2ed 100644
--- a/container_files/usr-local-bin/librarySetupFilesForComponent.sh
+++ b/container_files/usr-local-bin/librarySetupFilesForComponent.sh
@@ -13,17 +13,6 @@ setupFilesForComponent_ws() {
}
-setupFilesForComponent_scim() {
-
- if [ "$GROUPER_SCIM" = "true" ]
- then
- cp -r /opt/grouper/grouperWebapp/WEB-INF/libScim/* /opt/grouper/grouperWebapp/WEB-INF/lib/
- returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_scim) cp -r /opt/grouper/grouperWebapp/WEB-INF/libScim/* /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $returnCode"
- if [ $returnCode != 0 ]; then exit $returnCode; fi
- fi
-
-}
setupFilesForComponent_ui() {
@@ -65,8 +54,6 @@ setupFilesForComponent() {
setupFilesForComponent_ws
- setupFilesForComponent_scim
-
setupFilesForComponent_ui
setupFilesForComponent_quickstart
@@ -77,7 +64,6 @@ setupFilesForComponent() {
setupFilesForComponent_unsetAll() {
unset -f setupFilesForComponent
unset -f setupFilesForComponent_quickstart
- unset -f setupFilesForComponent_scim
unset -f setupFilesForComponent_ui
unset -f setupFilesForComponent_unsetAll
unset -f setupFilesForComponent_ws
@@ -86,7 +72,6 @@ setupFilesForComponent_unsetAll() {
setupFilesForComponent_exportAll() {
export -f setupFilesForComponent
export -f setupFilesForComponent_quickstart
- export -f setupFilesForComponent_scim
export -f setupFilesForComponent_ui
export -f setupFilesForComponent_unsetAll
export -f setupFilesForComponent_ws
diff --git a/container_files/usr-local-bin/librarySetupFilesTomcat.sh b/container_files/usr-local-bin/librarySetupFilesTomcat.sh
index 4e23c820..c0b6dabc 100644
--- a/container_files/usr-local-bin/librarySetupFilesTomcat.sh
+++ b/container_files/usr-local-bin/librarySetupFilesTomcat.sh
@@ -17,17 +17,17 @@ setupFilesTomcat() {
setupFilesTomcat_turnOnAjp() {
if [ "$GROUPER_ORIGFILE_SERVER_XML" = "true" ]; then
- cp /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.currentOriginalInContainer
+ cp /opt/tomcat/conf/server.xml /opt/tomcat/conf/server.xml.currentOriginalInContainer
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_turnOnAjp) cp /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.currentOriginalInContainer , result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_turnOnAjp) cp /opt/tomcat/conf/server.xml /opt/tomcat/conf/server.xml.currentOriginalInContainer , result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
- patch /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.turnOnAjp.patch
+ patch /opt/tomcat/conf/server.xml /opt/tomcat/conf/server.xml.turnOnAjp.patch
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_turnOnAjp) Patch server.xml to turn on ajp: patch /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.turnOnAjp.patch, result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_turnOnAjp) Patch server.xml to turn on ajp: patch /opt/tomcat/conf/server.xml /opt/tomcat/conf/server.xml.turnOnAjp.patch, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
else
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_turnOnAjp) /opt/tomee/conf/server.xml is not the original file so will not be edited"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_turnOnAjp) /opt/tomcat/conf/server.xml is not the original file so will not be edited"
fi
}
@@ -38,21 +38,21 @@ setupFilesTomcat_accessLogs() {
if [ "$GROUPER_TOMCAT_LOG_ACCESS" = "true" ]; then
# this patch happens after the last patch
- patch /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.loggingpipe.patch
+ patch /opt/tomcat/conf/server.xml /opt/tomcat/conf/server.xml.loggingpipe.patch
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_accessLogs) Patch server.xml to log access: patch /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.loggingpipe.patch , result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_accessLogs) Patch server.xml to log access: patch /opt/tomcat/conf/server.xml /opt/tomcat/conf/server.xml.loggingpipe.patch , result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
else
- patch /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.nologging.patch
+ patch /opt/tomcat/conf/server.xml /opt/tomcat/conf/server.xml.nologging.patch
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_accessLogs) Patch server.xml to not log access: patch /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.nologging.patch , result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_accessLogs) Patch server.xml to not log access: patch /opt/tomcat/conf/server.xml /opt/tomcat/conf/server.xml.nologging.patch , result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
else
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_accessLogs) /opt/tomee/conf/server.xml is not the original file so will not be edited"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_accessLogs) /opt/tomcat/conf/server.xml is not the original file so will not be edited"
fi
}
@@ -60,62 +60,62 @@ setupFilesTomcat_accessLogs() {
setupFilesTomcat_ports() {
if [ "$GROUPER_TOMCAT_HTTP_PORT" != "8080" ]; then
- sed -i "s|8080|$GROUPER_TOMCAT_HTTP_PORT|g" /opt/tomee/conf/server.xml
+ sed -i "s|8080|$GROUPER_TOMCAT_HTTP_PORT|g" /opt/tomcat/conf/server.xml
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml to change http port: sed -i \"s|8080|$GROUPER_TOMCAT_HTTP_PORT|g\" /opt/tomee/conf/server.xml, result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml to change http port: sed -i \"s|8080|$GROUPER_TOMCAT_HTTP_PORT|g\" /opt/tomcat/conf/server.xml, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
if [ "$GROUPER_TOMCAT_AJP_PORT" != "8009" ]; then
- sed -i "s|8009|$GROUPER_TOMCAT_AJP_PORT|g" /opt/tomee/conf/server.xml
+ sed -i "s|8009|$GROUPER_TOMCAT_AJP_PORT|g" /opt/tomcat/conf/server.xml
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml to change ajp port: sed -i \"s|8009|$GROUPER_TOMCAT_AJP_PORT|g\" /opt/tomee/conf/server.xml, result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml to change ajp port: sed -i \"s|8009|$GROUPER_TOMCAT_AJP_PORT|g\" /opt/tomcat/conf/server.xml, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
if [ "$GROUPER_TOMCAT_MAX_HEADER_COUNT" != "-1" ]; then
# add in maxHeaderCount since new chrome sends too many headers
- sed -i "s|port=\"$GROUPER_TOMCAT_AJP_PORT\"|port=\"$GROUPER_TOMCAT_AJP_PORT\" maxHeaderCount=\"$GROUPER_TOMCAT_MAX_HEADER_COUNT\" |g" /opt/tomee/conf/server.xml
+ sed -i "s|port=\"$GROUPER_TOMCAT_AJP_PORT\"|port=\"$GROUPER_TOMCAT_AJP_PORT\" maxHeaderCount=\"$GROUPER_TOMCAT_MAX_HEADER_COUNT\" |g" /opt/tomcat/conf/server.xml
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml add maxHeaderCount: sed -i \"s|port=\"$GROUPER_TOMCAT_AJP_PORT\"|port=\"$GROUPER_TOMCAT_AJP_PORT\" maxHeaderCount=\"$GROUPER_TOMCAT_MAX_HEADER_COUNT\" |g\" /opt/tomee/conf/server.xml, result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml add maxHeaderCount: sed -i \"s|port=\"$GROUPER_TOMCAT_AJP_PORT\"|port=\"$GROUPER_TOMCAT_AJP_PORT\" maxHeaderCount=\"$GROUPER_TOMCAT_MAX_HEADER_COUNT\" |g\" /opt/tomcat/conf/server.xml, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
if [ "$GROUPER_TOMCAT_SHUTDOWN_PORT" != "8005" ]; then
- sed -i "s|8005|$GROUPER_TOMCAT_SHUTDOWN_PORT|g" /opt/tomee/conf/server.xml
+ sed -i "s|8005|$GROUPER_TOMCAT_SHUTDOWN_PORT|g" /opt/tomcat/conf/server.xml
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml to change shutdown port: sed -i \"s|8005|$GROUPER_TOMCAT_SHUTDOWN_PORT|g\" /opt/tomee/conf/server.xml , result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml to change shutdown port: sed -i \"s|8005|$GROUPER_TOMCAT_SHUTDOWN_PORT|g\" /opt/tomcat/conf/server.xml , result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
}
setupFilesTomcat_context() {
- if [ -f /opt/tomee/conf/Catalina/localhost/grouper.xml ]
+ if [ -f /opt/tomcat/conf/Catalina/localhost/grouper.xml ]
then
if [ "$GROUPER_ORIGFILE_GROUPER_XML" = "true" ]; then
- # ws only and scim only dont have cookies
- sed -i "s|__GROUPER_CONTEXT_COOKIES__|$GROUPER_CONTEXT_COOKIES|g" /opt/tomee/conf/Catalina/localhost/grouper.xml
+ # ws only doesnt have cookies
+ sed -i "s|__GROUPER_CONTEXT_COOKIES__|$GROUPER_CONTEXT_COOKIES|g" /opt/tomcat/conf/Catalina/localhost/grouper.xml
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) Replace context cookies in grouper.xml: sed -i \"s|__GROUPER_CONTEXT_COOKIES__|$GROUPER_CONTEXT_COOKIES|g\" /opt/tomee/conf/Catalina/localhost/grouper.xml , result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) Replace context cookies in grouper.xml: sed -i \"s|__GROUPER_CONTEXT_COOKIES__|$GROUPER_CONTEXT_COOKIES|g\" /opt/tomcat/conf/Catalina/localhost/grouper.xml , result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
# setup context
- sed -i "s|__GROUPER_TOMCAT_CONTEXT__|$GROUPER_TOMCAT_CONTEXT|g" /opt/tomee/conf/Catalina/localhost/grouper.xml
+ sed -i "s|__GROUPER_TOMCAT_CONTEXT__|$GROUPER_TOMCAT_CONTEXT|g" /opt/tomcat/conf/Catalina/localhost/grouper.xml
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) Replace tomcat context in grouper.xml: sed -i \"s|__GROUPER_TOMCAT_CONTEXT__|$GROUPER_TOMCAT_CONTEXT|g\" /opt/tomee/conf/Catalina/localhost/grouper.xml, result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) Replace tomcat context in grouper.xml: sed -i \"s|__GROUPER_TOMCAT_CONTEXT__|$GROUPER_TOMCAT_CONTEXT|g\" /opt/tomcat/conf/Catalina/localhost/grouper.xml, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
# rename file if needed since that can matter with tomcat
if [ "$GROUPER_TOMCAT_CONTEXT" != "grouper" ]
then
- mv -v /opt/tomee/conf/Catalina/localhost/grouper.xml "/opt/tomee/conf/Catalina/localhost/$GROUPER_TOMCAT_CONTEXT.xml"
+ mv -v /opt/tomcat/conf/Catalina/localhost/grouper.xml "/opt/tomcat/conf/Catalina/localhost/$GROUPER_TOMCAT_CONTEXT.xml"
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) mv -v /opt/tomee/conf/Catalina/localhost/grouper.xml \"/opt/tomee/conf/Catalina/localhost/$GROUPER_TOMCAT_CONTEXT.xml\" , result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) mv -v /opt/tomcat/conf/Catalina/localhost/grouper.xml \"/opt/tomcat/conf/Catalina/localhost/$GROUPER_TOMCAT_CONTEXT.xml\" , result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
else
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) /opt/tomee/conf/Catalina/localhost/grouper.xml is not the original file so will not be edited"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) /opt/tomcat/conf/Catalina/localhost/grouper.xml is not the original file so will not be edited"
fi
fi
@@ -130,8 +130,6 @@ setupFilesTomcat_context() {
results="$results $?"
sed -i "s|__GROUPERWS_URL_CONTEXT__|$GROUPERWS_URL_CONTEXT|g" /etc/httpd/conf.d/grouper-www.conf
results="$results $?"
- sed -i "s|__GROUPERSCIM_URL_CONTEXT__|$GROUPERSCIM_URL_CONTEXT|g" /etc/httpd/conf.d/grouper-www.conf
- results="$results $?"
sed -i "s|__GROUPER_PROXY_PASS__|$GROUPER_PROXY_PASS|g" /etc/httpd/conf.d/grouper-www.conf
results="$results $?"
@@ -155,8 +153,6 @@ setupFilesTomcat_context() {
results="$results $?"
fi
fi
- sed -i "s|__GROUPERSCIM_PROXY_PASS__|$GROUPERSCIM_PROXY_PASS|g" /etc/httpd/conf.d/grouper-www.conf
- results="$results $?"
sed -i "s|__GROUPERWS_PROXY_PASS__|$GROUPERWS_PROXY_PASS|g" /etc/httpd/conf.d/grouper-www.conf
returnCode=$?
results="$results $returnCode"
@@ -184,9 +180,9 @@ setupFilesTomcat_authn() {
echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_authn) /opt/grouper/grouperWebapp/WEB-INF/web.xml is not the original file so will not be edited"
fi
- sed -i 's|tomcatAuthentication="false"|tomcatAuthentication="true"|g' /opt/tomee/conf/server.xml
+ sed -i 's|tomcatAuthentication="false"|tomcatAuthentication="true"|g' /opt/tomcat/conf/server.xml
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_authn) sed -i 's|tomcatAuthentication=\"false\"|tomcatAuthentication=\"true\"|g' /opt/tomee/conf/server.xml, result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_authn) sed -i 's|tomcatAuthentication=\"false\"|tomcatAuthentication=\"true\"|g' /opt/tomcat/conf/server.xml, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
@@ -195,11 +191,11 @@ setupFilesTomcat_authn() {
setupFilesTomcat_supervisor() {
- if [ "$GROUPER_RUN_TOMEE" = "true" ] && [ "$GROUPER_RUN_TOMCAT_NOT_SUPERVISOR" != "true" ]
+ if [ "$GROUPER_RUN_TOMCAT" = "true" ] && [ "$GROUPER_RUN_TOMCAT_NOT_SUPERVISOR" != "true" ]
then
- cat /opt/tier-support/supervisord-tomee.conf >> /opt/tier-support/supervisord.conf
+ cat /opt/tier-support/supervisord-tomcat.conf >> /opt/tier-support/supervisord.conf
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_supervisor) Append supervisord-tomee.conf to supervisord.conf: cat /opt/tier-support/supervisord-tomee.conf >> /opt/tier-support/supervisord.conf , result: $returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_supervisor) Append supervisord-tomcat.conf to supervisord.conf: cat /opt/tier-support/supervisord-tomcat.conf >> /opt/tier-support/supervisord.conf , result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
@@ -207,11 +203,11 @@ setupFilesTomcat_supervisor() {
setupFilesTomcat_sessionTimeout() {
- if [ "$GROUPER_RUN_TOMEE" = "true" ] && [ "$GROUPER_TOMCAT_SESSION_TIMEOUT_MINUTES" != "-2" ]
+ if [ "$GROUPER_RUN_TOMCAT" = "true" ] && [ "$GROUPER_TOMCAT_SESSION_TIMEOUT_MINUTES" != "-2" ]
then
- sed -i "s|30|$GROUPER_TOMCAT_SESSION_TIMEOUT_MINUTES|g" /opt/tomee/conf/web.xml
+ sed -i "s|30|$GROUPER_TOMCAT_SESSION_TIMEOUT_MINUTES|g" /opt/tomcat/conf/web.xml
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_sessionTimeout) based on GROUPER_TOMCAT_SESSION_TIMEOUT_MINUTES, sed -i \"s|30|$GROUPER_TOMCAT_SESSION_TIMEOUT_MINUTES|g\" /opt/tomee/conf/web.xml , result=$returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_sessionTimeout) based on GROUPER_TOMCAT_SESSION_TIMEOUT_MINUTES, sed -i \"s|30|$GROUPER_TOMCAT_SESSION_TIMEOUT_MINUTES|g\" /opt/tomcat/conf/web.xml , result=$returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
}
@@ -220,16 +216,16 @@ setupFilesTomcat_ssl() {
if [ "$GROUPER_WEBCLIENT_IS_SSL" = "false" ]
then
- sed -i 's|secure="true"||g' /opt/tomee/conf/server.xml
+ sed -i 's|secure="true"||g' /opt/tomcat/conf/server.xml
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ssl) based on GROUPER_WEBCLIENT_IS_SSL, sed -i 's|secure=\"true\"||g' /opt/tomee/conf/server.xml , result=$returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ssl) based on GROUPER_WEBCLIENT_IS_SSL, sed -i 's|secure=\"true\"||g' /opt/tomcat/conf/server.xml , result=$returnCode"
if [ $returnCode != 0 ] && [ "$GROUPER_ORIGFILE_SERVER_XML" = "true" ]
then
exit $returnCode
fi
- sed -i 's|scheme="https"|scheme="http"|g' /opt/tomee/conf/server.xml
+ sed -i 's|scheme="https"|scheme="http"|g' /opt/tomcat/conf/server.xml
returnCode=$?
- echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ssl) based on GROUPER_WEBCLIENT_IS_SSL, sed -i 's|scheme=\"https\"|scheme=\"http\"|g' /opt/tomee/conf/server.xml , result=$returnCode"
+ echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ssl) based on GROUPER_WEBCLIENT_IS_SSL, sed -i 's|scheme=\"https\"|scheme=\"http\"|g' /opt/tomcat/conf/server.xml , result=$returnCode"
if [ $returnCode != 0 ] && [ "$GROUPER_ORIGFILE_SERVER_XML" = "true" ]
then
exit $returnCode
diff --git a/container_files/usr-local-bin/librarySetupPipe.sh b/container_files/usr-local-bin/librarySetupPipe.sh
index ce78f52c..7b0ee8d3 100644
--- a/container_files/usr-local-bin/librarySetupPipe.sh
+++ b/container_files/usr-local-bin/librarySetupPipe.sh
@@ -52,10 +52,10 @@ setupPipe_shibdLog() {
setupPipe_tomcatLog() {
if [ "$GROUPER_USE_PIPES" == "true" ]; then
- if [ "$GROUPER_RUN_TOMEE" = "true" ] && [ "$GROUPER_LOG_TO_PIPE" = "true" ]
+ if [ "$GROUPER_RUN_TOMCAT" = "true" ] && [ "$GROUPER_LOG_TO_PIPE" = "true" ]
then
setupPipe /tmp/logtomcat
- (cat <> /tmp/logtomcat | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "tomee;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+ (cat <> /tmp/logtomcat | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "tomcat;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
fi
fi
}
diff --git a/container_files/usr-local-bin/quickstart b/container_files/usr-local-bin/quickstart
index 0fb7d383..d15780d9 100755
--- a/container_files/usr-local-bin/quickstart
+++ b/container_files/usr-local-bin/quickstart
@@ -3,9 +3,8 @@
prep_quickstart
prep_ui
prep_ws
-prep_scim
prep_daemon
prep_finish
setupFiles
-runCommand
\ No newline at end of file
+runCommand
diff --git a/container_files/usr-local-bin/scim b/container_files/usr-local-bin/scim
deleted file mode 100755
index f50697ac..00000000
--- a/container_files/usr-local-bin/scim
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-prep_scim
-prep_finish
-setupFiles
-
-runCommand
\ No newline at end of file
diff --git a/test-compose/README.md b/test-compose/README.md
index 6bf62c51..1edef55d 100644
--- a/test-compose/README.md
+++ b/test-compose/README.md
@@ -41,7 +41,6 @@ The components can be accessed at the following urls, with
Grouper UI: https://localhost/grouper (username: banderson, password: password (from ldap) or password1 (from tomcat-users.xml))
Grouper WS: https://localhost:8443/grouper-ws/status?diagnosticType=all
-Grouper SCIM: https://localhost:9443/grouper-ws-scim/ (username: banderson, password: password (from tomcat-users.xml))
RabbmitMQ: http://localhost:15672/ (username: guest, password: guest)
MariaDB: Port 3306 (username: root, password: (no password) )
389-ds Directory: Port 389 (username: cn=Directory Manager, password: password)
diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml
index e4eb940f..ea7ad843 100644
--- a/test-compose/docker-compose.yml
+++ b/test-compose/docker-compose.yml
@@ -125,41 +125,6 @@ services:
target: /etc/pki/tls/certs/cachain.pem
-# scim:
-# build: ./scim/
-# command: bash -c "while ! curl -s data:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; while ! curl -s ldap://data:389 > /dev/null; do echo waiting for ldap to start; sleep 3; done; exec scim"
-# depends_on:
-# - data
-# networks:
-# - front
-# - back
-# ports:
-# - "9443:443"
-# secrets:
-# - source: grouper.hibernate.properties
-# target: grouper_grouper.hibernate.properties
-# - source: grouper-loader.properties
-# target: grouper_grouper-loader.properties
-# - source: ldap.properties
-# target: grouper_ldap.properties
-# - source: subject.properties
-# target: grouper_subject.properties
-# - source: host-key.pem
-# volumes:
-# - type: bind
-# source: ./configs-and-secrets/grouper/grouper.properties
-# target: /opt/grouper/conf/grouper.properties
-# - type: bind
-# source: ./configs-and-secrets/grouper/grouper.client.properties
-# target: /opt/grouper/conf/grouper.client.properties
-# - type: bind
-# source: ./configs-and-secrets/httpd/host-cert.pem
-# target: /etc/pki/tls/certs/host-cert.pem
-# - type: bind
-# source: ./configs-and-secrets/httpd/host-cert.pem
-# target: /etc/pki/tls/certs/cachain.pem
-
-
gsh:
build: ./gsh/
depends_on:
diff --git a/test-compose/scim/Dockerfile b/test-compose/scim/Dockerfile
deleted file mode 100644
index 99843d2b..00000000
--- a/test-compose/scim/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM i2incommon/grouper:latest
-
-LABEL author="tier-packaging@internet2.edu "
-
-COPY container_files/web.xml /opt/grouper/grouper.scim/WEB-INF/
-COPY container_files/tomcat-users.xml /opt/tomee/conf/
-
-CMD ["scim"]
diff --git a/test-compose/scim/container_files/tomcat-users.xml b/test-compose/scim/container_files/tomcat-users.xml
deleted file mode 100644
index be015e1e..00000000
--- a/test-compose/scim/container_files/tomcat-users.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test-compose/scim/container_files/web.xml b/test-compose/scim/container_files/web.xml
deleted file mode 100644
index c57461bd..00000000
--- a/test-compose/scim/container_files/web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
- Web services
- /*
-
-
- *
-
-
-
-
-
- BASIC
- Grouper Application
-
-
-
-
-
- The role that is required to log in to web service
-
- *
-
-
-
\ No newline at end of file