Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Дмитрий Корытько
/
hware
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Commit
c08edf5c
...
c08edf5c338ac49018365be4929879289bd3757f
authored
2015-07-29 14:32:14 +0300
by
root
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
save
1 parent
736720f7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
47 deletions
UtilsTools/src/main/java/org/emercit/rserv/service/IRemSrv.java
UtilsTools/src/main/java/org/emercit/rserv/model/RServBean.java → UtilsTools/src/main/java/org/emercit/servers/model/ServerBean.java
UtilsTools/src/main/java/org/emercit/servers/service/IServers.java
UtilsTools/src/main/java/org/emercit/rserv/service/RemSrv.java → UtilsTools/src/main/java/org/emercit/servers/service/Servers.java
UtilsTools/src/main/java/org/emercit/utilstools/model/SettingsBean.java
UtilsTools/src/main/java/org/emercit/utilstools/service/Settings.java
UtilsTools/src/main/java/org/emercit/rserv/service/IRemSrv.java
deleted
100644 → 0
View file @
736720f
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
();
}
UtilsTools/src/main/java/org/emercit/
rserv/model/RServ
Bean.java
→
UtilsTools/src/main/java/org/emercit/
servers/model/Server
Bean.java
View file @
c08edf5
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
RServ
Bean
implements
Serializable
{
public
class
Server
Bean
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -23,7 +23,7 @@ private static final long serialVersionUID = 1L;
private
String
title
;
public
RServ
Bean
()
{
public
Server
Bean
()
{
}
...
...
UtilsTools/src/main/java/org/emercit/servers/service/IServers.java
0 → 100644
View file @
c08edf5
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
();
}
UtilsTools/src/main/java/org/emercit/
rserv/service/RemSrv
.java
→
UtilsTools/src/main/java/org/emercit/
servers/service/Servers
.java
View file @
c08edf5
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.RServ
Bean
;
import
org.emercit.
rserv.service.IRemSrv
;
import
org.emercit.
servers.model.Server
Bean
;
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
<
RServ
Bean
>
beans
)
{
public
boolean
set
(
Vector
<
Server
Bean
>
beans
)
{
return
db
.
create
(
beans
);
}
public
Vector
<
RServ
Bean
>
get
()
{
public
Vector
<
Server
Bean
>
get
()
{
return
(
Vector
<
RServ
Bean
>)
db
.
select
();
return
(
Vector
<
Server
Bean
>)
db
.
select
();
}
...
...
@@ -35,9 +35,9 @@ public class RemSrv implements IRemSrv {
public
void
init
()
{
Vector
<
RServBean
>
beans
=
new
Vector
<
RServ
Bean
>();
Vector
<
ServerBean
>
beans
=
new
Vector
<
Server
Bean
>();
RServBean
rsb
=
new
RServ
Bean
();
ServerBean
rsb
=
new
Server
Bean
();
rsb
.
setId
(
1
);
rsb
.
setIp
(
"127.0.0.1"
);
...
...
UtilsTools/src/main/java/org/emercit/utilstools/model/SettingsBean.java
View file @
c08edf5
...
...
@@ -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.RServ
Bean
;
import
org.emercit.
servers.model.Server
Bean
;
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
<
RServ
Bean
>
rserverbeans
;
private
Vector
<
Server
Bean
>
rserverbeans
;
private
Vector
<
SvBean
>
svbeans
;
...
...
@@ -67,7 +67,7 @@ public class SettingsBean implements Serializable {
this
.
proxybeans
=
models
;
}
public
void
setRserverbeans
(
Vector
<
RServ
Bean
>
models
)
{
public
void
setRserverbeans
(
Vector
<
Server
Bean
>
models
)
{
this
.
rserverbeans
=
models
;
}
...
...
@@ -110,7 +110,7 @@ public class SettingsBean implements Serializable {
return
proxybeans
;
}
public
Vector
<
RServ
Bean
>
getRserverbeans
()
{
public
Vector
<
Server
Bean
>
getRserverbeans
()
{
return
rserverbeans
;
}
...
...
UtilsTools/src/main/java/org/emercit/utilstools/service/Settings.java
View file @
c08edf5
...
...
@@ -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
;
}
...
...
Please
register
or
sign in
to post a comment