From ed3bce0806cecadb929f96220bab027be61b27e5 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 23 Sep 2018 14:02:14 +0300 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82?= =?UTF-8?q?=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java b/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java index 836e05e..c311e4a 100644 --- a/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java +++ b/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java @@ -25,7 +25,7 @@ public class WebApp { /** * Данный класс является файлом настройки контекста для Spring - * однако, т.к. мы никакие бины не объявляем, то красс пустует + * однако, т.к. мы никакие бины не объявляем, то класс пустует */ @Configuration @EnableWebMvc From 2f3b3a4262dc31bd3189e98610ec564bd6e7e83f Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 23 Sep 2018 14:17:28 +0300 Subject: [PATCH 2/7] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=D0=B0=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 34 +++++++++++++++++++ .../dmitriymx/skeleton/springmvc/WebApp.java | 9 ++--- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index d799a93..4626954 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,8 @@ 1.7.21 4.2.5.RELEASE 9.4.0.v20161208 + lib + ru.dmitriymx.skeleton.springmvc.WebApp @@ -94,6 +96,38 @@ -Dfile.encoding=${project.build.sourceEncoding} + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + ${dependencies.dir}/ + ${main.class} + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.2 + + ${project.build.directory}/${dependencies.dir}/ + provided + + + + copy-dependencies + package + + copy-dependencies + + + + diff --git a/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java b/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java index c311e4a..93a3f24 100644 --- a/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java +++ b/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java @@ -84,13 +84,8 @@ public class WebApp { * @param args параметры запуска */ public static void main(String[] args) { - String host = "127.0.0.1"; - int port = 8080; - - if (args.length == 2) { - host = args[0]; - port = Integer.parseInt(args[1]); - } + final String host = System.getProperty("host", "127.0.0.1"); + final int port = Integer.parseInt(System.getProperty("port", "8080")); log.info("Web app listen: {}:{}", host, port); WebApp app = new WebApp(host, port); From 4c093e688811e3ef1d24f365b9460bebf859c40a Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 23 Sep 2018 14:17:38 +0300 Subject: [PATCH 3/7] add README.MD --- README.MD | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 README.MD diff --git a/README.MD b/README.MD new file mode 100644 index 0000000..4d34940 --- /dev/null +++ b/README.MD @@ -0,0 +1,22 @@ +# Skeleton: SpringMVC (standalone) + +В данной ветке располагается пример *(заготовка, шаблон)* +для создания _WebApplication_ средствами **Spring Framework** +с использованием **Spring WebMVC** со встроенным сервером **Jetty**. + +## Сборка + +``` +mvn package +``` + +## Запуск + +``` +java -jar spring-mvc-1.0-SNAPSHOT.jar +``` + +По-умолчанию используются ip:port `127.0.0.1:8080`. Для изменения требуется добавить следующие параметры: + +- `-Dhost=0.0.0.0` - для указания IP адреса `0.0.0.0` +- `-Dport=80` - для указания порта `80` From e844c9e4895dce16d510235738f84afcfa08e672 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 23 Sep 2018 14:21:41 +0300 Subject: [PATCH 4/7] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=BE=D0=B3=D0=B3=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 14 ++++++++++---- src/main/resources/log4j2.xml | 13 +++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/log4j2.xml diff --git a/pom.xml b/pom.xml index 4626954..ebe51cc 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,8 @@ UTF-8 1.8 - 1.7.21 + 1.7.25 + 2.11.1 4.2.5.RELEASE 9.4.0.v20161208 lib @@ -32,9 +33,14 @@ ${slf4j.version} - org.slf4j - slf4j-simple - ${slf4j.version} + org.apache.logging.log4j + log4j-core + ${log4j.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml new file mode 100644 index 0000000..3be0d2c --- /dev/null +++ b/src/main/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + From 7a2c75021c2bde4179807620c917b6633035ce27 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 23 Sep 2018 14:28:53 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82?= =?UTF-8?q?=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.MD | 2 +- pom.xml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.MD b/README.MD index 4d34940..8316cff 100644 --- a/README.MD +++ b/README.MD @@ -13,7 +13,7 @@ mvn package ## Запуск ``` -java -jar spring-mvc-1.0-SNAPSHOT.jar +java -jar spring-mvc-1.0.1-SNAPSHOT.jar ``` По-умолчанию используются ip:port `127.0.0.1:8080`. Для изменения требуется добавить следующие параметры: diff --git a/pom.xml b/pom.xml index ebe51cc..da60991 100644 --- a/pom.xml +++ b/pom.xml @@ -7,15 +7,15 @@ ru.dmitriymx.skeleton spring-mvc - 1.0-SNAPSHOT + 1.0.1-SNAPSHOT UTF-8 1.8 1.7.25 2.11.1 - 4.2.5.RELEASE - 9.4.0.v20161208 + 5.1.0.RELEASE + 9.4.12.v20180830 lib ru.dmitriymx.skeleton.springmvc.WebApp @@ -77,7 +77,7 @@ org.projectlombok lombok - 1.16.16 + 1.18.2 @@ -87,7 +87,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.8.0 ${java.version} ${java.version} @@ -97,7 +97,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.15 + 2.22.0 -Dfile.encoding=${project.build.sourceEncoding} @@ -105,7 +105,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + 3.1.0 @@ -119,7 +119,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.0.2 + 3.1.1 ${project.build.directory}/${dependencies.dir}/ provided From 86792b28124b224fbb3788f97a580b94f0e2b3de Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 23 Sep 2018 14:29:45 +0300 Subject: [PATCH 6/7] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java b/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java index 93a3f24..7e64d4d 100644 --- a/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java +++ b/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java @@ -77,12 +77,6 @@ public class WebApp { } } - /** - * Для запуска можно указать два параметра: хост и порт. - * По-умолчанию: 127.0.0.1:8080 - * - * @param args параметры запуска - */ public static void main(String[] args) { final String host = System.getProperty("host", "127.0.0.1"); final int port = Integer.parseInt(System.getProperty("port", "8080")); From 350e80eb6a191a15c60f5a1332806636d20e87cb Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 23 Sep 2018 14:35:19 +0300 Subject: [PATCH 7/7] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4=D0=B0=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=20Spring=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java b/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java index 7e64d4d..ce306d6 100644 --- a/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java +++ b/src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java @@ -13,12 +13,12 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.net.InetSocketAddress; -@RequiredArgsConstructor @Slf4j +@RequiredArgsConstructor public class WebApp { private final String host; private final int port; @@ -29,7 +29,7 @@ public class WebApp { */ @Configuration @EnableWebMvc - public static class SpringConfigMVC extends WebMvcConfigurerAdapter { + public static class SpringConfigMVC implements WebMvcConfigurer { } /**