From 33c7dd6b63a004aefe7edf66a737796012fc4216 Mon Sep 17 00:00:00 2001 From: anuradha Date: Fri, 17 Sep 2021 00:39:53 +0530 Subject: [PATCH] Refactored code --- hexagon/pom.xml | 48 --- .../baeldung/hexagon/HexagonApplication.java | 13 - .../primary/BurgerRestControllerImpl.java | 32 -- .../secondary/BurgerRepositoryImpl.java | 31 -- .../baeldung/hexagon/core/domain/Burger.java | 25 -- .../core/service/BurgerServiceImpl.java | 31 -- .../hexagon/port/inbound/BurgerService.java | 15 - .../port/outbound/BurgerRepository.java | 13 - .../hexagon/ui/BurgerRestController.java | 21 -- .../hexagon/HexagonApplicationTests.java | 55 ---- maven-generate-war/mvnw | 310 ------------------ maven-generate-war/mvnw.cmd | 182 ---------- maven-generate-war/pom.xml | 63 ---- .../src/main/resources/application.properties | 1 - .../maven-generate-war}/.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../additional_resources/sample.txt | 0 .../maven-generate-war}/mvnw | 0 .../maven-generate-war}/mvnw.cmd | 0 maven-modules/maven-generate-war/pom.xml | 63 ++++ .../baeldung/MavenGenerateWarApplication.java | 0 .../java/com/baeldung/ServletInitializer.java | 0 .../baeldung/controllers/MainController.java | 0 .../src/main/resources/application.properties | 0 .../resources/static/css/bootstrap-grid.css | 0 .../static/css/bootstrap-grid.css.map | 0 .../static/css/bootstrap-grid.min.css | 0 .../static/css/bootstrap-grid.min.css.map | 0 .../resources/static/css/bootstrap-reboot.css | 0 .../static/css/bootstrap-reboot.css.map | 0 .../static/css/bootstrap-reboot.min.css | 0 .../static/css/bootstrap-reboot.min.css.map | 0 .../main/resources/static/css/bootstrap.css | 0 .../resources/static/css/bootstrap.css.map | 0 .../resources/static/css/bootstrap.min.css | 0 .../static/css/bootstrap.min.css.map | 0 .../src/main/resources/templates/index.html | 0 .../MavenGenerateWarApplicationTests.java | 0 40 files changed, 63 insertions(+), 840 deletions(-) delete mode 100644 hexagon/pom.xml delete mode 100644 hexagon/src/main/java/com/baeldung/hexagon/HexagonApplication.java delete mode 100644 hexagon/src/main/java/com/baeldung/hexagon/adaptor/primary/BurgerRestControllerImpl.java delete mode 100644 hexagon/src/main/java/com/baeldung/hexagon/adaptor/secondary/BurgerRepositoryImpl.java delete mode 100644 hexagon/src/main/java/com/baeldung/hexagon/core/domain/Burger.java delete mode 100644 hexagon/src/main/java/com/baeldung/hexagon/core/service/BurgerServiceImpl.java delete mode 100644 hexagon/src/main/java/com/baeldung/hexagon/port/inbound/BurgerService.java delete mode 100644 hexagon/src/main/java/com/baeldung/hexagon/port/outbound/BurgerRepository.java delete mode 100644 hexagon/src/main/java/com/baeldung/hexagon/ui/BurgerRestController.java delete mode 100644 hexagon/src/test/java/com/baeldung/hexagon/HexagonApplicationTests.java delete mode 100755 maven-generate-war/mvnw delete mode 100644 maven-generate-war/mvnw.cmd delete mode 100644 maven-generate-war/pom.xml delete mode 100644 maven-generate-war/src/main/resources/application.properties rename {maven-generate-war => maven-modules/maven-generate-war}/.gitignore (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/.mvn/wrapper/maven-wrapper.jar (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/.mvn/wrapper/maven-wrapper.properties (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/additional_resources/sample.txt (100%) rename {hexagon => maven-modules/maven-generate-war}/mvnw (100%) rename {hexagon => maven-modules/maven-generate-war}/mvnw.cmd (100%) create mode 100644 maven-modules/maven-generate-war/pom.xml rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/java/com/baeldung/MavenGenerateWarApplication.java (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/java/com/baeldung/ServletInitializer.java (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/java/com/baeldung/controllers/MainController.java (100%) rename {hexagon => maven-modules/maven-generate-war}/src/main/resources/application.properties (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap-grid.css (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap-grid.css.map (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap-grid.min.css (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap-grid.min.css.map (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap-reboot.css (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap-reboot.css.map (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap-reboot.min.css (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap-reboot.min.css.map (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap.css (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap.css.map (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap.min.css (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/static/css/bootstrap.min.css.map (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/main/resources/templates/index.html (100%) rename {maven-generate-war => maven-modules/maven-generate-war}/src/test/java/com/baeldung/MavenGenerateWarApplicationTests.java (100%) diff --git a/hexagon/pom.xml b/hexagon/pom.xml deleted file mode 100644 index 982c9de479..0000000000 --- a/hexagon/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.5.3 - - - com.baeldung - hexagon - 0.0.1-SNAPSHOT - hexagon - Spring Boot for demonstrate hexagonal architecture - - 11 - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - diff --git a/hexagon/src/main/java/com/baeldung/hexagon/HexagonApplication.java b/hexagon/src/main/java/com/baeldung/hexagon/HexagonApplication.java deleted file mode 100644 index 59c202e49b..0000000000 --- a/hexagon/src/main/java/com/baeldung/hexagon/HexagonApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baeldung.hexagon; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class HexagonApplication { - - public static void main(String[] args) { - SpringApplication.run(HexagonApplication.class, args); - } - -} diff --git a/hexagon/src/main/java/com/baeldung/hexagon/adaptor/primary/BurgerRestControllerImpl.java b/hexagon/src/main/java/com/baeldung/hexagon/adaptor/primary/BurgerRestControllerImpl.java deleted file mode 100644 index 3d71a969da..0000000000 --- a/hexagon/src/main/java/com/baeldung/hexagon/adaptor/primary/BurgerRestControllerImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.baeldung.hexagon.adaptor.primary; - -import com.baeldung.hexagon.core.domain.Burger; -import com.baeldung.hexagon.port.inbound.BurgerService; -import com.baeldung.hexagon.ui.BurgerRestController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/burger") -public class BurgerRestControllerImpl implements BurgerRestController { - - @Autowired - private BurgerService burgerService; - - @Override - public void createBurger(@RequestBody Burger burger) { - burgerService.createBurger(burger); - } - - @Override - public Burger findByName(@PathVariable String name) { - return burgerService.findByName(name); - } - - @Override - public List findAll() { - return burgerService.findAll(); - } -} diff --git a/hexagon/src/main/java/com/baeldung/hexagon/adaptor/secondary/BurgerRepositoryImpl.java b/hexagon/src/main/java/com/baeldung/hexagon/adaptor/secondary/BurgerRepositoryImpl.java deleted file mode 100644 index 128419352e..0000000000 --- a/hexagon/src/main/java/com/baeldung/hexagon/adaptor/secondary/BurgerRepositoryImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.baeldung.hexagon.adaptor.secondary; - -import com.baeldung.hexagon.core.domain.Burger; -import com.baeldung.hexagon.port.outbound.BurgerRepository; -import org.springframework.stereotype.Repository; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Repository -public class BurgerRepositoryImpl implements BurgerRepository { - - private Map burgerShop = new HashMap<>(); - - @Override - public void createBurger(Burger burger) { - burgerShop.put(burger.getName(), burger); - } - - @Override - public Burger findByName(String name) { - return burgerShop.get(name); - } - - @Override - public List findAll() { - return new ArrayList<>(burgerShop.values()); - } -} diff --git a/hexagon/src/main/java/com/baeldung/hexagon/core/domain/Burger.java b/hexagon/src/main/java/com/baeldung/hexagon/core/domain/Burger.java deleted file mode 100644 index cf2ae3f19d..0000000000 --- a/hexagon/src/main/java/com/baeldung/hexagon/core/domain/Burger.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.baeldung.hexagon.core.domain; - -public class Burger { - - private String name; - private String[] addons; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String[] getAddons() { - return addons; - } - - public void setAddons(String[] addons) { - this.addons = addons; - } - - //getters and setters -} diff --git a/hexagon/src/main/java/com/baeldung/hexagon/core/service/BurgerServiceImpl.java b/hexagon/src/main/java/com/baeldung/hexagon/core/service/BurgerServiceImpl.java deleted file mode 100644 index 308aaf4f05..0000000000 --- a/hexagon/src/main/java/com/baeldung/hexagon/core/service/BurgerServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.baeldung.hexagon.core.service; - -import com.baeldung.hexagon.core.domain.Burger; -import com.baeldung.hexagon.port.inbound.BurgerService; -import com.baeldung.hexagon.port.outbound.BurgerRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class BurgerServiceImpl implements BurgerService { - - @Autowired - private BurgerRepository burgerRepository; - - @Override - public void createBurger(Burger burger) { - burgerRepository.createBurger(burger); - } - - @Override - public Burger findByName(String name) { - return burgerRepository.findByName(name); - } - - @Override - public List findAll() { - return burgerRepository.findAll(); - } -} diff --git a/hexagon/src/main/java/com/baeldung/hexagon/port/inbound/BurgerService.java b/hexagon/src/main/java/com/baeldung/hexagon/port/inbound/BurgerService.java deleted file mode 100644 index 80ad0df500..0000000000 --- a/hexagon/src/main/java/com/baeldung/hexagon/port/inbound/BurgerService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung.hexagon.port.inbound; - -import com.baeldung.hexagon.core.domain.Burger; - -import java.util.List; - -public interface BurgerService { - - void createBurger(Burger burger); - - Burger findByName(String name); - - List findAll(); - -} diff --git a/hexagon/src/main/java/com/baeldung/hexagon/port/outbound/BurgerRepository.java b/hexagon/src/main/java/com/baeldung/hexagon/port/outbound/BurgerRepository.java deleted file mode 100644 index 91f99a4d48..0000000000 --- a/hexagon/src/main/java/com/baeldung/hexagon/port/outbound/BurgerRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baeldung.hexagon.port.outbound; - -import com.baeldung.hexagon.core.domain.Burger; - -import java.util.List; - -public interface BurgerRepository { - void createBurger(Burger burger); - - Burger findByName(String name); - - List findAll(); -} diff --git a/hexagon/src/main/java/com/baeldung/hexagon/ui/BurgerRestController.java b/hexagon/src/main/java/com/baeldung/hexagon/ui/BurgerRestController.java deleted file mode 100644 index 2e5bace276..0000000000 --- a/hexagon/src/main/java/com/baeldung/hexagon/ui/BurgerRestController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung.hexagon.ui; - -import com.baeldung.hexagon.core.domain.Burger; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; - -public interface BurgerRestController { - - @PostMapping - void createBurger(@RequestBody Burger burger); - - @GetMapping("/{name}") - Burger findByName(@PathVariable String name); - - @GetMapping - List findAll(); -} diff --git a/hexagon/src/test/java/com/baeldung/hexagon/HexagonApplicationTests.java b/hexagon/src/test/java/com/baeldung/hexagon/HexagonApplicationTests.java deleted file mode 100644 index ddce6a5b71..0000000000 --- a/hexagon/src/test/java/com/baeldung/hexagon/HexagonApplicationTests.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.baeldung.hexagon; - -import com.baeldung.hexagon.core.domain.Burger; -import com.baeldung.hexagon.port.inbound.BurgerService; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - -@SpringBootTest -class HexagonApplicationTests { - - @Autowired - private BurgerService burgerService; - - @Test - void testCreate() { - Burger burger = new Burger(); - burger.setName("Chicken Burger"); - burger.setAddons(new String[]{"tomato", "cheese"}); - burgerService.createBurger(burger); - assertNotNull(burgerService.findByName("Chicken Burger")); - } - - @Test - void testFindByName() { - Burger burger = new Burger(); - burger.setName("Chicken Burger"); - burger.setAddons(new String[]{"tomato", "cheese"}); - burgerService.createBurger(burger); - Burger burger1 = burgerService.findByName("Chicken Burger"); - Assertions.assertEquals("Chicken Burger", burger1.getName()); - } - - @Test - void testFindAll() { - Burger burger1 = new Burger(); - burger1.setName("Chicken Burger"); - burger1.setAddons(new String[]{"tomato", "cheese"}); - burgerService.createBurger(burger1); - - Burger burger2 = new Burger(); - burger2.setName("Veggie Burger"); - burger2.setAddons(new String[]{"onion", "cheese"}); - burgerService.createBurger(burger2); - List burgers = burgerService.findAll(); - - Assertions.assertEquals(2, burgers.size()); - } - -} diff --git a/maven-generate-war/mvnw b/maven-generate-war/mvnw deleted file mode 100755 index a16b5431b4..0000000000 --- a/maven-generate-war/mvnw +++ /dev/null @@ -1,310 +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 -# -# 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 "$@" diff --git a/maven-generate-war/mvnw.cmd b/maven-generate-war/mvnw.cmd deleted file mode 100644 index c8d43372c9..0000000000 --- a/maven-generate-war/mvnw.cmd +++ /dev/null @@ -1,182 +0,0 @@ -@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% diff --git a/maven-generate-war/pom.xml b/maven-generate-war/pom.xml deleted file mode 100644 index 34a97ba887..0000000000 --- a/maven-generate-war/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.5.4 - - - com.baeldung - maven-generate-war - 0.0.1-SNAPSHOT - war - maven-generate-war - Spring boot project to demonstrate war file generation - - 11 - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - - - maven-generate-war - - - maven-war-plugin - 3.3.1 - - - - additional_resources - - - - - true - - - - - - - - diff --git a/maven-generate-war/src/main/resources/application.properties b/maven-generate-war/src/main/resources/application.properties deleted file mode 100644 index 8b13789179..0000000000 --- a/maven-generate-war/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/maven-generate-war/.gitignore b/maven-modules/maven-generate-war/.gitignore similarity index 100% rename from maven-generate-war/.gitignore rename to maven-modules/maven-generate-war/.gitignore diff --git a/maven-generate-war/.mvn/wrapper/MavenWrapperDownloader.java b/maven-modules/maven-generate-war/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from maven-generate-war/.mvn/wrapper/MavenWrapperDownloader.java rename to maven-modules/maven-generate-war/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/maven-generate-war/.mvn/wrapper/maven-wrapper.jar b/maven-modules/maven-generate-war/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from maven-generate-war/.mvn/wrapper/maven-wrapper.jar rename to maven-modules/maven-generate-war/.mvn/wrapper/maven-wrapper.jar diff --git a/maven-generate-war/.mvn/wrapper/maven-wrapper.properties b/maven-modules/maven-generate-war/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from maven-generate-war/.mvn/wrapper/maven-wrapper.properties rename to maven-modules/maven-generate-war/.mvn/wrapper/maven-wrapper.properties diff --git a/maven-generate-war/additional_resources/sample.txt b/maven-modules/maven-generate-war/additional_resources/sample.txt similarity index 100% rename from maven-generate-war/additional_resources/sample.txt rename to maven-modules/maven-generate-war/additional_resources/sample.txt diff --git a/hexagon/mvnw b/maven-modules/maven-generate-war/mvnw similarity index 100% rename from hexagon/mvnw rename to maven-modules/maven-generate-war/mvnw diff --git a/hexagon/mvnw.cmd b/maven-modules/maven-generate-war/mvnw.cmd similarity index 100% rename from hexagon/mvnw.cmd rename to maven-modules/maven-generate-war/mvnw.cmd diff --git a/maven-modules/maven-generate-war/pom.xml b/maven-modules/maven-generate-war/pom.xml new file mode 100644 index 0000000000..48d5d3c590 --- /dev/null +++ b/maven-modules/maven-generate-war/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + com.baeldung + maven-generate-war + 0.0.1-SNAPSHOT + war + maven-generate-war + Spring boot project to demonstrate war file generation + + 11 + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.springframework.boot + spring-boot-starter-test + test + + + + + maven-generate-war + + + maven-war-plugin + 3.3.1 + + + + additional_resources + + + + + true + + + + + + + + diff --git a/maven-generate-war/src/main/java/com/baeldung/MavenGenerateWarApplication.java b/maven-modules/maven-generate-war/src/main/java/com/baeldung/MavenGenerateWarApplication.java similarity index 100% rename from maven-generate-war/src/main/java/com/baeldung/MavenGenerateWarApplication.java rename to maven-modules/maven-generate-war/src/main/java/com/baeldung/MavenGenerateWarApplication.java diff --git a/maven-generate-war/src/main/java/com/baeldung/ServletInitializer.java b/maven-modules/maven-generate-war/src/main/java/com/baeldung/ServletInitializer.java similarity index 100% rename from maven-generate-war/src/main/java/com/baeldung/ServletInitializer.java rename to maven-modules/maven-generate-war/src/main/java/com/baeldung/ServletInitializer.java diff --git a/maven-generate-war/src/main/java/com/baeldung/controllers/MainController.java b/maven-modules/maven-generate-war/src/main/java/com/baeldung/controllers/MainController.java similarity index 100% rename from maven-generate-war/src/main/java/com/baeldung/controllers/MainController.java rename to maven-modules/maven-generate-war/src/main/java/com/baeldung/controllers/MainController.java diff --git a/hexagon/src/main/resources/application.properties b/maven-modules/maven-generate-war/src/main/resources/application.properties similarity index 100% rename from hexagon/src/main/resources/application.properties rename to maven-modules/maven-generate-war/src/main/resources/application.properties diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap-grid.css b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-grid.css similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap-grid.css rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-grid.css diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap-grid.css.map b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-grid.css.map similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap-grid.css.map rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-grid.css.map diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap-grid.min.css b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-grid.min.css similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap-grid.min.css rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-grid.min.css diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap-grid.min.css.map b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-grid.min.css.map similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap-grid.min.css.map rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-grid.min.css.map diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.css b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.css similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap-reboot.css rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.css diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.css.map b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.css.map similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap-reboot.css.map rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.css.map diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.min.css b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.min.css similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap-reboot.min.css rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.min.css diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.min.css.map b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.min.css.map similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap-reboot.min.css.map rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap-reboot.min.css.map diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap.css b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap.css similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap.css rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap.css diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap.css.map b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap.css.map similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap.css.map rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap.css.map diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap.min.css b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap.min.css similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap.min.css rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap.min.css diff --git a/maven-generate-war/src/main/resources/static/css/bootstrap.min.css.map b/maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap.min.css.map similarity index 100% rename from maven-generate-war/src/main/resources/static/css/bootstrap.min.css.map rename to maven-modules/maven-generate-war/src/main/resources/static/css/bootstrap.min.css.map diff --git a/maven-generate-war/src/main/resources/templates/index.html b/maven-modules/maven-generate-war/src/main/resources/templates/index.html similarity index 100% rename from maven-generate-war/src/main/resources/templates/index.html rename to maven-modules/maven-generate-war/src/main/resources/templates/index.html diff --git a/maven-generate-war/src/test/java/com/baeldung/MavenGenerateWarApplicationTests.java b/maven-modules/maven-generate-war/src/test/java/com/baeldung/MavenGenerateWarApplicationTests.java similarity index 100% rename from maven-generate-war/src/test/java/com/baeldung/MavenGenerateWarApplicationTests.java rename to maven-modules/maven-generate-war/src/test/java/com/baeldung/MavenGenerateWarApplicationTests.java