From 40feda7c5e2d15ab62a955ec57f1a514d83d47c4 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 23 Mar 2024 23:28:02 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=BE=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0=20?=
 =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  19 +++----
 properties                                    |  11 ++--
 src/Common/Constants.java                     |   2 +
 src/Common/GlobalProperties.java              |  18 +++---
 src/TestingSystem/Common/TestingBar.java      |  30 +---------
 src/TestingSystem/DVM/DVMTestingPlanner.java  |   6 +-
 .../Passes/All/StopTestingServer.java         |  52 ++++++++++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |   4 ++
 .../Passes/SSH/TestingServerSSHPass.java      |  18 ++++++
 src/icons/Stop25.png                          | Bin 0 -> 1410 bytes
 10 files changed, 105 insertions(+), 55 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/StopTestingServer.java
 create mode 100644 src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java
 create mode 100644 src/icons/Stop25.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index db541f22..4de2f691 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,19 +7,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StopTestingServer.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/Stop25.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/DataSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/GlobalProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 4ced49cc..7e97f998 100644
--- a/properties
+++ b/properties
@@ -2,7 +2,7 @@
   "Mode": "Normal",
   "ServerAddress": "alex-freenas.ddns.net",
   "ServerUserName": "testuser",
-  "ServerUserSHHPort": 23,
+  "ServerUserSHHPort": 2000,
   "ComponentsServerPort": 7995,
   "TestingServerPort": 7998,
   "SocketTimeout": 5000,
@@ -10,6 +10,10 @@
   "SMTPHost": "smtp.mail.ru",
   "SMTPPort": 465,
   "MailSocketPort": 465,
+  "collapseCredentials": false,
+  "collapseFileGraphs": true,
+  "collapseFileMessages": true,
+  "collapseProjectTrees": true,
   "BackupWorkspace": "_sapfor_x64_backups",
   "BackupHour": 5,
   "BackupMinute": 0,
@@ -34,8 +38,5 @@
   "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": false,
-  "collapseCredentials": false,
-  "collapseFileGraphs": true,
-  "collapseFileMessages": true,
-  "collapseProjectTrees": false
+  "eraseTestingWorkspaces": true
 }
\ No newline at end of file
diff --git a/src/Common/Constants.java b/src/Common/Constants.java
index 44ff2d0a..118ace99 100644
--- a/src/Common/Constants.java
+++ b/src/Common/Constants.java
@@ -8,6 +8,8 @@ import java.util.regex.Pattern;
 public class Constants {
     public static final int Nan = -1;
     public static final int planner_version = 2;
+    //--
+    public static final String testingSystemHomeName = "_testing_system";
     //SVN
     public static final String REPOSITORY_AUTHENTICATION = "--username dvmhuser --password dvmh2013 --non-interactive";
     public static final String DVM_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/dvm";
diff --git a/src/Common/GlobalProperties.java b/src/Common/GlobalProperties.java
index fec7c61f..14696851 100644
--- a/src/Common/GlobalProperties.java
+++ b/src/Common/GlobalProperties.java
@@ -50,6 +50,16 @@ public class GlobalProperties extends Properties {
     @Expose
     public int MailSocketPort = 465;
     //---
+    //СВОРАЧИВАНИЕ ОБЛАСТЕЙ----------------------
+    @Expose
+    public boolean collapseCredentials = false;
+    @Expose
+    public boolean collapseFileGraphs = false;
+    @Expose
+    public boolean collapseFileMessages = false;
+    @Expose
+    public boolean collapseProjectTrees = false;
+    //-------------------------------------------
     @Expose
     public String BackupWorkspace = "_sapfor_x64_backups";
     @Expose
@@ -103,13 +113,7 @@ public class GlobalProperties extends Properties {
     @Expose
     public boolean EmailOnTestingProgress = false; //включено ли оповещение по email о результатах тестирования.
     @Expose
-    public boolean collapseCredentials = false;
-    @Expose
-    public boolean collapseFileGraphs = false;
-    @Expose
-    public boolean collapseFileMessages = false;
-    @Expose
-    public boolean collapseProjectTrees = false;
+    public boolean eraseTestingWorkspaces = true; //удалять ли рабочее пространство пакетов тестирования после его завершения.
     //-
     @Override
     public File getFile() {
diff --git a/src/TestingSystem/Common/TestingBar.java b/src/TestingSystem/Common/TestingBar.java
index c8f3445e..2c81ad33 100644
--- a/src/TestingSystem/Common/TestingBar.java
+++ b/src/TestingSystem/Common/TestingBar.java
@@ -12,37 +12,11 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 import javax.swing.*;
 import java.awt.*;
 public class TestingBar extends VisualiserMenuBar {
-  //  public MenuBarButton MachineButton;
-  //  public MenuBarButton UserButton;
     public JLabel KernelsLabel;
-
     public JButton autorefreshButton;
     JSpinner sCheckTime;
     JSpinner sKernels;
     public TestingBar() {
-        /*
-        add(MachineButton = new MenuBarButton() {
-            {
-                setIcon("/icons/Machine.png");
-                setFont(VisualiserFonts.TreePlain);
-                setToolTipText("Машина тестирования");
-                addActionListener(e -> {
-                   UI.getMainWindow().FocusCredentials();
-                });
-            }
-        });
-        //--
-        add(UserButton = new MenuBarButton() {
-            {
-                setIcon("/icons/User.png");
-                setFont(VisualiserFonts.TreePlain);
-                setToolTipText("Учетная запись машины тестирования");
-                addActionListener(e -> {
-                    UI.getMainWindow().FocusCredentials();
-                });
-            }
-        });
-         */
         //-
         KernelsLabel = addLabel("", "/icons/Kernels.png");
         KernelsLabel.setHorizontalTextPosition(JLabel.LEFT);
@@ -57,8 +31,6 @@ public class TestingBar extends VisualiserMenuBar {
         UI.MakeSpinnerRapid(sKernels, e -> {
             Global.properties.updateField("TestingKernels", sKernels.getValue());
         });
-
-
         addLabel("  ");
         //--
         add(new MenuBarButton() {
@@ -112,6 +84,8 @@ public class TestingBar extends VisualiserMenuBar {
                 setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
             }
         });
+        addSeparator();
+        addPasses(PassCode_2021.StopTestingServer);
     }
     public void ShowAutoCheckTesting() {
         autorefreshButton.setIcon(Utils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));
diff --git a/src/TestingSystem/DVM/DVMTestingPlanner.java b/src/TestingSystem/DVM/DVMTestingPlanner.java
index 59a335f6..9081b220 100644
--- a/src/TestingSystem/DVM/DVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/DVMTestingPlanner.java
@@ -242,11 +242,9 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
             UnzipFolderPass unzipFolderPass = new UnzipFolderPass();
             unzipFolderPass.Do(results_archive.getAbsolutePath(), packageLocalWorkspace.getAbsolutePath(), false);
         }
-        //todo привязать это к настройкам, чтобы можно было включать/выключать удаление.
-        //получили результат. теперь уничтожаем папку пакета на целевой машине.
-        if (user.connection.Exists(packageRemoteWorkspace)) {
+        //---
+        if (Global.properties.eraseTestingWorkspaces && user.connection.Exists(packageRemoteWorkspace))
             user.connection.RMDIR(packageRemoteWorkspace.full_name);
-        }
     }
     @Override
     protected void AnalyseResults() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/StopTestingServer.java b/src/Visual_DVM_2021/Passes/All/StopTestingServer.java
new file mode 100644
index 00000000..2a28366c
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/StopTestingServer.java
@@ -0,0 +1,52 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Constants;
+import Common.Current;
+import Common.UI.UI;
+import Common.Utils.Utils;
+import GlobalData.RemoteFile.RemoteFile;
+import Visual_DVM_2021.Passes.SSH.TestingServerSSHPass;
+import com.jcraft.jsch.ChannelSftp;
+import com.sun.corba.se.spi.orbutil.threadpool.Work;
+
+import java.util.Date;
+import java.util.Vector;
+public class StopTestingServer extends TestingServerSSHPass {
+    @Override
+    public String getIconPath() {
+        return "/icons/Stop25.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        RemoteFile Home = new RemoteFile(user.connection.sftpChannel.getHome(), true);
+        RemoteFile Workspace = new RemoteFile(Home, Constants.testingSystemHomeName);
+        //--
+        RemoteFile INTERRUPT =  new RemoteFile(Workspace, Constants.INTERRUPT);
+        RemoteFile ABORTED = new RemoteFile(Workspace, Constants.ABORTED);
+
+        //--
+        System.out.println("Home="+Utils.Brackets(Home.full_name));
+        System.out.println("Workspace="+Utils.Brackets(Workspace.full_name));
+
+        ShowMessage1("Создание файла INTERRUPT..");
+        user.connection.writeToFile("+", INTERRUPT);
+        ShowMessage1("Ожидание остановки сервера тестирования");
+        do {
+            Utils.sleep(1000);
+            ShowMessage2("Проверка признака остановки..");
+        } while (!user.connection.Exists(ABORTED));
+        //--
+        RemoteFile AbortLog = new RemoteFile(Workspace, Constants.ABORTED+
+                "_by_"+
+                Current.getAccount().email+
+                "_"+
+                new Date().toString()
+                );
+        user.connection.writeToFile("+", AbortLog);
+        user.connection.sftpChannel.rename(ABORTED.full_name, AbortLog.full_name);
+        System.out.println("Done");
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index a6145f30..875b82b5 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -322,11 +322,15 @@ public enum PassCode_2021 {
     CompareDVMRunTasks,
     CompareSapforPackages,
     CreateDVMPackageFromCurrentProject,
+    //--
+    StopTestingServer
     ;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case StopTestingServer:
+                return "Остановить серверный компонент тестирования";
             case CreateDVMPackageFromCurrentProject:
                 return "Тестировать текущий проект";
             case CompareSapforPackages:
diff --git a/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java b/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java
new file mode 100644
index 00000000..3b4edf53
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java
@@ -0,0 +1,18 @@
+package Visual_DVM_2021.Passes.SSH;
+import Common.Current;
+import Common.Global;
+import GlobalData.Machine.Machine;
+import GlobalData.Machine.MachineType;
+import GlobalData.User.User;
+public class TestingServerSSHPass extends ConnectionPass {
+    @Override
+    protected boolean needsAnimation() {
+        return true;
+    }
+    @Override
+    public void Connect() throws Exception {
+        machine = new Machine("alex", Global.properties.ServerAddress,Global.properties.ServerUserSHHPort,MachineType.Server);
+        user = new User(Global.properties.ServerUserName, "mprit_2011");
+        super.Connect();
+    }
+}
diff --git a/src/icons/Stop25.png b/src/icons/Stop25.png
new file mode 100644
index 0000000000000000000000000000000000000000..56c9cbfe370553dc97ce92cffb3f02aabbf527b5
GIT binary patch
literal 1410
zcmV-|1%3L7P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ>2uVaiRCwCdmRoF8RTPH5edf%$%%vTtL#Ily1ql{S6hqKPMJcy<izf5}#>ANT
zWK0wjjhgtb4<>3%(C}npG-w5VFcF6ijHOT&3RR)BKq^y;&>M5<Wtem3?CnDlTc*S(
zO<c)JcCuH_x7WYUUTX`b6#uqq{0FB0wb-Qz)*!eIP=HX165QvmT>hSnM#I9BUilF<
zpU7pVjFV?x^9j0?5C{e1zz;yPl=C5TO#m+3UuaspyR&{-&G~a_^aW%s0gKl(u<qu?
zdjcJ)HeIO{Lfkl$xmHxFae8CZp6;bf<44=u@kxnTAWkX8$nm3y=9WbdJhJht;NFfc
zrlRxuVEy_6xk@$Wn%3_AwV@$?=G$+nj#VKv-;D*AlC#MU%*UUoTD8e*kL)|pqA3o}
z&1fEETB!#z8`kYUy?S*#y)QvktO}uNDAXJw=g4+-8IqFohr2L0ZmMn&+8!s7Y(<eO
zg9H_g#=~oO4?Xly{9@_=(P$L31%AGHyuX1;N=A+xA+W9~7WKS#Gnr}zI_E*^RxJO}
zef+WbXm>Z^PzaPl7zRoyl<UrZRS0~BAL+U%&qFf|gr?y+&TPC8jP@SK-n=<hf9cYD
z!0P#OMQ^f7o=3nm39q~ZD;_6%@&raj1!h$Yq(n(c{>*6twM($#)#Up6@QOu3b#?e`
zo8tHc(-+R;x-R-nQL{|0qU(Cb<Rpvkxre%zt$2k3@y13b2L`BV+JIgWCi_b-fklg`
zeex+vlaqMsH<I4<Ik&&?B5p2^9u713=_i!(d5VtXmEHJ~rZJI9;iQM~S5`35-9<5-
zX8KegV?P{VW^j-{zWJJ(rY0_TA7XIlNBI1HsvGaeo1SK9*JqR_^XNijyrYBCoO)i%
z#1$Hb?kBzDW5SDTS@QhzTp1qb%7tOf%1VUaPq3y2JrG3ZC$TFl@$z{BOKQ=BL6$!I
z97=i&@7#$ViBK~1^4{eFy5ms$=w|XgM>u@%8q8P>G8rfo@CSp~RWUTnBDicBRwRmb
z%Pkc82XIG68QA_3JsZ~Jo*l#v*tiQ_MhA$X5Sc6u?|;D5seWe8oM!0lcc|Xdj6W3O
zj~zRh>FMFtx8B08tEbT4&+l)(&YfR;$<*P4$nhMO4t~H@3qU+g^I4WjCUuar&pb`=
zu2p0bdoh)yaHx}^zF%=p_A}aZoWjpPV%@faY%+nEnIgUYWenFv1$5Mv5`NF4<omlQ
z*C125oMWtPB-GV~bF7!*(Oxu5VA}?2Via%W5`myGD{b%WzHVy>pHA_opYYrMYx>*E
zmos(jSgE`wrv_g6Eu9{VY~4mk7X(5&mfw$o!qjyv%fJ8(z_JYjVFOdwF$CBF0~3Yq
zl!&yoapK~|O!2qASIZzabY}Ob+K!Bkj|W@YupNmZB_{l%8%kmqON6$x(v!_+ClbkR
zHYCd+N<amqa*2J-og-r-R!b{E*TYZ}LvUkPl7Lgf-qOOMY;HXB-QJe4Afe`T;dvcU
z3PA)qr<40zlVcMTM%y-mj)z%rFt04^!D0!kc`N(#Q`y}2iER-`%IgM~`0F9jt_jrD
zY2#ChbFj`{-_*YK)+I4>a1bfVC!?mosjug&izAn3_H{g63kfL%O3d!HULC&+Lx5qW
zI1CToy>i97mC;zx^E`Py#OL#A`OM{+6Mg+}tc3$HA&^(4Ul8)Ye-iyU0N0B?Ll|~>
Qv;Y7A07*qoM6N<$g5V~kfdBvi

literal 0
HcmV?d00001