Завершение обновления безопасности.
v++
This commit is contained in:
@@ -16,6 +16,7 @@ import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
|
||||
import com.sun.org.glassfish.gmbal.Description;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Vector;
|
||||
@@ -26,7 +27,6 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
||||
public int machine_port = 22;
|
||||
//---
|
||||
public String user_name = "";
|
||||
public String user_password;
|
||||
public String user_workspace;
|
||||
//---
|
||||
public DVMPackage() {
|
||||
@@ -47,7 +47,6 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
||||
machine_port = machine.port;
|
||||
//-
|
||||
user_name = user.login;
|
||||
user_password = user.password;
|
||||
user_workspace = user.workspace;
|
||||
//-
|
||||
drv = compiler.call_command;
|
||||
@@ -99,16 +98,18 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
||||
machine_port = tasksPackage.machine_port;
|
||||
user_name = tasksPackage.user_name;
|
||||
user_workspace = tasksPackage.user_workspace;
|
||||
user_password = tasksPackage.user_password;
|
||||
}
|
||||
public Machine getMachine() {
|
||||
return new Machine(machine_name, machine_address, machine_port, MachineType.Server);
|
||||
}
|
||||
public User getUser() {
|
||||
return new User(user_name, user_password, user_workspace);
|
||||
return new User(user_name, "", user_workspace);
|
||||
}
|
||||
@Override
|
||||
public void checkFinishState() throws Exception {
|
||||
}
|
||||
public String getMachineURL(){
|
||||
return machine_address + ":" + machine_port;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
package _VisualDVM.TestingSystem.DVM.PackageCredentials;
|
||||
import Common.CommonConstants;
|
||||
import Common.Database.Objects.iDBObject;
|
||||
import _VisualDVM.GlobalData.Machine.Machine;
|
||||
import _VisualDVM.GlobalData.Machine.MachineType;
|
||||
import _VisualDVM.GlobalData.User.User;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||
public class DVMPackageCredentials extends iDBObject {
|
||||
public int dvmpackage_id = CommonConstants.Nan;
|
||||
public String userPassword = "";
|
||||
//---->>
|
||||
public DVMPackageCredentials() {
|
||||
}
|
||||
public DVMPackageCredentials(DVMPackage dvmPackage, String password_in) {
|
||||
dvmpackage_id = dvmPackage.id;
|
||||
userPassword = password_in;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package _VisualDVM.TestingSystem.DVM.PackageCredentials;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||
public class DVMPackagesCredentialsDBTable extends iDBTable<DVMPackageCredentials> {
|
||||
public DVMPackagesCredentialsDBTable() {
|
||||
super(DVMPackageCredentials.class);
|
||||
}
|
||||
public DVMPackageCredentials getForPackageId(int dvmPackage_id){
|
||||
for (DVMPackageCredentials dvmPackageCredentials: Data.values()){
|
||||
if (dvmPackageCredentials.dvmpackage_id==dvmPackage_id)
|
||||
return dvmPackageCredentials;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user