From a5ffce7c084935cd092a8a9ea91abc5ec2857125 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 29 Mar 2024 00:07:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=BA=D0=B8=20=D0=BF=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0.=20?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B0=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D1=8F?=
 =?UTF-8?q?=D0=B5=D1=82=20=D0=BE=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA?=
 =?UTF-8?q?=D1=83=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0,=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D0=BD=D1=83=20=D0=B5=D0=B3=D0=BE=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B8=D0=B9=20=D1=84?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=20jar,=20=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83?=
 =?UTF-8?q?=D1=81=D0=BA=D0=B0=D0=B5=D1=82=20=D0=B7=D0=B0=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 12 +++--
 src/Common/Constants.java                     |  1 -
 src/TestingSystem/Common/TestingBar.java      |  2 +-
 .../Passes/All/PublishTestingServer.java      | 53 +++++++++++++++++++
 .../Passes/All/ShutdownTestingServer.java     | 12 ++++-
 .../Passes/All/StartTestingServer.java        | 17 +++---
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  3 ++
 ...Pass.java => RepositoryServerSSHPass.java} | 29 +++++-----
 src/Visual_DVM_2021/UI/Main/CallbackForm.java |  3 ++
 9 files changed, 104 insertions(+), 28 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/PublishTestingServer.java
 rename src/Visual_DVM_2021/Passes/SSH/{TestingServerSSHPass.java => RepositoryServerSSHPass.java} (69%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 445cc032..1f60e4f8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,15 @@
   </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/PublishTestingServer.java" 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/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.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/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTestingServer.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" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Constants.java b/src/Common/Constants.java
index 6453e65e..8c576876 100644
--- a/src/Common/Constants.java
+++ b/src/Common/Constants.java
@@ -9,7 +9,6 @@ public class Constants {
     public static final int Nan = -1;
     public static final int planner_version = 3;
     //--
-    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/TestingSystem/Common/TestingBar.java b/src/TestingSystem/Common/TestingBar.java
index c94e8756..7b12b5ab 100644
--- a/src/TestingSystem/Common/TestingBar.java
+++ b/src/TestingSystem/Common/TestingBar.java
@@ -85,7 +85,7 @@ public class TestingBar extends VisualiserMenuBar {
         });
         addSeparator();
         serverAdminLabel = addLabel("  управление сервером  ");
-        addPasses(PassCode_2021.StartTestingServer, PassCode_2021.ShutdownTestingServer);
+        addPasses(PassCode_2021.StartTestingServer, PassCode_2021.ShutdownTestingServer, PassCode_2021.PublishTestingServer);
     }
     public void ShowAutoCheckTesting() {
         autorefreshButton.setIcon(Utils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTestingServer.java b/src/Visual_DVM_2021/Passes/All/PublishTestingServer.java
new file mode 100644
index 00000000..8122ed67
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/PublishTestingServer.java
@@ -0,0 +1,53 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Global;
+import Common.UI.UI;
+import Common.Utils.Utils;
+import GlobalData.RemoteFile.RemoteFile;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassException;
+import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass;
+
+import java.io.File;
+public class PublishTestingServer extends RepositoryServerSSHPass {
+    @Override
+    protected String getServerFileName() {
+        return "TestingSystem.jar";
+    }
+    @Override
+    protected String getServerHomeName() {
+        return "_testing_system";
+    }
+    @Override
+    public String getIconPath() {
+        return "/icons/Publish.png";
+    }
+    //1. остановить сервер.
+    //2. заменить файл сервера на компонент визуализатора. переименовать его.
+    //3. запустить сервер.
+    @Override
+    protected void ServerAction() throws Exception {
+        if (passes.get(PassCode_2021.PingTestingServer).Do(true))
+            ShutdownServer();
+        if (passes.get(PassCode_2021.PingTestingServer).Do(true)) {
+            throw new PassException("Не удалось остановить сервер.");
+        }
+        File src = Global.visualiser.getFile();
+        //-
+        RemoteFile dst = new RemoteFile(serverHome, getServerFileName());
+        user.connection.tryRM(dst);
+        user.connection.putSingleFile(src, dst);
+        //-
+
+        StartServer();
+        System.out.println("userHome=" + Utils.Brackets(userHome.full_name));
+        System.out.println("testingHome=" + Utils.Brackets(serverHome.full_name));
+    }
+    @Override
+    protected boolean validate() {
+
+        if (!passes.get(PassCode_2021.PingTestingServer).Do(true)) {
+            Log.Writeln_("Не удалось запустить сервер.");
+        }
+        return true;
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java b/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java
index 39d98d79..38f1c6a1 100644
--- a/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java
+++ b/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java
@@ -1,7 +1,15 @@
 package Visual_DVM_2021.Passes.All;
 import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.SSH.TestingServerSSHPass;
-public class ShutdownTestingServer extends TestingServerSSHPass {
+import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass;
+public class ShutdownTestingServer extends RepositoryServerSSHPass {
+    @Override
+    protected String getServerFileName() {
+        return  "TestingSystem.jar";
+    }
+    @Override
+    protected String getServerHomeName() {
+        return "_testing_system";
+    }
     @Override
     public String getIconPath() {
         return "/icons/Stop25.png";
diff --git a/src/Visual_DVM_2021/Passes/All/StartTestingServer.java b/src/Visual_DVM_2021/Passes/All/StartTestingServer.java
index 1378566e..13bf18e1 100644
--- a/src/Visual_DVM_2021/Passes/All/StartTestingServer.java
+++ b/src/Visual_DVM_2021/Passes/All/StartTestingServer.java
@@ -1,17 +1,16 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Constants;
-import Common.Current;
-import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.SSH.TestingServerSSHPass;
-
-import java.util.Date;
-public class StartTestingServer extends TestingServerSSHPass {
+import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass;
+public class StartTestingServer extends RepositoryServerSSHPass {
     @Override
     public String getIconPath() {
         return "/icons/GreenStart.png";
     }
     @Override
+    protected String getServerHomeName() {
+        return "_testing_system";
+    }
+    @Override
     protected boolean canStart(Object... args) throws Exception {
         if (passes.get(PassCode_2021.PingTestingServer).Do(true)) {
             Log.Writeln_("Сервер уже активен!");
@@ -27,4 +26,8 @@ public class StartTestingServer extends TestingServerSSHPass {
     protected boolean validate() {
         return passes.get(PassCode_2021.PingTestingServer).Do();
     }
+    @Override
+    protected String getServerFileName() {
+        return  "TestingSystem.jar";
+    }
 }
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 4e39f7b5..9997e03f 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -327,11 +327,14 @@ public enum PassCode_2021 {
     ShutdownTestingServer,
     StartTestingServer,
     SPF_InsertImplicitNone,
+    PublishTestingServer,
     ;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case PublishTestingServer:
+                return "Опубликовать тестовый сервер.";
             case SPF_InsertImplicitNone:
                 return "Вставка оператора Implicit NONE";
             case PingTestingServer:
diff --git a/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java b/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
similarity index 69%
rename from src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java
rename to src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
index 5f0e69b3..3e1b5a9d 100644
--- a/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java
+++ b/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
@@ -9,14 +9,16 @@ import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.User.User;
 
 import java.util.Date;
-public class TestingServerSSHPass extends ConnectionPass {
+public abstract class RepositoryServerSSHPass extends ConnectionPass {
+    protected abstract String getServerFileName();
+    protected abstract String getServerHomeName();
     @Override
     public String getButtonText() {
         return "";
     }
     //--
     protected RemoteFile userHome;
-    protected RemoteFile testingHome;
+    protected RemoteFile serverHome;
     @Override
     protected boolean needsAnimation() {
         return true;
@@ -24,22 +26,23 @@ public class TestingServerSSHPass extends ConnectionPass {
     @Override
     public void Connect() throws Exception {
         userHome = null;
-        testingHome = null;
+        serverHome = null;
         //--
         machine = new Machine("alex", Global.properties.ServerAddress, Global.properties.ServerUserSHHPort, MachineType.Server);
         user = new User(Global.properties.ServerUserName, "mprit_2011");
         super.Connect();
         //--
         userHome = new RemoteFile(user.connection.sftpChannel.getHome(), true);
-        testingHome = new RemoteFile(userHome, Constants.testingSystemHomeName);
+        serverHome = new RemoteFile(userHome, getServerHomeName());
         //-
         System.out.println("userHome=" + Utils.Brackets(userHome.full_name));
-        System.out.println("testingHome=" + Utils.Brackets(testingHome.full_name));
+        System.out.println("testingHome=" + Utils.Brackets(serverHome.full_name));
     }
     //--
     protected void StartServer() throws Exception {
-        user.connection.performScript(testingHome, "nohup java -jar TestingSystem.jar &");
-        RemoteFile StartLog = new RemoteFile(testingHome, Constants.STARTED +
+        user.connection.performScript(serverHome, "nohup java -jar " + getServerFileName()+
+                " &");
+        RemoteFile StartLog = new RemoteFile(serverHome, Constants.STARTED +
                 "_by_" +
                 Current.getAccount().email +
                 "_" +
@@ -48,9 +51,9 @@ public class TestingServerSSHPass extends ConnectionPass {
         user.connection.writeToFile("+", StartLog);
         //--
         RemoteFile[] files = new RemoteFile[]{
-                new RemoteFile(testingHome, Constants.script),
-                new RemoteFile(testingHome, Constants.out_file),
-                new RemoteFile(testingHome, Constants.err_file)
+                new RemoteFile(serverHome, Constants.script),
+                new RemoteFile(serverHome, Constants.out_file),
+                new RemoteFile(serverHome, Constants.err_file)
         };
         //-
         for (RemoteFile file : files) {
@@ -59,8 +62,8 @@ public class TestingServerSSHPass extends ConnectionPass {
     }
     protected void ShutdownServer() throws Exception {
         //--
-        RemoteFile INTERRUPT = new RemoteFile(testingHome, Constants.INTERRUPT);
-        RemoteFile ABORTED = new RemoteFile(testingHome, Constants.ABORTED);
+        RemoteFile INTERRUPT = new RemoteFile(serverHome, Constants.INTERRUPT);
+        RemoteFile ABORTED = new RemoteFile(serverHome, Constants.ABORTED);
         //--
         ShowMessage1("Создание файла INTERRUPT..");
         user.connection.writeToFile("+", INTERRUPT);
@@ -72,7 +75,7 @@ public class TestingServerSSHPass extends ConnectionPass {
         //--
         ShowMessage2("");
         ShowMessage1("Журнализация");
-        RemoteFile AbortLog = new RemoteFile(testingHome, Constants.ABORTED +
+        RemoteFile AbortLog = new RemoteFile(serverHome, Constants.ABORTED +
                 "_by_" +
                 Current.getAccount().email +
                 "_" +
diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.java b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
index 370ed236..d51d5c0f 100644
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
@@ -377,6 +377,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         //
         Pass_2021.passes.get(PassCode_2021.ShutdownTestingServer).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.StartTestingServer).setControlsVisible(false);
+        Pass_2021.passes.get(PassCode_2021.PublishTestingServer).setControlsVisible(false);
         UI.testingBar.showServerAdminLabel(false);
     }
     private void setDeveloperRights() {
@@ -391,6 +392,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         //
         Pass_2021.passes.get(PassCode_2021.ShutdownTestingServer).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.StartTestingServer).setControlsVisible(false);
+        Pass_2021.passes.get(PassCode_2021.PublishTestingServer).setControlsVisible(false);
         UI.testingBar.showServerAdminLabel(false);
     }
     @Override
@@ -406,6 +408,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         //--
         Pass_2021.passes.get(PassCode_2021.ShutdownTestingServer).setControlsVisible(true);
         Pass_2021.passes.get(PassCode_2021.StartTestingServer).setControlsVisible(true);
+        Pass_2021.passes.get(PassCode_2021.PublishTestingServer).setControlsVisible(true);
         UI.testingBar.showServerAdminLabel(true);
     }
     @Override