рефакторинг

2025-02-18 16:21:20 +03:00
parent 9c0ed53d52
commit 0a123988b3
163 changed files with 938 additions and 367 deletions
--- a/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
@@ -1,18 +1,18 @@
-package _VisualDVM.Repository.BugReport;
+package _VisualDVM.ComponentsServer.BugReport;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.rDBObject;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
 import Common.Utils.Vector_;
+import _VisualDVM.ComponentsServer.BugReport.Json.RecipientJson;
+import _VisualDVM.ComponentsServer.BugReport.Json.RecipientsJson;
+import _VisualDVM.ComponentsServer.BugReport.Json.VisualiserSettingsJson;
+import _VisualDVM.ComponentsServer.Component.ComponentType;
+import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.Account;
 import _VisualDVM.ProjectData.SapforData.SapforProperties;
-import _VisualDVM.Repository.BugReport.Json.RecipientJson;
-import _VisualDVM.Repository.BugReport.Json.RecipientsJson;
-import _VisualDVM.Repository.BugReport.Json.VisualiserSettingsJson;
-import _VisualDVM.Repository.Component.ComponentType;
-import _VisualDVM.Repository.Subscribes.Subscriber;
 import com.sun.org.glassfish.gmbal.Description;

 import java.io.File;
--- a/src/_VisualDVM/ComponentsServer/BugReport/BugReportState.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/BugReportState.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.BugReport;
+package _VisualDVM.ComponentsServer.BugReport;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.StatusEnum;

--- a/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java
@@ -1,7 +1,7 @@
-package _VisualDVM.Repository.BugReport;
+package _VisualDVM.ComponentsServer.BugReport;
 import Common.Database.Tables.DBTable;
 import Common.Visual.DataSetControlForm;
-import _VisualDVM.Repository.BugReport.UI.BugReportsForm;
+import _VisualDVM.ComponentsServer.BugReport.UI.BugReportsForm;

 import javax.swing.*;
 import java.util.Vector;
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java
@@ -1,5 +1,5 @@
-package _VisualDVM.Repository.BugReport.Json;
-import _VisualDVM.Repository.BugReport.BugReport;
+package _VisualDVM.ComponentsServer.BugReport.Json;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import com.google.gson.annotations.Expose;

 import java.io.Serializable;
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.BugReport.Json;
+package _VisualDVM.ComponentsServer.BugReport.Json;
 import com.google.gson.annotations.Expose;
 public class RecipientJson {
    @Expose
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java
@@ -1,5 +1,5 @@
-package _VisualDVM.Repository.BugReport.Json;
-import _VisualDVM.Repository.Subscribes.Subscriber;
+package _VisualDVM.ComponentsServer.BugReport.Json;
+import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
 import com.google.gson.annotations.Expose;

 import java.util.List;
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.BugReport.Json;
+package _VisualDVM.ComponentsServer.BugReport.Json;
 import com.google.gson.annotations.Expose;
 public class VisualiserSettingJson {
    @Expose
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingsJson.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingsJson.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.BugReport.Json;
+package _VisualDVM.ComponentsServer.BugReport.Json;
 import _VisualDVM.ProjectData.SapforData.SapforProperties;
 import com.google.gson.annotations.Expose;

--- a/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.BugReport.UI;
+package _VisualDVM.ComponentsServer.BugReport.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
 import Common.Visual.DataSetControlForm;
@@ -7,10 +7,10 @@ import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererProgressBar;
 import Common.Visual.Tables.RendererStatusEnum;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
+import _VisualDVM.ComponentsServer.BugReport.BugReportState;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportState;

 import javax.swing.*;
 import java.awt.event.ActionEvent;
--- a/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
+++ b/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
@@ -1,10 +1,10 @@
-package _VisualDVM.Repository;
+package _VisualDVM.ComponentsServer;
 import Common.Database.SQLITE.SQLiteDatabase;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
+import _VisualDVM.ComponentsServer.BugReport.BugReportsDBTable;
+import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspaceDBTable;
+import _VisualDVM.ComponentsServer.Subscribes.SubsribersDBTable;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportsDBTable;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
-import _VisualDVM.Repository.Subscribes.SubsribersDBTable;

 import java.nio.file.Paths;
 import java.util.Vector;
--- a/src/_VisualDVM/ComponentsServer/Component/Component.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Component.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component;
+package _VisualDVM.ComponentsServer.Component;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Passes.PassException;
--- a/src/_VisualDVM/ComponentsServer/Component/ComponentState.java
+++ b/src/_VisualDVM/ComponentsServer/Component/ComponentState.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component;
+package _VisualDVM.ComponentsServer.Component;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.StatusEnum;
 public enum ComponentState implements StatusEnum {
--- a/src/_VisualDVM/ComponentsServer/Component/ComponentType.java
+++ b/src/_VisualDVM/ComponentsServer/Component/ComponentType.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component;
+package _VisualDVM.ComponentsServer.Component;
 import java.io.Serializable;
 public enum ComponentType implements Serializable {
    Undefined,
--- a/src/_VisualDVM/ComponentsServer/Component/ComponentsSet.java
+++ b/src/_VisualDVM/ComponentsServer/Component/ComponentsSet.java
@@ -1,12 +1,12 @@
-package _VisualDVM.Repository.Component;
+package _VisualDVM.ComponentsServer.Component;
 import Common.Database.Tables.DataSet;
 import Common.MainModule_;
 import Common.Visual.DataSetControlForm;
+import _VisualDVM.ComponentsServer.Component.PerformanceAnalyzer.PerformanceAnalyzer;
+import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor_F;
+import _VisualDVM.ComponentsServer.Component.UI.ComponentsForm;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
-import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
-import _VisualDVM.Repository.Component.Sapfor.Sapfor_F;
-import _VisualDVM.Repository.Component.UI.ComponentsForm;

 import javax.swing.*;
 public class ComponentsSet extends DataSet<ComponentType, Component> {
--- a/src/_VisualDVM/ComponentsServer/Component/Instruction.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Instruction.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component;
+package _VisualDVM.ComponentsServer.Component;
 import Common.Utils.Utils_;
 import _VisualDVM.Utils;

--- a/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java
@@ -1,7 +1,7 @@
-package _VisualDVM.Repository.Component.Json;
+package _VisualDVM.ComponentsServer.Component.Json;
 import Common.Utils.Utils_;
-import _VisualDVM.Repository.Component.Component;
-import _VisualDVM.Repository.Component.ComponentType;
+import _VisualDVM.ComponentsServer.Component.Component;
+import _VisualDVM.ComponentsServer.Component.ComponentType;
 import com.google.gson.annotations.Expose;

 import java.io.Serializable;
--- a/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java
@@ -1,5 +1,5 @@
-package _VisualDVM.Repository.Component.Json;
-import _VisualDVM.Repository.Component.ComponentType;
+package _VisualDVM.ComponentsServer.Component.Json;
+import _VisualDVM.ComponentsServer.Component.ComponentType;
 import com.google.gson.annotations.Expose;

 import java.io.Serializable;
--- a/src/_VisualDVM/ComponentsServer/Component/OSDComponent.java
+++ b/src/_VisualDVM/ComponentsServer/Component/OSDComponent.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component;
+package _VisualDVM.ComponentsServer.Component;
 import Common.Utils.Utils_;
 public abstract class OSDComponent extends Component {
    @Override
--- a/src/_VisualDVM/ComponentsServer/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
+++ b/src/_VisualDVM/ComponentsServer/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
@@ -1,9 +1,9 @@
-package _VisualDVM.Repository.Component.PerformanceAnalyzer;
+package _VisualDVM.ComponentsServer.Component.PerformanceAnalyzer;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
+import _VisualDVM.ComponentsServer.Component.Component;
+import _VisualDVM.ComponentsServer.Component.ComponentType;
 import _VisualDVM.Global;
-import _VisualDVM.Repository.Component.Component;
-import _VisualDVM.Repository.Component.ComponentType;
 import _VisualDVM.Utils;
 import analyzer.common.MessageJtoJ;

--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/MessagesServer.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/MessagesServer.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component.Sapfor;
+package _VisualDVM.ComponentsServer.Component.Sapfor;
 import Common.MainModule_;
 import Common.Utils.Utils_;

--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
@@ -1,16 +1,16 @@
-package _VisualDVM.Repository.Component.Sapfor;
+package _VisualDVM.ComponentsServer.Component.Sapfor;
 import Common.CommonConstants;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
+import _VisualDVM.ComponentsServer.Component.OSDComponent;
+import _VisualDVM.ComponentsServer.Component.Visualizer_2;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
-import _VisualDVM.Repository.Component.OSDComponent;
-import _VisualDVM.Repository.Component.Visualizer_2;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.Utils;
 import org.apache.commons.io.FileUtils;
--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java
@@ -1,6 +1,6 @@
-package _VisualDVM.Repository.Component.Sapfor;
+package _VisualDVM.ComponentsServer.Component.Sapfor;
+import _VisualDVM.ComponentsServer.Component.ComponentType;
 import _VisualDVM.Global;
-import _VisualDVM.Repository.Component.ComponentType;

 import java.io.File;
 import java.nio.file.Paths;
--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/TransformationPermission.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/TransformationPermission.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component.Sapfor;
+package _VisualDVM.ComponentsServer.Component.Sapfor;
 public enum TransformationPermission {
    None,
    All,
--- a/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.form
+++ b/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Repository.Component.UI.ComponentsFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.ComponentsServer.Component.UI.ComponentsFields">
  <grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
    <constraints>
      <xy x="20" y="20" width="802" height="400"/>
--- a/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.java
+++ b/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component.UI;
+package _VisualDVM.ComponentsServer.Component.UI;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Global;

--- a/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsForm.java
+++ b/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsForm.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component.UI;
+package _VisualDVM.ComponentsServer.Component.UI;
 import Common.Database.Tables.DataSet;
 import Common.MainModule_;
 import Common.Visual.DataSetControlForm;
@@ -8,9 +8,9 @@ import Common.Visual.Menus.VisualiserMenu;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.RendererMaskedNanInteger;
 import Common.Visual.Tables.RendererStatusEnum;
+import _VisualDVM.ComponentsServer.Component.Component;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Repository.Component.Component;

 import javax.swing.*;
 import java.util.Vector;
--- a/src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.form
+++ b/src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Repository.Component.UI.PickUpComponentFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.ComponentsServer.Component.UI.PickUpComponentFields">
  <grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
    <constraints>
      <xy x="20" y="20" width="500" height="400"/>
--- a/src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.java
+++ b/src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component.UI;
+package _VisualDVM.ComponentsServer.Component.UI;
 import Common.Visual.Windows.Dialog.DialogFields;

 import javax.swing.*;
--- a/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.form
+++ b/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Repository.Component.UI.PublishFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.ComponentsServer.Component.UI.PublishFields">
  <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="8" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
    <margin top="0" left="0" bottom="0" right="0"/>
    <constraints>
--- a/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java
+++ b/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component.UI;
+package _VisualDVM.ComponentsServer.Component.UI;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Visual.Editor.BaseEditor;

--- a/src/_VisualDVM/ComponentsServer/Component/UI/PublishForm.java
+++ b/src/_VisualDVM/ComponentsServer/Component/UI/PublishForm.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component.UI;
+package _VisualDVM.ComponentsServer.Component.UI;
 import Common.Visual.Windows.Dialog.Dialog;
 public class PublishForm extends Dialog<String, PublishFields> {
    public PublishForm() {
--- a/src/_VisualDVM/ComponentsServer/Component/Visualiser.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Visualiser.java
@@ -1,8 +1,9 @@
-package _VisualDVM.Repository.Component;
+package _VisualDVM.ComponentsServer.Component;
 import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
--- a/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Component;
+package _VisualDVM.ComponentsServer.Component;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
@@ -73,7 +73,9 @@ public class Visualizer_2 extends OSDComponent {
    }
    @Override
    public String getAssemblyCommand() {
-        return "cd Repo/sapfor/experts/Sapfor_2017/_src/Server\n" +
+        File src_home= Paths.get(Global.RepoDirectory.getAbsolutePath(),"/sapfor/experts/Sapfor_2017/_src/Server").toFile();
+        return "cd " +Utils_.DQuotes(src_home)+
+                "\n" +
                "g++ -O3 -std=c++17 checkUniq.cpp server.cpp -o Visualizer_2 -lpthread -lstdc++fs\n";
    }
    @Override
--- a/src/_VisualDVM/Repository/Server/ComponentsServer.java
+++ b/src/_VisualDVM/Repository/Server/ComponentsServer.java
@@ -1,10 +1,18 @@
-package _VisualDVM.Repository.Server;
+package _VisualDVM.ComponentsServer;
 import Common.Database.Objects.DBObject;
 import Common.Database.RepositoryRefuseException;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
+import _VisualDVM.ComponentsServer.BugReport.Json.BugReportAdditionJson;
+import _VisualDVM.ComponentsServer.Component.ComponentType;
+import _VisualDVM.ComponentsServer.Component.Json.ComponentPublicationInfoJson;
+import _VisualDVM.ComponentsServer.Component.Json.ComponentVersionsInfoJson;
+import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
+import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.Account;
+import _VisualDVM.GlobalData.Account.AccountRole;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -13,18 +21,12 @@ import _VisualDVM.Passes.All.ArchivesBackupPass;
 import _VisualDVM.Passes.All.UnzipFolderPass;
 import _VisualDVM.Passes.All.ZipFolderPass;
 import _VisualDVM.ProjectData.LanguageName;
-import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.Json.BugReportAdditionJson;
-import _VisualDVM.Repository.BugReportsDatabase;
-import _VisualDVM.Repository.Component.ComponentType;
-import _VisualDVM.Repository.Component.Json.ComponentPublicationInfoJson;
-import _VisualDVM.Repository.Component.Json.ComponentVersionsInfoJson;
 import _VisualDVM.Repository.EmailMessage;
-import _VisualDVM.Repository.RepositoryServer;
-import _VisualDVM.Repository.Subscribes.Subscriber;
+import _VisualDVM.Repository.Server.RepositoryServer;
 import _VisualDVM.Utils;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.RandomStringUtils;

 import java.io.BufferedWriter;
 import java.io.File;
@@ -37,6 +39,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Vector;
 public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
+    public CredentialsDatabase credentials_db = null;
+    //--
    public static ZipFolderPass zip = new ZipFolderPass();
    public static UnzipFolderPass unzip = new UnzipFolderPass();
    public static ArchivesBackupPass backupSession = new ArchivesBackupPass();
@@ -138,6 +142,13 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                Email(message, address);
            }
        }
+        //--
+        try {
+            credentials_db = new CredentialsDatabase();
+            credentials_db.Activate();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
    }
    @Override
    protected void startAdditionalThreads() {
@@ -328,11 +339,32 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
        Print("Получить компонент " + packed1[0]);
        response.object = Utils_.fileToBytes(componentFile1);
    }
+    void GetUserAccountByKey() throws Exception {
+        UserAccount account = credentials_db.userAccounts.getByKey(request.arg);
+        response.object = account==null? null: account;
+    }
+    void GetUserAccountByEmail() throws Exception {
+        UserAccount account_info = (UserAccount) request.object;
+        UserAccount account = credentials_db.userAccounts.getByEmail(account_info.email);
+        if (account==null){
+            account = new UserAccount(account_info);
+            account.role = Constants.admins_mails.contains(account.email)? AccountRole.Admin: AccountRole.User;
+            account.security_key =  RandomStringUtils.random(100, true, true);
+            credentials_db.Insert(account);
+        }
+        response.object = account;
+    }
    //--
    @Override
    protected void UnsafeSession() throws Exception {
        switch (code) {
-            case CheckSubscriberRole:
+            case GetUserAccountByKey:
+                GetUserAccountByKey();
+                break;
+            case GetUserAccountByEmail:
+                GetUserAccountByEmail();
+                break;
+            case CheckSubscriberRole: //todo устарело
                CheckSubscriberRole();
                break;
            case GetComponentsBackups:
--- a/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
+++ b/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
@@ -0,0 +1,20 @@
+package _VisualDVM.ComponentsServer;
+import Common.Database.SQLITE.SQLiteDatabase;
+import Common.Passes.PassCode_;
+import _VisualDVM.ComponentsServer.UserAccount.UserAccountsDBTable;
+
+import java.nio.file.Paths;
+public class CredentialsDatabase extends SQLiteDatabase {
+    public UserAccountsDBTable userAccounts;
+    public CredentialsDatabase() {
+        super(Paths.get(System.getProperty("user.dir"), "Data", "credentials.sqlite").toFile());
+    }
+    @Override
+    protected void initAllTables() throws Exception {
+        addTable(userAccounts = new UserAccountsDBTable());
+    }
+    @Override
+    public PassCode_ getSynchronizePassCode() {
+        return null;
+    }
+}
--- a/src/_VisualDVM/ComponentsServer/SubscriberRights/SubscriberRights.java
+++ b/src/_VisualDVM/ComponentsServer/SubscriberRights/SubscriberRights.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.SubscriberRights;
+package _VisualDVM.ComponentsServer.SubscriberRights;
 import Common.Database.Objects.DBObject;
 public class SubscriberRights extends DBObject {
    public String email; //почта
--- a/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspace.java
+++ b/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspace.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.SubscriberWorkspace;
+package _VisualDVM.ComponentsServer.SubscriberWorkspace;
 import Common.Database.Objects.iDBObject;
 public class SubscriberWorkspace extends iDBObject {
    public String email; //почта
--- a/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
+++ b/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
@@ -1,7 +1,7 @@
-package _VisualDVM.Repository.SubscriberWorkspace;
+package _VisualDVM.ComponentsServer.SubscriberWorkspace;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import _VisualDVM.Repository.SubscriberWorkspace.UI.SubscriberWorkspacesForm;
+import _VisualDVM.ComponentsServer.SubscriberWorkspace.UI.SubscriberWorkspacesForm;

 import javax.swing.*;
 public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
--- a/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
+++ b/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
@@ -1,13 +1,13 @@
-package _VisualDVM.Repository.SubscriberWorkspace.UI;
+package _VisualDVM.ComponentsServer.SubscriberWorkspace.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
+import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
+import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
-import _VisualDVM.Repository.Subscribes.Subscriber;

 import javax.swing.*;
 public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {
--- a/src/_VisualDVM/ComponentsServer/Subscribes/Subscriber.java
+++ b/src/_VisualDVM/ComponentsServer/Subscribes/Subscriber.java
@@ -1,8 +1,9 @@
-package _VisualDVM.Repository.Subscribes;
+package _VisualDVM.ComponentsServer.Subscribes;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.GlobalData.Account.AccountRole;
 import com.sun.org.glassfish.gmbal.Description;
 public class Subscriber extends DBObject {
+    //todo скорее всего вывести.ибо дублер UserAccount
    @Description("PRIMARY KEY, UNIQUE")
    public String address = "";
    @Description("DEFAULT ''")
--- a/src/_VisualDVM/ComponentsServer/Subscribes/SubsribersDBTable.java
+++ b/src/_VisualDVM/ComponentsServer/Subscribes/SubsribersDBTable.java
@@ -1,14 +1,14 @@
-package _VisualDVM.Repository.Subscribes;
+package _VisualDVM.ComponentsServer.Subscribes;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Visual.DataSetControlForm;
+import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
+import _VisualDVM.ComponentsServer.Subscribes.UI.SubsribersForm;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
-import _VisualDVM.Repository.Subscribes.UI.SubsribersForm;

 import javax.swing.*;
 import java.util.LinkedHashMap;
--- a/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberDialog.java
+++ b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberDialog.java
@@ -1,10 +1,10 @@
-package _VisualDVM.Repository.Subscribes.UI;
+package _VisualDVM.ComponentsServer.Subscribes.UI;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
+import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.AccountRole;
-import _VisualDVM.Repository.Subscribes.Subscriber;
 public class SubscriberDialog extends DBObjectDialog<Subscriber, SubscriberFields> {
    public SubscriberDialog() {
        super(SubscriberFields.class);
--- a/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.form
+++ b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Repository.Subscribes.UI.SubscriberFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.ComponentsServer.Subscribes.UI.SubscriberFields">
  <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
    <margin top="0" left="0" bottom="0" right="0"/>
    <constraints>
--- a/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.java
+++ b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Subscribes.UI;
+package _VisualDVM.ComponentsServer.Subscribes.UI;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.GlobalData.Account.AccountRole;
--- a/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubsribersForm.java
+++ b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubsribersForm.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Repository.Subscribes.UI;
+package _VisualDVM.ComponentsServer.Subscribes.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
 import Common.Visual.DataSetControlForm;
@@ -6,10 +6,10 @@ import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Visual.Windows.Dialog.DialogFields;
+import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.AccountRole;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Repository.Subscribes.Subscriber;

 import javax.swing.*;
 public class SubsribersForm extends DataSetControlForm<Subscriber> {
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java
@@ -0,0 +1,52 @@
+package _VisualDVM.ComponentsServer.UserAccount.UI;
+import Common.Utils.Utils_;
+import Common.Visual.UI;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
+import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Account.AccountRole;
+public class UserAccountDialog extends DBObjectDialog<UserAccount, UserAccountFields> {
+    public UserAccountDialog() {
+        super(UserAccountFields.class);
+    }
+    @Override
+    public int getDefaultHeight() {
+        return 250;
+    }
+    @Override
+    public int getDefaultWidth() {
+        return 450;
+    }
+    @Override
+    public void validateFields() {
+        if (fields.tfName.getText().isEmpty())
+            Log.Writeln("Имя учётной записи не может быть пустым");
+        Utils_.validateEmail(fields.tfAddress.getText(), Log);
+        if (fields.tfAddress.getText().isEmpty())
+            Log.Writeln_("Адрес электронной почты не может быть пустым");
+        if (!title_text.equals("Регистрация") && (fields.tfAddress.isEditable() && Global.componentsServer.db.subscribers.Data.containsKey(fields.tfAddress.getText()))) {
+            Log.Writeln_("Адрес электронной почты " + Utils_.Brackets(fields.tfAddress.getText()) + " уже есть в списке.");
+        }
+    }
+    @Override
+    public void fillFields() {
+        fields.tfName.setText(Result.name);
+        fields.tfAddress.setText(Result.email);
+        fields.cbMail.setSelected(Result.subscribe_active != 0);
+        UI.TrySelect(fields.cbRole, Result.role);
+    }
+    @Override
+    public void SetEditLimits() {
+        fields.tfAddress.setEditable(false);
+    }
+    private AccountRole getSelectedRole() {
+        return (AccountRole) fields.cbRole.getSelectedItem();
+    }
+    @Override
+    public void ProcessResult() {
+        Result.name = fields.tfName.getText();
+        Result.email = fields.tfAddress.getText();
+        Result.subscribe_active = fields.cbMail.isSelected() ? 1 : 0;
+        Result.role = getSelectedRole();
+    }
+};
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.form
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.form
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.ComponentsServer.UserAccount.UI.UserAccountFields">
+  <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="500" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <component id="5e1da" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font name="Times New Roman" size="16" style="2"/>
+          <text value="имя"/>
+        </properties>
+      </component>
+      <vspacer id="de3f0">
+        <constraints>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </vspacer>
+      <component id="e0e31" class="javax.swing.JTextField" binding="tfName" custom-create="true">
+        <constraints>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
+      <component id="c014a" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font name="Times New Roman" size="16" style="2"/>
+          <text value="адрес"/>
+        </properties>
+      </component>
+      <component id="2761d" class="javax.swing.JTextField" binding="tfAddress" custom-create="true">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
+      <component id="15e49" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font name="Times New Roman" size="16" style="2"/>
+          <text value="рассылка"/>
+        </properties>
+      </component>
+      <component id="4da2" class="javax.swing.JCheckBox" binding="cbMail">
+        <constraints>
+          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font name="Times New Roman" size="16" style="2"/>
+          <horizontalAlignment value="0"/>
+          <icon value="Common/icons/NotPick.png"/>
+          <selectedIcon value="Common/icons/Pick.png"/>
+          <text value=""/>
+          <toolTipText value="Будет ли включена рассылка для этого пользователя"/>
+        </properties>
+      </component>
+      <component id="398ee" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font name="Times New Roman" size="16" style="2"/>
+          <text value="роль"/>
+        </properties>
+      </component>
+      <component id="34bef" class="javax.swing.JComboBox" binding="cbRole" custom-create="true">
+        <constraints>
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+      </component>
+    </children>
+  </grid>
+</form>
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java
@@ -0,0 +1,27 @@
+package _VisualDVM.ComponentsServer.UserAccount.UI;
+import Common.Visual.TextField.StyledTextField;
+import Common.Visual.Windows.Dialog.DialogFields;
+import _VisualDVM.GlobalData.Account.AccountRole;
+
+import javax.swing.*;
+import java.awt.*;
+public class UserAccountFields implements DialogFields {
+    private JPanel content;
+    public JTextField tfName;
+    public JTextField tfAddress;
+    public JCheckBox cbMail;
+    public JComboBox cbRole;
+    private void createUIComponents() {
+        // TODO: place custom component creation code here
+        tfName = new StyledTextField();
+        tfAddress = new StyledTextField();
+        cbRole = new JComboBox<>();
+        cbRole.addItem(AccountRole.User);
+        cbRole.addItem(AccountRole.Developer);
+        cbRole.addItem(AccountRole.Admin);
+    }
+    @Override
+    public Component getContent() {
+        return content;
+    }
+}
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java
@@ -0,0 +1,30 @@
+package _VisualDVM.ComponentsServer.UserAccount;
+import Common.Database.Objects.DBObject;
+import Common.Database.Objects.iDBObject;
+import _VisualDVM.GlobalData.Account.AccountRole;
+import com.sun.org.glassfish.gmbal.Description;
+public class UserAccount extends iDBObject {
+    public String name = "";
+    public String email = "";
+    @Description("DEFAULT 1")
+    public int subscribe_active = 1;
+    public String security_key = "";
+    @Description("DEFAULT 'User'")
+    public AccountRole role = AccountRole.User;  //права доступа
+    public UserAccount(){
+
+    }
+    public UserAccount(UserAccount account_in) {
+        this.SynchronizeFields(account_in);
+    }
+    @Override
+    public void SynchronizeFields(DBObject src) {
+        super.SynchronizeFields(src);
+        UserAccount src_ = (UserAccount) src;
+        name = src_.name;
+        email = src_.email;
+        subscribe_active=src_.subscribe_active;
+        security_key = src_.security_key;
+        role = src_.role;
+    }
+}
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java
@@ -0,0 +1,21 @@
+package _VisualDVM.ComponentsServer.UserAccount;
+import Common.Database.Tables.iDBTable;
+public class UserAccountsDBTable extends iDBTable<UserAccount> {
+    public UserAccountsDBTable() {
+        super(UserAccount.class);
+    }
+    public UserAccount getByKey(String key_in){
+        for (UserAccount userAccount: Data.values()){
+            if (userAccount.security_key.equals(key_in))
+                return userAccount;
+        }
+        return null;
+    }
+    public UserAccount getByEmail(String email_in){
+        for (UserAccount userAccount: Data.values()){
+            if (userAccount.email.equals(email_in))
+                return userAccount;
+        }
+        return null;
+    }
+}
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;

 import java.util.Vector;
 public class Constants {
-    public static final int version = 1173;
+    public static final int version = 1177;
    public static final int planner_version = 10;
    public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
    //--
@@ -22,6 +22,7 @@ public class Constants {
    public static final String TestsDirectoryName = "Tests";
    public static final String DVMPackagesDirectoryName = "DVMPackages";
    public static final String PerformanceAnalyzerDirectoryName = "PerformanceAnalyzer";
+    public static final String KeyDirectoryName = "Key";
    //--
    //SVN vmk-post@yandex.ru
    public static final String REPOSITORY_AUTHENTICATION = "--username dvmhuser --password dvmh2013 --non-interactive";
@@ -43,7 +44,7 @@ public class Constants {
    public static final String SMTPHost = "smtp.mail.ru";
    public static final int SMTPPort = 465;
    public static final int MailSocketPort = 465;
-    public static final int ComponentsServerPort = 7995;
+    public static final int ComponentsServerPort = 7996;// 7995;
    public static final int TestingServerPort = 7998;
    public static final int SocketTimeout = 0;
    //-
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -2,14 +2,14 @@ package _VisualDVM;
 import Common.Utils.Loggable;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
+import _VisualDVM.ComponentsServer.Component.ComponentsSet;
+import _VisualDVM.ComponentsServer.Component.PerformanceAnalyzer.PerformanceAnalyzer;
+import _VisualDVM.ComponentsServer.Component.Sapfor.MessagesServer;
+import _VisualDVM.ComponentsServer.Component.Visualiser;
+import _VisualDVM.ComponentsServer.Component.Visualizer_2;
+import _VisualDVM.ComponentsServer.ComponentsServer;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.ProjectView;
-import _VisualDVM.Repository.Component.ComponentsSet;
-import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
-import _VisualDVM.Repository.Component.Sapfor.MessagesServer;
-import _VisualDVM.Repository.Component.Visualiser;
-import _VisualDVM.Repository.Component.Visualizer_2;
-import _VisualDVM.Repository.Server.ComponentsServer;
 import _VisualDVM.TestingSystem.Common.TestingServer;
 import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
 import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor;
@@ -35,6 +35,7 @@ public class Global {
    public static ComponentsSet components = null;
    public static MessagesServer messagesServer = null;
    public static File ComponentsDirectory;
+    public static File KeyDirectory;
    public static File DataDirectory;
    public static File BugReportsDirectory;
    public static File BackUpsDirectory;
@@ -73,9 +74,8 @@ public class Global {
        Utils_.CheckDirectory(TestsDirectory = new File(Utils_.getHomeDirectory(), Constants.TestsDirectoryName));
        Utils_.CheckDirectory(PerformanceAnalyzerDirectory = new File(Utils_.getHomeDirectory(), Constants.PerformanceAnalyzerDirectoryName));
        Utils_.CheckDirectory(DVMPackagesDirectory = new File(Utils_.getHomeDirectory(), Constants.DVMPackagesDirectoryName));
-        //через пару версий заменить на clean.
        Utils_.CheckDirectory(SapforPackagesDirectory = new File(Utils_.getHomeDirectory(), "SapforPackages"));
-        Utils_.CheckDirectory(MachinesDirectory = new File(Utils_.getHomeDirectory(), "Machines"));
+        Utils_.CheckDirectory(KeyDirectory = new File(Utils_.getHomeDirectory(), Constants.KeyDirectoryName));
    }
    public static void CheckServerDirectories() {
        Utils_.CheckDirectory(ComponentsDirectory = new File(Utils_.getHomeDirectory(), Constants.ComponentsDirectoryName));
@@ -84,7 +84,6 @@ public class Global {
        //-
        Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
        Utils_.CheckDirectory(DataBackUpsDirectory = new File(Utils_.getHomeDirectory(), Constants.DataBackUpsDirectoryName));
-        Utils_.CheckDirectory(MachinesDirectory = new File(Utils_.getHomeDirectory(), "Machines"));
    }
    public static void CheckTestingSystemDirectories() {
        Utils_.CheckDirectory(ComponentsDirectory = new File(Utils_.getHomeDirectory(), Constants.ComponentsDirectoryName));
@@ -196,8 +195,8 @@ public class Global {
        //  FoldParserManager.get().addFoldParserMapping("text/FortranSPF", new FortranFolder()); блоки кода. todo
        //light_editor.xml-------->>
        mainModule.ActivateDB();
-        /*
-        https://habr.com/ru/articles/446888/ сертификат?
+     //   https://habr.com/ru/articles/446888/ сертификат?
+/*
        mainModule.set(Current.Account, new Account() {
            {
                name = "M";
@@ -205,7 +204,7 @@ public class Global {
                role = AccountRole.Admin;
            }
        });
-         */
+ */
        mainModule.getPass(PassCode.CheckAccount).Do();
        //---------------
        componentsServer.ActivateDB();
--- a/src/_VisualDVM/GlobalData/Account/Account.java
+++ b/src/_VisualDVM/GlobalData/Account/Account.java
@@ -1,8 +1,8 @@
 package _VisualDVM.GlobalData.Account;
 import Common.Database.Objects.DBObject;
 import Common.Utils.TextLog;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.Global;
-import _VisualDVM.Repository.BugReport.BugReport;
 import com.sun.org.glassfish.gmbal.Description;
 public class Account extends DBObject {
    @Description("PRIMARY KEY,NOT NULL")
--- a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
+++ b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
@@ -1,7 +1,6 @@
 package _VisualDVM.GlobalData.Machine.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
-import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
@@ -12,8 +11,6 @@ import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.Passes.PassCode;

 import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 public class MachinesForm extends DataSetControlForm<Machine> {
    public MachinesForm(DataSet<?, Machine> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
--- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
+++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
@@ -59,7 +59,7 @@ public class ModuleAnchestorFields implements DialogFields {
                ((Module) target).language;
        cbCompilers.addActionListener(e -> {
            if (cbCompilers.getSelectedItem() instanceof Compiler) {
-                Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
+               Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
                UI.TrySelect(cbCommands,
                        linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName));
            }
--- a/src/_VisualDVM/MainModule.java
+++ b/src/_VisualDVM/MainModule.java
@@ -1,6 +1,7 @@
 package _VisualDVM;
 import Common.MainModule_;
 import Common.Utils.Vector_;
+import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
 import _VisualDVM.GlobalData.Account.Account;
 import _VisualDVM.GlobalData.GlobalDatabase;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -9,7 +10,6 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.ProjectData.ProjectView;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
-import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.Visual.MainUI;

 import javax.swing.tree.DefaultMutableTreeNode;
@@ -52,7 +52,8 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
    //--
    public boolean HasAccount() {
        return get(Current.Account) != null;
-    } //Бессмысленно. аккаунт всегда подразумевается. вывести.
+    }
+    //todo Бессмысленно. аккаунт всегда подразумевается. вывести.
    public Account getAccount() {
        return (Account) get(Current.Account);
    } //временно
--- a/src/_VisualDVM/NormalProperties.java
+++ b/src/_VisualDVM/NormalProperties.java
@@ -1,16 +1,25 @@
 package _VisualDVM;
 import Common.CommonConstants;
+import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
+import _VisualDVM.GlobalData.Account.AccountRole;
 import _VisualDVM.Passes.PassCode;
 import com.google.gson.annotations.Expose;

 import javax.swing.*;
 import java.io.File;
-public class NormalProperties extends VisualDVMProperties{
-    //---
+public class NormalProperties extends VisualDVMProperties {
+    //--->
    @Expose
-    public String Workspace ="";
+    public String Email = "";
    @Expose
-    public String ProjectsSearchDirectory="";
+    public String Name = "";
+    @Expose
+    public AccountRole Role = AccountRole.Undefined;
+    //--->
+    @Expose
+    public String Workspace = "";
+    @Expose
+    public String ProjectsSearchDirectory = "";
    @Expose
    public String VisualiserPath = "";
    @Expose
@@ -43,16 +52,16 @@ public class NormalProperties extends VisualDVMProperties{
    public boolean collapseProjectTrees = false;
    //--
    @Expose
-    public int EditorFontSize=14;
+    public int EditorFontSize = 14;
    @Expose
    public int ComponentsWindowWidth = 650;
    @Expose
    public int ComponentsWindowHeight = 250;
    //--
    @Expose
-    public int Kernels= Utils.getHalfKernels();
+    public int Kernels = Utils.getHalfKernels();
    @Expose
-    public String LocalMakePathWindows= "C:\\MinGW\\msys\\1.0\\bin\\make.exe";
+    public String LocalMakePathWindows = "C:\\MinGW\\msys\\1.0\\bin\\make.exe";
    //--
    @Expose
    public int CheckTestingIntervalSeconds = 10; //интервал автопроверки тестирования
@@ -82,27 +91,29 @@ public class NormalProperties extends VisualDVMProperties{
    public boolean ComparsionDiffMergeOn = false;
    //компактность--
    @Expose
-    public boolean ShowFullArraysDeclarations =false;
+    public boolean ShowFullArraysDeclarations = false;
    @Expose
-    public boolean ShowFullTabsNames=true;
+    public boolean ShowFullTabsNames = true;
    @Expose
    public boolean SmallScreen = false;
    @Expose
    public int BugReportsAgeLimit = 2;
    @Expose
-    public int FastAccessPassesCount=10;
+    public int FastAccessPassesCount = 10;
    @Expose
-    public int LastOpenedProjectsCount=10;
+    public int LastOpenedProjectsCount = 10;
    //--
-    public NormalProperties(){
+    public NormalProperties() {
        Mode = _VisualDVM.Mode.Normal;
    }
-    public NormalProperties(File file_in){
+    public NormalProperties(File file_in) {
        super(_VisualDVM.Mode.Normal, file_in);
    }
    @Override
    public String getFieldDescription(String fieldName) {
        switch (fieldName) {
+            case "Email":
+                return "Адрес электронной почты";
            case "Kernels":
                return "Число ядер при компиляции";
            case "LocalMakePathWindows":
@@ -159,4 +170,10 @@ public class NormalProperties extends VisualDVMProperties{
    public boolean controlAction(String fieldName, JMenuItem control) {
        return (Global.mainModule.getPass(PassCode.UpdateProperty).Do(fieldName));
    }
+    public void SynchronizeAccount(UserAccount account){
+        Name = account.name;
+        Email = account.email;
+        Role = account.role;
+        Update();
+    }
 }
--- a/src/_VisualDVM/Passes/All/AddBugReport.java
+++ b/src/_VisualDVM/Passes/All/AddBugReport.java
@@ -3,12 +3,12 @@ import Common.Database.Database;
 import Common.Passes.AddObjectPass;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
+import _VisualDVM.ComponentsServer.BugReport.BugReportState;
+import _VisualDVM.ComponentsServer.Component.ComponentType;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.AccountRole;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportState;
-import _VisualDVM.Repository.Component.ComponentType;

 import java.io.File;
 import java.nio.file.Files;
--- a/src/_VisualDVM/Passes/All/AddSubscriber.java
+++ b/src/_VisualDVM/Passes/All/AddSubscriber.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Passes.All;
+import _VisualDVM.ComponentsServer.ComponentsServer;
+import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.PublishServerObject;
-import _VisualDVM.Repository.Server.ComponentsServer;
-import _VisualDVM.Repository.Subscribes.Subscriber;
 public class AddSubscriber extends PublishServerObject<ComponentsServer, Subscriber> {
    public AddSubscriber() {
        super(Global.componentsServer, Subscriber.class);
--- a/src/_VisualDVM/Passes/All/AppendBugReportField.java
+++ b/src/_VisualDVM/Passes/All/AppendBugReportField.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
+import _VisualDVM.ComponentsServer.BugReport.Json.BugReportAdditionJson;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
-import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.Json.BugReportAdditionJson;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;

--- a/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java
+++ b/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.Global;
-import _VisualDVM.Repository.BugReport.BugReport;
 public class ApplyBugReportSettings extends Pass<BugReport> {
    @Override
    public String getIconPath() {
--- a/src/_VisualDVM/Passes/All/BuildComponent.java
+++ b/src/_VisualDVM/Passes/All/BuildComponent.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.Component.Component;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.ProcessPass;
-import _VisualDVM.Repository.Component.Component;

 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
--- a/src/_VisualDVM/Passes/All/CheckAccount.java
+++ b/src/_VisualDVM/Passes/All/CheckAccount.java
@@ -1,56 +1,60 @@
 package _VisualDVM.Passes.All;
-import Common.Passes.Pass;
+import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-public class CheckAccount extends Pass<Boolean> {
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = false;
-        return true;
-    }
+import _VisualDVM.Passes.Server.ComponentsServerPass;
+import _VisualDVM.Repository.Server.ServerCode;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+public class CheckAccount extends ComponentsServerPass<UserAccount> {
    @Override
    public String getIconPath() {
        return "/icons/Registry.png";
    }
    @Override
-    public String getButtonText() {
-        return "";
+    protected boolean isSafe() {
+        return false;
+    }
+    File keyFile;
+    void confirmEmail() throws Exception{
+        ConfirmEmail confirmEmailPass = (ConfirmEmail) Global.mainModule.getPass(PassCode.ConfirmEmail);;
+        if (confirmEmailPass.Do()){
+            UserAccount userAccount = confirmEmailPass.target;
+            //подтвердили почту. теперь проверяем ее роль на сервере. если на сервере нет акка будет создан
+            if (SendRequest(ServerCode.GetUserAccountByEmail, null,userAccount)){
+                target = (UserAccount) request.server_response.object;
+                FileUtils.writeStringToFile(keyFile, target.security_key);
+            }
+        }
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        target =null;
+        keyFile = new File(Global.KeyDirectory, "key");
+        //--
+        //1. Ищем ключ.
+        if (keyFile.exists()) {
+            //ключ есть. проверить его актуальность.
+            if  (SendRequest(ServerCode.GetUserAccountByKey, FileUtils.readFileToString(keyFile))){
+                if (request.server_response!=null){
+                    //ключ актуальный.
+                    target = (UserAccount) request.server_response.object;
+                }else {
+                    //ключ неактуальный. регистрируемся по новой.
+                    Utils_.forceDeleteWithCheck(keyFile);
+                    confirmEmail();
+                }
+            }
+        }else {
+            confirmEmail();
+        }
+        return target!=null;
    }
    @Override
    protected void body() throws Exception {
-        /*
-        switch (Current.getAccount().email){
-            case "vmk-post@yandex.ru":
-            case "79854210702@ya.ru":
-                Current.getAccount().role = AccountRole.Admin;
-                target = true;
-                break;
-            case "npodderyugina@gmail.com":
-            case "savol@keldysh.ru":
-            case "mkocharmin@yandex.ru":
-            case "juk.06@list.ru":
-                Current.getAccount().role = AccountRole.Developer;
-                target = true;
-                break;
-            case "?":
-                Current.getAccount().role = AccountRole.Undefined;
-                target = false;
-                break;
-            default:
-                Current.getAccount().role =AccountRole.User;
-                target = true;
-                break;
-        }
-         */
-        //временно. оффлайн проверка по почте
-        target = Global.mainModule.getAccount().email.equals("?") ?
-                (Global.mainModule.getPass(PassCode.EditAccount).Do() &&
-                        Global.mainModule.getPass(PassCode.CheckRegistrationOnServer).Do()) :
-                (Global.mainModule.getPass(PassCode.CheckRegistrationOnServer).Do());
-    }
-    @Override
-    protected boolean validate() {
-        return target;
+        Global.normalProperties.SynchronizeAccount(target);
    }
    @Override
    protected void showDone() throws Exception {
--- a/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java
+++ b/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Passes.All;
+import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.Repository.Subscribes.Subscriber;
 public class CheckRegistrationOnServer extends ComponentsServerPass<Subscriber> {
    @Override
    protected boolean isSafe() {
--- a/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
+++ b/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
@@ -1,11 +1,11 @@
 package _VisualDVM.Passes.All;
 import Common.MainModule_;
+import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
 public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
    @Override
    protected boolean isSafe() {
--- a/src/_VisualDVM/Passes/All/CloseBugReport.java
+++ b/src/_VisualDVM/Passes/All/CloseBugReport.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Passes.All;
-import _VisualDVM.Repository.BugReport.BugReportState;
+import _VisualDVM.ComponentsServer.BugReport.BugReportState;
 public class CloseBugReport extends UpdateBugReportField {
    @Override
    public String getIconPath() {
--- a/src/_VisualDVM/Passes/All/CombineFiles.java
+++ b/src/_VisualDVM/Passes/All/CombineFiles.java
@@ -1,11 +1,11 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
+import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
+import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.Transformation;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
-import _VisualDVM.Repository.Component.Sapfor.Sapfor;
-import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
 import _VisualDVM.Utils;
 import _VisualDVM.Visual.Windows.CombineFilesDialog;
 import org.apache.commons.io.FileUtils;
--- a/src/_VisualDVM/Passes/All/ConfirmEmail.java
+++ b/src/_VisualDVM/Passes/All/ConfirmEmail.java
@@ -0,0 +1,64 @@
+package _VisualDVM.Passes.All;
+import Common.Utils.Utils_;
+import Common.Visual.UI;
+import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountDialog;
+import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
+import _VisualDVM.Repository.EmailMessage;
+import _VisualDVM.Repository.Server.ServerCode;
+
+import javax.swing.*;
+public class ConfirmEmail extends ComponentsServerPass<UserAccount> {
+    String password;
+    UserAccountDialog f = new UserAccountDialog() {
+        {
+            fields.tfName.setText(Global.normalProperties.Email);
+            fields.tfAddress.setText(Global.normalProperties.Email);
+            fields.cbRole.setEnabled(false);
+        }
+    };
+    public static int getRandomIntegerBetweenRange(int min, int max) {
+        return (int) ((Math.random() * ((max - min) + 1)) + min);
+    }
+    @Override
+    protected boolean isSafe() {
+        return false;
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        target = new UserAccount(); // объект для заполнения полей.не более.
+        password = null;
+        if (f.ShowDialog("Регистрация", target)) {
+            if (!Utils_.validateEmail(target.email, Log)) {
+                return false;
+            }
+            password = String.valueOf(getRandomIntegerBetweenRange(1111, 9999));
+            return  SendRequest(ServerCode.Email,
+                    target.email,
+                    new EmailMessage("Код подтверждения визуализатора для: " + Utils_.Brackets(target.name), password));
+        }
+        return false;
+    }
+    @Override
+    protected boolean validate() {
+        String attempt = null;
+        do {
+            attempt = JOptionPane.showInputDialog(null,
+                    new String[]{"Введите код активации, полученный по почте"},
+                    "Подтверждение адреса почты",
+                    JOptionPane.INFORMATION_MESSAGE);
+            if (attempt != null) {
+                if (attempt.equals(password)) {
+                    UI.Info("Почта успешно подтверждена!");
+                    return true;
+                } else {
+                    UI.Error("Неверный код активации.\nПовторите попытку.");
+                }
+            } else {
+                UI.Info("Подтверждение почты отменено");
+                return false;
+            }
+        } while (true);
+    }
+}
--- a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
+++ b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
@@ -3,12 +3,12 @@ import Common.Passes.Pass;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
+import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ProjectData.LanguageName;
-import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.Utils;
--- a/src/_VisualDVM/Passes/All/CreateTestFromFile.java
+++ b/src/_VisualDVM/Passes/All/CreateTestFromFile.java
@@ -2,11 +2,11 @@ package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.FileType;
 import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ProjectData.LanguageName;
-import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.Utils;
--- a/src/_VisualDVM/Passes/All/DeleteBugReport.java
+++ b/src/_VisualDVM/Passes/All/DeleteBugReport.java
@@ -1,9 +1,9 @@
 package _VisualDVM.Passes.All;
 import Common.Database.Database;
 import Common.Passes.DeleteObjectPass;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Repository.BugReport.BugReport;
 public class DeleteBugReport extends DeleteObjectPass<BugReport> {
    public DeleteBugReport() {
        super(BugReport.class);
--- a/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java
+++ b/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.All;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
+import _VisualDVM.ComponentsServer.BugReport.BugReportState;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
-import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.Server.ServerCode;
 import javafx.util.Pair;
 public class DeleteBugReportFromServer extends ComponentsServerPass<BugReport> {
--- a/src/_VisualDVM/Passes/All/DeleteSubscriber.java
+++ b/src/_VisualDVM/Passes/All/DeleteSubscriber.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Passes.All;
+import _VisualDVM.ComponentsServer.ComponentsServer;
+import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.DeleteServerObject;
-import _VisualDVM.Repository.Server.ComponentsServer;
-import _VisualDVM.Repository.Subscribes.Subscriber;
 public class DeleteSubscriber extends DeleteServerObject<ComponentsServer, Subscriber> {
    public DeleteSubscriber() {
        super(Global.componentsServer, Subscriber.class);
--- a/src/_VisualDVM/Passes/All/DeleteSubscriberWorkspace.java
+++ b/src/_VisualDVM/Passes/All/DeleteSubscriberWorkspace.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Passes.All;
+import _VisualDVM.ComponentsServer.ComponentsServer;
+import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.DeleteServerObject;
-import _VisualDVM.Repository.Server.ComponentsServer;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
 public class DeleteSubscriberWorkspace extends DeleteServerObject<ComponentsServer, SubscriberWorkspace> {
    public DeleteSubscriberWorkspace() {
        super(Global.componentsServer, SubscriberWorkspace.class);
--- a/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java
+++ b/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java
@@ -3,7 +3,6 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.TestingSystem.Common.Test.Test;

 import java.util.Vector;
 public class DetectSelectedTestsMinMaDim extends TestingServerPass<Vector<Object>> {
--- a/src/_VisualDVM/Passes/All/DownloadBugReport.java
+++ b/src/_VisualDVM/Passes/All/DownloadBugReport.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
-import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.Server.ServerCode;
 public class DownloadBugReport extends ComponentsServerPass<BugReport> {
    @Override
--- a/src/_VisualDVM/Passes/All/DownloadComponent.java
+++ b/src/_VisualDVM/Passes/All/DownloadComponent.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.Component.Component;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
-import _VisualDVM.Repository.Component.Component;
 import _VisualDVM.Repository.Server.ServerCode;
 public class DownloadComponent extends ComponentsServerPass<Component> {
    @Override
--- a/src/_VisualDVM/Passes/All/DownloadTaskTest.java
+++ b/src/_VisualDVM/Passes/All/DownloadTaskTest.java
@@ -1,7 +1,6 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 public class DownloadTaskTest extends DownloadTest {
    @Override
--- a/src/_VisualDVM/Passes/All/EditAccount.java
+++ b/src/_VisualDVM/Passes/All/EditAccount.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
+import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
+import _VisualDVM.ComponentsServer.Subscribes.UI.SubscriberDialog;
 import _VisualDVM.Global;
 import _VisualDVM.Repository.EmailMessage;
-import _VisualDVM.Repository.Subscribes.Subscriber;
-import _VisualDVM.Repository.Subscribes.UI.SubscriberDialog;

 import javax.swing.*;
 public class EditAccount extends Email {
--- a/src/_VisualDVM/Passes/All/EditSubscriber.java
+++ b/src/_VisualDVM/Passes/All/EditSubscriber.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Passes.All;
+import _VisualDVM.ComponentsServer.ComponentsServer;
+import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.EditServerObject;
-import _VisualDVM.Repository.Server.ComponentsServer;
-import _VisualDVM.Repository.Subscribes.Subscriber;
 public class EditSubscriber extends EditServerObject<ComponentsServer, Subscriber> {
    public EditSubscriber() {
        super(Global.componentsServer, Subscriber.class);
--- a/src/_VisualDVM/Passes/All/Email.java
+++ b/src/_VisualDVM/Passes/All/Email.java
@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;

 import java.util.Vector;
 public class Email extends ComponentsServerPass<EmailMessage> {
--- a/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java
+++ b/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java
@@ -1,9 +1,9 @@
 package _VisualDVM.Passes.All;
+import _VisualDVM.ComponentsServer.Component.Component;
+import _VisualDVM.ComponentsServer.Component.ComponentType;
+import _VisualDVM.ComponentsServer.Component.Json.ComponentVersionsInfoJson;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
-import _VisualDVM.Repository.Component.Component;
-import _VisualDVM.Repository.Component.ComponentType;
-import _VisualDVM.Repository.Component.Json.ComponentVersionsInfoJson;
 import _VisualDVM.Repository.Server.ServerCode;

 import java.util.Vector;
--- a/src/_VisualDVM/Passes/All/InitialiseUser.java
+++ b/src/_VisualDVM/Passes/All/InitialiseUser.java
@@ -2,13 +2,13 @@ package _VisualDVM.Passes.All;
 import Common.MainModule_;
 import Common.Passes.Pass;
 import Common.Passes.PassException;
+import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.GlobalData.User.UserState;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
 public class InitialiseUser extends Pass {
    @Override
    public String getIconPath() {
--- a/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
+++ b/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
@@ -1,5 +1,4 @@
 package _VisualDVM.Passes.All;
-import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.TestingServerPass;
@@ -7,8 +6,6 @@ import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-
-import java.util.Vector;
 public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
    @Override
    public String getIconPath() {
--- a/src/_VisualDVM/Passes/All/OpenBugReport.java
+++ b/src/_VisualDVM/Passes/All/OpenBugReport.java
@@ -1,5 +1,5 @@
 package _VisualDVM.Passes.All;
-import _VisualDVM.Repository.BugReport.BugReportState;
+import _VisualDVM.ComponentsServer.BugReport.BugReportState;
 public class OpenBugReport extends UpdateBugReportField {
    @Override
    public String getIconPath() {
--- a/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
+++ b/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Repository.BugReport.BugReport;

 import java.io.File;
 public class OpenBugReportTestProject extends Pass<BugReport> {
--- a/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java
+++ b/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java
@@ -1,11 +1,11 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
+import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.Transformation;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileType;
-import _VisualDVM.Repository.Component.Sapfor.Sapfor;
-import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
 import org.apache.commons.io.FileUtils;

 import java.io.File;
--- a/src/_VisualDVM/Passes/All/PublishBugReport.java
+++ b/src/_VisualDVM/Passes/All/PublishBugReport.java
@@ -2,10 +2,10 @@ package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
+import _VisualDVM.ComponentsServer.BugReport.BugReportState;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.EmailMessage;

 import java.io.File;
--- a/src/_VisualDVM/Passes/All/PublishComponent.java
+++ b/src/_VisualDVM/Passes/All/PublishComponent.java
@@ -1,15 +1,15 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.Component.Component;
+import _VisualDVM.ComponentsServer.Component.ComponentType;
+import _VisualDVM.ComponentsServer.Component.Json.ComponentPublicationInfoJson;
+import _VisualDVM.ComponentsServer.Component.UI.PublishForm;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.AccountRole;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
-import _VisualDVM.Repository.Component.Component;
-import _VisualDVM.Repository.Component.ComponentType;
-import _VisualDVM.Repository.Component.Json.ComponentPublicationInfoJson;
-import _VisualDVM.Repository.Component.UI.PublishForm;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;

--- a/src/_VisualDVM/Passes/All/PublishComponentsServer.java
+++ b/src/_VisualDVM/Passes/All/PublishComponentsServer.java
@@ -1,14 +1,7 @@
 package _VisualDVM.Passes.All;
-import Common.Passes.PassException;
+import _VisualDVM.ComponentsServer.ComponentsServer;
 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 PublishServerPass<ComponentsServer> {
    @Override
    protected ComponentsServer getServer() {
--- a/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java
+++ b/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.All;
+import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
 public class PublishRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
    @Override
    protected boolean canStart(Object... args) throws Exception {
--- a/src/_VisualDVM/Passes/All/PublishTestingServer.java
+++ b/src/_VisualDVM/Passes/All/PublishTestingServer.java
@@ -1,13 +1,7 @@
 package _VisualDVM.Passes.All;
-import Common.Passes.PassException;
 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 PublishServerPass<TestingServer> {
    @Override
    protected TestingServer getServer() {
--- a/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
+++ b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
@@ -17,7 +17,7 @@ import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.Vector;
-public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDVM.Repository.Component.Component> {
+public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDVM.ComponentsServer.Component.Component> {
    Vector<RemoteFile> backups; //не забывать что файлы на СЕРВЕРЕ.
    RemoteFile remoteFile;
    File localFile;
--- a/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java
+++ b/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
 import Common.Visual.UI;
+import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
+import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforTransformation;
 import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
-import _VisualDVM.Repository.Component.Sapfor.Sapfor;
-import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
 public class SPF_CreateParallelVariant extends SapforTransformation {
    ParallelVariant variant = null;
    @Override
--- a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
+++ b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
@@ -1,14 +1,14 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
+import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
+import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileState;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
-import _VisualDVM.Repository.Component.Sapfor.Sapfor;
-import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
 import org.apache.commons.io.FileUtils;

 import java.util.Vector;
--- a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
+++ b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.BugReport.Json.RecipientsJson;
 import _VisualDVM.Global;
-import _VisualDVM.Repository.BugReport.Json.RecipientsJson;
 public class SaveBugReportRecipients extends UpdateBugReportField {
    @Override
    public String getIconPath() {
--- a/src/_VisualDVM/Passes/All/SendBugReport.java
+++ b/src/_VisualDVM/Passes/All/SendBugReport.java
@@ -1,9 +1,9 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
+import _VisualDVM.ComponentsServer.BugReport.BugReportState;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
-import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.Server.ServerCode;
 public class SendBugReport extends ComponentsServerPass<BugReport> {
    @Override
--- a/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
+++ b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import _VisualDVM.ComponentsServer.Component.Component;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
-import _VisualDVM.Repository.Component.Component;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Utils;
 import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
--- a/src/_VisualDVM/Passes/All/ShowInstruction.java
+++ b/src/_VisualDVM/Passes/All/ShowInstruction.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
+import _VisualDVM.ComponentsServer.Component.ComponentType;
 import _VisualDVM.Global;
-import _VisualDVM.Repository.Component.ComponentType;

 import java.awt.*;
 import java.io.File;
--- a/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java
+++ b/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java
@@ -1,9 +1,7 @@
 package _VisualDVM.Passes.All;
+import _VisualDVM.ComponentsServer.ComponentsServer;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
 import _VisualDVM.Passes.Server.ShutdownServerPass;
-import _VisualDVM.Repository.Server.ComponentsServer;
 public class ShutdownComponentsServer extends ShutdownServerPass<ComponentsServer> {
    @Override
    protected ComponentsServer getServer() {
--- a/Show More
+++ b/Show More