update docker images for cluster redeployment

smp-docker/compose/weblogic-oracle/data/upload/.disable_default_excludes

+.gitignore is excluded when sharing artifacts on bamboo
+http://ant.apache.org/manual/dirtasks.html
+
+And we want this folder to be shared in order to keep the project structure.
\ No newline at end of file

smp-docker/compose/weblogic-oracle/data/upload/.gitignore

+# Ignore everything in this directory
+..
+# Except the following
+!.gitignore
+!.disable_default_excludes
\ No newline at end of file

smp-docker/compose/weblogic-oracle/docker-compose.yml

 version: "3.0"
 services:
   smp-oracle-db:
-    image: smp-oradb-${ORA_VERSION}-${ORA_EDITION}:${SMP_VERSION}
+    image: smp-oradb-${ORA_VERSION}-${ORA_EDITION}:${SMP_VERSION:-5.0-SNAPSHOT}
     hostname: smp-database.local
     environment:
       - ORACLE_CHARACTERSET=AL32UTF8 # set database encoding
@@ -17,10 +17,12 @@ services:
     depends_on:
       - smp-oracle-db
     command: [bash, -c, "rm -rf /u01/status/wls-admin.started;for i in `seq 150`; do timeout 1  bash -c 'echo \" $$(ls /u01/status/)\"'; if [ -f '/u01/status/database.status' ] && [ \"$$( cat /u01/status/database.status )\" == 'DATABASE IS READY TO USE!' ] ; then break;fi; echo \"$$i. Wait for database!\"; sleep 10;  done;   /u01/oracle/startAdminServer.sh"]
-    image:  smp-weblogic-122:${SMP_VERSION:-4.2-RC2-SNAPSHOT}
+    image:  smp-weblogic-122:${SMP_VERSION:-5.0-SNAPSHOT}
     hostname: smp-wls-admin
     environment:
       - JAVA_OPTIONS="-Dweblogic.webservice.i18n.charset=utf-8"
+      - WL_PRODUCTION_MODE_ENABLED=true # to enable production deployment
+      - WL_DEPLOYMENT_TARGET=smp-cluster
     ports:
       - 7901:7001
     volumes:
@@ -36,7 +38,7 @@ services:
     environment:
       - WL_ADMIN_HOST=smp-wls-admin
       - WL_MANAGED_SERV_NAME=smp-node-1
-    image: smp-weblogic-122:${SMP_VERSION:-4.2-RC2-SNAPSHOT}
+    image: smp-weblogic-122:${SMP_VERSION:-5.0-SNAPSHOT}
     #    ports:
     #      - "18453:8453"
     #      - "18001:8001"
@@ -51,7 +53,8 @@ services:
     environment:
       - WL_ADMIN_HOST=smp-wls-admin
       - WL_MANAGED_SERV_NAME=smp-node-2
-    image: smp-weblogic-122:${SMP_VERSION:-4.2-RC2-SNAPSHOT}
+      - WL_DELAY_STARTUP_IN_S=20 # delay startup to allow node 01 to initialize the database, truststore and keystore
+    image: smp-weblogic-122:${SMP_VERSION:-5.0-SNAPSHOT}
     #    ports:
     #      - "18453:8453"
     #      - "18001:8001"
@@ -63,12 +66,13 @@ services:
     depends_on:
       - smp-node-01
       - smp-node-02
-    image: edelivery-docker.devops.tech.ec.europa.eu/domibustest/edelivery-httpd:2.4.39
+    image: smp-httpd:${SMP_VERSION:-5.0-SNAPSHOT}
     environment:
       - VHOST_CORNER_HOSTNAME=smp.edelivery.eu
       - NODES_COUNT=2
       - NODE_HOSTNAMES=smp-node-01,smp-node-02
       - NODE_PORT_NUMBERS=8001,8001
+      - AllowEncodedSlashes=NoDecode
     ports:
       - "7980:80"
     restart: always

smp-docker/compose/weblogic-oracle/runCompose.sh

@@ -71,16 +71,16 @@ function createDatabaseSchemaForUser() {
   } >>"$3"
 }
 
-
 function clearOldContainers {
   echo "Clear containers and volumes"
   docker-compose -p "${PREFIX}" rm -s -f -v
   echo "Clear container data ${WORKING_DIR}/data/"
+  rm -rf ${WORKING_DIR}/data/upload/*.*
   rm -rf ${WORKING_DIR}/data/smp/config/*.*
   rm -rf ${WORKING_DIR}/data/smp/security/*.*
   rm -rf ${WORKING_DIR}/data/weblogic/keystores/*.*
   rm -rf ${WORKING_DIR}/data/weblogic/security.properties
-  rm -rf ${WORKING_DIR}/data/*.jar
+  rm -rf ${WORKING_DIR}/data/*.*
 }
 
 createDatabaseSchemaForUser $SMP_DB_USERNAME $SMP_DB_PASSWORD "${SMP_DB_SCRIPTS}/01_create_user.sql"

smp-docker/images/build-docker-images.sh

@@ -216,6 +216,13 @@ buildWebLogicOracleImages(){
     echo "Error occurred while building image [smp-weblogic-122:${SMP_VERSION}]!"
     exit 10
   fi
+ # build the httpd image for LB. The Http is configured to allow encoded characters which
+ # are not decoded!
+ docker build -t "smp-httpd:${SMP_VERSION}" ./smp-httpd/
+  if [ $? -ne 0 ]; then
+    echo "Error occurred while building image [smp-httpd:${SMP_VERSION}]!"
+    exit 10
+  fi
 }
 
 function pushImageToDockerhub() {

smp-docker/images/smp-httpd/Dockerfile

+FROM httpd:2.4.39
+
+# in order to be able to use additional terminal capabilities
+ENV TERM=xterm-256color
+
+# turn off the package manager interactive mode during the image build
+ENV DEBIAN_FRONTEND noninteractive
+
+# Set the correct timezone
+ENV TZ=Europe/Brussels
+RUN ln -sf /usr/share/zoneinfo/"${TZ}" /etc/localtime && \
+    echo "${TZ}" > /etc/timezone
+
+# install some useful packages
+RUN apt-get update && apt-get install -y unzip net-tools vim wget && \
+# activate vim syntax highlight
+    sed -i 's/"syntax on/syntax on/g' /etc/vim/vimrc && \
+# create apache httpd vhosts directory
+    mkdir /usr/local/apache2/conf/vhosts.d
+
+# add configuration files and other related files
+COPY resources/httpd-default.conf /usr/local/apache2/conf/extra/
+COPY resources/httpd.conf /usr/local/apache2/conf/
+COPY resources/vhost_corner.conf /usr/local/apache2/conf/vhosts.d/
+COPY resources/entrypoint.sh /usr/local/bin/
+
+# set the correct permissions for the copied files
+RUN chown -R root:www-data /usr/local/apache2/conf/ \
+    && chmod +x /usr/local/bin/entrypoint.sh
+
+# turn off the package manager interactive mode during the image build
+ENV DEBIAN_FRONTEND noninteractive
+
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
+CMD ["httpd-foreground"]
\ No newline at end of file

smp-docker/images/smp-httpd/README.md

+# Edelivery HTTPD
+
+This image is created from httpd:2.4.39.
+It contains an HTTPD server prepared to be used as a load balancer 
+for the weblogic SMP cluster environment. It has configured AllowEncodedSlashes NoDecode to allow
+%2F for the test PASSING_AUTO_BAMBOO/SMP063EDELIVERY364_slash_encodingTomca
+
+# Usage
+
+Usage via docker-compose, e.g:
+
+```
+  smp-httpd:
+    depends_on:
+      - smp-node-01
+      - smp-node-02
+    image: smp-httpd:${SMP_VERSION:-5.0-SNAPSHOT}
+    environment:
+      - VHOST_CORNER_HOSTNAME=smp.edelivery.eu
+      - NODES_COUNT=2
+      - NODE_HOSTNAMES=smp-node-01,smp-node-02
+      - NODE_PORT_NUMBERS=8001,8001
+      - AllowEncodedSlashes=NoDecode
+```
+
+
+   
+# More information
+
+Please check the base image:
+https://hub.docker.com/_/httpd/
\ No newline at end of file

smp-docker/images/smp-httpd/resources/entrypoint.sh

+#!/usr/bin/env bash
+
+: "${HOSTNAME:?Need to set HOSTNAME non-empty (can also run the container with 'docker run --hostname=...' specified or use its analogous docker-compose 'hostname:...' property)}"
+: "${VHOST_CORNER_HOSTNAME:?Need to set VHOST_CORNER_HOSTNAME non-empty}"
+: "${NODES_COUNT:?Need to set NODES_COUNT non-empty}"
+: "${NODE_HOSTNAMES:?Need to set NODE_HOSTNAMES non-empty}"
+: "${NODE_PORT_NUMBERS:?Need to set NODE_PORTS non-empty}"
+
+configureBalancedMembers() {
+	echo "Configuring load balancer..."
+
+	local nodeHostnames=(${NODE_HOSTNAMES//,/ })
+	local nodePortNumbers=(${NODE_PORT_NUMBERS//,/ })
+
+	if (( NODES_COUNT < 2 )); then
+		echo "The number of nodes must be at least 2: NODES_COUNT=${NODES_COUNT}"
+		exit 1
+	fi
+
+	if (( ${#nodeHostnames[@]} != NODES_COUNT )); then
+		echo "Please provide the same number of nodes and node hostnames: NODES_COUNT=${NODES_COUNT}, NODE_HOSTNAMES=${NODE_HOSTNAMES}"
+		exit 1
+	fi
+
+	if (( ${#nodePortNumbers[@]} != NODES_COUNT )); then
+		echo "Please provide the same number of nodes and node port numbers: NODES_COUNT=${NODES_COUNT}, NODE_PORT_NUMBERS=${NODE_PORT_NUMBERS}"
+		exit 1
+	fi
+
+	local BALANCER_MEMBERS=""
+	for (( nodeNumber = 0; nodeNumber < NODES_COUNT; nodeNumber++ )); do
+		BALANCER_MEMBERS="${BALANCER_MEMBERS}\n    $(printf 'BalancerMember http://%s:%s route=xt%s min=1 max=50 connectiontimeout=1000ms keepalive=on retry=0 timeout=60 ttl=30' \
+"${nodeHostnames[nodeNumber]}" "${nodePortNumbers[nodeNumber]}" "${nodeNumber}")"
+	done
+
+	sed -i.bak "{
+		s#PLACEHOLDER_SERVER_NAME#${VHOST_CORNER_HOSTNAME}#g
+		s#PLACEHOLDER_BALANCER_MEMBERS#${BALANCER_MEMBERS}#g
+	}" /usr/local/apache2/conf/vhosts.d/vhost_corner.conf
+
+	sed -i.bak "{
+		s#PLACEHOLDER_SERVER_HOSTNAME#${HOSTNAME}#g
+	}" /usr/local/apache2/conf/httpd.conf
+}
+
+cd ~ || exit 13
+if [ ! -f ".initialized" ]; then
+	echo "Initializing..."
+
+	configureBalancedMembers
+
+	cd - || exit 13
+	touch ~/.initialized
+else
+	echo "Resuming..."
+fi
+
+exec "$@"
\ No newline at end of file

smp-docker/images/smp-httpd/resources/httpd-default.conf

+#
+# This configuration file reflects default settings for Apache HTTP Server.
+#
+# You may change these, but chances are that you may not need to.
+#
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 60
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 5
+
+#
+# UseCanonicalName: Determines how Apache constructs self-referencing 
+# URLs and the SERVER_NAME and SERVER_PORT variables.
+# When set "Off", Apache will use the Hostname and Port supplied
+# by the client.  When set "On", Apache will use the value of the
+# ServerName directive.
+#
+UseCanonicalName Off
+
+#
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride 
+# directive.
+#
+AccessFileName .htaccess
+
+#
+# ServerTokens
+# This directive configures what you return as the Server HTTP response
+# Header. The default is 'Full' which sends information about the OS-Type
+# and compiled in modules.
+# Set to one of:  Full | OS | Minor | Minimal | Major | Prod
+# where Full conveys the most information, and Prod the least.
+#
+ServerTokens Prod
+
+#
+# Optionally add a line containing the server version and virtual host
+# name to server-generated pages (internal error documents, FTP directory 
+# listings, mod_status and mod_info output etc., but not CGI generated 
+# documents or custom error documents).
+# Set to "EMail" to also include a mailto: link to the ServerAdmin.
+# Set to one of:  On | Off | EMail
+#
+ServerSignature Off
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+#
+# Set a timeout for how long the client may take to send the request header
+# and body.
+# The default for the headers is header=20-40,MinRate=500, which means wait
+# for the first byte of headers for 20 seconds. If some data arrives,
+# increase the timeout corresponding to a data rate of 500 bytes/s, but not
+# above 40 seconds.
+# The default for the request body is body=20,MinRate=500, which is the same
+# but has no upper limit for the timeout.
+# To disable, set to header=0 body=0
+#
+<IfModule reqtimeout_module>
+  RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500
+</IfModule>

smp-docker/images/smp-httpd/resources/httpd.conf

+#
+# This is the main Apache HTTP server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
+# In particular, see
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
+# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
+# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log"
+# will be interpreted as '/logs/access_log'.
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to specify a local disk on the
+# Mutex directive, if file-based mutexes are used.  If you wish to share the
+# same ServerRoot for multiple httpd daemons, you will need to change at
+# least PidFile.
+#
+ServerRoot "/usr/local/apache2"
+
+#
+# Mutex: Allows you to set the mutex mechanism and mutex file directory
+# for individual mutexes, or change the global defaults
+#
+# Uncomment and change the directory if mutexes are file-based and the default
+# mutex file directory is not on a local disk or is not appropriate for some
+# other reason.
+#
+# Mutex default:logs
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to
+# prevent Apache from glomming onto all bound IP addresses.
+#
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+LoadModule mpm_event_module modules/mod_mpm_event.so
+#LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
+#LoadModule mpm_worker_module modules/mod_mpm_worker.so
+LoadModule authn_file_module modules/mod_authn_file.so
+#LoadModule authn_dbm_module modules/mod_authn_dbm.so
+#LoadModule authn_anon_module modules/mod_authn_anon.so
+#LoadModule authn_dbd_module modules/mod_authn_dbd.so
+#LoadModule authn_socache_module modules/mod_authn_socache.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_user_module modules/mod_authz_user.so
+#LoadModule authz_dbm_module modules/mod_authz_dbm.so
+#LoadModule authz_owner_module modules/mod_authz_owner.so
+#LoadModule authz_dbd_module modules/mod_authz_dbd.so
+LoadModule authz_core_module modules/mod_authz_core.so
+#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
+#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+#LoadModule auth_form_module modules/mod_auth_form.so
+#LoadModule auth_digest_module modules/mod_auth_digest.so
+#LoadModule allowmethods_module modules/mod_allowmethods.so
+#LoadModule isapi_module modules/mod_isapi.so
+#LoadModule file_cache_module modules/mod_file_cache.so
+LoadModule cache_module modules/mod_cache.so
+#LoadModule cache_disk_module modules/mod_cache_disk.so
+#LoadModule cache_socache_module modules/mod_cache_socache.so
+LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+#LoadModule socache_dbm_module modules/mod_socache_dbm.so
+#LoadModule socache_memcache_module modules/mod_socache_memcache.so
+#LoadModule socache_redis_module modules/mod_socache_redis.so
+#LoadModule watchdog_module modules/mod_watchdog.so
+#LoadModule macro_module modules/mod_macro.so
+#LoadModule dbd_module modules/mod_dbd.so
+#LoadModule bucketeer_module modules/mod_bucketeer.so
+#LoadModule dumpio_module modules/mod_dumpio.so
+#LoadModule echo_module modules/mod_echo.so
+#LoadModule example_hooks_module modules/mod_example_hooks.so
+#LoadModule case_filter_module modules/mod_case_filter.so
+#LoadModule case_filter_in_module modules/mod_case_filter_in.so
+#LoadModule example_ipc_module modules/mod_example_ipc.so
+#LoadModule buffer_module modules/mod_buffer.so
+#LoadModule data_module modules/mod_data.so
+#LoadModule ratelimit_module modules/mod_ratelimit.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+#LoadModule ext_filter_module modules/mod_ext_filter.so
+#LoadModule request_module modules/mod_request.so
+#LoadModule include_module modules/mod_include.so
+LoadModule filter_module modules/mod_filter.so
+#LoadModule reflector_module modules/mod_reflector.so
+#LoadModule substitute_module modules/mod_substitute.so
+#LoadModule sed_module modules/mod_sed.so
+#LoadModule charset_lite_module modules/mod_charset_lite.so
+#LoadModule deflate_module modules/mod_deflate.so
+#LoadModule xml2enc_module modules/mod_xml2enc.so
+#LoadModule proxy_html_module modules/mod_proxy_html.so
+LoadModule mime_module modules/mod_mime.so
+#LoadModule ldap_module modules/mod_ldap.so
+LoadModule log_config_module modules/mod_log_config.so
+#LoadModule log_debug_module modules/mod_log_debug.so
+#LoadModule log_forensic_module modules/mod_log_forensic.so
+#LoadModule logio_module modules/mod_logio.so
+#LoadModule lua_module modules/mod_lua.so
+LoadModule env_module modules/mod_env.so
+#LoadModule mime_magic_module modules/mod_mime_magic.so
+#LoadModule cern_meta_module modules/mod_cern_meta.so
+#LoadModule expires_module modules/mod_expires.so
+LoadModule headers_module modules/mod_headers.so
+#LoadModule ident_module modules/mod_ident.so
+#LoadModule usertrack_module modules/mod_usertrack.so
+#LoadModule unique_id_module modules/mod_unique_id.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+#LoadModule remoteip_module modules/mod_remoteip.so
+LoadModule proxy_module modules/mod_proxy.so
+#LoadModule proxy_connect_module modules/mod_proxy_connect.so
+#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
+#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
+#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
+#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
+#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
+LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
+LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
+#LoadModule proxy_express_module modules/mod_proxy_express.so
+#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
+#LoadModule session_module modules/mod_session.so
+#LoadModule session_cookie_module modules/mod_session_cookie.so
+#LoadModule session_crypto_module modules/mod_session_crypto.so
+#LoadModule session_dbd_module modules/mod_session_dbd.so
+LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
+#LoadModule ssl_module modules/mod_ssl.so
+#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so
+#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so
+#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so
+#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so
+#LoadModule dialup_module modules/mod_dialup.so
+#LoadModule http2_module modules/mod_http2.so
+#LoadModule proxy_http2_module modules/mod_proxy_http2.so
+LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
+#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
+LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
+#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
+LoadModule unixd_module modules/mod_unixd.so
+#LoadModule heartbeat_module modules/mod_heartbeat.so
+#LoadModule heartmonitor_module modules/mod_heartmonitor.so
+#LoadModule dav_module modules/mod_dav.so
+LoadModule status_module modules/mod_status.so
+LoadModule autoindex_module modules/mod_autoindex.so
+#LoadModule asis_module modules/mod_asis.so
+#LoadModule info_module modules/mod_info.so
+#LoadModule suexec_module modules/mod_suexec.so
+<IfModule !mpm_prefork_module>
+	#LoadModule cgid_module modules/mod_cgid.so
+</IfModule>
+<IfModule mpm_prefork_module>
+	#LoadModule cgi_module modules/mod_cgi.so
+</IfModule>
+#LoadModule dav_fs_module modules/mod_dav_fs.so
+#LoadModule dav_lock_module modules/mod_dav_lock.so
+LoadModule vhost_alias_module modules/mod_vhost_alias.so
+#LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule dir_module modules/mod_dir.so
+#LoadModule imagemap_module modules/mod_imagemap.so
+#LoadModule actions_module modules/mod_actions.so
+#LoadModule speling_module modules/mod_speling.so
+#LoadModule userdir_module modules/mod_userdir.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule rewrite_module modules/mod_rewrite.so
+
+<IfModule unixd_module>
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User daemon
+Group daemon
+
+</IfModule>
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+#ServerAdmin root@example.com
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+#ServerName www.example.com:80
+ServerName PLACEHOLDER_SERVER_HOSTNAME:80
+
+#
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other
+# <Directory> blocks below.
+#
+<Directory />
+    AllowOverride none
+    Require all denied
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/usr/local/apache2/htdocs"
+<Directory "/usr/local/apache2/htdocs">
+    #
+    # Possible values for the Options directive are "None", "All",
+    # or any combination of:
+    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+    #
+    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+    # doesn't give it to you.
+    #
+    # The Options directive is both complicated and important.  Please see
+    # http://httpd.apache.org/docs/2.4/mod/core.html#options
+    # for more information.
+    #
+    Options Indexes FollowSymLinks
+
+    #
+    # AllowOverride controls what directives may be placed in .htaccess files.
+    # It can be "All", "None", or any combination of the keywords:
+    #   AllowOverride FileInfo AuthConfig Limit
+    #
+    AllowOverride None
+
+    #
+    # Controls who can get stuff from this server.
+    #
+    Require all granted
+</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
+#
+<Files ".ht*">
+    Require all denied
+</Files>
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog /proc/self/fd/2
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+    #
+    # The following directives define some format nicknames for use with
+    # a CustomLog directive (see below).
+    #
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    #
+    # The location and format of the access logfile (Common Logfile Format).
+    # If you do not define any access logfiles within a <VirtualHost>
+    # container, they will be logged here.  Contrariwise, if you *do*
+    # define per-<VirtualHost> access logfiles, transactions will be
+    # logged therein and *not* in this file.
+    #
+    CustomLog /proc/self/fd/1 common
+
+    #
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
+    #
+    #CustomLog "logs/access_log" combined
+</IfModule>
+
+<IfModule alias_module>
+    #
+    # Redirect: Allows you to tell clients about documents that used to
+    # exist in your server's namespace, but do not anymore. The client
+    # will make a new request for the document at its new location.
+    # Example:
+    # Redirect permanent /foo http://www.example.com/bar
+
+    #
+    # Alias: Maps web paths into filesystem paths and is used to
+    # access content that does not live under the DocumentRoot.
+    # Example:
+    # Alias /webpath /full/filesystem/path
+    #
+    # If you include a trailing / on /webpath then the server will
+    # require it to be present in the URL.  You will also likely
+    # need to provide a <Directory> section to allow access to
+    # the filesystem path.
+
+    #
+    # ScriptAlias: This controls which directories contain server scripts.
+    # ScriptAliases are essentially the same as Aliases, except that
+    # documents in the target directory are treated as applications and
+    # run by the server when requested rather than as documents sent to the
+    # client.  The same rules about trailing "/" apply to ScriptAlias
+    # directives as to Alias.
+    #
+    ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/"
+
+</IfModule>
+
+<IfModule cgid_module>
+    #
+    # ScriptSock: On threaded servers, designate the path to the UNIX
+    # socket used to communicate with the CGI daemon of mod_cgid.
+    #
+    #Scriptsock cgisock
+</IfModule>
+
+#
+# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/usr/local/apache2/cgi-bin">
+    AllowOverride None
+    Options None
+    Require all granted
+</Directory>
+
+<IfModule headers_module>
+    #
+    # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
+    # backend servers which have lingering "httpoxy" defects.
+    # 'Proxy' request header is undefined by the IETF, not listed by IANA
+    #
+    RequestHeader unset Proxy early
+</IfModule>
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig conf/mime.types
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file specified in TypesConfig for specific file types.
+    #
+    #AddType application/x-gzip .tgz
+    #
+    # AddEncoding allows you to have certain browsers uncompress
+    # information on the fly. Note: Not all browsers support this.
+    #
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
+    #
+    # If the AddEncoding directives above are commented-out, then you
+    # probably should define those extensions to indicate media types:
+    #
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+
+    #
+    # AddHandler allows you to map certain file extensions to "handlers":
+    # actions unrelated to filetype. These can be either built into the server
+    # or added with the Action directive (see below)
+    #
+    # To use CGI scripts outside of ScriptAliased directories:
+    # (You will also need to add "ExecCGI" to the "Options" directive.)
+    #
+    #AddHandler cgi-script .cgi
+
+    # For type maps (negotiated resources):
+    #AddHandler type-map var
+
+    #
+    # Filters allow you to process content before it is sent to the client.
+    #
+    # To parse .shtml files for server-side includes (SSI):
+    # (You will also need to add "Includes" to the "Options" directive.)
+    #
+    #AddType text/html .shtml
+    #AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+#MIMEMagicFile conf/magic
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# MaxRanges: Maximum number of Ranges in a request before
+# returning the entire resource, or one of the special
+# values 'default', 'none' or 'unlimited'.
+# Default setting is to accept 200 Ranges.
+#MaxRanges unlimited
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it,
+# memory-mapping or the sendfile syscall may be used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+# Defaults: EnableMMAP On, EnableSendfile Off
+#
+#EnableMMAP off
+#EnableSendfile on
+
+# Supplemental configuration
+#
+# The configuration files in the conf/extra/ directory can be
+# included to add extra features or to modify the default configuration of
+# the server, or you may simply copy their contents here and change as
+# necessary.
+
+# Server-pool management (MPM specific)
+Include conf/extra/httpd-mpm.conf
+
+# Multi-language error messages
+#Include conf/extra/httpd-multilang-errordoc.conf
+
+# Fancy directory listings
+#Include conf/extra/httpd-autoindex.conf
+
+# Language settings
+#Include conf/extra/httpd-languages.conf
+
+# User home directories
+#Include conf/extra/httpd-userdir.conf
+
+# Real-time info on requests and configuration
+#Include conf/extra/httpd-info.conf
+
+# Virtual hosts
+#Include conf/extra/httpd-vhosts.conf
+
+# Local access to the Apache HTTP Server Manual
+#Include conf/extra/httpd-manual.conf
+
+# Distributed authoring and versioning (WebDAV)
+#Include conf/extra/httpd-dav.conf
+
+# Various default settings
+Include conf/extra/httpd-default.conf
+
+# Include vhosts configuration files
+Include conf/vhosts.d/*.conf
+
+# Configure mod_proxy_html to understand HTML4/XHTML1
+<IfModule proxy_html_module>
+Include conf/extra/proxy-html.conf
+</IfModule>
+
+# Secure (SSL/TLS) connections
+#Include conf/extra/httpd-ssl.conf
+#
+# Note: The following must must be present to support
+#       starting without SSL on platforms with no /dev/random equivalent
+#       but a statically compiled-in mod_ssl.
+#
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>
+
+# Disable the TRACE method
+TraceEnable Off
+
+# Proxy configurations
+ProxyVia On
+ProxyMaxForwards 10
+ProxyTimeout 120

smp-docker/images/smp-httpd/resources/vhost_corner.conf

+<VirtualHost *:80>
+    ServerName PLACEHOLDER_SERVER_NAME
+
+    ErrorLog logs/vhost_corner.error.log
+    CustomLog logs/vhost_corner.log combined
+
+    # allow encoded slashes, but do not decode them, they are handled by SMP!
+    AllowEncodedSlashes NoDecode
+
+    ProxyRequests Off
+    ProxyPreserveHost On
+    ProxyPass /server-status !
+    ProxyPass /balancer-manager !
+    ProxyPass /server-info !
+    ProxyPass / balancer://wl_c2/ nocanon
+    ProxyPassReverse / balancer://wl_c2/ nocanon
+
+    RequestHeader unset Proxy-ip
+    RequestHeader unset Proxy-keysize
+    RequestHeader unset X-Forwarded-Proto
+    Header unset filter-class
+    Header add Set-Cookie "xtx=.%{BALANCER_WORKER_ROUTE}e; path=/; HttpOnly" env=BALANCER_ROUTE_CHANGED
+</VirtualHost>
+<Proxy balancer://wl_c2>
+    PLACEHOLDER_BALANCER_MEMBERS
+
+    ProxySet lbmethod=bybusyness
+    ProxySet timeout=60
+    ProxySet nofailover=off
+    ProxySet stickysession=xtx
+</Proxy>

smp-docker/images/weblogic-12.2-smp/Dockerfile

@@ -57,6 +57,8 @@ ENV SMP_VERSION=$SMP_VERSION \
     WL_MANAGED_SERVER_PORT="${WL_MANAGED_SERVER_PORT}" \
     WL_ADMIN_NAME="${WL_ADMIN_NAME}" \
     WL_CLUSTER_NAME="${WL_CLUSTER_NAME}" \
+    WL_DEPLOYMENT_TARGET="${WL_ADMIN_NAME}" \
+    WL_ADMIN_UPLOAD_FOLDER="${DOCKER_DATA}/upload" \
     SMP_CONFIG_DIR=${SMP_CONFIG_DIR:-/data/smp} \
     SMP_SECURITY_DIR="${SMP_CONFIG_DIR}/security" \
     CLASSPATH="${SMP_CONFIG_DIR}/config" \
@@ -70,6 +72,7 @@ ENV SMP_VERSION=$SMP_VERSION \
     WL_PRODUCTION_MODE_ENABLED="${WL_PRODUCTION_MODE_ENABLED:-false}" \
     WL_MANAGED_SERV_NAME="${WL_MANAGED_SERV_NAME}" \
     WL_STATUS_FOLDER=${WL_STATUS_FOLDER:-/u01/status/} \
+    WL_DELAY_STARTUP_IN_S="${WL_DELAY_STARTUP_IN_S:-0}" \
     ENABLE_JACOCO="${ENABLE_JACOCO:-false}"
 
 

smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/create-wls-domain.py

@@ -28,6 +28,7 @@ cluster_name                  = CLUSTER_NAME
 admin_server_name             = ADMIN_NAME
 admin_port                    = int(ADMIN_PORT)
 admin_https_port              = int(ADMIN_HTTPS_PORT)
+admin_upload_folder           = ADMIN_UPLOAD_FOLDER
 domain_name                   = DOMAIN_NAME
 t3_channel_port               = int(T3_CHANNEL_PORT)
 t3_public_address             = T3_PUBLIC_ADDRESS
@@ -43,6 +44,7 @@ print('domain_path              : [%s]' % domain_path)
 print('domain_name              : [%s]' % domain_name)
 print('admin_server_name        : [%s]' % admin_server_name)
 print('admin_port               : [%s]' % admin_port)
+print('admin_upload_folder      : [%s]' % admin_upload_folder)
 print('cluster_name             : [%s]' % cluster_name)
 print('server_port              : [%s]' % server_port)
 print('number_of_ms             : [%s]' % number_of_ms)
@@ -59,7 +61,7 @@ readTemplate("/u01/oracle/wlserver/common/templates/wls/wls.jar")
 set('Name', domain_name)
 setOption('DomainName', domain_name)
 create(domain_name,'Log')
-cd('/Log/%s' % domain_name);
+cd('/Log/%s' % domain_name)
 set('FileName', '%s.log' % (domain_name))
 
 # Configure the Administration Server
@@ -68,7 +70,9 @@ cd('/Servers/AdminServer')
 #set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
 set('ListenPort', admin_port)
 set('Name', admin_server_name)
-
+# set shared upload folder for redeployment - admin server uploads the artefacts to this folder
+# which must be shared to all nodes!
+set('UploadDirectoryName', admin_upload_folder)
 
 create('T3Channel', 'NetworkAccessPoint')
 cd('/Servers/%s/NetworkAccessPoints/T3Channel' % admin_server_name)

smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/createWLSDomain.sh

@@ -131,6 +131,7 @@ ADMIN_PORT=${WL_ADMIN_PORT}
 ADMIN_HTTPS_PORT=${WL_ADMIN_PORT_HTTPS}
 ADMIN_NAME=${WL_ADMIN_NAME}
 ADMIN_HOST=${WL_ADMIN_HOST}
+ADMIN_UPLOAD_FOLDER=${WL_ADMIN_UPLOAD_FOLDER}
 MANAGED_SERVER_PORT=${WL_MANAGED_SERVER_PORT}
 MANAGED_SERVER_NAME_BASE=${WL_MANAGED_SERV_BASE_NAME}
 CONFIGURED_MANAGED_SERVER_COUNT=${WL_MANAGED_SERVER_COUNT}

smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/ds-deploy.py

@@ -13,11 +13,13 @@ domain_name = os.environ.get('WL_DOMAIN_NAME', 'base_domain')
 domain_home = os.environ.get('WL_DOMAIN_HOME', '/u01/oracle/user_projects/domains/' + domain_name)
 cluster_name =  os.environ.get('WL_CLUSTER_NAME')
 admin_name = os.environ.get("WL_ADMIN_NAME", "AdminServer")
+target_name =   os.environ.get('WL_DEPLOYMENT_TARGET')
 
 
 print('Domain Home      : [%s]' % domain_home)
 print('Admin Name       : [%s]' % admin_name)
 print('Cluster Name     : [%s]' % cluster_name)
+print('Deployment target: [%s]' % target_name)
 print('Datasource name  : [%s]' % dsname)
 print('Datasource JNDI  : [%s]' % dsjndiname)
 print('Datasource URL   : [%s]' % dsurl)
@@ -69,8 +71,7 @@ set('TestTableName',dstestquery)
 
 # Assign
 # ======
-assign('JDBCSystemResource', dsname, 'Target', admin_name)
-assign('JDBCSystemResource', dsname, 'Target', cluster_name)
+assign('JDBCSystemResource', dsname, 'Target', target_name)
 
 # Update Domain, Close It, Exit
 # ==========================

smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/smp-app-deploy.py

@@ -13,16 +13,18 @@ import os
 # Deployment Information
 domainhome = os.environ.get('WL_DOMAIN_HOME', '/u01/oracle/user_projects/domains/base_domain')
 admin_name = os.environ.get('WL_ADMIN_NAME', 'AdminServer')
-appVersion    = os.environ.get('SMP_VERSION', '4.2')
+appVersion    = os.environ.get('SMP_VERSION', '5.0')
 appfilename    = os.environ.get('WL_APP_FILE_NAME', 'smp')
 appname    = os.environ.get('WL_APP_NAME', appfilename+'#'+appVersion)
 appfile    = os.environ.get('APP_FILE', 'smp.war')
 appdir     = os.environ.get('WL_DOMAIN_HOME')
 cluster_name =   os.environ.get('WL_CLUSTER_NAME')
+target_name =   os.environ.get('WL_DEPLOYMENT_TARGET')
 
 print('Domain Home      : [%s]' % domainhome)
 print('Admin Name       : [%s]' % admin_name)
 print('Cluster Name     : [%s]' % cluster_name)
+print('Deployment target: [%s]' % target_name)
 print('Application Name : [%s]' % appname)
 print('appfile          : [%s]' % appfile)
 print('appdir           : [%s]' % appdir)
@@ -40,8 +42,7 @@ app.setStagingMode('nostage')
 
 # Assign application to AdminServer
 # =================================
-assign('AppDeployment', appname, 'Target', admin_name)
-assign('AppDeployment', appname, 'Target', cluster_name)
+assign('AppDeployment', appname, 'Target', target_name)
 
 # Update Domain, Close It, Exit
 # ==========================

smp-docker/images/weblogic-12.2-smp/container-scripts/startAdminServer.sh

@@ -7,6 +7,9 @@
 #Define DOMAIN_HOME
 echo "Oracle Home is: " "$ORACLE_HOME"
 echo "Domain Home is: " "${WL_DOMAIN_HOME}"
+echo "Delay startup in seconds: ${WL_DELAY_STARTUP_IN_S:-0}"
+sleep ${WL_DELAY_STARTUP_IN_S:-0}
+
 
 # init setup properties
 STATUS_FILE=${WL_STATUS_FOLDER}/wls-admin.started

smp-docker/images/weblogic-12.2-smp/container-scripts/startManagedServer.sh

@@ -4,7 +4,10 @@
 #
 # If log.nm does not exists, container is starting for 1st time
 # So it should start NM and also associate with AdminServer, as well Managed Server
-# Otherwise, only start NM (container is being restarted)o
+# Otherwise, only start NM (container is being restarted)
+
+echo "Delay startup in seconds: ${WL_DELAY_STARTUP_IN_S:-0}"
+sleep ${WL_DELAY_STARTUP_IN_S:-0}
 
 function initWebLogicDomain(){
   echo "Init WebLogic domain"

smp-soapui-tests/pom.xml

@@ -54,7 +54,8 @@
                             <projectFile>${basedir}/soapui/SMP4.0-Generic-soapui-project.xml
                             </projectFile>
                             <testSuite>PASSING_AUTO_BAMBOO</testSuite>
-                            <!--If you want to execute single test case <testCase>SMP001-Create ServiceGroup-Basic Flow-Admin Service Group specified</testCase>-->
+                            <!--If you want to execute single test case -->
+                             <!-- testCase>SMP063-EDELIVERY-364 slash encoding-Tomcat</testCase -->
                             <projectProperties>
                                 <value>url=${url}</value>
                                 <value>SMPAdminUser=${SMPAdminUser}</value>