Commit c08edf5c c08edf5c338ac49018365be4929879289bd3757f by root

save

1 parent 736720f7
package org.emercit.rserv.service;
import java.util.Vector;
import org.emercit.rserv.model.RServBean;
public interface IRemSrv {
public Vector<RServBean> get();
public boolean set(Vector<RServBean> beans);
public void init();
}
package org.emercit.rserv.model;
package org.emercit.servers.model;
......@@ -6,7 +6,7 @@ package org.emercit.rserv.model;
import java.io.Serializable;
import java.util.Vector;
public class RServBean implements Serializable {
public class ServerBean implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -23,7 +23,7 @@ private static final long serialVersionUID = 1L;
private String title;
public RServBean() {
public ServerBean() {
}
......
package org.emercit.servers.service;
import java.util.Vector;
import org.emercit.servers.model.ServerBean;
public interface IServers {
public Vector<ServerBean> get();
public boolean set(Vector<ServerBean> beans);
public void init();
}
package org.emercit.rserv.service;
package org.emercit.servers.service;
import java.util.Vector;
import java.beans.XMLEncoder;
......@@ -9,25 +9,25 @@ import java.io.FileOutputStream;
import java.io.FileInputStream;
import org.apache.log4j.Logger;
import org.emercit.rserv.model.RServBean;
import org.emercit.rserv.service.IRemSrv;
import org.emercit.servers.model.ServerBean;
import org.emercit.servers.service.IServers;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.projecttools.constants.Paths;
public class RemSrv implements IRemSrv {
public class Servers implements IServers {
private static final Logger log = Logger.getLogger(RemSrv.class);
private static final Logger log = Logger.getLogger(Servers.class);
private Db db=new Db(Paths.BEAN_REMOTESERVER);
public boolean set(Vector<RServBean> beans) {
public boolean set(Vector<ServerBean> beans) {
return db.create(beans);
}
public Vector<RServBean> get() {
public Vector<ServerBean> get() {
return (Vector<RServBean>)db.select();
return (Vector<ServerBean>)db.select();
}
......@@ -35,9 +35,9 @@ public class RemSrv implements IRemSrv {
public void init() {
Vector<RServBean> beans=new Vector<RServBean>();
Vector<ServerBean> beans=new Vector<ServerBean>();
RServBean rsb=new RServBean();
ServerBean rsb=new ServerBean();
rsb.setId(1);
rsb.setIp("127.0.0.1");
......
......@@ -8,7 +8,7 @@ import org.emercit.dtmanager.model.DateInfo;
import org.emercit.gsmmanager.model.GSMBean;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.proxymanager.model.ProxyBean;
import org.emercit.rserv.model.RServBean;
import org.emercit.servers.model.ServerBean;
import org.emercit.svmanager.model.SvBean;
import java.io.Serializable;
......@@ -28,7 +28,7 @@ public class SettingsBean implements Serializable {
private Vector<ProxyBean> proxybeans;
private Vector<RServBean> rserverbeans;
private Vector<ServerBean> rserverbeans;
private Vector<SvBean> svbeans;
......@@ -67,7 +67,7 @@ public class SettingsBean implements Serializable {
this.proxybeans=models;
}
public void setRserverbeans(Vector<RServBean> models) {
public void setRserverbeans(Vector<ServerBean> models) {
this.rserverbeans=models;
}
......@@ -110,7 +110,7 @@ public class SettingsBean implements Serializable {
return proxybeans;
}
public Vector<RServBean> getRserverbeans() {
public Vector<ServerBean> getRserverbeans() {
return rserverbeans;
}
......
......@@ -5,23 +5,14 @@ import java.util.Vector;
import org.emercit.utilstools.model.SettingsBean;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.projecttools.constants.Paths;
import org.emercit.devinfo.model.DevInfoBean;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.dtmanager.model.DateInfo;
import org.emercit.gsmmanager.model.GSMBean;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.proxymanager.model.ProxyBean;
import org.emercit.rserv.model.RServBean;
import org.emercit.svmanager.model.SvBean;
import org.emercit.devinfo.service.DevInfo;
import org.emercit.dnsmanager.service.DnsLinux;
import org.emercit.dtmanager.service.NtpLinux;
import org.emercit.gsmmanager.service.Gsm;
import org.emercit.ethmanager.service.EthLinux;
import org.emercit.proxymanager.service.ProxyLinux;
import org.emercit.rserv.service.RemSrv;
import org.emercit.servers.service.Servers;
import org.emercit.svmanager.service.Sv;
......@@ -43,7 +34,7 @@ public class Settings implements ISettings {
private ProxyLinux proxylinux=new ProxyLinux();
private RemSrv remserv=new RemSrv();
private Servers remserv=new Servers();
private Sv sv=new Sv();
......@@ -84,7 +75,7 @@ public class Settings implements ISettings {
sb.setGSMBean(gsm.get());
sb.setEthBeans(ethlinux.getEthBeans());
sb.setProxyBeans(proxylinux.getProxyBeans());
// sb.setRserverbeans(remserv.get());
sb.setRserverbeans(remserv.get());
return sb;
}
......