From 205be64cac1d3379ac19571ad39e4707418fcd0f Mon Sep 17 00:00:00 2001 From: Misagh Moayyed Date: Mon, 30 Jul 2018 14:45:07 +0430 Subject: [PATCH] working on overlay --- .../gradle.properties => build.properties | 31 ++++++++------ build.sh | 41 ++++++++++++------- maven-overlay/pom.xml | 29 +++++-------- 3 files changed, 55 insertions(+), 46 deletions(-) rename gradle-overlay/gradle.properties => build.properties (51%) diff --git a/gradle-overlay/gradle.properties b/build.properties similarity index 51% rename from gradle-overlay/gradle.properties rename to build.properties index 19e4354..2c4d67f 100644 --- a/gradle-overlay/gradle.properties +++ b/build.properties @@ -1,21 +1,26 @@ -cas.version=6.0.0-RC1-SNAPSHOT +# Versions -app.server=-tomcat +casVersion=6.0.0-RC1-SNAPSHOT +appServer=-tomcat +springBootVersion=2.0.3.RELEASE +tomcatVersion=9 +tomcatFullVersion=${tomcat.version}.0.10 -## -# Only modify below this line if you know what you're doing! -## -cas.run.jvmArgs=-Xmx2048M -cas.debug.jvmArgs=-Xmx2048M -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xdebug -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=y - -gradle.version=4.9 +# Build sourceCompatibility=10 targetCompatibility=10 -springboot.version=2.0.3.RELEASE +# Maven + +# ... + +# Gradle + +gradle.version=4.9 + +cas.run.jvmArgs=-Xmx2048M +cas.debug.jvmArgs=-Xmx2048M -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xdebug -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=y -# For debug, increase speed when executing gradle many times -# Daemon will keep running a daemon for 3h hours on each gradle run, improves speed org.gradle.daemon=true -org.gradle.jvmargs=-Xmx2048M -XX:+TieredCompilation -XX:TieredStopAtLevel=1 +org.gradle.jvmargs=-Xmx2048M -XX:+TieredCompilation -XX:TieredStopAtLevel=1 \ No newline at end of file diff --git a/build.sh b/build.sh index 2e2df24..d7e651a 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,14 @@ #!/bin/bash +while IFS='' read -r line || [[ -n "$line" ]]; do + if [ -n "$line" ] && [[ $line != \#* ]] ; then + IFS='=' read -r -a array <<< "$line" + varName=${array[0]} + varValue=${array[1]} + export "$varName"="$varValue" 2>/dev/null + fi +done < ./build.properties + function copy() { echo -e "Creating configuration directory under /etc/cas" mkdir -p /etc/cas/config @@ -11,26 +20,28 @@ function copy() { function help() { clear echo "******************************************************************" - echo "Apereo CAS" + tput setaf 2 + echo "Apereo CAS ${casVersion}" echo "Enterprise Single SignOn for all earthlings and beyond" + tput sgr 0 echo "- https://github.com/apereo/cas" echo "- https://apereo.github.io/cas" echo "******************************************************************" - echo -e "Usage: build.sh [maven|gradle] [copy|clean|package|run|update|debug|tomcat|gencert]\n" - echo " clean: Clean Maven build directory" - echo " cli: Run the CAS command line shell and pass commands" - echo " copy: Copy config from the project's local etc/cas/config directory to the root /etc/cas/config" - echo " debug: Run cas.war and listen for Java debugger on port 5000" - echo " dependencies: Get a report of all dependencies configured in the build" - echo " gencert: Create keystore with SSL certificate in location where CAS looks by default" - echo " getview: Ask for a view name to be included in the overlay for customizations" - echo " listviews: List all CAS views that ship with the web application and can be customized in the overlay" - echo " package: Clean and build CAS war" - echo " run: Build and run cas.war via Java as an executable war" - echo " runalone: Build and run cas.war on its own as a standalone executable" - echo " tomcat: Deploy the CAS web application to an external Apache Tomcat server" - echo " update: Package the CAS overlay by force-updating dependencies and SNAPSHOT versions" + echo -e "Usage: build.sh [maven|gradle] [copy|clean|package|run|dependencies|update|debug|tomcat|gencert]\n" + echo -e "\tclean: \t\tClean Maven build directory" + echo -e "\tcli: \t\tRun the CAS command line shell and pass commands" + echo -e "\tcopy: \t\tCopy config from the project's local etc/cas/config directory to the root /etc/cas/config" + echo -e "\tdebug: \t\tRun cas.war and listen for Java debugger on port 5000" + echo -e "\tdependencies: \tGet a report of all dependencies configured in the build" + echo -e "\tgencert: \tCreate keystore with SSL certificate in location where CAS looks by default" + echo -e "\tgetview: \tAsk for a view name to be included in the overlay for customizations" + echo -e "\tlistviews: \tList all CAS views that ship with the web application and can be customized in the overlay" + echo -e "\tpackage: \tClean and build CAS war" + echo -e "\trun: \t\tBuild and run cas.war via Java as an executable war" + echo -e "\trunalone: \tBuild and run cas.war on its own as a standalone executable" + echo -e "\ttomcat: \tDeploy the CAS web application to an external Apache Tomcat server" + echo -e "\tupdate: \tPackage the CAS overlay by force-updating dependencies and SNAPSHOT versions" } function clean() { diff --git a/maven-overlay/pom.xml b/maven-overlay/pom.xml index 80d0fd0..0b3b7d3 100755 --- a/maven-overlay/pom.xml +++ b/maven-overlay/pom.xml @@ -22,7 +22,7 @@ org.springframework.boot spring-boot-maven-plugin - ${springboot.version} + ${springBootVersion} ${startClass} true @@ -32,7 +32,7 @@ org.apereo.cas - cas-server-webapp${app.server} + cas-server-webapp${appServer} @@ -62,7 +62,7 @@ org.apereo.cas - cas-server-webapp${app.server} + cas-server-webapp${appServer} @@ -77,19 +77,13 @@ - 6.0.0-RC1-SNAPSHOT - 2.0.3.RELEASE - 9 - ${tomcat.version}.0.10 - - - -tomcat false org.apereo.cas.web.CasWebApplication org.springframework.boot.loader.WarLauncher - 10 - 10 + ${sourceCompatibility} + ${targetCompatibility} + UTF-8 @@ -150,8 +144,8 @@ org.apereo.cas - cas-server-webapp${app.server} - ${cas.version} + cas-server-webapp${appServer} + ${casVersion} war runtime @@ -177,15 +171,14 @@ external - false ${startClass} org.apereo.cas - cas-server-webapp${app.server} - ${cas.version} + cas-server-webapp + ${casVersion} war compile @@ -204,7 +197,7 @@ wget - http://www-eu.apache.org/dist/tomcat/tomcat-${tomcat.version}/v${tomcat.fullversion}/bin/apache-tomcat-${tomcat.fullversion}.zip + http://www-eu.apache.org/dist/tomcat/tomcat-${tomcatVersion}/v${tomcatFullVersion}/bin/apache-tomcat-${tomcatFullVersion}.zip true ${project.basedir} -- 2.26.2