From cc235da44b3ebba675250bcc7e122653b9821052 Mon Sep 17 00:00:00 2001 From: Lemonochrme Date: Tue, 10 Dec 2024 16:46:50 +0100 Subject: [PATCH] Clean boilerplate for independant REST and SOAP services --- helpapp/.gitattributes | 2 - helpapp/.gitignore | 33 --- helpapp/.mvn/wrapper/maven-wrapper.properties | 19 -- helpapp/README.md | 24 ++ helpapp/mvnw | 259 ------------------ helpapp/mvnw.cmd | 149 ---------- helpapp/pom.xml | 83 ++---- helpapp/rest-service/pom.xml | 40 +++ .../helpapp/rest/RestApplication.java | 20 ++ .../src/main/resources/application.properties | 1 + .../target/classes/application.properties | 1 + .../helpapp/rest/RestApplication.class | Bin 0 -> 996 bytes .../target/maven-archiver/pom.properties | 5 + .../compile/default-compile/createdFiles.lst | 1 + .../compile/default-compile/inputFiles.lst | 1 + .../target/rest-service-1.0-SNAPSHOT.jar | Bin 0 -> 3033 bytes helpapp/soap-service/pom.xml | 40 +++ .../helpapp/soap/SoapApplication.java | 12 + .../src/main/resources/application.properties | 1 + .../target/classes/application.properties | 1 + .../helpapp/soap/SoapApplication.class | Bin 0 -> 729 bytes .../target/maven-archiver/pom.properties | 5 + .../compile/default-compile/createdFiles.lst | 1 + .../compile/default-compile/inputFiles.lst | 1 + .../target/soap-service-1.0-SNAPSHOT.jar | Bin 0 -> 2826 bytes .../helpapp/CustomErrorController.java | 17 -- .../helpapp/HelpappApplication.java | 13 - .../src/main/resources/application.properties | 2 - .../helpapp/HelpappApplicationTests.java | 13 - 29 files changed, 175 insertions(+), 569 deletions(-) delete mode 100644 helpapp/.gitattributes delete mode 100644 helpapp/.gitignore delete mode 100644 helpapp/.mvn/wrapper/maven-wrapper.properties create mode 100644 helpapp/README.md delete mode 100755 helpapp/mvnw delete mode 100644 helpapp/mvnw.cmd create mode 100644 helpapp/rest-service/pom.xml create mode 100644 helpapp/rest-service/src/main/java/insa/application/helpapp/rest/RestApplication.java create mode 100644 helpapp/rest-service/src/main/resources/application.properties create mode 100644 helpapp/rest-service/target/classes/application.properties create mode 100644 helpapp/rest-service/target/classes/insa/application/helpapp/rest/RestApplication.class create mode 100644 helpapp/rest-service/target/maven-archiver/pom.properties create mode 100644 helpapp/rest-service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 helpapp/rest-service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 helpapp/rest-service/target/rest-service-1.0-SNAPSHOT.jar create mode 100644 helpapp/soap-service/pom.xml create mode 100644 helpapp/soap-service/src/main/java/insa/application/helpapp/soap/SoapApplication.java create mode 100644 helpapp/soap-service/src/main/resources/application.properties create mode 100644 helpapp/soap-service/target/classes/application.properties create mode 100644 helpapp/soap-service/target/classes/insa/application/helpapp/soap/SoapApplication.class create mode 100644 helpapp/soap-service/target/maven-archiver/pom.properties create mode 100644 helpapp/soap-service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 helpapp/soap-service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 helpapp/soap-service/target/soap-service-1.0-SNAPSHOT.jar delete mode 100644 helpapp/src/main/java/insa/application/helpapp/CustomErrorController.java delete mode 100644 helpapp/src/main/java/insa/application/helpapp/HelpappApplication.java delete mode 100644 helpapp/src/main/resources/application.properties delete mode 100644 helpapp/src/test/java/insa/application/helpapp/HelpappApplicationTests.java diff --git a/helpapp/.gitattributes b/helpapp/.gitattributes deleted file mode 100644 index 3b41682..0000000 --- a/helpapp/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -/mvnw text eol=lf -*.cmd text eol=crlf diff --git a/helpapp/.gitignore b/helpapp/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/helpapp/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -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/ diff --git a/helpapp/.mvn/wrapper/maven-wrapper.properties b/helpapp/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index d58dfb7..0000000 --- a/helpapp/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,19 +0,0 @@ -# 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 -# -# http://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. -wrapperVersion=3.3.2 -distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/helpapp/README.md b/helpapp/README.md new file mode 100644 index 0000000..57185fb --- /dev/null +++ b/helpapp/README.md @@ -0,0 +1,24 @@ +# Mini-Projet Architecture de Services + +## Objectif : + +Créer une application axée microservices en utilisant SOAP et REST + +## Installation + +``` +mvn compile +``` + +Une fois le projet compilé, lancer les différents services SOAP et REST via `Spring Boot` : + +``` +mvn spring-boot:run -pl rest-service +``` + + +``` +mvn spring-boot:run -pl soap-service +``` + +Vérifier le bon fonctionnement en accédant à `localhost:8080/hello` pour REST et `localhost:8081/ws` pour SOAP. diff --git a/helpapp/mvnw b/helpapp/mvnw deleted file mode 100755 index 19529dd..0000000 --- a/helpapp/mvnw +++ /dev/null @@ -1,259 +0,0 @@ -#!/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 -# -# http://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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 -# -# Optional ENV vars -# ----------------- -# JAVA_HOME - location of a JDK home dir, required when download maven via java source -# MVNW_REPOURL - repo url base for downloading maven distribution -# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output -# ---------------------------------------------------------------------------- - -set -euf -[ "${MVNW_VERBOSE-}" != debug ] || set -x - -# OS specific support. -native_path() { printf %s\\n "$1"; } -case "$(uname)" in -CYGWIN* | MINGW*) - [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" - native_path() { cygpath --path --windows "$1"; } - ;; -esac - -# set JAVACMD and JAVACCMD -set_java_home() { - # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched - 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" - JAVACCMD="$JAVA_HOME/jre/sh/javac" - else - JAVACMD="$JAVA_HOME/bin/java" - JAVACCMD="$JAVA_HOME/bin/javac" - - if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then - echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 - echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 - return 1 - fi - fi - else - JAVACMD="$( - 'set' +e - 'unset' -f command 2>/dev/null - 'command' -v java - )" || : - JAVACCMD="$( - 'set' +e - 'unset' -f command 2>/dev/null - 'command' -v javac - )" || : - - if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then - echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 - return 1 - fi - fi -} - -# hash string like Java String::hashCode -hash_string() { - str="${1:-}" h=0 - while [ -n "$str" ]; do - char="${str%"${str#?}"}" - h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) - str="${str#?}" - done - printf %x\\n $h -} - -verbose() { :; } -[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } - -die() { - printf %s\\n "$1" >&2 - exit 1 -} - -trim() { - # MWRAPPER-139: - # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. - # Needed for removing poorly interpreted newline sequences when running in more - # exotic environments such as mingw bash on Windows. - printf "%s" "${1}" | tr -d '[:space:]' -} - -# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties -while IFS="=" read -r key value; do - case "${key-}" in - distributionUrl) distributionUrl=$(trim "${value-}") ;; - distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; - esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" - -case "${distributionUrl##*/}" in -maven-mvnd-*bin.*) - MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ - case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in - *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; - :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; - :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; - :Linux*x86_64*) distributionPlatform=linux-amd64 ;; - *) - echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 - distributionPlatform=linux-amd64 - ;; - esac - distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" - ;; -maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; -esac - -# apply MVNW_REPOURL and calculate MAVEN_HOME -# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ -[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" -distributionUrlName="${distributionUrl##*/}" -distributionUrlNameMain="${distributionUrlName%.*}" -distributionUrlNameMain="${distributionUrlNameMain%-bin}" -MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" -MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" - -exec_maven() { - unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : - exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" -} - -if [ -d "$MAVEN_HOME" ]; then - verbose "found existing MAVEN_HOME at $MAVEN_HOME" - exec_maven "$@" -fi - -case "${distributionUrl-}" in -*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; -*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; -esac - -# prepare tmp dir -if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then - clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } - trap clean HUP INT TERM EXIT -else - die "cannot create temp dir" -fi - -mkdir -p -- "${MAVEN_HOME%/*}" - -# Download and Install Apache Maven -verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." -verbose "Downloading from: $distributionUrl" -verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" - -# select .zip or .tar.gz -if ! command -v unzip >/dev/null; then - distributionUrl="${distributionUrl%.zip}.tar.gz" - distributionUrlName="${distributionUrl##*/}" -fi - -# verbose opt -__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' -[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v - -# normalize http auth -case "${MVNW_PASSWORD:+has-password}" in -'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; -has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; -esac - -if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then - verbose "Found wget ... using wget" - wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" -elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then - verbose "Found curl ... using curl" - curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" -elif set_java_home; then - verbose "Falling back to use Java to download" - javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" - targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" - cat >"$javaSource" <<-END - public class Downloader extends java.net.Authenticator - { - protected java.net.PasswordAuthentication getPasswordAuthentication() - { - return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); - } - public static void main( String[] args ) throws Exception - { - setDefault( new Downloader() ); - java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); - } - } - END - # For Cygwin/MinGW, switch paths to Windows format before running javac and java - verbose " - Compiling Downloader.java ..." - "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" - verbose " - Running Downloader.java ..." - "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" -fi - -# If specified, validate the SHA-256 sum of the Maven distribution zip file -if [ -n "${distributionSha256Sum-}" ]; then - distributionSha256Result=false - if [ "$MVN_CMD" = mvnd.sh ]; then - echo "Checksum validation is not supported for maven-mvnd." >&2 - echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 - exit 1 - elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then - distributionSha256Result=true - fi - elif command -v shasum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then - distributionSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 - echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 - exit 1 - fi - if [ $distributionSha256Result = false ]; then - echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 - echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 - exit 1 - fi -fi - -# unzip and move -if command -v unzip >/dev/null; then - unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" -else - tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" -fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" - -clean || : -exec_maven "$@" diff --git a/helpapp/mvnw.cmd b/helpapp/mvnw.cmd deleted file mode 100644 index 249bdf3..0000000 --- a/helpapp/mvnw.cmd +++ /dev/null @@ -1,149 +0,0 @@ -<# : batch portion -@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 http://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 Apache Maven Wrapper startup batch script, version 3.3.2 -@REM -@REM Optional ENV vars -@REM MVNW_REPOURL - repo url base for downloading maven distribution -@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output -@REM ---------------------------------------------------------------------------- - -@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) -@SET __MVNW_CMD__= -@SET __MVNW_ERROR__= -@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% -@SET PSModulePath= -@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( - IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) -) -@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% -@SET __MVNW_PSMODULEP_SAVE= -@SET __MVNW_ARG0_NAME__= -@SET MVNW_USERNAME= -@SET MVNW_PASSWORD= -@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) -@echo Cannot start maven from wrapper >&2 && exit /b 1 -@GOTO :EOF -: end batch / begin powershell #> - -$ErrorActionPreference = "Stop" -if ($env:MVNW_VERBOSE -eq "true") { - $VerbosePreference = "Continue" -} - -# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties -$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl -if (!$distributionUrl) { - Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" -} - -switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { - "maven-mvnd-*" { - $USE_MVND = $true - $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" - $MVN_CMD = "mvnd.cmd" - break - } - default { - $USE_MVND = $false - $MVN_CMD = $script -replace '^mvnw','mvn' - break - } -} - -# apply MVNW_REPOURL and calculate MAVEN_HOME -# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ -if ($env:MVNW_REPOURL) { - $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } - $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" -} -$distributionUrlName = $distributionUrl -replace '^.*/','' -$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' -$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" -if ($env:MAVEN_USER_HOME) { - $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" -} -$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' -$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" - -if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { - Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" - Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" - exit $? -} - -if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { - Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" -} - -# prepare tmp dir -$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile -$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" -$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null -trap { - if ($TMP_DOWNLOAD_DIR.Exists) { - try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } - catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } - } -} - -New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null - -# Download and Install Apache Maven -Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." -Write-Verbose "Downloading from: $distributionUrl" -Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" - -$webclient = New-Object System.Net.WebClient -if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { - $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) -} -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null - -# If specified, validate the SHA-256 sum of the Maven distribution zip file -$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum -if ($distributionSha256Sum) { - if ($USE_MVND) { - Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." - } - Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash - if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { - Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." - } -} - -# unzip and move -Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null -Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null -try { - Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null -} catch { - if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { - Write-Error "fail to move MAVEN_HOME" - } -} finally { - try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } - catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } -} - -Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/helpapp/pom.xml b/helpapp/pom.xml index d16cec9..6ef8936 100644 --- a/helpapp/pom.xml +++ b/helpapp/pom.xml @@ -1,66 +1,25 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.4.0 - - - insa.application - helpapp - 0.0.1-SNAPSHOT - helpapp - Exercice Application that ease voluntary help to others - - - - - - - - - - - - - - - 21 - - - - org.springframework.boot - spring-boot-starter - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + insa.application.helpapp + helpapp + 1.0-SNAPSHOT + pom - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - 3.5.0 - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + rest-service + soap-service + + + + + org.springframework.boot + spring-boot-dependencies + 3.1.4 + pom + import + + + diff --git a/helpapp/rest-service/pom.xml b/helpapp/rest-service/pom.xml new file mode 100644 index 0000000..c85e368 --- /dev/null +++ b/helpapp/rest-service/pom.xml @@ -0,0 +1,40 @@ + + + insa.application.helpapp + helpapp + 1.0-SNAPSHOT + + 4.0.0 + rest-service + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 3.1.4 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 21 + 21 + + + + + + diff --git a/helpapp/rest-service/src/main/java/insa/application/helpapp/rest/RestApplication.java b/helpapp/rest-service/src/main/java/insa/application/helpapp/rest/RestApplication.java new file mode 100644 index 0000000..2e82618 --- /dev/null +++ b/helpapp/rest-service/src/main/java/insa/application/helpapp/rest/RestApplication.java @@ -0,0 +1,20 @@ +package insa.application.helpapp.rest; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@SpringBootApplication +@RestController +public class RestApplication { + + public static void main(String[] args) { + SpringApplication.run(RestApplication.class, args); + } + + @GetMapping("/hello") + public String hello() { + return "Hello from REST!"; + } +} diff --git a/helpapp/rest-service/src/main/resources/application.properties b/helpapp/rest-service/src/main/resources/application.properties new file mode 100644 index 0000000..4c00e40 --- /dev/null +++ b/helpapp/rest-service/src/main/resources/application.properties @@ -0,0 +1 @@ +server.port=8080 diff --git a/helpapp/rest-service/target/classes/application.properties b/helpapp/rest-service/target/classes/application.properties new file mode 100644 index 0000000..4c00e40 --- /dev/null +++ b/helpapp/rest-service/target/classes/application.properties @@ -0,0 +1 @@ +server.port=8080 diff --git a/helpapp/rest-service/target/classes/insa/application/helpapp/rest/RestApplication.class b/helpapp/rest-service/target/classes/insa/application/helpapp/rest/RestApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..fdfbad45dfbc148a35b760d95d94ab8fda6e0e3d GIT binary patch literal 996 zcmb7D%We}f6g_U94IwRQD3oUcERsmY8-$R8DwT-GB7l@s>7px7>ZC4?9eF%0p9L!r z3qF94LR^Q4j9@m5H1^!rIrcqwe*FCQ9l#+TRj`3v3Hd4tC^BrHiwnWEFf;x>I+qjA zP<*b8@&^pLc4u5dnPFdS7%xvn!TwYrDfk)PQK3Y0cl|<tpq`h~wT#$}{o-tk)T2Ay2IF@}uW{ zYo=*QlLeWKc+gbM-Q(U+i0qWZ5bNv&c9t@*c&Fs ztGOJjScS_QWBpP!0(_F$vr8HANSRYE{^au4(!V8zL!*iDLg<8=Pz=Hc>dMF_ZX#c) z(3-|y1MoPA$8eCzwNzdt-jYyDf#hlqUeHLSgd)~wnE+Xb4F?FyI;*vGJ+x4wF%M4; zbb1tNy+#(NozY(CegXST9~-FC8p5Ed-J!MmI{^(`Cu46)FcS|+=~7V<~t1dKY=Ub+yi&Ilno`;EM5sr$stm=T7K&>pF3;KUoqsMNIpE zO2y7O-9f_MLBS<+wbqKra0^W~4ic>qJ{|N~r01*7mot?+=Xem$G3Ip|kTqg#^NRHDhD9SHLEh@=OE!Ota z)$-Q8qUw?A!u!1Cw- z{{wf$W4A>)ugWE;o?r8PcK$xe+xGRf{}~?$^xLjk7~r_EP3RQQ?es@69|By0{~ffS z+?cAdKVae}cAnO<^ccsfiSe!*A0%z$2vt~fNpSwj0>|pSl$@Uv&O8+Q^59_<>sBeV z4JR*LO*{3tHSl6d(vg_BjL#E)M@8FtHEa7!GU1HeZyT}gD!;4DcfT+t<<}K^&nc`g zTA-|LA9?TkMHgRTe4)!Y^uy*BAYi&b)t-VdkTq9Ky4< zpE1tNUm`4g;`*t%PLEI3_{RkEuasL0#$mQ&_CEDbs9 z_t`*T&u5W;J8tJSGCM64;!v?*5OuwOw{-hT#f`eRH9vURuRv-`uNN=AYqWw_4)L zQk1S$Z7Z$$mbL7blc(U6i#d#~M@x@MAKT@=W5F{gHWvFx-5lSTrq34HCMnETJ8h-? z*S(W7y0^enFyH%>mvQr>df$#y#`g|>`^6>m!@+jP(n%MlPF!KUVL|$WrA+rHed`Y@ z`uK0#Do)+Th+s>lyT7F^f--~nRlZN3%Y|hr zDqKp>HC8-!$_^0!(=8moQ*g5H<-Xf*Z*bgIl-{&B?$)(?xx)J|PZZ%>{9J3j4BHZh zn5ki+N(^Cj&wc*RT$aCW-;{i-$#*=243zA*Je|Q?enY79tmWhUgw1l6a=a4_tPVJS zeO)G(X3;KC`Sta)xWJ)(HQ!y4SHhUg_9Bcyi_dS9*VvemGSE6F>tHJ5!Pn z5Ct>u32&}L1_BHhYW)l^lsXG->2?xdv`FudLvf?w+^hvl5+||k*&Dgz-;q@N^=MhVEF%EjRh&LVP!kahnSi{r8`1%Fs5caWj$_FL8U#y z)R`ohidOc+tl(h4R{Fy%+0yuiTq~e;0U~^{7cU5#zOrG2FU}xB@eIf&L}3%)%?dP# Qfq@qYzW^J0=h;C#0Ct!4N&o-= literal 0 HcmV?d00001 diff --git a/helpapp/soap-service/pom.xml b/helpapp/soap-service/pom.xml new file mode 100644 index 0000000..da398d8 --- /dev/null +++ b/helpapp/soap-service/pom.xml @@ -0,0 +1,40 @@ + + + insa.application.helpapp + helpapp + 1.0-SNAPSHOT + + 4.0.0 + soap-service + + + + + org.springframework.boot + spring-boot-starter-web-services + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 3.1.4 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 21 + 21 + + + + + + diff --git a/helpapp/soap-service/src/main/java/insa/application/helpapp/soap/SoapApplication.java b/helpapp/soap-service/src/main/java/insa/application/helpapp/soap/SoapApplication.java new file mode 100644 index 0000000..3abc8e9 --- /dev/null +++ b/helpapp/soap-service/src/main/java/insa/application/helpapp/soap/SoapApplication.java @@ -0,0 +1,12 @@ +package insa.application.helpapp.soap; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SoapApplication { + + public static void main(String[] args) { + SpringApplication.run(SoapApplication.class, args); + } +} diff --git a/helpapp/soap-service/src/main/resources/application.properties b/helpapp/soap-service/src/main/resources/application.properties new file mode 100644 index 0000000..4d360de --- /dev/null +++ b/helpapp/soap-service/src/main/resources/application.properties @@ -0,0 +1 @@ +server.port=8081 diff --git a/helpapp/soap-service/target/classes/application.properties b/helpapp/soap-service/target/classes/application.properties new file mode 100644 index 0000000..4d360de --- /dev/null +++ b/helpapp/soap-service/target/classes/application.properties @@ -0,0 +1 @@ +server.port=8081 diff --git a/helpapp/soap-service/target/classes/insa/application/helpapp/soap/SoapApplication.class b/helpapp/soap-service/target/classes/insa/application/helpapp/soap/SoapApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..e398bf1db77462971bae9f9dc32e52c8209b7a73 GIT binary patch literal 729 zcmb7CxlRKy5Pc4T4Iy0NJ{r0Z3Ea^HAweXn2qc0+LFHY{V%XR#uNU|&Di8%9z(*m* z3sP1n4K8Lh*Bj59`TTnS0C0@$Ix3h5P;FomQw$6D;!*HK=$M~}_cC$}Q-?|`cf>H! z+8qR_G3+Uw2`>zO`Z~ zpNxIrp)rp43umd4TH0JQgstA_TirxtS?9Xs={pbB+3k%(j*NEl+3~K?w<^x92oqUq zL2e)JFjTwdMl#Izl$K}tFqHPv=Q1>VCKAa&Smo_sXVu-QjDb`3KdA6+hC~t1dKY=Ub+yi&Ilno`;EM5sr$stm=T7K&>pF3;KUoqsMNIpE zO2y7O-9f_MLBS<+wbqKra0^W~4ic>qJ{|N~r01*7mot?+=Xe!NUS#j2MG-_(VnqhMPC(p`rmdC zsO47VQ_~f&FFUJCPDsT+NPlv1yQ@ZBMZvbe%l!^7k^Ho!#^EgWcc1pE({dy-!+`VCuBI-?T(>Ti#LrgWL;?|EcbsIy3o2T|m^% z;~Kk7L3KXiHNRS-C>^;Ao++h^&>DNjD1>X_uusVA1wBOxvLt9H+!?6!#;E!TUk zE~(2s8uQQOTi^0y7IwS`!&J9!F-^4c5li;v3JiU`IxOW?&D|dsk;~>tzJ0RyvGC&c zp>fd@#Wr0{`sC9uX(jwQ)+k5K>-71rHdDXNKA$R~q9%OQC*tW}wHt-ztCAj^te<;m z`%G?E?YI2Xa}AW^Zp>*ZpLT)gr(G~;Lfwt~qve$yt#O8;f5=J+C(XwIUX zBm8Z?u)zVoo274()@#~vCpqK`^wuT+Eee!xPczia*%?4(tg+k^Q2h?~A&j+pNUg9}r ziR_gT+5+Q2_0Y!9RFj;BfNM|MnFH*Niw zzB4Clrui@XVR%~h#RWD&jkzn|dQbFzYZ(@$%F2H!V-s_#VcM2tnd}|hMW><1^!wSL@p?t%@U*|uaM2am?Eg^UQ)2B*cEHwbJGbOQwD9LzFcyk?A5Ma2lce%s~t3{Xi zSvG0pdhC9|{)ly1+9fVW*WL@auRpCm>(Qr_HtXTvW^1vcH5a81w(@u|e!8G}^=*HF zoQcN5GM?mZ+_P$C|9)b)r88+`+YR+!x>vU7DIOOH%QlF9|6}^KfU{gjL+*O(-FjJA z<$Ha3T77^wBa;X-?ivv2Js=QZc147AdNnT5UDgPFFau@h((l4p=AL4>!k*LestE)aAN)*29D0cK2rid+Z~VEF%k z6R`M#$2F_~hWQXvGpGngXuglB8Bc+X+f-1Ij4)M|1;a@=O+_o9VOC%-qG6V7X{;dE s3TT0i2wzA9q8Bd+o7C9I^bE)*L}3%)%?dP#fq@qYzW_s>fgQvH06b}si2wiq literal 0 HcmV?d00001 diff --git a/helpapp/src/main/java/insa/application/helpapp/CustomErrorController.java b/helpapp/src/main/java/insa/application/helpapp/CustomErrorController.java deleted file mode 100644 index 32f0f72..0000000 --- a/helpapp/src/main/java/insa/application/helpapp/CustomErrorController.java +++ /dev/null @@ -1,17 +0,0 @@ -package insa.application.helpapp; - -import org.springframework.boot.web.servlet.error.ErrorController; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -@Controller -public class CustomErrorController implements ErrorController { - - @RequestMapping("/error") - @ResponseBody - public String handleError() { - // Return the inline HTML content for the custom error page - return "Error

Something went wrong!

We are sorry, but the page you are looking for does not exist.

Error Image"; - } -} \ No newline at end of file diff --git a/helpapp/src/main/java/insa/application/helpapp/HelpappApplication.java b/helpapp/src/main/java/insa/application/helpapp/HelpappApplication.java deleted file mode 100644 index ee1a710..0000000 --- a/helpapp/src/main/java/insa/application/helpapp/HelpappApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package insa.application.helpapp; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class HelpappApplication { - - public static void main(String[] args) { - SpringApplication.run(HelpappApplication.class, args); - } - -} diff --git a/helpapp/src/main/resources/application.properties b/helpapp/src/main/resources/application.properties deleted file mode 100644 index 42482f7..0000000 --- a/helpapp/src/main/resources/application.properties +++ /dev/null @@ -1,2 +0,0 @@ -spring.application.name=helpapp -server.port=8080 \ No newline at end of file diff --git a/helpapp/src/test/java/insa/application/helpapp/HelpappApplicationTests.java b/helpapp/src/test/java/insa/application/helpapp/HelpappApplicationTests.java deleted file mode 100644 index 34f598c..0000000 --- a/helpapp/src/test/java/insa/application/helpapp/HelpappApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package insa.application.helpapp; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class HelpappApplicationTests { - - @Test - void contextLoads() { - } - -}