From 1e17d4102e676915a9072981b505ba4bdf965e36 Mon Sep 17 00:00:00 2001
From: "sergey.tolstyh" <sergey.tolstyh@red-soft.ru>
Date: Tue, 2 Jul 2024 18:19:30 +0300
Subject: [PATCH] =?UTF-8?q?TomcatStarter=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |   3 +-
 .../VAADIN/themes/img/page_white_delete.png   | Bin 0 -> 953 bytes
 .../VAADIN/themes/img/upload_file.gif         | Bin 0 -> 1016 bytes
 .../biz/redsoft/sample/TomcatStarter.java     | 122 ++++++++++++++++++
 4 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/META-INF/resources/VAADIN/themes/img/page_white_delete.png
 create mode 100644 src/main/resources/META-INF/resources/VAADIN/themes/img/upload_file.gif
 create mode 100644 src/test/java/biz/redsoft/sample/TomcatStarter.java

diff --git a/build.gradle b/build.gradle
index 13b2038..5ab6588 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,8 @@ repositories {
 dependencies {
     testImplementation 'junit:junit:4.13.1'
     provided 'javax.servlet:javax.servlet-api:3.1.0'
-
+    testImplementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.76'
+    testImplementation 'org.apache.tomcat.embed:tomcat-embed-jasper:9.0.76'
     testCompile 'org.junit.jupiter:junit-jupiter:5.8.2'
     runtimeClasspath files(ncoreGenerateControlDataJar)
     runtimeClasspath files(genJar)
diff --git a/src/main/resources/META-INF/resources/VAADIN/themes/img/page_white_delete.png b/src/main/resources/META-INF/resources/VAADIN/themes/img/page_white_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..644935f456946f31e4985ed2da1159210c527867
GIT binary patch
literal 953
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47*hj$LR=Xc7~VS>d{ot#$IbuB
z*!*L>`*lU7{pz}_`9;1|#C-5I{a~s0+ROS=qT6;6smGRv@3f6RxEbHpR^K5c`QB9P
zmWIm5D2LbDMymxxpNY$#6_tBdQv6y%@uQa3*WTv$zUChSEI-D(ytUW=5N`V^-ThOt
z+dE^OtFj88Qa!%5XP*?7d1t2cMOkgFnDl!!)m6O0?~JrJ^NGIG(D)E$``*=fF^}M<
zSjUesj$eC<KSu_Cs3`srX!$YJ;ZaW3%Zj3RAx@vOV&2+1zYnnb)K>p7$m+hd@(po?
zHwNZ+g=MZuD&7^5eebOQF~V+_mhMdnh4)T|UwT@;bT(cQSNPOf|7}Xk0~zH{k@hd_
zOujVd>{QqOobK^4(e?Y()~6;`U*aN<%d34(^LXuH@uaBWMQQPul(09RX78O1_6bUS
z>S%Z<q4+7u^_ipbDJ_F%)=pnra^9QSyl^&qUXuT{yLg|V_y=3(SJkBt#T6`Fb}a&i
zJ7Y<ZUoeBivm0qZ&btiH;1Gro24)5(IzdK;0fy0Gubu*ZE?wdpQ4*Y=R#Ki=l**8v
znPyawm#$!-XQrT$lv<Lgx$17_B%rc~o-U3d6?2jk1Wrs(Y+#xx#K^{0=<8?c&T&7s
zFF1HkqpRy-r2wHL(|I&51tcbFJoXGYyQwQR;RNrq(B4NUQxZ6Qd%}7OzI{4zBKQe!
zIjd%=wt?_x&Q4BY<LBR-C7#V(n{(z=)|xZ&ESvqbuDUuNyyeMtEd9c!=aZ&C-*mC*
zWAU3yJ}j)hd$=Df{&{psq~1+c)y<9lc8S1z+enw$(H;>I9nsM$opT!x2Hd*j;5((i
zvC%)|tb*UI35r4IJ*M?CFPYNpd(GqgbjR>^&se6U87)?m`}CNbSK1k$u}Z5AW@Grd
XT#;>3%AEqBXBj+Q{an^LB{Ts5*TXJ#

literal 0
HcmV?d00001

diff --git a/src/main/resources/META-INF/resources/VAADIN/themes/img/upload_file.gif b/src/main/resources/META-INF/resources/VAADIN/themes/img/upload_file.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9bffce7bc15b32a399c7a8ab41f748e93475e21c
GIT binary patch
literal 1016
zcmZ?wbhEHblw*)&_|5<VdMR2-NlA%STh!)?cx}@tSzVZL!m#9~TVdDw+}4Ag@53iA
zTs3$7@%^{{-+TAZ!NCEnX_OcZf#DDWia%Kx85jf@bU>Z~<p~Fls|<=9G9DWi9Bk&0
zwuw0Lfw8%jML@yAVWR^h69=nS&4mSv-CLQMWDF*3Tyk=<I(L9g!bhdX>8j>+Z!{Jh
zXqwH+(y}MwlcF=bL$g&t!=@D%n~WtjLZymQy=O?KR+XGM@QkTbM>DBsS3w#xGoyfx
zM!}Wk*V!C|WnxcndmG4H@c2~fg>9Lx-TK?ra!!0uY-Z4U|LMu8>kpeZ2&so%sV+!<
zILmxJ8$(UQM#tkd&i7m#HfcON!?;fF?;e2{%<N24q`v<A{3Vl}`I?rm!)~*;j9f{(
JOQi)EtO4~~ckloJ

literal 0
HcmV?d00001

diff --git a/src/test/java/biz/redsoft/sample/TomcatStarter.java b/src/test/java/biz/redsoft/sample/TomcatStarter.java
new file mode 100644
index 0000000..49006e6
--- /dev/null
+++ b/src/test/java/biz/redsoft/sample/TomcatStarter.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2017 Red Soft Corporation.
+ *
+ * This file is part of Red nCore.
+ *
+ * Red nCore is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * Red nCore is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Red nCore; see the file COPYING. If not, write to the
+ * Red Soft Corporation, 117105, Russia, Moscow, Nagornyy proyezd, 5.
+ *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library. Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give you
+ * permission to link this library with independent modules to produce an
+ * executable, regardless of the license terms of these independent
+ * modules, and to copy and distribute the resulting executable under
+ * terms of your choice, provided that you also meet, for each linked
+ * independent module, the terms and conditions of the license of that
+ * module. An independent module is a module which is not derived from
+ * or based on this library. If you modify this library, you may extend
+ * this exception to your version of the library, but you are not
+ * obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+package biz.redsoft.sample;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+
+import javax.servlet.ServletException;
+
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.Server;
+import org.apache.catalina.WebResourceRoot;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.webresources.DirResourceSet;
+import org.apache.catalina.webresources.FileResourceSet;
+import org.apache.catalina.webresources.StandardRoot;
+import org.apache.tomcat.util.scan.StandardJarScanner;
+
+/**
+ * @author Victor Bellavin
+ */
+public class TomcatStarter {
+  private String contextPath = "/ncore";
+  private int port = 8080;
+
+  private int shutdownPort = 8020;
+  private String shutdownCommand = "SHUTDOWN";
+
+  public void start() throws ServletException, LifecycleException {
+    System.setProperty("catalina.home", new File(".").getAbsolutePath());
+    final Tomcat tomcat = new Tomcat();
+    tomcat.setPort(port);
+    tomcat.setBaseDir(".");
+    tomcat.getHost().setAppBase(".");
+    tomcat.getConnector(); // initialize standard HTTP 1.1 connector
+    tomcat.enableNaming();
+    final Server server = tomcat.getServer();
+    server.setPort(shutdownPort);
+    server.setShutdown(shutdownCommand);
+    final StandardContext webContext = (StandardContext) tomcat.addWebapp(contextPath, "src/main/webapp");
+    webContext.setUseNaming(true);
+    final WebResourceRoot resources = new StandardRoot(webContext);
+    //aliases to resources
+    final String base = ap("");
+    resources.addPreResources(new DirResourceSet(resources, "/META-INF/resources", ap("src/main/resources"), "/META-INF/resources"));
+    //resources.addPreResources(new DirResourceSet(resources, "/WEB-INF/classes/export_templates", base, "/export_templates"));
+    if (new File(base, "ncore-properties-local.xml").exists())
+      resources.addPreResources(new FileResourceSet(resources, "/WEB-INF/ncore-properties-local.xml", base, "/ncore-properties-local.xml"));
+    //resources.addPreResources(new FileResourceSet(resources, "/WEB-INF/ncore-properties-local-openid.xml", base, "/ncore-properties-local-openid.xml"));
+    resources.addPreResources(new FileResourceSet(resources, "/WEB-INF/logback.xml", base, "/logback.xml"));
+    webContext.setResources(resources);
+    // IDEA не всегда корректно формирует пути. Отключим проверку ресурсов.
+    ((StandardJarScanner)webContext.getJarScanner()).setScanClassPath(false);
+    webContext.setWorkDir("build/tomcat/work");
+    tomcat.start();
+    server.await();
+    tomcat.stop();
+  }
+
+  private String ap(String s) {
+    return new File(s).getAbsolutePath();
+  }
+
+  public void stop() throws IOException {
+    final InetAddress serverAddress = InetAddress.getByName("localhost");
+    final Socket socket = new Socket(serverAddress, shutdownPort);
+    try (OutputStream os = socket.getOutputStream()) {
+      final byte[] buffer = shutdownCommand.getBytes();
+      os.write(buffer, 0, buffer.length);
+      os.flush();
+    }
+  }
+
+  public static void main(String[] args) throws ServletException, LifecycleException, IOException {
+    if (args.length > 0) {
+      String command = args[0];
+      if ("start".equals(command))
+        new TomcatStarter().start();
+      else if ("stop".equals(command))
+        new TomcatStarter().stop();
+    }
+  }
+}