Рефакторинг проходов запуска, остановки,публикации серверов

v++

.idea/workspace.xml

@@ -7,15 +7,28 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerPass.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ShutdownServerPass.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/StartServerPass.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/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingComponentsServer.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingTestingServer.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShutdownTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShutdownTestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartTestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

properties

@@ -22,7 +22,7 @@
   "Kernels": 8,
   "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
   "CheckTestingIntervalSeconds": 10,
-  "AutoCheckTesting": true,
+  "AutoCheckTesting": false,
   "EmailOnTestingProgress": true,
   "lastMachineId": 13,
   "lastUserId": 24,

src/_VisualDVM/Constants.java

@@ -1,6 +1,5 @@
 package _VisualDVM;
 import Common.Utils.Vector_;
-import com.google.gson.annotations.Expose;
 
 import java.util.Vector;
 public class Constants {
@@ -48,8 +47,9 @@ public class Constants {
     public static final int SocketTimeout = 5000;
     //-
     public static final String ServerAddress = "alex-freenas.ddns.net";
-    public static final  String ServerUserName = "testuser";
+    public static final String ServerUserName = "testuser";
-    public static final int ServerUserSHHPort = 23;
+    public static final String ServerUserPasword = "mprit_2011";
+    public static final int ServerUserSHHPort = 2000;
     //--
     public static final String package_json = "package_json";
     public static final String results_json = "results_json";

src/_VisualDVM/Passes/All/PingComponentsServer.java

@@ -1,12 +0,0 @@
-package _VisualDVM.Passes.All;
-import _VisualDVM.Passes.Server.ComponentsServerPass;
-import _VisualDVM.Repository.Server.ServerCode;
-public class PingComponentsServer extends ComponentsServerPass {
-    //todo ПИНГ РЕАЛИЗОВАТЬ ЧЕРЕЗ SSH
-    boolean silent;
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        silent = args.length > 0 ? (boolean) args[0] : false;
-        return super.canStart(args)&&SendRequest(ServerCode.Ping);
-    }
-}

src/_VisualDVM/Passes/All/PingTestingServer.java

@@ -1,12 +0,0 @@
-package _VisualDVM.Passes.All;
-import _VisualDVM.Passes.Server.TestingServerPass;
-import _VisualDVM.Repository.Server.ServerCode;
-public class PingTestingServer extends TestingServerPass {
-    //todo ПИНГ РЕАЛИЗОВАТЬ ЧЕРЕЗ SSH
-    boolean silent;
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        silent = args.length > 0 ? (boolean) args[0] : false;
-        return super.canStart(args)&&(SendRequest(ServerCode.Ping));
-    }
-}

src/_VisualDVM/Passes/All/PublishComponentsServer.java

@@ -4,45 +4,15 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
+import _VisualDVM.Passes.Server.PublishServerPass;
+import _VisualDVM.Repository.RepositoryServer;
+import _VisualDVM.Repository.Server.ComponentsServer;
 
 import java.io.File;
-public class PublishComponentsServer extends RepositoryServerSSHPass {
+public class PublishComponentsServer extends PublishServerPass<ComponentsServer> {
     @Override
-    protected String getServerFileName() {
+    protected ComponentsServer getServer() {
-        return "VisualSapfor.jar";
+        return Global.componentsServer;
-    }
-    @Override
-    protected String getServerHomeName() {
-        return "_sapfor_x64";
-    }
-    @Override
-    public String getIconPath() {
-        return "/Common/icons/Publish.png";
-    }
-    //1. остановить сервер.
-    //2. заменить файл сервера на компонент визуализатора. переименовать его.
-    //3. запустить сервер.
-    @Override
-    protected void ServerAction() throws Exception {
-        if (Global.mainModule.getPass(PassCode.PingComponentsServer).Do(true))
-            ShutdownServer();
-        if (Global.mainModule.getPass(PassCode.PingComponentsServer).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();
-    }
-    @Override
-    protected boolean validate() {
-        if (!Global.mainModule.getPass(PassCode.PingComponentsServer).Do(true)) {
-            Log.Writeln_("Не удалось запустить сервер.");
-        }
-        return true;
     }
 }
 

src/_VisualDVM/Passes/All/PublishTestingServer.java

@@ -4,44 +4,13 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
+import _VisualDVM.Passes.Server.PublishServerPass;
+import _VisualDVM.TestingSystem.Common.TestingServer;
 
 import java.io.File;
-public class PublishTestingServer extends RepositoryServerSSHPass {
+public class PublishTestingServer extends PublishServerPass<TestingServer> {
     @Override
-    protected String getServerFileName() {
+    protected TestingServer getServer() {
-        return "TestingSystem.jar";
+        return Global.testingServer;
-    }
-    @Override
-    protected String getServerHomeName() {
-        return "_testing_system";
-    }
-    @Override
-    public String getIconPath() {
-        return "/Common/icons/Publish.png";
-    }
-    //1. остановить сервер.
-    //2. заменить файл сервера на компонент визуализатора. переименовать его.
-    //3. запустить сервер.
-    @Override
-    protected void ServerAction() throws Exception {
-        if (Global.mainModule.getPass(PassCode.PingTestingServer).Do(true))
-            ShutdownServer();
-        if (Global.mainModule.getPass(PassCode.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();
-    }
-    @Override
-    protected boolean validate() {
-        if (!Global.mainModule.getPass(PassCode.PingTestingServer).Do(true)) {
-            Log.Writeln_("Не удалось запустить сервер.");
-        }
-        return true;
     }
 }

src/_VisualDVM/Passes/All/ShutdownComponentsServer.java

@@ -2,30 +2,11 @@ package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
-public class ShutdownComponentsServer extends RepositoryServerSSHPass {
+import _VisualDVM.Passes.Server.ShutdownServerPass;
+import _VisualDVM.Repository.Server.ComponentsServer;
+public class ShutdownComponentsServer extends ShutdownServerPass<ComponentsServer> {
     @Override
-    protected String getServerFileName() {
+    protected ComponentsServer getServer() {
-        return "VisualSapfor.jar";
+        return Global.componentsServer;
-    }
-    @Override
-    protected String getServerHomeName() {
-        return "_sapfor_x64";
-    }
-    @Override
-    public String getIconPath() {
-        return "/icons/Stop25.png";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.getPass(PassCode.PingComponentsServer).Do(true)) {
-            return true;
-        } else {
-            Log.Writeln_("Сервер уже неактивен!");
-            return false;
-        }
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        ShutdownServer();
     }
 }

src/_VisualDVM/Passes/All/ShutdownTestingServer.java

@@ -2,30 +2,11 @@ package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
-public class ShutdownTestingServer extends RepositoryServerSSHPass {
+import _VisualDVM.Passes.Server.ShutdownServerPass;
+import _VisualDVM.TestingSystem.Common.TestingServer;
+public class ShutdownTestingServer extends ShutdownServerPass<TestingServer> {
     @Override
-    protected String getServerFileName() {
+    protected TestingServer getServer() {
-        return "TestingSystem.jar";
+        return Global.testingServer;
-    }
-    @Override
-    protected String getServerHomeName() {
-        return "_testing_system";
-    }
-    @Override
-    public String getIconPath() {
-        return "/icons/Stop25.png";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.getPass(PassCode.PingTestingServer).Do(true)) {
-            return true;
-        } else {
-            Log.Writeln_("Сервер уже неактивен!");
-            return false;
-        }
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        ShutdownServer();
     }
 }

src/_VisualDVM/Passes/All/StartComponentsServer.java

@@ -2,34 +2,11 @@ package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
-public class StartComponentsServer extends RepositoryServerSSHPass {
+import _VisualDVM.Passes.Server.StartServerPass;
+import _VisualDVM.Repository.Server.ComponentsServer;
+public class StartComponentsServer extends StartServerPass<ComponentsServer> {
     @Override
-    public String getIconPath() {
+    protected ComponentsServer getServer() {
-        return "/Common/icons/GreenStart.png";
+        return Global.componentsServer;
-    }
-    @Override
-    protected String getServerHomeName() {
-        return "_sapfor_x64";
-    }
-    @Override
-    protected String getServerFileName() {
-        return "VisualSapfor.jar";
-    }
-    //--
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.getPass(PassCode.PingComponentsServer).Do(true)) {
-            Log.Writeln_("Сервер уже активен!");
-            return false;
-        }
-        return true;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        StartServer();
-    }
-    @Override
-    protected boolean validate() {
-        return Global.mainModule.getPass(PassCode.PingComponentsServer).Do();
     }
 }

src/_VisualDVM/Passes/All/StartTestingServer.java

@@ -2,33 +2,11 @@ package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
-public class StartTestingServer extends RepositoryServerSSHPass {
+import _VisualDVM.Passes.Server.StartServerPass;
+import _VisualDVM.TestingSystem.Common.TestingServer;
+public class StartTestingServer extends StartServerPass<TestingServer> {
     @Override
-    public String getIconPath() {
+    protected TestingServer getServer() {
-        return "/Common/icons/GreenStart.png";
+        return Global.testingServer;
-    }
-    @Override
-    protected String getServerHomeName() {
-        return "_testing_system";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Global.mainModule.getPass(PassCode.PingTestingServer).Do(true)) {
-            Log.Writeln_("Сервер уже активен!");
-            return false;
-        }
-        return true;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        StartServer();
-    }
-    @Override
-    protected boolean validate() {
-        return Global.mainModule.getPass(PassCode.PingTestingServer).Do();
-    }
-    @Override
-    protected String getServerFileName() {
-        return "TestingSystem.jar";
     }
 }

src/_VisualDVM/Passes/All/TestPass.java

@@ -1,39 +1,9 @@
 package _VisualDVM.Passes.All;
-import Common.Utils.Utils_;
+import Common.Passes.Pass;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.PassCode;
+public class TestPass extends Pass {
-import _VisualDVM.Passes.Server.TestingServerPass;
-import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.TestingSystem.Common.Group.Group;
-import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-
-import java.io.File;
-import java.util.Vector;
-public class TestPass extends TestingServerPass {
-    Group group;
-    SapforPackage sapforPackage;
-
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)){
-            group = Global.testingServer.db.groups.getUI().getCurrent();
-            sapforPackage = Global.testingServer.db.sapforPackages.getUI().getCurrent();
-            return SendRequest(ServerCode.TestCode, group.id+"\n"+sapforPackage.id, null, 0 );
-        }
-        return false;
-    }
     @Override
     protected void body() throws Exception {
-
+        Global.testingServer.PingFromClient();
-        Vector<String> res = (Vector<String>) request.server_response.object;
-        System.out.println("--");
-        for (String path: res){
-            System.out.println(Utils_.Brackets(path));
-        }
-        System.out.println("--");
-    }
-    @Override
-    protected void performFinish() throws Exception {
-        Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
     }
 }

src/_VisualDVM/Passes/PassCode.java

@@ -313,12 +313,10 @@ public enum PassCode implements PassCode_ {
     CompareSapforPackages,
     CreateDVMPackageFromCurrentProject,
     //--
-    PingTestingServer,
     ShutdownTestingServer,
     StartTestingServer,
     PublishTestingServer,
     //---
-    PingComponentsServer,
     ShutdownComponentsServer,
     StartComponentsServer,
     PublishComponentsServer,
@@ -403,8 +401,6 @@ public enum PassCode implements PassCode_ {
                 return "Собрать версию Sapfor";
             case PublishComponentsServer:
                 return "Опубликовать сервер компонент и отчётов об ошибках";
-            case PingComponentsServer:
-                return "Проверить активносто сервера компонент и отчётов об ошибках";
             case StartComponentsServer:
                 return "Запустить сервер компонент и отчётов об ошибках";
             case ShutdownComponentsServer:
@@ -414,8 +410,6 @@ public enum PassCode implements PassCode_ {
                 return "Опубликовать тестовый сервер.";
             case SPF_InsertImplicitNone:
                 return "Вставка оператора Implicit NONE";
-            case PingTestingServer:
-                return "Проверить активность тестового сервера";
             case StartTestingServer:
                 return "Запустить тестовый сервер";
             case ShutdownTestingServer:

src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java

@@ -7,14 +7,13 @@ import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.GlobalData.User.User;
+import _VisualDVM.Repository.RepositoryServer;
 
 import java.util.Date;
-public abstract class RepositoryServerSSHPass extends ConnectionPass {
+public abstract class RepositoryServerSSHPass<S extends RepositoryServer> extends ConnectionPass<S> {
     //--
     protected RemoteFile userHome;
     protected RemoteFile serverHome;
-    protected abstract String getServerFileName();
-    protected abstract String getServerHomeName();
     @Override
     public String getButtonText() {
         return "";
@@ -23,22 +22,24 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass {
     protected boolean needsAnimation() {
         return true;
     }
+    protected abstract S getServer();
     @Override
     public void Connect() throws Exception {
         userHome = null;
         serverHome = null;
         //--
         machine = new Machine("alex", Constants.ServerAddress, Constants.ServerUserSHHPort, MachineType.Server);
-        user = new User(Constants.ServerUserName, "mprit_2011");
+        user = new User(Constants.ServerUserName, Constants.ServerUserPasword);
         super.Connect();
         //--
         userHome = new RemoteFile(user.connection.sftpChannel.getHome(), true);
-        serverHome = new RemoteFile(userHome, getServerHomeName());
+        serverHome = new RemoteFile(userHome, getServer().getServerHomeName());
         //-
     }
     //--
     protected void StartServer() throws Exception {
-        user.connection.startShellProcess(serverHome, "server_out.txt", "java -jar " + getServerFileName());
+        user.connection.startShellProcess(serverHome, "server_out.txt", "java -jar " +
+                getServer().getServerFileName());
         //--
         RemoteFile StartLog = new RemoteFile(serverHome, CommonConstants.STARTED +
                 "_by_" +

src/_VisualDVM/Passes/Server/PublishServerPass.java

@@ -0,0 +1,34 @@
+package _VisualDVM.Passes.Server;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
+import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
+import _VisualDVM.Repository.RepositoryServer;
+import java.io.File;
+public abstract class PublishServerPass<S extends RepositoryServer> extends RepositoryServerSSHPass<S> {
+    @Override
+    public String getIconPath() {
+        return "/Common/icons/Publish.png";
+    }
+    //1. остановить сервер.
+    //2. заменить файл сервера на компонент визуализатора. переименовать его.
+    //3. запустить сервер.
+    @Override
+    protected void ServerAction() throws Exception {
+        if (getServer().PingFromClient())
+            ShutdownServer();
+        File src = Global.visualiser.getFile();
+        //-
+        RemoteFile dst = new RemoteFile(serverHome, getServer().getServerFileName());
+        user.connection.tryRM(dst);
+        user.connection.putSingleFile(src, dst);
+        //-
+        StartServer();
+    }
+    @Override
+    protected boolean validate() {
+        if (!getServer().PingFromClient()) {
+            Log.Writeln_("Не удалось запустить сервер.");
+        }
+        return true;
+    }
+}

src/_VisualDVM/Passes/Server/ShutdownServerPass.java

@@ -0,0 +1,23 @@
+package _VisualDVM.Passes.Server;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
+import _VisualDVM.Repository.RepositoryServer;
+public abstract class ShutdownServerPass<S extends RepositoryServer> extends RepositoryServerSSHPass<S> {
+    @Override
+    public String getIconPath() {
+        return "/icons/Stop25.png";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (getServer().PingFromClient()) {
+            return true;
+        } else {
+            Log.Writeln_("Сервер уже неактивен!");
+            return false;
+        }
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        ShutdownServer();
+    }
+}

src/_VisualDVM/Passes/Server/StartServerPass.java

@@ -0,0 +1,28 @@
+package _VisualDVM.Passes.Server;
+import Common.CommonConstants;
+import _VisualDVM.Constants;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
+import _VisualDVM.Repository.RepositoryServer;
+
+import java.util.Date;
+public abstract class StartServerPass<S extends RepositoryServer> extends RepositoryServerSSHPass<S> {
+    @Override
+    public String getIconPath() {
+        return "/Common/icons/GreenStart.png";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (getServer().PingFromClient()) {
+            Log.Writeln_("Сервер уже активен!");
+            return false;
+        }
+        return true;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+       StartServer();
+    }
+}

src/_VisualDVM/Repository/Component/Visualiser.java

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1161;
+        version = 1162;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());

src/_VisualDVM/Repository/RepositoryServer.java

@@ -5,7 +5,7 @@ import Common.Database.Objects.riDBObject;
 import Common.Utils.InterruptThread;
 import Common.Utils.Utils_;
 import _VisualDVM.Constants;
-import _VisualDVM.Global;
+import _VisualDVM.Passes.Server.RepositoryPass;
 import _VisualDVM.Repository.Server.DiagnosticSignalHandler;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -123,29 +123,29 @@ public abstract class RepositoryServer<D extends Database> {
                                         Constants.MailPassword);
                             }
                         });
-                    try {
+                try {
-                        MimeMessage message = new MimeMessage(session);
+                    MimeMessage message = new MimeMessage(session);
-                        message.setFrom(new InternetAddress(Constants.MailAddress));
+                    message.setFrom(new InternetAddress(Constants.MailAddress));
-                        message.setRecipients(Message.RecipientType.CC, InternetAddress.parse(address_in));
+                    message.setRecipients(Message.RecipientType.CC, InternetAddress.parse(address_in));
-                        message.setSubject(message_in.subject);
+                    message.setSubject(message_in.subject);
-                        Multipart multipart = new MimeMultipart();
+                    Multipart multipart = new MimeMultipart();
-                        MimeBodyPart textBodyPart = new MimeBodyPart();
+                    MimeBodyPart textBodyPart = new MimeBodyPart();
-                        textBodyPart.setText(message_in.text);
+                    textBodyPart.setText(message_in.text);
-                        multipart.addBodyPart(textBodyPart);
+                    multipart.addBodyPart(textBodyPart);
-                        for (String aName : innerFiles.keySet()) {
+                    for (String aName : innerFiles.keySet()) {
-                            MimeBodyPart attachmentBodyPart = new MimeBodyPart();
+                        MimeBodyPart attachmentBodyPart = new MimeBodyPart();
-                            DataSource source = new FileDataSource(innerFiles.get(aName));
+                        DataSource source = new FileDataSource(innerFiles.get(aName));
-                            attachmentBodyPart.setDataHandler(new DataHandler(source));
+                        attachmentBodyPart.setDataHandler(new DataHandler(source));
-                            attachmentBodyPart.setFileName(aName);
+                        attachmentBodyPart.setFileName(aName);
-                            multipart.addBodyPart(attachmentBodyPart);
+                        multipart.addBodyPart(attachmentBodyPart);
-                        }
-                        message.setContent(multipart);
-                        Transport.send(message);
-                    } catch (Exception ex) {
-                        System.out.println("Исключение во время отправки сообщения абоненту " + Utils_.Brackets(address_in));
-                        ex.printStackTrace();
-                        Utils_.sleep(1000);
                     }
+                    message.setContent(multipart);
+                    Transport.send(message);
+                } catch (Exception ex) {
+                    System.out.println("Исключение во время отправки сообщения абоненту " + Utils_.Brackets(address_in));
+                    ex.printStackTrace();
+                    Utils_.sleep(1000);
+                }
             } catch (Exception ex) {
                 System.out.println("Исключение во время выполнения рассылки.");
                 ex.printStackTrace();
@@ -386,4 +386,47 @@ public abstract class RepositoryServer<D extends Database> {
     public void Ping() {
         response = new ServerExchangeUnit_2021(ServerCode.OK);
     }
+    //--
+    public abstract String getServerFileName();
+    public abstract String getServerHomeName();
+    public boolean PingFromClient() {
+        RepositoryPass pingPass = new RepositoryPass(this) {
+            boolean success;
+            @Override
+            protected boolean needsAnimation() {
+                return true;
+            }
+            @Override
+            protected boolean canStart(Object... args) throws Exception {
+                success = false;
+                return true;
+            }
+            @Override
+            public String getDescription() {
+                return "Ping";
+            }
+            @Override
+            protected int getTimeout() {
+                return 0;
+            }
+            @Override
+            protected void body() throws Exception {
+                try {
+                    super.body();
+                    success = true;
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+            }
+            @Override
+            protected void ServerAction() throws Exception {
+                Command(new ServerExchangeUnit_2021(ServerCode.Ping));
+            }
+            @Override
+            protected boolean validate() {
+                return success;
+            }
+        };
+        return pingPass.Do();
+    }
 }

src/_VisualDVM/Repository/Server/ComponentsServer.java

@@ -513,4 +513,12 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
         //-
         response = new ServerExchangeUnit_2021(ServerCode.OK);
     }
+    @Override
+    public String getServerFileName() {
+        return "VisualSapfor.jar";
+    }
+    @Override
+    public String getServerHomeName() {
+        return "_sapfor_x64";
+    }
 }

src/_VisualDVM/TestingSystem/Common/TestingServer.java

@@ -243,6 +243,14 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
         //-
     }
+    @Override
+    public String getServerFileName() {
+        return "TestingSystem.jar";
+    }
+    @Override
+    public String getServerHomeName() {
+        return "_testing_system";
+    }
     //-->>>
     @Override
     protected void beforePublishAction(DBObject object) throws Exception {

src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java

@@ -61,7 +61,6 @@ public class MainMenuBar extends VisualiserMenuBar {
         //-
         setPreferredSize(new Dimension(0, 30));
         //--
-        /*
         add(new MenuBarButton() {
             {
                 setIcon("/Common/icons/Apply.png");
@@ -71,7 +70,6 @@ public class MainMenuBar extends VisualiserMenuBar {
                 });
             }
         });
-         */
         //--
         add(new JSeparator());
         add(MachineButton = new MenuBarButton() {