Skip to content

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

Go to a project
Toggle navigation
Toggle navigation pinning
Commit a8010af3 a8010af34e3a49241b9bfcf176181552e92754c7 by root
Options

save

1 parent da398cc6
Inline Side-by-side
Showing 65 changed files with 221 additions and 140 deletions
1 15eb35b145401b3c6a2a69578cc0c148
...\ No newline at end of file ...\ No newline at end of file
1 20aa5ff62216b4538dc1681fb4439906b5315caf
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.23</version>
8 </project>
1 6bc97a3eda1381d115a4553b89a66920
...\ No newline at end of file ...\ No newline at end of file
1 5bbfebfb25a691b0f97cc34c3927618b7713e04d
...\ No newline at end of file ...\ No newline at end of file
1 c5607a59cfc8f1e8289ee97a7891e0f7
...\ No newline at end of file ...\ No newline at end of file
1 5e835ccc9394f0564e0b529f82b13622620e5a85
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.24</version>
8 </project>
1 5a580b2b577cea96f8de5cd5a4dea7a4
...\ No newline at end of file ...\ No newline at end of file
1 87db22fa91cc7b9805e21f46f852a94dcbc569ec
...\ No newline at end of file ...\ No newline at end of file
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <groupId>org.emercit</groupId> 3 <groupId>org.emercit</groupId>
4 <artifactId>utilstools</artifactId> 4 <artifactId>utilstools</artifactId>
5 <versioning> 5 <versioning>
6 <release>1.22</release> 6 <release>1.24</release>
7 <versions> 7 <versions>
8 <version>1.0</version> 8 <version>1.0</version>
9 <version>1.1</version> 9 <version>1.1</version>
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
28 <version>1.20</version> 28 <version>1.20</version>
29 <version>1.21</version> 29 <version>1.21</version>
30 <version>1.22</version> 30 <version>1.22</version>
31 <version>1.23</version>
32 <version>1.24</version>
31 </versions> 33 </versions>
32 <lastUpdated>20150804090803</lastUpdated> 34 <lastUpdated>20150805070834</lastUpdated>
33 </versioning> 35 </versioning>
34 </metadata> 36 </metadata>
......
1 d3cc127db852d356f6369653233badc8
...\ No newline at end of file ...\ No newline at end of file
1 8ecd5372e5a1b5ec31440b910a62d00f
...\ No newline at end of file ...\ No newline at end of file
......
1 3a98161da9ae3de4390b837d2853af35cd5c60c2
...\ No newline at end of file ...\ No newline at end of file
1 53d2aab96a91cb154e320a7c71d864f062408ca0
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -90,7 +90,8 @@ Ext.define('App.view.Sv', { ...@@ -90,7 +90,8 @@ Ext.define('App.view.Sv', {
90 text : 'Автозагрузка', 90 text : 'Автозагрузка',
91 dataIndex : 'autostart', 91 dataIndex : 'autostart',
92 width : 100, 92 width : 100,
93 xtype: 'checkcolumn' 93 xtype: 'checkcolumn',
94 hidden:true
94 }, 95 },
95 96
96 { 97 {
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
10 </layout> 10 </layout>
11 </appender> 11 </appender>
12 12
13 <!-- LOG FILE -->
13 <appender name="file" class="org.apache.log4j.FileAppender"> 14 <appender name="file" class="org.apache.log4j.FileAppender">
14
15 <param name="File" value="/var/log/devtools.log" /> 15 <param name="File" value="/var/log/devtools.log" />
16 <param name="MaxFileSize" value="10KB"/> 16 <param name="MaxFileSize" value="10KB"/>
17 <layout class="org.apache.log4j.PatternLayout"> 17 <layout class="org.apache.log4j.PatternLayout">
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
25 25
26 <level value="info" /> 26 <level value="info" />
27 <appender-ref ref="console" /> 27 <appender-ref ref="console" />
28 <appender-ref ref="file" /> 28 <!--<appender-ref ref="file" />-->
29 </logger> 29 </logger>
30 30
31 31
32 <logger name="org.emercit"> 32 <logger name="org.emercit">
33 <level value="info" /> 33 <level value="info" />
34 <appender-ref ref="console" /> 34 <appender-ref ref="console" />
35 <appender-ref ref="file" /> 35 <!-- <appender-ref ref="file" />-->
36 </logger> 36 </logger>
37 37
38 38
...@@ -40,25 +40,25 @@ ...@@ -40,25 +40,25 @@
40 <logger name="org.springframework.core"> 40 <logger name="org.springframework.core">
41 <level value="info" /> 41 <level value="info" />
42 <appender-ref ref="console" /> 42 <appender-ref ref="console" />
43 <appender-ref ref="file" /> 43 <!-- <appender-ref ref="file" /> -->
44 </logger> 44 </logger>
45 45
46 <logger name="org.springframework.beans"> 46 <logger name="org.springframework.beans">
47 <level value="info" /> 47 <level value="info" />
48 <appender-ref ref="console" /> 48 <appender-ref ref="console" />
49 <appender-ref ref="file" /> 49 <!-- <appender-ref ref="file" /> -->
50 </logger> 50 </logger>
51 51
52 <logger name="org.springframework.context"> 52 <logger name="org.springframework.context">
53 <level value="info" /> 53 <level value="info" />
54 <appender-ref ref="console" /> 54 <appender-ref ref="console" />
55 <appender-ref ref="file" /> 55 <!--<appender-ref ref="file" />-->
56 </logger> 56 </logger>
57 57
58 <logger name="org.springframework.web"> 58 <logger name="org.springframework.web">
59 <level value="info" /> 59 <level value="info" />
60 <appender-ref ref="console" /> 60 <appender-ref ref="console" />
61 <appender-ref ref="file" /> 61 <!-- <appender-ref ref="file" /> -->
62 </logger> 62 </logger>
63 63
64 <!-- Root Logger --> 64 <!-- Root Logger -->
......
...@@ -2,7 +2,7 @@ package org.emercit.utilstools.config; ...@@ -2,7 +2,7 @@ package org.emercit.utilstools.config;
2 2
3 import java.util.Vector; 3 import java.util.Vector;
4 4
5 import org.emercit.proxymanager.model.ProxyBean; 5 import org.emercit.utilstools.proxymanager.model.ProxyBean;
6 6
7 public class DefSettings { 7 public class DefSettings {
8 8
...@@ -83,4 +83,9 @@ public class DefSettings { ...@@ -83,4 +83,9 @@ public class DefSettings {
83 83
84 public static final String devtools_title="Web интерфейс для конфигурации"; 84 public static final String devtools_title="Web интерфейс для конфигурации";
85 85
86 public static final String ssh_host="127.0.0.1";
87 public static final int ssh_port=22;
88 public static final String ssh_login="root";
89 public static final String ssh_password="root";
90
86 } 91 }
......
...@@ -43,7 +43,19 @@ public enum Msg { ...@@ -43,7 +43,19 @@ public enum Msg {
43 43
44 44
45 RestartEthSucc(22,TypeMsg.INFO,"Перезагрузка сетевого интерфейса успешно выполнена"), 45 RestartEthSucc(22,TypeMsg.INFO,"Перезагрузка сетевого интерфейса успешно выполнена"),
46 RestartEthErr(23,TypeMsg.ERROR,"Перезагрузка сетевого интерфейса не выполнена"); 46 RestartEthErr(23,TypeMsg.ERROR,"Перезагрузка сетевого интерфейса не выполнена"),
47
48
49 DnsUpdateSucc(24,TypeMsg.INFO,"Конфигурация DNS выполнена успешно"),
50 DnsUpdateError(25,TypeMsg.ERROR,"Конфигурация DNS не выполнена"),
51
52
53 NTPUpdateSucc(26,TypeMsg.INFO,"Конфигурация NTP выполнена успешно"),
54 NTPUpdateError(27,TypeMsg.ERROR,"Конфигурация NTP не выполнена"),
55
56 ProxyUpdateSucc(28,TypeMsg.INFO,"Конфигурация Proxy выполнена успешно"),
57 ProxyUpdateError(29,TypeMsg.ERROR,"Конфигурация Proxy не выполнена");
58
47 59
48 private int code; 60 private int code;
49 61
......
1 package org.emercit.controldevtools.bean; 1 package org.emercit.utilstools.controldevtools.bean;
2 2
3 import java.awt.Color; 3 import java.awt.Color;
4 import java.awt.Dimension; 4 import java.awt.Dimension;
...@@ -31,15 +31,11 @@ import javax.swing.event.SwingPropertyChangeSupport; ...@@ -31,15 +31,11 @@ import javax.swing.event.SwingPropertyChangeSupport;
31 31
32 import org.apache.log4j.Logger; 32 import org.apache.log4j.Logger;
33 import org.emercit.utilstools.config.DefSettings; 33 import org.emercit.utilstools.config.DefSettings;
34 import org.emercit.pckutils.checkservice.STService; 34 import org.emercit.utilstools.pckutils.checkservice.STService;
35
36 import org.emercit.utilstools.service.Settings; 35 import org.emercit.utilstools.service.Settings;
37 36 import org.emercit.utilstools.svmanager.model.SvBean;
38 import org.emercit.svmanager.service.SvControl; 37 import org.emercit.utilstools.svmanager.service.Sv;
39 38 import org.emercit.utilstools.svmanager.service.SvControl;
40 import org.emercit.svmanager.service.Sv;
41
42 import org.emercit.svmanager.model.SvBean;
43 39
44 public class DevToolsBean extends RoundPanel implements Externalizable { 40 public class DevToolsBean extends RoundPanel implements Externalizable {
45 41
...@@ -225,7 +221,7 @@ public class DevToolsBean extends RoundPanel implements Externalizable { ...@@ -225,7 +221,7 @@ public class DevToolsBean extends RoundPanel implements Externalizable {
225 221
226 block=true; 222 block=true;
227 223
228 svcontrol.start(); 224 svcontrol.stop();
229 225
230 block=false; 226 block=false;
231 227
......
1 package org.emercit.controldevtools.bean; 1 package org.emercit.utilstools.controldevtools.bean;
2 2
3 3
4 import java.awt.BasicStroke; 4 import java.awt.BasicStroke;
......
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
5 * @author root 5 * @author root
6 * 6 *
7 */ 7 */
8 package org.emercit.controldevtools.bean;
...\ No newline at end of file ...\ No newline at end of file
8 package org.emercit.utilstools.controldevtools.bean;
...\ No newline at end of file ...\ No newline at end of file
......
1 package org.emercit.devinfo.service; 1 package org.emercit.utilstools.devinfo.service;
2 2
3 import java.beans.XMLDecoder; 3 import java.beans.XMLDecoder;
4 import java.beans.XMLEncoder; 4 import java.beans.XMLEncoder;
...@@ -8,10 +8,10 @@ import java.io.FileInputStream; ...@@ -8,10 +8,10 @@ import java.io.FileInputStream;
8 import java.io.FileOutputStream; 8 import java.io.FileOutputStream;
9 9
10 import org.apache.log4j.Logger; 10 import org.apache.log4j.Logger;
11 import org.emercit.devinfo.model.DevInfoBean;
12 import org.emercit.utilstools.config.DefSettings; 11 import org.emercit.utilstools.config.DefSettings;
13 import org.emercit.utilstools.config.Msg; 12 import org.emercit.utilstools.config.Msg;
14 import org.emercit.utilstools.config.Paths; 13 import org.emercit.utilstools.config.Paths;
14 import org.emercit.utilstools.devinfo.model.DevInfoBean;
15 import org.emercit.xmldbmanager.service.Db; 15 import org.emercit.xmldbmanager.service.Db;
16 16
17 public class DevInfo implements IDevInfo { 17 public class DevInfo implements IDevInfo {
......
1 package org.emercit.devinfo.service; 1 package org.emercit.utilstools.devinfo.service;
2 2
3 import java.beans.XMLDecoder; 3 import java.beans.XMLDecoder;
4 import java.beans.XMLEncoder; 4 import java.beans.XMLEncoder;
...@@ -8,7 +8,7 @@ import java.io.FileInputStream; ...@@ -8,7 +8,7 @@ import java.io.FileInputStream;
8 import java.io.FileOutputStream; 8 import java.io.FileOutputStream;
9 9
10 import org.emercit.utilstools.config.Msg; 10 import org.emercit.utilstools.config.Msg;
11 import org.emercit.devinfo.model.DevInfoBean; 11 import org.emercit.utilstools.devinfo.model.DevInfoBean;
12 12
13 public interface IDevInfo { 13 public interface IDevInfo {
14 14
......
1 package org.emercit.displaycalibrator.service; 1 package org.emercit.utilstools.displaycalibrator.service;
2 2
3 import org.emercit.utilstools.config.Msg; 3 import org.emercit.utilstools.config.Msg;
4 4
......
1 package org.emercit.displaycalibrator.service; 1 package org.emercit.utilstools.displaycalibrator.service;
2 2
3 import java.io.BufferedReader; 3 import java.io.BufferedReader;
4 import java.io.BufferedWriter; 4 import java.io.BufferedWriter;
...@@ -8,9 +8,9 @@ import java.io.InputStreamReader; ...@@ -8,9 +8,9 @@ import java.io.InputStreamReader;
8 import java.util.Vector; 8 import java.util.Vector;
9 9
10 import org.apache.log4j.Logger; 10 import org.apache.log4j.Logger;
11 import org.emercit.devinfo.service.DevInfo;
12 import org.emercit.pckutils.cmd.CmdExec;
13 import org.emercit.utilstools.config.Msg; 11 import org.emercit.utilstools.config.Msg;
12 import org.emercit.utilstools.devinfo.service.DevInfo;
13 import org.emercit.utilstools.pckutils.cmd.CmdExec;
14 14
15 15
16 public class DCalibratorBB implements DCalibrator { 16 public class DCalibratorBB implements DCalibrator {
......
1 package org.emercit.dnsmanager.model; 1 package org.emercit.utilstools.dnsmanager.model;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 4
......
1 package org.emercit.dnsmanager.service; 1 package org.emercit.utilstools.dnsmanager.service;
2 2
3 import java.io.BufferedWriter; 3 import java.io.BufferedWriter;
4 import java.io.File; 4 import java.io.File;
...@@ -7,10 +7,10 @@ import java.io.IOException; ...@@ -7,10 +7,10 @@ import java.io.IOException;
7 import java.util.Vector; 7 import java.util.Vector;
8 8
9 import org.apache.log4j.Logger; 9 import org.apache.log4j.Logger;
10 import org.emercit.dnsmanager.model.DnsBean;
11 import org.emercit.pckutils.cmd.CmdExec;
12 import org.emercit.utilstools.config.DefSettings; 10 import org.emercit.utilstools.config.DefSettings;
13 import org.emercit.utilstools.config.Msg; 11 import org.emercit.utilstools.config.Msg;
12 import org.emercit.utilstools.dnsmanager.model.DnsBean;
13 import org.emercit.utilstools.pckutils.cmd.CmdExec;
14 14
15 public class DnsLinux implements IDns{ 15 public class DnsLinux implements IDns{
16 16
...@@ -98,12 +98,13 @@ public class DnsLinux implements IDns{ ...@@ -98,12 +98,13 @@ public class DnsLinux implements IDns{
98 } 98 }
99 99
100 bw.close(); 100 bw.close();
101 //log.info(Msg.SaveFileSucc.getDescription()); 101 log.info(Msg.DnsUpdateSucc.getDescription());
102 return Msg.SaveFileSucc.getCode(); 102 return Msg.DnsUpdateSucc.getCode();
103 103
104 } catch (IOException e) { 104 } catch (IOException e) {
105 log.error(e.getMessage()); 105 log.error(e.getMessage());
106 return Msg.SaveFileError.getCode(); 106 log.error(Msg.DnsUpdateError.getDescription());
107 return Msg.DnsUpdateError.getCode();
107 } 108 }
108 109
109 } 110 }
......
1 package org.emercit.dnsmanager.service; 1 package org.emercit.utilstools.dnsmanager.service;
2 2
3 import org.emercit.dnsmanager.model.DnsBean; 3 import org.emercit.utilstools.dnsmanager.model.DnsBean;
4 4
5 import java.util.Vector; 5 import java.util.Vector;
6 6
......
1 package org.emercit.dtmanager.model; 1 package org.emercit.utilstools.dtmanager.model;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 4
......
1 package org.emercit.dtmanager.model; 1 package org.emercit.utilstools.dtmanager.model;
2 2
3 3
4 import java.io.Serializable; 4 import java.io.Serializable;
......
1 package org.emercit.dtmanager.service; 1 package org.emercit.utilstools.dtmanager.service;
2 2
3 public interface INtp { 3 public interface INtp {
4 4
......
1 package org.emercit.dtmanager.service; 1 package org.emercit.utilstools.dtmanager.service;
2 2
3 import java.io.BufferedWriter; 3 import java.io.BufferedWriter;
4 import java.io.File; 4 import java.io.File;
...@@ -6,9 +6,9 @@ import java.io.FileWriter; ...@@ -6,9 +6,9 @@ import java.io.FileWriter;
6 import java.io.IOException; 6 import java.io.IOException;
7 7
8 import org.apache.log4j.Logger; 8 import org.apache.log4j.Logger;
9 import org.emercit.pckutils.cmd.CmdExec;
10 import org.emercit.utilstools.config.Msg; 9 import org.emercit.utilstools.config.Msg;
11 import org.emercit.utilstools.config.DefSettings; 10 import org.emercit.utilstools.config.DefSettings;
11 import org.emercit.utilstools.pckutils.cmd.CmdExec;
12 12
13 public class NtpLinux implements INtp { 13 public class NtpLinux implements INtp {
14 14
...@@ -62,12 +62,13 @@ public class NtpLinux implements INtp { ...@@ -62,12 +62,13 @@ public class NtpLinux implements INtp {
62 62
63 bw.close(); 63 bw.close();
64 64
65 //log.info(Msg.SaveFileSucc.getDescription()); 65 log.info(Msg.NTPUpdateSucc.getDescription());
66 } catch (IOException e) { 66 } catch (IOException e) {
67 log.error(e.getMessage()); 67 log.error(e.getMessage());
68 return Msg.SaveFileError.getCode(); 68 log.error(Msg.NTPUpdateError.getDescription());
69 return Msg.NTPUpdateError.getCode();
69 } 70 }
70 return Msg.SaveFileSucc.getCode(); 71 return Msg.NTPUpdateSucc.getCode();
71 } 72 }
72 73
73 public int init() { 74 public int init() {
......
1 package org.emercit.ethmanager.model; 1 package org.emercit.utilstools.ethmanager.model;
2 2
3 3
4 import java.io.Serializable; 4 import java.io.Serializable;
......
1 package org.emercit.ethmanager.service; 1 package org.emercit.utilstools.ethmanager.service;
2 2
3 import org.apache.log4j.Logger; 3 import org.apache.log4j.Logger;
4 import org.emercit.ethmanager.model.EthBean; 4
5 import java.util.Vector; 5 import java.util.Vector;
6 import java.io.File; 6 import java.io.File;
7 import java.io.FileWriter; 7 import java.io.FileWriter;
8 import java.io.BufferedWriter; 8 import java.io.BufferedWriter;
9 import java.io.IOException; 9 import java.io.IOException;
10
10 import org.emercit.utilstools.config.Paths; 11 import org.emercit.utilstools.config.Paths;
11 import org.emercit.utilstools.config.DefSettings; 12 import org.emercit.utilstools.config.DefSettings;
12 import org.emercit.utilstools.config.Msg; 13 import org.emercit.utilstools.config.Msg;
14 import org.emercit.utilstools.ethmanager.model.EthBean;
15 import org.emercit.utilstools.pckutils.cmd.CmdExec;
13 import org.emercit.xmldbmanager.service.Db; 16 import org.emercit.xmldbmanager.service.Db;
14 import org.emercit.pckutils.cmd.CmdExec;
15 17
16 public class EthLinux implements IEth { 18 public class EthLinux implements IEth {
17 19
......
1 package org.emercit.ethmanager.service; 1 package org.emercit.utilstools.ethmanager.service;
2 2
3 3
4 import java.util.Vector; 4 import java.util.Vector;
5 5
6 import org.emercit.ethmanager.model.*; 6 import org.emercit.utilstools.ethmanager.model.*;
7 7
8 public interface IEth { 8 public interface IEth {
9 9
......
1 package org.emercit.gsmmanager.model; 1 package org.emercit.utilstools.gsmmanager.model;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.Vector; 4 import java.util.Vector;
......
1 package org.emercit.gsmmanager.service; 1 package org.emercit.utilstools.gsmmanager.service;
2 2
3 import org.emercit.gsmmanager.model.GSMBean;
4 import org.emercit.utilstools.config.Paths; 3 import org.emercit.utilstools.config.Paths;
5 import org.emercit.xmldbmanager.service.Db; 4 import org.emercit.xmldbmanager.service.Db;
6 import org.emercit.utilstools.config.DefSettings; 5 import org.emercit.utilstools.config.DefSettings;
7 import org.emercit.utilstools.config.Paths; 6 import org.emercit.utilstools.config.Paths;
8 import org.emercit.utilstools.config.Msg; 7 import org.emercit.utilstools.config.Msg;
8 import org.emercit.utilstools.gsmmanager.model.GSMBean;
9 9
10 public class Gsm implements IGsm { 10 public class Gsm implements IGsm {
11 11
......
1 package org.emercit.gsmmanager.service; 1 package org.emercit.utilstools.gsmmanager.service;
2 2
3 import org.emercit.gsmmanager.model.GSMBean; 3 import org.emercit.utilstools.gsmmanager.model.GSMBean;
4 4
5 public interface IGsm { 5 public interface IGsm {
6 6
......
1 package org.emercit.logreader; 1 package org.emercit.utilstools.logreader;
2 2
3 import java.io.BufferedReader; 3 import java.io.BufferedReader;
4 import java.io.FileInputStream; 4 import java.io.FileInputStream;
......
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
5 * @author root 5 * @author root
6 * 6 *
7 */ 7 */
8 package org.emercit.logreader;
...\ No newline at end of file ...\ No newline at end of file
8 package org.emercit.utilstools.logreader;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,14 +2,14 @@ package org.emercit.utilstools.model; ...@@ -2,14 +2,14 @@ package org.emercit.utilstools.model;
2 2
3 import java.util.Vector; 3 import java.util.Vector;
4 4
5 import org.emercit.devinfo.model.DevInfoBean; 5 import org.emercit.utilstools.devinfo.model.DevInfoBean;
6 import org.emercit.dnsmanager.model.DnsBean; 6 import org.emercit.utilstools.dnsmanager.model.DnsBean;
7 import org.emercit.dtmanager.model.DateInfo; 7 import org.emercit.utilstools.dtmanager.model.DateInfo;
8 import org.emercit.gsmmanager.model.GSMBean; 8 import org.emercit.utilstools.ethmanager.model.EthBean;
9 import org.emercit.ethmanager.model.EthBean; 9 import org.emercit.utilstools.gsmmanager.model.GSMBean;
10 import org.emercit.proxymanager.model.ProxyBean; 10 import org.emercit.utilstools.proxymanager.model.ProxyBean;
11 import org.emercit.servers.model.ServerBean; 11 import org.emercit.utilstools.servers.model.ServerBean;
12 import org.emercit.svmanager.model.SvBean; 12 import org.emercit.utilstools.svmanager.model.SvBean;
13 13
14 import java.io.Serializable; 14 import java.io.Serializable;
15 15
......
1 package org.emercit.pckutils.checkservice; 1 package org.emercit.utilstools.pckutils.checkservice;
2 2
3 import org.emercit.pckutils.cmd.CmdExec;
4 import org.emercit.utilstools.config.Paths; 3 import org.emercit.utilstools.config.Paths;
4 import org.emercit.utilstools.pckutils.cmd.CmdExec;
5 5
6 import java.util.Vector; 6 import java.util.Vector;
7 7
......
1 package org.emercit.pckutils.cmd; 1 package org.emercit.utilstools.pckutils.cmd;
2 2
3 3
4 import java.io.BufferedReader; 4 import java.io.BufferedReader;
...@@ -9,7 +9,7 @@ import java.util.Random; ...@@ -9,7 +9,7 @@ import java.util.Random;
9 import java.util.Vector; 9 import java.util.Vector;
10 10
11 import org.apache.log4j.Logger; 11 import org.apache.log4j.Logger;
12 import org.emercit.devinfo.service.DevInfo; 12 import org.emercit.utilstools.devinfo.service.DevInfo;
13 13
14 14
15 15
......
1 package org.emercit.pckutils.cmd; 1 package org.emercit.utilstools.pckutils.cmd;
2 2
3 import java.util.Vector; 3 import java.util.Vector;
4 4
5 import org.apache.log4j.Logger; 5 import org.apache.log4j.Logger;
6 import org.emercit.dtmanager.service.NtpLinux; 6 import org.emercit.utilstools.dtmanager.service.NtpLinux;
7 7
8 public class CmdLog { 8 public class CmdLog {
9 9
......
1 package org.emercit.proxymanager.model; 1 package org.emercit.utilstools.proxymanager.model;
2 2
3 3
4 import java.io.Serializable; 4 import java.io.Serializable;
......
1 package org.emercit.proxymanager.service; 1 package org.emercit.utilstools.proxymanager.service;
2 2
3 public interface IProxy { 3 public interface IProxy {
4 4
......
1 package org.emercit.proxymanager.service; 1 package org.emercit.utilstools.proxymanager.service;
2 2
3 import java.io.BufferedWriter; 3 import java.io.BufferedWriter;
4 import java.io.File; 4 import java.io.File;
5 import java.io.FileWriter; 5 import java.io.FileWriter;
6 import java.io.IOException; 6 import java.io.IOException;
7 import java.util.Vector; 7 import java.util.Vector;
8
8 import org.apache.log4j.Logger; 9 import org.apache.log4j.Logger;
9 import org.emercit.proxymanager.model.ProxyBean;
10 import org.emercit.utilstools.config.Paths; 10 import org.emercit.utilstools.config.Paths;
11 import org.emercit.utilstools.config.Msg; 11 import org.emercit.utilstools.config.Msg;
12 import org.emercit.utilstools.config.DefSettings; 12 import org.emercit.utilstools.config.DefSettings;
13 13 import org.emercit.utilstools.proxymanager.model.ProxyBean;
14 import org.emercit.xmldbmanager.service.Db; 14 import org.emercit.xmldbmanager.service.Db;
15 15
16 16
...@@ -68,11 +68,17 @@ public class ProxyLinux implements IProxy { ...@@ -68,11 +68,17 @@ public class ProxyLinux implements IProxy {
68 } 68 }
69 bw.write("\n"); 69 bw.write("\n");
70 bw.close(); 70 bw.close();
71 return db.create(pbs); 71
72 72
73 int value=db.create(pbs);
74 if (Msg.getByCode(value).getTypeVariable().getCode()==1) {
75 return Msg.ProxyUpdateError.getCode();
76 }
77 return Msg.ProxyUpdateSucc.getCode();
73 } catch (IOException e) { 78 } catch (IOException e) {
74 log.error(e.getMessage()); 79 log.error(e.getMessage());
75 return Msg.SaveFileError.getCode(); 80 log.error(Msg.ProxyUpdateError.getDescription());
81 return Msg.ProxyUpdateError.getCode();
76 } 82 }
77 } 83 }
78 84
......
1 package org.emercit.servers.service; 1 package org.emercit.utilstools.servers.service;
2 2
3 3
4 import java.util.Vector; 4 import java.util.Vector;
5 5
6 import org.emercit.servers.model.ServerBean; 6 import org.emercit.utilstools.servers.model.ServerBean;
7 7
8 public interface IServers { 8 public interface IServers {
9 9
......
1 package org.emercit.servers.service; 1 package org.emercit.utilstools.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,10 +9,10 @@ import java.io.FileOutputStream; ...@@ -9,10 +9,10 @@ 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.servers.model.ServerBean;
13 import org.emercit.servers.service.IServers;
14 import org.emercit.utilstools.config.Paths; 12 import org.emercit.utilstools.config.Paths;
15 import org.emercit.utilstools.config.DefSettings; 13 import org.emercit.utilstools.config.DefSettings;
14 import org.emercit.utilstools.servers.model.ServerBean;
15 import org.emercit.utilstools.servers.service.IServers;
16 import org.emercit.xmldbmanager.service.Db; 16 import org.emercit.xmldbmanager.service.Db;
17 17
18 public class Servers implements IServers { 18 public class Servers implements IServers {
......
...@@ -5,19 +5,18 @@ import java.util.Vector; ...@@ -5,19 +5,18 @@ import java.util.Vector;
5 import org.emercit.utilstools.config.Msg; 5 import org.emercit.utilstools.config.Msg;
6 import org.emercit.utilstools.config.Paths; 6 import org.emercit.utilstools.config.Paths;
7 import org.emercit.utilstools.model.SettingsBean; 7 import org.emercit.utilstools.model.SettingsBean;
8 import org.emercit.utilstools.proxymanager.service.ProxyLinux;
9 import org.emercit.utilstools.servers.service.Servers;
10 import org.emercit.utilstools.svmanager.service.Sv;
8 import org.emercit.xmldbmanager.service.Db; 11 import org.emercit.xmldbmanager.service.Db;
9 import org.emercit.dtmanager.model.DateInfo;
10 import org.emercit.ethmanager.model.EthBean;
11 import org.emercit.devinfo.service.DevInfo;
12 import org.emercit.dnsmanager.service.DnsLinux;
13 import org.emercit.dtmanager.service.NtpLinux;
14 import org.emercit.gsmmanager.service.Gsm;
15 import org.emercit.ethmanager.service.EthLinux;
16 import org.emercit.proxymanager.service.ProxyLinux;
17 import org.emercit.servers.service.Servers;
18 import org.emercit.svmanager.service.Sv;
19
20 import org.emercit.utilstools.config.Msg; 12 import org.emercit.utilstools.config.Msg;
13 import org.emercit.utilstools.devinfo.service.DevInfo;
14 import org.emercit.utilstools.dnsmanager.service.DnsLinux;
15 import org.emercit.utilstools.dtmanager.model.DateInfo;
16 import org.emercit.utilstools.dtmanager.service.NtpLinux;
17 import org.emercit.utilstools.ethmanager.model.EthBean;
18 import org.emercit.utilstools.ethmanager.service.EthLinux;
19 import org.emercit.utilstools.gsmmanager.service.Gsm;
21 20
22 21
23 public class Settings implements ISettings { 22 public class Settings implements ISettings {
......
1 package org.emercit.sshexec; 1 package org.emercit.utilstools.sshexec;
2 2
3 3
4 import java.util.Properties; 4 import java.util.Properties;
...@@ -13,6 +13,8 @@ import java.io.OutputStream; ...@@ -13,6 +13,8 @@ import java.io.OutputStream;
13 13
14 import org.apache.log4j.Logger; 14 import org.apache.log4j.Logger;
15 15
16 import org.emercit.utilstools.config.DefSettings;
17
16 18
17 public class SSHExec { 19 public class SSHExec {
18 20
...@@ -30,10 +32,20 @@ public class SSHExec { ...@@ -30,10 +32,20 @@ public class SSHExec {
30 32
31 private String cmd; 33 private String cmd;
32 34
35 /*
36 * По умолчанию команды выполняются от рута на локальном хосте
37 */
33 public SSHExec() { 38 public SSHExec() {
34 config.put("StrictHostKeyChecking", "no"); 39 config.put("StrictHostKeyChecking", "no");
40
41 this.host=DefSettings.ssh_host;
42 this.port=DefSettings.ssh_port;
43 this.login=DefSettings.ssh_login;
44 this.password=DefSettings.ssh_password;
45 this.cmd="";
35 } 46 }
36 47
48
37 public void setLogin(String value) { 49 public void setLogin(String value) {
38 this.login=value; 50 this.login=value;
39 } 51 }
......
1 package org.emercit.svmanager.model; 1 package org.emercit.utilstools.svmanager.model;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.Vector; 4 import java.util.Vector;
......
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
5 * @author root 5 * @author root
6 * 6 *
7 */ 7 */
8 package org.emercit.svmanager.model;
...\ No newline at end of file ...\ No newline at end of file
8 package org.emercit.utilstools.svmanager.model;
...\ No newline at end of file ...\ No newline at end of file
......
1 package org.emercit.svmanager.service; 1 package org.emercit.utilstools.svmanager.service;
2 2
3 import org.emercit.svmanager.model.SvBean; 3 import org.emercit.utilstools.svmanager.model.SvBean;
4 4
5 import java.util.Vector; 5 import java.util.Vector;
6 6
......
1 package org.emercit.svmanager.service; 1 package org.emercit.utilstools.svmanager.service;
2 2
3 public interface ISvControl { 3 public interface ISvControl {
4 4
......
1 package org.emercit.svmanager.service; 1 package org.emercit.utilstools.svmanager.service;
2 2
3 import java.util.Vector; 3 import java.util.Vector;
4 4
5 import org.emercit.svmanager.model.SvBean;
6 import org.emercit.xmldbmanager.service.Db; 5 import org.emercit.xmldbmanager.service.Db;
7 import org.emercit.svmanager.service.SvControl;
8 import org.emercit.utilstools.config.Paths; 6 import org.emercit.utilstools.config.Paths;
9 import org.emercit.utilstools.config.DefSettings; 7 import org.emercit.utilstools.config.DefSettings;
8 import org.emercit.utilstools.svmanager.model.SvBean;
9 import org.emercit.utilstools.svmanager.service.SvControl;
10 10
11 public class Sv { 11 public class Sv {
12 12
......
1 package org.emercit.svmanager.service; 1 package org.emercit.utilstools.svmanager.service;
2 2
3 3
4 import org.apache.log4j.Logger; 4 import org.apache.log4j.Logger;
5 import org.emercit.devinfo.service.DevInfo;
6 import org.emercit.pckutils.cmd.CmdExec;
7 import org.emercit.utilstools.config.Paths; 5 import org.emercit.utilstools.config.Paths;
8 import org.emercit.utilstools.config.Msg; 6 import org.emercit.utilstools.config.Msg;
9 import org.emercit.svmanager.model.SvBean; 7 import org.emercit.utilstools.devinfo.service.DevInfo;
10 import org.emercit.pckutils.checkservice.STService; 8 import org.emercit.utilstools.pckutils.checkservice.STService;
9 import org.emercit.utilstools.pckutils.cmd.CmdExec;
10 import org.emercit.utilstools.pckutils.cmd.CmdLog;
11 import org.emercit.utilstools.sshexec.SSHExec;
12 import org.emercit.utilstools.svmanager.model.SvBean;
13
11 import java.util.Vector; 14 import java.util.Vector;
12 import org.emercit.pckutils.cmd.CmdLog;
13 15
14 public class SvControl implements ISvControl { 16 public class SvControl implements ISvControl {
15 17
16 private static final Logger log = Logger.getLogger(SvControl.class); 18 private static final Logger log = Logger.getLogger(SvControl.class);
17 19
18 private CmdExec cmdexec=new CmdExec(); 20
19 private CmdLog cmdLog=new CmdLog(); 21 private SSHExec sshexec;
20 22
21 private STService st=new STService(); 23 private STService st=new STService();
22 24
...@@ -25,7 +27,22 @@ public class SvControl implements ISvControl { ...@@ -25,7 +27,22 @@ public class SvControl implements ISvControl {
25 private int typeCode; 27 private int typeCode;
26 28
27 public SvControl(SvBean svbean) { 29 public SvControl(SvBean svbean) {
30
28 this.svbean=svbean; 31 this.svbean=svbean;
32 this.sshexec=new SSHExec();
33
34 this.sshexec.setHost("");
35 /*
36 private String login;
37
38 private String password;
39
40 private String host;
41
42 private int port;
43
44 private String cmd;
45 */
29 } 46 }
30 /* 47 /*
31 * Остановка процесса 48 * Остановка процесса
...@@ -35,8 +52,9 @@ public class SvControl implements ISvControl { ...@@ -35,8 +52,9 @@ public class SvControl implements ISvControl {
35 try { 52 try {
36 53
37 54
38 cmdLog.print(cmdexec.Run(Paths.dirInit_d+this.svbean.getProcess()+" "+"stop")); 55 sshexec.setCmd(Paths.dirInit_d+this.svbean.getProcess()+" "+"stop");
39 56 sshexec.Exec();
57
40 Thread.sleep(this.svbean.getStoptime()); 58 Thread.sleep(this.svbean.getStoptime());
41 59
42 if(st.IsRun(this.svbean.getProcess())) { //если еще запущен 60 if(st.IsRun(this.svbean.getProcess())) { //если еще запущен
...@@ -60,7 +78,8 @@ public class SvControl implements ISvControl { ...@@ -60,7 +78,8 @@ public class SvControl implements ISvControl {
60 78
61 try { 79 try {
62 80
63 cmdLog.print(cmdexec.Run(Paths.dirInit_d+this.svbean.getProcess()+" "+"start")); 81 sshexec.setCmd(Paths.dirInit_d+this.svbean.getProcess()+" "+"start");
82 sshexec.Exec();
64 83
65 Thread.sleep(this.svbean.getStarttime()); 84 Thread.sleep(this.svbean.getStarttime());
66 85
...@@ -85,7 +104,6 @@ public class SvControl implements ISvControl { ...@@ -85,7 +104,6 @@ public class SvControl implements ISvControl {
85 */ 104 */
86 public int restart() { 105 public int restart() {
87 try { 106 try {
88
89 typeCode =Msg.getByCode(stop()).getTypeVariable().getCode(); 107 typeCode =Msg.getByCode(stop()).getTypeVariable().getCode();
90 108
91 109
...@@ -118,7 +136,9 @@ public class SvControl implements ISvControl { ...@@ -118,7 +136,9 @@ public class SvControl implements ISvControl {
118 */ 136 */
119 public int addAutoRun() { 137 public int addAutoRun() {
120 try { 138 try {
121 cmdLog.print(cmdexec.Run("update-rc.d "+this.svbean.getProcess()+" defaults")); 139 sshexec.setCmd("update-rc.d "+this.svbean.getProcess()+" defaults");
140 sshexec.Exec();
141
122 }catch(Exception e) { 142 }catch(Exception e) {
123 return Msg.ProcessAddAutoRunError.getCode(); 143 return Msg.ProcessAddAutoRunError.getCode();
124 }; 144 };
...@@ -132,11 +152,12 @@ public class SvControl implements ISvControl { ...@@ -132,11 +152,12 @@ public class SvControl implements ISvControl {
132 public int delAutoRun() { 152 public int delAutoRun() {
133 153
134 try { 154 try {
135 cmdLog.print(cmdexec.Run("update-rc.d -f "+this.svbean.getProcess()+" remove")); 155 sshexec.setCmd("update-rc.d -f "+this.svbean.getProcess()+" remove");
156 sshexec.Exec();
157
136 }catch(Exception e) { 158 }catch(Exception e) {
137 return Msg.ProcessDelAutoRunError.getCode(); 159 return Msg.ProcessDelAutoRunError.getCode();
138 }; 160 };
139
140 return Msg.ProcessDelAutoRunSucc.getCode(); 161 return Msg.ProcessDelAutoRunSucc.getCode();
141 } 162 }
142 163
......
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
5 * @author root 5 * @author root
6 * 6 *
7 */ 7 */
8 package org.emercit.svmanager.service;
...\ No newline at end of file ...\ No newline at end of file
8 package org.emercit.utilstools.svmanager.service;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -8,9 +8,9 @@ import java.io.FileInputStream; ...@@ -8,9 +8,9 @@ import java.io.FileInputStream;
8 import java.io.FileOutputStream; 8 import java.io.FileOutputStream;
9 9
10 import org.apache.log4j.Logger; 10 import org.apache.log4j.Logger;
11 import org.emercit.devinfo.service.DevInfo;
12 import org.emercit.utilstools.config.Msg; 11 import org.emercit.utilstools.config.Msg;
13 import org.emercit.utilstools.config.Paths; 12 import org.emercit.utilstools.config.Paths;
13 import org.emercit.utilstools.devinfo.service.DevInfo;
14 14
15 public class Db implements IDb { 15 public class Db implements IDb {
16 16
......
...@@ -10,11 +10,11 @@ import static org.junit.Assert.*; ...@@ -10,11 +10,11 @@ import static org.junit.Assert.*;
10 import java.util.Vector; 10 import java.util.Vector;
11 11
12 import org.emercit.utilstools.config.Msg; 12 import org.emercit.utilstools.config.Msg;
13 import org.emercit.utilstools.ethmanager.model.EthBean;
14 import org.emercit.utilstools.ethmanager.service.EthLinux;
13 import org.junit.Before; 15 import org.junit.Before;
14 import org.junit.After; 16 import org.junit.After;
15 import org.junit.Ignore; 17 import org.junit.Ignore;
16 import org.emercit.ethmanager.model.EthBean;
17 import org.emercit.ethmanager.service.EthLinux;
18 18
19 @Ignore 19 @Ignore
20 public class TestEthLinux extends TestCase { 20 public class TestEthLinux extends TestCase {
......
...@@ -5,16 +5,15 @@ import junit.framework.Test; ...@@ -5,16 +5,15 @@ import junit.framework.Test;
5 import junit.framework.TestCase; 5 import junit.framework.TestCase;
6 import junit.framework.TestSuite; 6 import junit.framework.TestSuite;
7 import static org.junit.Assert.*; 7 import static org.junit.Assert.*;
8
8 import java.util.Vector; 9 import java.util.Vector;
10
9 import org.emercit.utilstools.config.Msg; 11 import org.emercit.utilstools.config.Msg;
10 import org.junit.Before; 12 import org.junit.Before;
11 import org.junit.After; 13 import org.junit.After;
12
13 import org.emercit.proxymanager.model.ProxyBean;
14
15 import org.emercit.proxymanager.service.ProxyLinux;
16
17 import org.emercit.utilstools.config.Msg; 14 import org.emercit.utilstools.config.Msg;
15 import org.emercit.utilstools.proxymanager.model.ProxyBean;
16 import org.emercit.utilstools.proxymanager.service.ProxyLinux;
18 17
19 18
20 public class TestProxyLinux extends TestCase { 19 public class TestProxyLinux extends TestCase {
......
...@@ -11,13 +11,13 @@ import org.junit.AfterClass; ...@@ -11,13 +11,13 @@ import org.junit.AfterClass;
11 import org.junit.Before; 11 import org.junit.Before;
12 import org.junit.BeforeClass; 12 import org.junit.BeforeClass;
13 import org.junit.Ignore; 13 import org.junit.Ignore;
14 import org.emercit.svmanager.service.SvControl;
15 import org.emercit.svmanager.service.Sv;
16 import org.emercit.svmanager.model.SvBean;
17 14
18 import java.util.Vector; 15 import java.util.Vector;
19 16
20 import org.emercit.utilstools.config.Msg; 17 import org.emercit.utilstools.config.Msg;
18 import org.emercit.utilstools.svmanager.model.SvBean;
19 import org.emercit.utilstools.svmanager.service.Sv;
20 import org.emercit.utilstools.svmanager.service.SvControl;
21 21
22 @Ignore 22 @Ignore
23 public class TestSvControl extends TestCase { 23 public class TestSvControl extends TestCase {
......