Skip to content

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

Go to a project
Toggle navigation
Toggle navigation pinning
Commit a4cd1744 a4cd1744c894f172762baa23dd3872cd1ec45613 by root
Options

save

1 parent e375f827
Inline Side-by-side
Showing 20 changed files with 37 additions and 21 deletions
1 eclipse.preferences.version=1
2 org.eclipse.wst.ws.service.policy.projectEnabled=false
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
147 <dependency> 147 <dependency>
148 <groupId>org.emercit</groupId> 148 <groupId>org.emercit</groupId>
149 <artifactId>utilstools</artifactId> 149 <artifactId>utilstools</artifactId>
150 <version>1.45</version> 150 <version>1.50</version>
151 </dependency> 151 </dependency>
152 152
153 <dependency> 153 <dependency>
......
1 7879f7b7e9fa12c6d38e02448689bb24
...\ No newline at end of file ...\ No newline at end of file
1 5fa041999fef685b156663188c7132a3d00161fd
...\ 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.46</version>
8 </project>
1 c9213046769341aee04745bf0be6ddb3
...\ No newline at end of file ...\ No newline at end of file
1 a2cf6fe498f7d21e94b029d31beb7236c9d023fe
...\ No newline at end of file ...\ No newline at end of file
1 f69534b889c2f58a6f97a2437b304784
...\ No newline at end of file ...\ No newline at end of file
1 70abfc291ceae25140fb3192216df9b95d54227c
...\ 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.50</version>
8 </project>
1 e84eff436901094a0c9b13a0f8d6e5ac
...\ No newline at end of file ...\ No newline at end of file
1 5cb0075a224e925c604685a7d9947b3d1931ed0b
...\ 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.45</release> 6 <release>1.50</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>
...@@ -49,7 +49,9 @@ ...@@ -49,7 +49,9 @@
49 <version>1.41</version> 49 <version>1.41</version>
50 <version>1.42</version> 50 <version>1.42</version>
51 <version>1.45</version> 51 <version>1.45</version>
52 <version>1.46</version>
53 <version>1.50</version>
52 </versions> 54 </versions>
53 <lastUpdated>20150811122648</lastUpdated> 55 <lastUpdated>20150812065914</lastUpdated>
54 </versioning> 56 </versioning>
55 </metadata> 57 </metadata>
......
1 620a2c75beef4761b60e181a96ea3369
...\ No newline at end of file ...\ No newline at end of file
1 b608ba80436a86a0616f055bcc8a8a65
...\ No newline at end of file ...\ No newline at end of file
......
1 94013eaf8466549c9d4f9a446c807a987c3ba90e
...\ No newline at end of file ...\ No newline at end of file
1 5fd4e8f6aa6d6094cf2b61baee024dc673b79784
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -80,12 +80,11 @@ Ext.define('App.controller.Proxy', { ...@@ -80,12 +80,11 @@ Ext.define('App.controller.Proxy', {
80 }, 80 },
81 params: data, 81 params: data,
82 success: function(response, opts) { 82 success: function(response, opts) {
83 // proxyView.unmask();
84 var result = Ext.JSON.decode(response.responseText); 83 var result = Ext.JSON.decode(response.responseText);
85 // Ext.Msg.alert(result.type+" "+"Код-"+result.code,result.message); 84
85 Ext.Msg.alert(result.type+" "+"Код-"+result.code,result.message);
86 86
87 }, failure: function(response, opts) { 87 }, failure: function(response, opts) {
88 proxyView.unmask();
89 Ext.Msg.alert('Ошибка', 'Сервер недоступен'); 88 Ext.Msg.alert('Ошибка', 'Сервер недоступен');
90 } 89 }
91 }); 90 });
......
...@@ -85,7 +85,7 @@ public class DefSettings { ...@@ -85,7 +85,7 @@ public class DefSettings {
85 // 85 //
86 public static final String ssh_host="127.0.0.1"; 86 public static final String ssh_host="127.0.0.1";
87 public static final int ssh_port=22; 87 public static final int ssh_port=22;
88 public static final String ssh_login="debian"; 88 public static final String ssh_login="root";
89 public static final String ssh_password="temppwd"; 89 public static final String ssh_password="root";
90 90
91 } 91 }
......
...@@ -31,18 +31,7 @@ public class SvControl implements ISvControl { ...@@ -31,18 +31,7 @@ public class SvControl implements ISvControl {
31 this.svbean=svbean; 31 this.svbean=svbean;
32 this.sshexec=new SSHExec(); 32 this.sshexec=new SSHExec();
33 33
34 this.sshexec.setHost("");
35 /*
36 private String login;
37
38 private String password;
39
40 private String host;
41 34
42 private int port;
43
44 private String cmd;
45 */
46 } 35 }
47 /* 36 /*
48 * Остановка процесса 37 * Остановка процесса
......