Skip to content

Дмитрий Корытько / hware

Go to a project
Toggle navigation
Toggle navigation pinning
Commit c08edf5c c08edf5c338ac49018365be4929879289bd3757f by root
Options

save

1 parent 736720f7
Inline Side-by-side
Showing 6 changed files with 38 additions and 47 deletions
1 package org.emercit.rserv.service;
2
3
4 import java.util.Vector;
5
6 import org.emercit.rserv.model.RServBean;
7
8 public interface IRemSrv {
9
10
11 public Vector<RServBean> get();
12
13 public boolean set(Vector<RServBean> beans);
14
15 public void init();
16
17
18 }
1 package org.emercit.rserv.model; 1 package org.emercit.servers.model;
2 2
3 3
4 4
...@@ -6,7 +6,7 @@ package org.emercit.rserv.model; ...@@ -6,7 +6,7 @@ package org.emercit.rserv.model;
6 import java.io.Serializable; 6 import java.io.Serializable;
7 import java.util.Vector; 7 import java.util.Vector;
8 8
9 public class RServBean implements Serializable { 9 public class ServerBean implements Serializable {
10 10
11 private static final long serialVersionUID = 1L; 11 private static final long serialVersionUID = 1L;
12 12
...@@ -23,7 +23,7 @@ private static final long serialVersionUID = 1L; ...@@ -23,7 +23,7 @@ private static final long serialVersionUID = 1L;
23 23
24 private String title; 24 private String title;
25 25
26 public RServBean() { 26 public ServerBean() {
27 27
28 } 28 }
29 29
......
1 package org.emercit.servers.service;
2
3
4 import java.util.Vector;
5
6 import org.emercit.servers.model.ServerBean;
7
8 public interface IServers {
9
10
11 public Vector<ServerBean> get();
12
13 public boolean set(Vector<ServerBean> beans);
14
15 public void init();
16
17
18 }
1 package org.emercit.rserv.service; 1 package org.emercit.servers.service;
2 2
3 import java.util.Vector; 3 import java.util.Vector;
4 import java.beans.XMLEncoder; 4 import java.beans.XMLEncoder;
...@@ -9,25 +9,25 @@ import java.io.FileOutputStream; ...@@ -9,25 +9,25 @@ import java.io.FileOutputStream;
9 import java.io.FileInputStream; 9 import java.io.FileInputStream;
10 10
11 import org.apache.log4j.Logger; 11 import org.apache.log4j.Logger;
12 import org.emercit.rserv.model.RServBean; 12 import org.emercit.servers.model.ServerBean;
13 import org.emercit.rserv.service.IRemSrv; 13 import org.emercit.servers.service.IServers;
14 import org.emercit.xmldbmanager.service.Db; 14 import org.emercit.xmldbmanager.service.Db;
15 import org.emercit.projecttools.constants.Paths; 15 import org.emercit.projecttools.constants.Paths;
16 16
17 public class RemSrv implements IRemSrv { 17 public class Servers implements IServers {
18 18
19 private static final Logger log = Logger.getLogger(RemSrv.class); 19 private static final Logger log = Logger.getLogger(Servers.class);
20 20
21 private Db db=new Db(Paths.BEAN_REMOTESERVER); 21 private Db db=new Db(Paths.BEAN_REMOTESERVER);
22 22
23 public boolean set(Vector<RServBean> beans) { 23 public boolean set(Vector<ServerBean> beans) {
24 24
25 return db.create(beans); 25 return db.create(beans);
26 } 26 }
27 27
28 public Vector<RServBean> get() { 28 public Vector<ServerBean> get() {
29 29
30 return (Vector<RServBean>)db.select(); 30 return (Vector<ServerBean>)db.select();
31 31
32 } 32 }
33 33
...@@ -35,9 +35,9 @@ public class RemSrv implements IRemSrv { ...@@ -35,9 +35,9 @@ public class RemSrv implements IRemSrv {
35 35
36 public void init() { 36 public void init() {
37 37
38 Vector<RServBean> beans=new Vector<RServBean>(); 38 Vector<ServerBean> beans=new Vector<ServerBean>();
39 39
40 RServBean rsb=new RServBean(); 40 ServerBean rsb=new ServerBean();
41 41
42 rsb.setId(1); 42 rsb.setId(1);
43 rsb.setIp("127.0.0.1"); 43 rsb.setIp("127.0.0.1");
......
...@@ -8,7 +8,7 @@ import org.emercit.dtmanager.model.DateInfo; ...@@ -8,7 +8,7 @@ import org.emercit.dtmanager.model.DateInfo;
8 import org.emercit.gsmmanager.model.GSMBean; 8 import org.emercit.gsmmanager.model.GSMBean;
9 import org.emercit.ethmanager.model.EthBean; 9 import org.emercit.ethmanager.model.EthBean;
10 import org.emercit.proxymanager.model.ProxyBean; 10 import org.emercit.proxymanager.model.ProxyBean;
11 import org.emercit.rserv.model.RServBean; 11 import org.emercit.servers.model.ServerBean;
12 import org.emercit.svmanager.model.SvBean; 12 import org.emercit.svmanager.model.SvBean;
13 13
14 import java.io.Serializable; 14 import java.io.Serializable;
...@@ -28,7 +28,7 @@ public class SettingsBean implements Serializable { ...@@ -28,7 +28,7 @@ public class SettingsBean implements Serializable {
28 28
29 private Vector<ProxyBean> proxybeans; 29 private Vector<ProxyBean> proxybeans;
30 30
31 private Vector<RServBean> rserverbeans; 31 private Vector<ServerBean> rserverbeans;
32 32
33 private Vector<SvBean> svbeans; 33 private Vector<SvBean> svbeans;
34 34
...@@ -67,7 +67,7 @@ public class SettingsBean implements Serializable { ...@@ -67,7 +67,7 @@ public class SettingsBean implements Serializable {
67 this.proxybeans=models; 67 this.proxybeans=models;
68 } 68 }
69 69
70 public void setRserverbeans(Vector<RServBean> models) { 70 public void setRserverbeans(Vector<ServerBean> models) {
71 71
72 this.rserverbeans=models; 72 this.rserverbeans=models;
73 } 73 }
...@@ -110,7 +110,7 @@ public class SettingsBean implements Serializable { ...@@ -110,7 +110,7 @@ public class SettingsBean implements Serializable {
110 return proxybeans; 110 return proxybeans;
111 } 111 }
112 112
113 public Vector<RServBean> getRserverbeans() { 113 public Vector<ServerBean> getRserverbeans() {
114 114
115 return rserverbeans; 115 return rserverbeans;
116 } 116 }
......
...@@ -5,23 +5,14 @@ import java.util.Vector; ...@@ -5,23 +5,14 @@ import java.util.Vector;
5 import org.emercit.utilstools.model.SettingsBean; 5 import org.emercit.utilstools.model.SettingsBean;
6 import org.emercit.xmldbmanager.service.Db; 6 import org.emercit.xmldbmanager.service.Db;
7 import org.emercit.projecttools.constants.Paths; 7 import org.emercit.projecttools.constants.Paths;
8
9 import org.emercit.devinfo.model.DevInfoBean;
10 import org.emercit.dnsmanager.model.DnsBean;
11 import org.emercit.dtmanager.model.DateInfo; 8 import org.emercit.dtmanager.model.DateInfo;
12 import org.emercit.gsmmanager.model.GSMBean;
13 import org.emercit.ethmanager.model.EthBean;
14 import org.emercit.proxymanager.model.ProxyBean;
15 import org.emercit.rserv.model.RServBean;
16 import org.emercit.svmanager.model.SvBean;
17
18 import org.emercit.devinfo.service.DevInfo; 9 import org.emercit.devinfo.service.DevInfo;
19 import org.emercit.dnsmanager.service.DnsLinux; 10 import org.emercit.dnsmanager.service.DnsLinux;
20 import org.emercit.dtmanager.service.NtpLinux; 11 import org.emercit.dtmanager.service.NtpLinux;
21 import org.emercit.gsmmanager.service.Gsm; 12 import org.emercit.gsmmanager.service.Gsm;
22 import org.emercit.ethmanager.service.EthLinux; 13 import org.emercit.ethmanager.service.EthLinux;
23 import org.emercit.proxymanager.service.ProxyLinux; 14 import org.emercit.proxymanager.service.ProxyLinux;
24 import org.emercit.rserv.service.RemSrv; 15 import org.emercit.servers.service.Servers;
25 import org.emercit.svmanager.service.Sv; 16 import org.emercit.svmanager.service.Sv;
26 17
27 18
...@@ -43,7 +34,7 @@ public class Settings implements ISettings { ...@@ -43,7 +34,7 @@ public class Settings implements ISettings {
43 34
44 private ProxyLinux proxylinux=new ProxyLinux(); 35 private ProxyLinux proxylinux=new ProxyLinux();
45 36
46 private RemSrv remserv=new RemSrv(); 37 private Servers remserv=new Servers();
47 38
48 private Sv sv=new Sv(); 39 private Sv sv=new Sv();
49 40
...@@ -84,7 +75,7 @@ public class Settings implements ISettings { ...@@ -84,7 +75,7 @@ public class Settings implements ISettings {
84 sb.setGSMBean(gsm.get()); 75 sb.setGSMBean(gsm.get());
85 sb.setEthBeans(ethlinux.getEthBeans()); 76 sb.setEthBeans(ethlinux.getEthBeans());
86 sb.setProxyBeans(proxylinux.getProxyBeans()); 77 sb.setProxyBeans(proxylinux.getProxyBeans());
87 // sb.setRserverbeans(remserv.get()); 78 sb.setRserverbeans(remserv.get());
88 79
89 return sb; 80 return sb;
90 } 81 }
......