From 306ae182c146b465fbe82320bbee1c6873656750 Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Tue, 2 Jul 2024 18:19:30 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20TomcatStarter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 20 +++ .idea/gradle.xml | 2 +- .idea/jarRepositories.xml | 10 ++ .idea/modules.xml | 3 + build.gradle | 2 + .../java/biz/redsoft/sample/MainForm.java | 45 ------- .../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 ++++++++++++++++++ 9 files changed, 158 insertions(+), 46 deletions(-) delete mode 100644 src/main/java/biz/redsoft/sample/MainForm.java 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/.idea/compiler.xml b/.idea/compiler.xml index 76fcf38..a38cb43 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -32,6 +32,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 611e7c8..f0a3acf 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,8 +4,8 @@ \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 7ffebf6..7d583ac 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,9 @@ + + + diff --git a/build.gradle b/build.gradle index d640ba4..a7934ee 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,8 @@ repositories { dependencies { implementation 'javax.servlet:javax.servlet-api:3.1.0' testCompileClasspath 'org.junit.jupiter:junit-jupiter:5.8.2' + testImplementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.76' + testImplementation 'org.apache.tomcat.embed:tomcat-embed-jasper:9.0.76' runtimeClasspath files(ncoreGenerateControlDataJar) runtimeClasspath files(genJar) annotationProcessor 'biz.redsoft.ncore:ncoreAnnotationProcessor:1.0.+' diff --git a/src/main/java/biz/redsoft/sample/MainForm.java b/src/main/java/biz/redsoft/sample/MainForm.java deleted file mode 100644 index 97ff2b8..0000000 --- a/src/main/java/biz/redsoft/sample/MainForm.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2023 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; - -public class MainForm extends biz.redsoft.ncore.client.MainForm { - - public static void main(String[] args) throws Throwable { - biz.redsoft.ncore.client.MainForm.main(args); - } -} 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$eCp7$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%ZI9nsM$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*)&_|5Z~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{% 0) { + String command = args[0]; + if ("start".equals(command)) + new TomcatStarter().start(); + else if ("stop".equals(command)) + new TomcatStarter().stop(); + } + } +}