Index: .gitignore =================================================================== --- .gitignore (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ .gitignore (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ Index: .mvn/wrapper/MavenWrapperDownloader.java =================================================================== --- .mvn/wrapper/MavenWrapperDownloader.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ .mvn/wrapper/MavenWrapperDownloader.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} Index: .mvn/wrapper/maven-wrapper.properties =================================================================== --- .mvn/wrapper/maven-wrapper.properties (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ .mvn/wrapper/maven-wrapper.properties (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar Index: mvnw =================================================================== --- mvnw (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ mvnw (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" Index: mvnw.cmd =================================================================== --- mvnw.cmd (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ mvnw.cmd (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% Index: pom.xml =================================================================== --- pom.xml (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ pom.xml (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,90 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.1 + + + it.finki + charitable + 0.0.1-SNAPSHOT + war + charitable + Demo project for Spring Boot + + 16 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + org.thymeleaf.extras + thymeleaf-extras-springsecurity5 + + + + org.postgresql + postgresql + runtime + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + commons-validator + commons-validator + 1.7 + + + org.springframework.boot + spring-boot-starter-mail + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + 15 + 15 + + + + + + Index: src/main/java/it/finki/charitable/CharitableApplication.java =================================================================== --- src/main/java/it/finki/charitable/CharitableApplication.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/CharitableApplication.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,15 @@ +package it.finki.charitable; + + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CharitableApplication { + + public static void main(String[] args) { + SpringApplication.run(CharitableApplication.class, args); + } + +} + Index: src/main/java/it/finki/charitable/ServletInitializer.java =================================================================== --- src/main/java/it/finki/charitable/ServletInitializer.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/ServletInitializer.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,13 @@ +package it.finki.charitable; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +public class ServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(CharitableApplication.class); + } + +} Index: src/main/java/it/finki/charitable/repository/ConfirmationTokenRepository.java =================================================================== --- src/main/java/it/finki/charitable/repository/ConfirmationTokenRepository.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/repository/ConfirmationTokenRepository.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,13 @@ +package it.finki.charitable.repository; + +import it.finki.charitable.security.ConfirmationToken; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface ConfirmationTokenRepository extends JpaRepository { + + Optional findByToken(String token); +} Index: src/main/java/it/finki/charitable/repository/DonationInformationRepository.java =================================================================== --- src/main/java/it/finki/charitable/repository/DonationInformationRepository.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/repository/DonationInformationRepository.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,7 @@ +package it.finki.charitable.repository; + +import it.finki.charitable.entities.DonationInformation; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface DonationInformationRepository extends JpaRepository { +} Index: src/main/java/it/finki/charitable/repository/DonationPostRepository.java =================================================================== --- src/main/java/it/finki/charitable/repository/DonationPostRepository.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/repository/DonationPostRepository.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,13 @@ +package it.finki.charitable.repository; + +import it.finki.charitable.entities.AppUser; +import it.finki.charitable.entities.DonationPost; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface DonationPostRepository extends JpaRepository { + List findAllByUser(AppUser user); +} Index: src/main/java/it/finki/charitable/repository/FundsCollectedRepository.java =================================================================== --- src/main/java/it/finki/charitable/repository/FundsCollectedRepository.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/repository/FundsCollectedRepository.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,9 @@ +package it.finki.charitable.repository; + +import it.finki.charitable.entities.FundsCollected; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface FundsCollectedRepository extends JpaRepository { +} Index: src/main/java/it/finki/charitable/repository/UserRepository.java =================================================================== --- src/main/java/it/finki/charitable/repository/UserRepository.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/repository/UserRepository.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,13 @@ +package it.finki.charitable.repository; + +import it.finki.charitable.entities.AppUser; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface UserRepository extends JpaRepository { + + Optional findByEmail(String email); +} Index: src/main/java/it/finki/charitable/security/ConfirmationToken.java =================================================================== --- src/main/java/it/finki/charitable/security/ConfirmationToken.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/security/ConfirmationToken.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,68 @@ +package it.finki.charitable.security; + +import it.finki.charitable.entities.AppUser; + +import javax.persistence.*; + +@Entity +@Table(name = "confirmation_token") +public class ConfirmationToken { + + @SequenceGenerator( + name = "conf_token_sequence", + sequenceName = "conf_token_sequence", + allocationSize = 1 + ) + @GeneratedValue( + strategy = GenerationType.SEQUENCE, + generator = "conf_token_sequence" + ) + @Id + @Column( + name = "id", + nullable = false, + updatable = false + ) + private Long id; + + private String token; + + @OneToOne + @JoinColumn( + nullable = false, + name = "app_user_id" + ) + private AppUser user; + + public ConfirmationToken() { + } + + public ConfirmationToken(String token, AppUser user) { + this.token = token; + this.user = user; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public AppUser getUser() { + return user; + } + + public void setUser(AppUser user) { + this.user = user; + } +} Index: src/main/java/it/finki/charitable/security/PasswordEncoder.java =================================================================== --- src/main/java/it/finki/charitable/security/PasswordEncoder.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/security/PasswordEncoder.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,14 @@ +package it.finki.charitable.security; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; + +@Configuration +public class PasswordEncoder { + + @Bean + public static BCryptPasswordEncoder bCryptPasswordEncoder() { + return new BCryptPasswordEncoder(10); + } +} Index: src/main/java/it/finki/charitable/security/SecurityConfig.java =================================================================== --- src/main/java/it/finki/charitable/security/SecurityConfig.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/security/SecurityConfig.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,61 @@ +package it.finki.charitable.security; + +import it.finki.charitable.entities.UserRole; +import it.finki.charitable.services.UserService; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.web.util.matcher.AntPathRequestMatcher; + +@Configuration +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + private final UserService userService; + private BCryptPasswordEncoder passwordEncoder() { + return PasswordEncoder.bCryptPasswordEncoder(); + } + + public SecurityConfig(UserService userService) { + this.userService = userService; + } + + private final static String[] publicMatchers = { + "/css/**", + "/js/**", + "/image/**", + "/", + "/login", + "/register", + "/validate", + "/album/**", + "/post", + "/post-photos/**" + }; + + @Override + protected void configure(HttpSecurity http) throws Exception { + http + .authorizeRequests() + .antMatchers(publicMatchers).permitAll() + .antMatchers("/moderator-photos/**").hasAuthority(UserRole.MODERATOR.name()) + .anyRequest().authenticated(); + + http + .csrf().disable() + .cors().disable() + .formLogin().loginPage("/login") + .defaultSuccessUrl("/", true) + .and() + .logout().logoutRequestMatcher(new AntPathRequestMatcher("/logout")) + .logoutSuccessUrl("/").deleteCookies("remember-me") + .and() + .rememberMe(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(userService).passwordEncoder(passwordEncoder()); + } +} Index: src/main/java/it/finki/charitable/services/ConfirmationTokenService.java =================================================================== --- src/main/java/it/finki/charitable/services/ConfirmationTokenService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/services/ConfirmationTokenService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,34 @@ +package it.finki.charitable.services; + +import it.finki.charitable.entities.AppUser; +import it.finki.charitable.repository.ConfirmationTokenRepository; +import it.finki.charitable.security.ConfirmationToken; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ConfirmationTokenService { + + private final ConfirmationTokenRepository tokenRepository; + + public ConfirmationTokenService(ConfirmationTokenRepository tokenRepository) { + this.tokenRepository = tokenRepository; + } + + public ConfirmationToken getConfirmationToken(String token) { + return tokenRepository.findByToken(token).orElse(null); + } + + public List getAll() { + return tokenRepository.findAll(); + } + + public void saveConfirmationToken(ConfirmationToken token) { + tokenRepository.save(token); + } + + public void deleteConfirmationToken(ConfirmationToken token) { + tokenRepository.delete(token); + } +} Index: src/main/java/it/finki/charitable/services/DonationInformationService.java =================================================================== --- src/main/java/it/finki/charitable/services/DonationInformationService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/services/DonationInformationService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,20 @@ +package it.finki.charitable.services; + +import it.finki.charitable.entities.DonationInformation; +import it.finki.charitable.repository.DonationInformationRepository; +import org.springframework.stereotype.Service; + +@Service +public class DonationInformationService { + + private final DonationInformationRepository donationInformationRepository; + + public DonationInformationService(DonationInformationRepository donationInformationRepository) { + this.donationInformationRepository = donationInformationRepository; + } + + public void save(DonationInformation donationInformation) { + donationInformationRepository.save(donationInformation); + } +} + Index: src/main/java/it/finki/charitable/services/DonationPostService.java =================================================================== --- src/main/java/it/finki/charitable/services/DonationPostService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/services/DonationPostService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,51 @@ +package it.finki.charitable.services; + +import it.finki.charitable.entities.AppUser; +import it.finki.charitable.entities.DonationPost; +import it.finki.charitable.repository.DonationPostRepository; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class DonationPostService { + + private final DonationPostRepository donationPostRepository; + + public DonationPostService(DonationPostRepository donationPostRepository) { + this.donationPostRepository = donationPostRepository; + } + + public DonationPost save(DonationPost donationPost) { + return donationPostRepository.save(donationPost); + } + + public DonationPost getById(Long id) { + if(donationPostRepository.existsById(id)) { + return donationPostRepository.getById(id); + } + + return null; + } + + public List findAll() { + return donationPostRepository.findAll(); + } + + public List findAllByUser(AppUser user) { + return donationPostRepository.findAllByUser(user); + } + + public void delete(DonationPost donationPost) { + donationPostRepository.delete(donationPost); + } + + public Page findPaginated(int pageNo, int pageSize, String sort) { + Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.by(sort)); + return donationPostRepository.findAll(pageable); + } +} Index: src/main/java/it/finki/charitable/services/EmailService.java =================================================================== --- src/main/java/it/finki/charitable/services/EmailService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/services/EmailService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,26 @@ +package it.finki.charitable.services; + +import org.springframework.mail.SimpleMailMessage; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.stereotype.Component; + +@Component +public class EmailService { + + private final JavaMailSender javaMailSender; + + public EmailService(JavaMailSender javaMailSender) { + this.javaMailSender = javaMailSender; + } + + public void sendValidationEmail(String to, String subject, String token) { + SimpleMailMessage message = new SimpleMailMessage(); + message.setTo(to); + message.setSubject(subject); + + String text = "Verify your account on the following link\n" + + "http://localhost:8080/validate?token=" + token; + message.setText(text); + javaMailSender.send(message); + } +} Index: src/main/java/it/finki/charitable/services/FundsCollectedService.java =================================================================== --- src/main/java/it/finki/charitable/services/FundsCollectedService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/services/FundsCollectedService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,19 @@ +package it.finki.charitable.services; + +import it.finki.charitable.entities.FundsCollected; +import it.finki.charitable.repository.FundsCollectedRepository; +import org.springframework.stereotype.Service; + +@Service +public class FundsCollectedService { + + private final FundsCollectedRepository fundsCollectedRepository; + + public FundsCollectedService(FundsCollectedRepository fundsCollectedRepository) { + this.fundsCollectedRepository = fundsCollectedRepository; + } + + public void save(FundsCollected fundsCollected) { + fundsCollectedRepository.save(fundsCollected); + } +} Index: src/main/java/it/finki/charitable/services/UserService.java =================================================================== --- src/main/java/it/finki/charitable/services/UserService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/services/UserService.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,30 @@ +package it.finki.charitable.services; + +import it.finki.charitable.entities.AppUser; +import it.finki.charitable.repository.UserRepository; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +@Service +public class UserService implements UserDetailsService { + + private final UserRepository userRepository; + + public UserService(UserRepository userRepository) { + this.userRepository = userRepository; + } + + @Override + public AppUser loadUserByUsername(String s) throws UsernameNotFoundException { + return userRepository.findByEmail(s).orElse(null); + } + + public void saveUser(AppUser user) { + userRepository.save(user); + } + + public void deleteUser(AppUser user) { + userRepository.delete(user); + } +} Index: src/main/java/it/finki/charitable/util/AutomaticEvents.java =================================================================== --- src/main/java/it/finki/charitable/util/AutomaticEvents.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/util/AutomaticEvents.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,34 @@ +package it.finki.charitable.util; + +import it.finki.charitable.entities.AppUser; +import it.finki.charitable.security.ConfirmationToken; +import it.finki.charitable.services.ConfirmationTokenService; +import it.finki.charitable.services.UserService; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class AutomaticEvents { + + private final UserService userService; + private final ConfirmationTokenService confirmationTokenService; + + public AutomaticEvents(UserService userService, ConfirmationTokenService confirmationTokenService) { + this.userService = userService; + this.confirmationTokenService = confirmationTokenService; + } + + @Scheduled(cron = "0 0 0 * * *") + public void deleteNonEnabledUsers() { + List toDelete = confirmationTokenService.getAll(); + for(ConfirmationToken token : toDelete) { + AppUser user = token.getUser(); + confirmationTokenService.deleteConfirmationToken(token); + if(!user.getEnabled()) { + userService.deleteUser(user); + } + } + } +} Index: src/main/java/it/finki/charitable/util/FileUploadUtil.java =================================================================== --- src/main/java/it/finki/charitable/util/FileUploadUtil.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/main/java/it/finki/charitable/util/FileUploadUtil.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,29 @@ +package it.finki.charitable.util; + +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; + +public class FileUploadUtil { + + public static void saveFile(String uploadDir, String fileName, + MultipartFile multipartFile) throws IOException { + Path uploadPath = Paths.get(uploadDir); + + if (!Files.exists(uploadPath)) { + Files.createDirectories(uploadPath); + } + + try (InputStream inputStream = multipartFile.getInputStream()) { + Path filePath = uploadPath.resolve(fileName); + Files.copy(inputStream, filePath, StandardCopyOption.REPLACE_EXISTING); + } catch (IOException ioe) { + throw new IOException("Could not save image file: " + fileName, ioe); + } + } +} Index: src/test/java/it/finki/charitable/CharitableApplicationTests.java =================================================================== --- src/test/java/it/finki/charitable/CharitableApplicationTests.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) +++ src/test/java/it/finki/charitable/CharitableApplicationTests.java (revision 3fc9e500d3c47267af48c8223f25bf602e852ee8) @@ -0,0 +1,13 @@ +package it.finki.charitable; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CharitableApplicationTests { + + @Test + void contextLoads() { + } + +}