diff --git a/cas/cas-secured-app/pom.xml b/cas/cas-secured-app/pom.xml
index 1a9176ff3e..332ee912b6 100644
--- a/cas/cas-secured-app/pom.xml
+++ b/cas/cas-secured-app/pom.xml
@@ -12,7 +12,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.0.M7
+ 1.5.13.RELEASE
@@ -60,28 +60,6 @@
-
-
- spring-milestones
- Spring Milestones
- https://repo.spring.io/milestone
-
- false
-
-
-
-
-
-
- spring-milestones
- Spring Milestones
- https://repo.spring.io/milestone
-
- false
-
-
-
-
UTF-8
UTF-8
diff --git a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java
index 7faccbb125..2c88b74a83 100644
--- a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java
+++ b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java
@@ -1,7 +1,7 @@
package com.baeldung.cassecuredapp.controllers;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.authentication.logout.CookieClearingLogoutHandler;
diff --git a/cas/cas-server/.factorypath b/cas/cas-server/.factorypath
new file mode 100644
index 0000000000..006c761796
--- /dev/null
+++ b/cas/cas-server/.factorypath
@@ -0,0 +1,228 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cas/cas-server/README.md b/cas/cas-server/README.md
index bae8b648e5..bacf45a2a1 100644
--- a/cas/cas-server/README.md
+++ b/cas/cas-server/README.md
@@ -6,10 +6,11 @@ Generic CAS WAR overlay to exercise the latest versions of CAS. This overlay cou
# Versions
```xml
-5.1.x
+5.3.x
```
# Requirements
+
* JDK 1.8+
# Configuration
@@ -64,20 +65,23 @@ Run the CAS web application as an executable WAR via Spring Boot. This is most u
### Warning!
-Be careful with this method of deployment. `bootRun` is not designed to work with already executable WAR artifacts such that CAS server web application. YMMV. Today, uses of this mode ONLY work when there is **NO OTHER** dependency added to the build script and the `cas-server-webapp` is the only present module. See [this issue](https://github.com/apereo/cas/issues/2334) and [this issue](https://github.com/spring-projects/spring-boot/issues/8320) for more info.
+Be careful with this method of deployment. `bootRun` is not designed to work with already executable WAR artifacts such that CAS server web application. YMMV. Today, uses of this mode ONLY work when there is **NO OTHER** dependency added to the build script and the `cas-server-webapp` is the only present module. See [this issue](https://github.com/spring-projects/spring-boot/issues/8320) for more info.
## Spring Boot App Server Selection
-There is an app.server property in the pom.xml that can be used to select a spring boot application server.
-It defaults to "-tomcat" but "-jetty" and "-undertow" are supported.
-It can also be set to an empty value (nothing) if you want to deploy CAS to an external application server of your choice and you don't want the spring boot libraries included.
+
+There is an app.server property in the `pom.xml` that can be used to select a spring boot application server.
+It defaults to `-tomcat` but `-jetty` and `-undertow` are supported.
+
+It can also be set to an empty value (nothing) if you want to deploy CAS to an external application server of your choice.
```xml
-tomcat
```
## Windows Build
-If you are building on windows, try build.cmd instead of build.sh. Arguments are similar but for usage, run:
+
+If you are building on windows, try `build.cmd` instead of `build.sh`. Arguments are similar but for usage, run:
```
build.cmd help
@@ -86,3 +90,12 @@ build.cmd help
## External
Deploy resultant `target/cas.war` to a servlet container of choice.
+
+
+## Command Line Shell
+
+Invokes the CAS Command Line Shell. For a list of commands either use no arguments or use `-h`. To enter the interactive shell use `-sh`.
+
+```bash
+./build.sh cli
+```
\ No newline at end of file
diff --git a/cas/cas-server/build.cmd b/cas/cas-server/build.cmd
index f907dcb388..2cf9262afe 100644
--- a/cas/cas-server/build.cmd
+++ b/cas/cas-server/build.cmd
@@ -23,8 +23,10 @@
@if "%1" == "bootrun" call:bootrun %2 %3 %4
@if "%1" == "debug" call:debug %2 %3 %4
@if "%1" == "run" call:run %2 %3 %4
+@if "%1" == "runalone" call:runalone %2 %3 %4
@if "%1" == "help" call:help
@if "%1" == "gencert" call:gencert
+@if "%1" == "cli" call:runcli %2 %3 %4
@rem function section starts here
@goto:eof
@@ -38,7 +40,7 @@
@goto:eof
:help
- @echo "Usage: build.bat [copy|clean|package|run|debug|bootrun|gencert] [optional extra args for maven]"
+ @echo "Usage: build.bat [copy|clean|package|run|debug|bootrun|gencert|cli] [optional extra args for maven or cli]"
@echo "To get started on a clean system, run "build.bat copy" and "build.bat gencert", then "build.bat run"
@echo "Note that using the copy or gencert arguments will create and/or overwrite the %CAS_DIR% which is outside this project"
@goto:eof
@@ -66,6 +68,10 @@
call:package %1 %2 %3 & java %JAVA_ARGS% -jar target/cas.war
@goto:eof
+:runalone
+ call:package %1 %2 %3 & target/cas.war
+@goto:eof
+
:gencert
where /q keytool
if ERRORLEVEL 1 (
@@ -80,3 +86,17 @@
keytool -exportcert -alias cas -storepass changeit -keystore %CAS_DIR%\thekeystore -file %CAS_DIR%\cas.cer
)
@goto:eof
+
+:runcli
+ for /f %%i in ('call %MAVEN_CMD% -q --non-recursive "-Dexec.executable=cmd" "-Dexec.args=/C echo ${cas.version}" "org.codehaus.mojo:exec-maven-plugin:1.3.1:exec"') do set CAS_VERSION=%%i
+ @set CAS_VERSION=%CAS_VERSION: =%
+ @set DOWNLOAD_DIR=target
+ @set COMMAND_FILE=cas-server-support-shell-%CAS_VERSION%.jar
+ @if not exist %DOWNLOAD_DIR% mkdir %DOWNLOAD_DIR%
+ @if not exist %DOWNLOAD_DIR%\%COMMAND_FILE% (
+ @call mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -DgroupId=org.apereo.cas -DartifactId=cas-server-support-shell -Dversion=%CAS_VERSION% -Dpackaging=jar -DartifactItem.outputDirectory=%DOWNLOAD_DIR% -DartifactItem.destFileName=%COMMAND_FILE% -DremoteRepositories=central::default::http://repo1.maven.apache.org/maven2,snapshots::::https://oss.sonatype.org/content/repositories/snapshots -Dtransitive=false
+ @call mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy -Dmdep.useBaseVersion=true -Dartifact=org.apereo.cas:cas-server-support-shell:%CAS_VERSION%:jar -DoutputDirectory=%DOWNLOAD_DIR%
+ )
+ @call java %JAVA_ARGS% -jar %DOWNLOAD_DIR%\%COMMAND_FILE% %1 %2 %3
+
+@goto:eof
\ No newline at end of file
diff --git a/cas/cas-server/build.sh b/cas/cas-server/build.sh
index e33f7de854..4d80aa2593 100644
--- a/cas/cas-server/build.sh
+++ b/cas/cas-server/build.sh
@@ -13,24 +13,31 @@ function help() {
echo "Usage: build.sh [copy|clean|package|run|debug|bootrun|gencert]"
echo " copy: Copy config from ./etc/cas/config to /etc/cas/config"
echo " clean: Clean Maven build directory"
- echo " package: Clean and build CAS war, also call copy"
- echo " run: Build and run CAS.war via spring boot (java -jar target/cas.war)"
+ echo " package: Clean and build CAS war"
+ echo " run: Build and run cas.war via Java (i.e. java -jar target/cas.war)"
+ echo " runalone: Build and run cas.war on its own as a standalone executable (target/cas.war)"
echo " debug: Run CAS.war and listen for Java debugger on port 5000"
- echo " bootrun: Run with maven spring boot plugin, doesn't work with multiple dependencies"
+ echo " bootrun: Run with maven spring boot plugin"
+ echo " listviews: List all CAS views that ship with the web application and can be customized in the overlay"
+ echo " getview: Ask for a view name to be included in the overlay for customizations"
echo " gencert: Create keystore with SSL certificate in location where CAS looks by default"
+ echo " cli: Run the CAS command line shell and pass commands"
}
function clean() {
+ shift
./mvnw clean "$@"
}
function package() {
+ shift
./mvnw clean package -T 5 "$@"
- copy
+ # copy
}
function bootrun() {
- ./mvnw clean package spring-boot:run -T 5 "$@"
+ shift
+ ./mvnw clean package spring-boot:run -P bootiful -T 5 "$@"
}
function debug() {
@@ -41,14 +48,59 @@ function run() {
package && java -jar target/cas.war
}
+function runalone() {
+ shift
+ ./mvnw clean package -P default,exec "$@"
+ chmod +x target/cas.war
+ target/cas.war
+}
+
+function listviews() {
+ shift
+ explodeapp
+ find $PWD/target/cas -type f -name "*.html" | xargs -n 1 basename | sort | more
+}
+
+function explodeapp() {
+ if [ ! -d $PWD/target/cas ];then
+ echo "Building the CAS web application and exploding the final war file..."
+ ./mvnw clean package war:exploded "$@"
+ fi
+ echo "Exploded the CAS web application file."
+}
+
+function getview() {
+ shift
+ explodeapp
+ echo "Searching for view name $@..."
+ results=`find $PWD/target/cas -type f -name "*.html" | grep -i "$@"`
+ echo -e "Found view(s): \n$results"
+ count=`wc -w <<< "$results"`
+ if [ "$count" -eq 1 ];then
+ # echo "Found view $results to include in the overlay"
+ firststring="target/cas/WEB-INF/classes"
+ secondstring="src/main/resources"
+ overlayfile=`echo "${results/$firststring/$secondstring}"`
+ overlaypath=`dirname "${overlayfile}"`
+ # echo "Overlay file is $overlayfile to be created at $overlaypath"
+ mkdir -p $overlaypath
+ cp $results $overlaypath
+ echo "Created view at $overlayfile"
+ ls $overlayfile
+ else
+ echo "More than one view file is found. Narrow down the search query..."
+ fi
+}
+
+
function gencert() {
- if [[ ! -d /etc/cas ]] ; then
+ if [[ ! -d /etc/cas ]] ; then
copy
fi
which keytool
if [[ $? -ne 0 ]] ; then
- echo Error: Java JDK \'keytool\' is not installed or is not in the path
- exit 1
+ echo Error: Java JDK \'keytool\' is not installed or is not in the path
+ exit 1
fi
# override DNAME and CERT_SUBJ_ALT_NAMES before calling or use dummy values
DNAME="${DNAME:-CN=cas.example.org,OU=Example,OU=Org,C=US}"
@@ -58,21 +110,49 @@ function gencert() {
keytool -exportcert -alias cas -storepass changeit -keystore /etc/cas/thekeystore -file /etc/cas/cas.cer
}
+function cli() {
+
+ CAS_VERSION=$(./mvnw -q -Dexec.executable="echo" -Dexec.args='${cas.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec 2>/dev/null)
+ # echo "CAS version: $CAS_VERSION"
+ JAR_FILE_NAME="cas-server-support-shell-${CAS_VERSION}.jar"
+ # echo "JAR name: $JAR_FILE_NAME"
+ JAR_PATH="org/apereo/cas/cas-server-support-shell/${CAS_VERSION}/${JAR_FILE_NAME}"
+ # echo "JAR path: $JAR_PATH"
+
+ JAR_FILE_LOCAL="$HOME/.m2/repository/$JAR_PATH";
+ # echo "Local JAR file path: $JAR_FILE_LOCAL";
+ if [ -f "$JAR_FILE_LOCAL" ]; then
+ # echo "Using JAR file locally at $JAR_FILE_LOCAL"
+ java -jar $JAR_FILE_LOCAL "$@"
+ exit 0;
+ fi
+
+ DOWNLOAD_DIR=./target
+ COMMAND_FILE="${DOWNLOAD_DIR}/${JAR_FILE_NAME}"
+ if [ ! -f "$COMMAND_FILE" ]; then
+ mkdir -p $DOWNLOAD_DIR
+ ./mvnw org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -DgroupId=org.apereo.cas -DartifactId=cas-server-support-shell -Dversion=$CAS_VERSION -Dpackaging=jar -DartifactItem.outputDirectory=$DOWNLOAD_DIR -DremoteRepositories=central::default::http://repo1.maven.apache.org/maven2,snapshots::::https://oss.sonatype.org/content/repositories/snapshots -Dtransitive=false
+ ./mvnw org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy -Dmdep.useBaseVersion=true -Dartifact=org.apereo.cas:cas-server-support-shell:$CAS_VERSION:jar -DoutputDirectory=$DOWNLOAD_DIR
+ fi
+ java -jar $COMMAND_FILE "$@"
+ exit 0;
+
+}
+
if [ $# -eq 0 ]; then
echo -e "No commands provided. Defaulting to [run]\n"
run
exit 0
fi
-
case "$1" in
"copy")
- copy
+ copy
;;
"clean")
shift
clean "$@"
- ;;
+ ;;
"package")
shift
package "$@"
@@ -87,11 +167,23 @@ case "$1" in
"run")
run "$@"
;;
+"runalone")
+ runalone "$@"
+ ;;
+"listviews")
+ listviews "$@"
+ ;;
"gencert")
gencert "$@"
;;
+"getview")
+ getview "$@"
+ ;;
+"cli")
+ shift
+ cli "$@"
+ ;;
*)
help
;;
esac
-
diff --git a/cas/cas-server/etc/cas/config/log4j2.xml b/cas/cas-server/etc/cas/config/log4j2.xml
index 53b30b4228..e688cc0350 100644
--- a/cas/cas-server/etc/cas/config/log4j2.xml
+++ b/cas/cas-server/etc/cas/config/log4j2.xml
@@ -92,7 +92,7 @@
-
+
diff --git a/cas/cas-server/maven/maven-wrapper.jar b/cas/cas-server/maven/maven-wrapper.jar
new file mode 100644
index 0000000000..18ba302c65
Binary files /dev/null and b/cas/cas-server/maven/maven-wrapper.jar differ
diff --git a/cas/cas-server/maven/maven-wrapper.properties b/cas/cas-server/maven/maven-wrapper.properties
index b368e4609a..97a946225a 100644
--- a/cas/cas-server/maven/maven-wrapper.properties
+++ b/cas/cas-server/maven/maven-wrapper.properties
@@ -1 +1,3 @@
-distributionUrl=https\://repository.apache.org/content/repositories/releases/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
+#Maven download properties
+#Fri Dec 01 21:35:11 MST 2017
+distributionUrl=https\://repository.apache.org/content/repositories/releases/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml
index 30e29b155f..52ddba1a68 100644
--- a/cas/cas-server/pom.xml
+++ b/cas/cas-server/pom.xml
@@ -7,37 +7,23 @@
cas-server
war
1.0
-
-
- org.springframework.boot
- spring-boot-starter-parent
- ${org.springframework.boot.spring-boot-starter-parent.version}
-
-
-
+
- org.apereo.cas
- cas-server-webapp${app.server}
- ${cas.version}
- war
- runtime
-
-
- org.apereo.cas
- cas-server-support-json-service-registry
- ${cas.version}
-
-
- org.apereo.cas
- cas-server-support-jdbc
- ${cas.version}
-
-
- org.apereo.cas
- cas-server-support-jdbc-drivers
- ${cas.version}
-
+ org.apereo.cas
+ cas-server-support-json-service-registry
+ ${cas.version}
+
+
+ org.apereo.cas
+ cas-server-support-jdbc
+ ${cas.version}
+
+
+ org.apereo.cas
+ cas-server-support-jdbc-drivers
+ ${cas.version}
+
@@ -45,7 +31,7 @@
com.rimerosolutions.maven.plugins
wrapper-maven-plugin
- ${wrapper-maven-plugin.version}
+ 0.0.4
true
MD5
@@ -56,22 +42,30 @@
spring-boot-maven-plugin
${springboot.version}
- org.springframework.boot.loader.WarLauncher
+ ${mainClassName}
true
+ ${isExecutable}
+ WAR
+
+
+
+ repackage
+
+
+
org.apache.maven.plugins
maven-war-plugin
- ${maven-war-plugin.version}
+ 2.6
cas
false
false
false
- ${project.build.directory}/war/work/org.apereo.cas/cas-server-webapp${app.server}/META-INF/MANIFEST.MF
-
+ ${manifestFileToUse}
@@ -84,47 +78,26 @@
org.apache.maven.plugins
maven-compiler-plugin
- ${maven-compiler-plugin.version}
-
- ${maven.compiler.source}
- ${maven.compiler.target}
-
+ 3.3
cas
-
-
-
- false
-
- pgp
-
-
-
- com.github.s4u.plugins
- pgpverify-maven-plugin
- ${pgpverify-maven-plugin.version}
-
-
-
- check
-
-
-
-
- hkp://pool.sks-keyservers.net
- ${settings.localRepository}/pgpkeys-cache
- test
- true
- false
-
-
-
-
-
-
+
+ 5.3.0-SNAPSHOT
+ 1.5.13.RELEASE
+
+ -tomcat
+
+ org.springframework.boot.loader.WarLauncher
+ false
+ ${project.build.directory}/war/work/org.apereo.cas/cas-server-webapp${app.server}/META-INF/MANIFEST.MF
+
+ 1.8
+ 1.8
+ UTF-8
+
@@ -151,25 +124,110 @@
shibboleth-releases
https://build.shibboleth.net/nexus/content/repositories/releases
-
- spring-milestones
- https://repo.spring.io/milestone
-
-
- 5.1.4
- 1.5.3.RELEASE
-
- -tomcat
- 1.8
- 1.8
- UTF-8
- 2.0.0.M7
- 0.0.4
- 2.6
- 3.7.0
- 1.1.0
-
+
+
+
+ true
+
+ default
+
+
+ org.apereo.cas
+ cas-server-webapp${app.server}
+ ${cas.version}
+ war
+ runtime
+
+
+
+
-
\ No newline at end of file
+
+
+ false
+
+ exec
+
+ org.apereo.cas.web.CasWebApplication
+ true
+
+
+
+
+
+ com.soebes.maven.plugins
+ echo-maven-plugin
+ 0.3.0
+
+
+ prepare-package
+
+ echo
+
+
+
+
+
+ Executable profile to make the generated CAS web application executable.
+
+
+
+
+
+
+
+
+
+ false
+
+ bootiful
+
+ -tomcat
+ false
+
+
+
+ org.apereo.cas
+ cas-server-webapp${app.server}
+ ${cas.version}
+ war
+ runtime
+
+
+
+
+
+
+ false
+
+ pgp
+
+
+
+ com.github.s4u.plugins
+ pgpverify-maven-plugin
+ 1.1.0
+
+
+
+ check
+
+
+
+
+ hkp://pool.sks-keyservers.net
+ ${settings.localRepository}/pgpkeys-cache
+ test
+ true
+ false
+
+
+
+
+
+
+
diff --git a/cas/cas-server/src/main/resources/application.properties b/cas/cas-server/src/main/resources/application.properties
index 018fd351ff..7735fcabdc 100644
--- a/cas/cas-server/src/main/resources/application.properties
+++ b/cas/cas-server/src/main/resources/application.properties
@@ -43,7 +43,7 @@ spring.http.encoding.force=true
##
#CAS CONFIG LOCATION
#
-cas.standalone.config=classpath:/etc/cas/config
+standalone.config=classpath:/etc/cas/config
##
@@ -109,7 +109,7 @@ cas.authn.jdbc.query[0].sql=SELECT * FROM users WHERE email = ?
cas.authn.jdbc.query[0].url=jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
cas.authn.jdbc.query[0].dialect=org.hibernate.dialect.MySQLDialect
cas.authn.jdbc.query[0].user=root
-cas.authn.jdbc.query[0].password=root
+cas.authn.jdbc.query[0].password=1234
cas.authn.jdbc.query[0].ddlAuto=none
#cas.authn.jdbc.query[0].driverClass=com.mysql.jdbc.Driver
cas.authn.jdbc.query[0].driverClass=com.mysql.cj.jdbc.Driver
diff --git a/cas/cas-server/src/main/resources/cas.properties b/cas/cas-server/src/main/resources/cas.properties
index f80f22fc11..26b0a63a79 100644
--- a/cas/cas-server/src/main/resources/cas.properties
+++ b/cas/cas-server/src/main/resources/cas.properties
@@ -3,38 +3,5 @@ cas.server.prefix: https://localhost:643/cas
cas.adminPagesSecurity.ip=127\.0\.0\.1
-cas.serviceRegistry.initFromJson=true
-cas.serviceRegistry.config.location=classpath:/services
-
-cas.authn.accept.users=
-cas.authn.accept.name=
-
-
-#CAS Database Authentication Property
-
-# cas.authn.jdbc.query[0].healthQuery=
-# cas.authn.jdbc.query[0].isolateInternalQueries=false
-# cas.authn.jdbc.query[0].failFast=true
-# cas.authn.jdbc.query[0].isolationLevelName=ISOLATION_READ_COMMITTED
-# cas.authn.jdbc.query[0].leakThreshold=10
-# cas.authn.jdbc.query[0].propagationBehaviorName=PROPAGATION_REQUIRED
-# cas.authn.jdbc.query[0].batchSize=1
-# cas.authn.jdbc.query[0].maxAgeDays=180
-# cas.authn.jdbc.query[0].autocommit=false
-# cas.authn.jdbc.query[0].idleTimeout=5000
-# cas.authn.jdbc.query[0].credentialCriteria=
-# cas.authn.jdbc.query[0].name=
-# cas.authn.jdbc.query[0].order=0
-# cas.authn.jdbc.query[0].dataSourceName=
-# cas.authn.jdbc.query[0].dataSourceProxy=false
-# cas.authn.jdbc.query[0].fieldExpired=
-# cas.authn.jdbc.query[0].fieldDisabled=
-# cas.authn.jdbc.query[0].principalAttributeList=sn,cn:commonName,givenName
-# cas.authn.jdbc.query[0].passwordEncoder.type=NONE|DEFAULT|STANDARD|BCRYPT|SCRYPT|PBKDF2|com.example.CustomPasswordEncoder
-# cas.authn.jdbc.query[0].passwordEncoder.characterEncoding=
-# cas.authn.jdbc.query[0].passwordEncoder.encodingAlgorithm=
-# cas.authn.jdbc.query[0].passwordEncoder.secret=
-# cas.authn.jdbc.query[0].passwordEncoder.strength=16
-# cas.authn.jdbc.query[0].principalTransformation.suffix=
-# cas.authn.jdbc.query[0].principalTransformation.caseConversion=NONE|UPPERCASE|LOWERCASE
-# cas.authn.jdbc.query[0].principalTransformation.prefix=
\ No newline at end of file
+logging.config: file:/etc/cas/config/log4j2.xml
+# cas.serviceRegistry.config.location: classpath:/services
diff --git a/cas/cas-server/src/main/resources/etc/cas/config/log4j2.xml b/cas/cas-server/src/main/resources/etc/cas/config/log4j2.xml
index 53b30b4228..e688cc0350 100644
--- a/cas/cas-server/src/main/resources/etc/cas/config/log4j2.xml
+++ b/cas/cas-server/src/main/resources/etc/cas/config/log4j2.xml
@@ -92,7 +92,7 @@
-
+
diff --git a/cas/cas-server/src/main/resources/etc/cas/thekeystore b/cas/cas-server/src/main/resources/etc/cas/thekeystore
index 86170dff16..3ca5fd059a 100644
Binary files a/cas/cas-server/src/main/resources/etc/cas/thekeystore and b/cas/cas-server/src/main/resources/etc/cas/thekeystore differ
diff --git a/cas/cas-server/src/main/resources/etc/cas/thekeystore.crt b/cas/cas-server/src/main/resources/etc/cas/thekeystore.crt
index 5bd9d5baba..adf6e9498e 100644
Binary files a/cas/cas-server/src/main/resources/etc/cas/thekeystore.crt and b/cas/cas-server/src/main/resources/etc/cas/thekeystore.crt differ
diff --git a/cas/cas-server/src/main/resources/log4j2.xml b/cas/cas-server/src/main/resources/log4j2.xml
new file mode 100644
index 0000000000..e688cc0350
--- /dev/null
+++ b/cas/cas-server/src/main/resources/log4j2.xml
@@ -0,0 +1,117 @@
+
+
+
+
+
+ .
+
+ warn
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cas/cas-server/src/main/resources/services/casSecuredApp.json b/cas/cas-server/src/main/resources/services/casSecuredApp-19991.json
similarity index 100%
rename from cas/cas-server/src/main/resources/services/casSecuredApp.json
rename to cas/cas-server/src/main/resources/services/casSecuredApp-19991.json