save

@@ -136,7 +136,7 @@
 		<dependency>
 		<dependency>
 	    <groupId>org.emercit</groupId>
 	    <groupId>org.emercit</groupId>
 	    <artifactId>utilstools</artifactId>
 	    <artifactId>utilstools</artifactId>
-	    <version>1.12</version>
+	    <version>1.13</version>
 	</dependency>
 	</dependency>
 	
 	
 	</dependencies>
 	</dependencies>

+528d24e7e4a499f3ffd53b20f37c1d6e
\ No newline at end of file

+04c21c2a5e86f843cd60cd939caee1a12d5f75b4
\ No newline at end of file

+<?xml version="1.0" encoding="UTF-8"?>
+<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"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.emercit</groupId>
+  <artifactId>utilstools</artifactId>
+  <version>1.13</version>
+</project>

+325bd099aab6e30e723421fc3c92c960
\ No newline at end of file

+d1c45642f5e1014728ded0025f0637168d3fa5ee
\ No newline at end of file

@@ -3,7 +3,7 @@
   <groupId>org.emercit</groupId>
   <groupId>org.emercit</groupId>
   <artifactId>utilstools</artifactId>
   <artifactId>utilstools</artifactId>
   <versioning>
   <versioning>
-    <release>1.12</release>
+    <release>1.13</release>
     <versions>
     <versions>
       <version>1.0</version>
       <version>1.0</version>
       <version>1.1</version>
       <version>1.1</version>
@@ -18,7 +18,8 @@
       <version>1.10</version>
       <version>1.10</version>
       <version>1.11</version>
       <version>1.11</version>
       <version>1.12</version>
       <version>1.12</version>
+      <version>1.13</version>
     </versions>
     </versions>
-    <lastUpdated>20150730124043</lastUpdated>
+    <lastUpdated>20150730153808</lastUpdated>
   </versioning>
   </versioning>
 </metadata>
 </metadata>

-783d946983428dd9e3aa55dbcc953fce
\ No newline at end of file
+f720592af8e70c58b6c262c92ae2c999
\ No newline at end of file

-916946b4b7029a982ce5dfcef1f086ac89c62019
\ No newline at end of file
+41e1fbb03c75906bcff785a016afcbc4b0cb5661
\ No newline at end of file

+package org.emercit.devtools.app;
+
+
+import java.util.Locale;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.*;
+import javax.servlet.ServletContext;
+
+import java.io.*;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RequestBody;
+import java.util.Vector;
+import java.util.ArrayList;
+import java.util.List;
+import org.emercit.utilstools.config.Msg;
+import org.emercit.utilstools.config.MsgResult;
+
+import org.emercit.devtools.service.SvService;
+
+import org.emercit.svmanager.model.SvBean;
+
+@Controller
+@RequestMapping("api")
+public class SvController {
+
+	
+	@RequestMapping(value = "sv/all",  method = RequestMethod.GET)
+	public @ResponseBody Vector<SvBean> getAllSv() {
+		
+		return SvService.INSTANCE.getSvBeans();
+	}
+
+	@RequestMapping(value="sv/update" , method = RequestMethod.POST)
+	public @ResponseBody MsgResult update(@RequestBody SvBean bean) {
+		
+		return Msg.getMsgResultByCode(SvService.INSTANCE.Update(bean));  
+	}
+	
+	@RequestMapping(value="sv/start" , method = RequestMethod.POST)
+	public @ResponseBody MsgResult start(@RequestBody SvBean bean) {
+		
+		return Msg.getMsgResultByCode(SvService.INSTANCE.Start(bean));  
+	}
+	
+	@RequestMapping(value="sv/stop" , method = RequestMethod.POST)
+	public @ResponseBody MsgResult stop(@RequestBody SvBean bean) {
+		
+		return Msg.getMsgResultByCode(SvService.INSTANCE.Stop(bean));  
+	}	
+	
+	@RequestMapping(value="sv/restart" , method = RequestMethod.POST)
+	public @ResponseBody MsgResult restart(@RequestBody SvBean bean) {
+		
+		return Msg.getMsgResultByCode(SvService.INSTANCE.Restart(bean));  
+	}
+	
+}

 package org.emercit.devtools.service;
 package org.emercit.devtools.service;
 import org.emercit.model.IPAddressValidator;
 import org.emercit.model.IPAddressValidator;
+
 import java.util.Vector;
 import java.util.Vector;
+
 import org.emercit.svmanager.service.Sv;
 import org.emercit.svmanager.service.Sv;
 import org.emercit.svmanager.service.SvControl;
 import org.emercit.svmanager.service.SvControl;
 import org.emercit.svmanager.model.SvBean;
 import org.emercit.svmanager.model.SvBean;
+
 import java.util.Vector;
 import java.util.Vector;
 
 
 import org.emercit.pckutils.checkservice.STService;
 import org.emercit.pckutils.checkservice.STService;
@@ -30,7 +33,7 @@ public enum SvService {
 	 */
 	 */
 	public Vector<SvBean> getSvBeans() {
 	public Vector<SvBean> getSvBeans() {
 	  
 	  
-		svbeans=new Vector<SvBean>();
+		svbeans=sv.get();
 		
 		
 		for (SvBean s:svbeans) { // проверяем запущен или остановлен
 		for (SvBean s:svbeans) { // проверяем запущен или остановлен
 			try { s.setIsrun(st.IsRun(s.getProcess())); } catch (Exception e) {};
 			try { s.setIsrun(st.IsRun(s.getProcess())); } catch (Exception e) {};
@@ -42,24 +45,29 @@ public enum SvService {
 	/*
 	/*
 	 * 
 	 * 
 	 */
 	 */
-	public int Update(Vector<SvBean> beans) {
+	public int Update(SvBean bean) {
 		
 		
-		return sv.set(beans);
+			svbeans=sv.get();
+		
+			for (SvBean b:svbeans) {
+
+			if (b.getId()==bean.getId()) {
+				b.setAutostart(bean.getAutostart());
+			}
+			}
+		return sv.set(svbeans);
 	}
 	}
 	
 	
 	public int Start(SvBean svbean) { 
 	public int Start(SvBean svbean) { 
-	
 		svcontrol=new SvControl(svbean.getProcess());
 		svcontrol=new SvControl(svbean.getProcess());
 		return svcontrol.start();
 		return svcontrol.start();
 	}
 	}
 	
 	
 	public int Stop(SvBean svbean) { 
 	public int Stop(SvBean svbean) { 
-		
 		svcontrol=new SvControl(svbean.getProcess());
 		svcontrol=new SvControl(svbean.getProcess());
 		return svcontrol.stop();
 		return svcontrol.stop();
 	}
 	}
-	
-	
+
 	public int Restart(SvBean svbean) { 
 	public int Restart(SvBean svbean) { 
 		svcontrol=new SvControl(svbean.getProcess());
 		svcontrol=new SvControl(svbean.getProcess());
 		return svcontrol.restart();
 		return svcontrol.restart();

@@ -61,12 +61,34 @@
         
         
         
         
         
         
-        .fieladtime {
-    background-image:none;
-    background-color:#FFFFCC;
-    color:red;
+        
+        
+     .button-green
+	   {
+	    	background:url(resources/img/button-green.png) 16px no-repeat !important;
+	   }
+	   
+  	  .button-orange
+	   {
+	           background:url(resources/img/button-green.png) 16px no-repeat !important;
+	   }
+   	  .button-red
+	   {
+	           background:url(resources/img/button-red.png) 16px no-repeat !important;
+	   }
+	   
+	   .button-white
+	   {
+	           background:url(img/button-white.png) 20px no-repeat !important;
+	   }
+        
+    
+     .fieladtime {
+		    background-image:none;
+		    background-color:#FFFFCC;
+		    color:red;
     
     
-}
+		}
         
         
         
         
         </style>
         </style>

 Ext.application({
 Ext.application({
     name : 'App',
     name : 'App',
+    globals:{
+    	serverNotFound:'Сервер конфигурации недоступен',
+    	Error:'Ошибка'
+    	
+       
+    },
+    
    appFolder:"resources/js/app",
    appFolder:"resources/js/app",
     views : [
     views : [
         'MainConfig',
         'MainConfig',
@@ -13,7 +20,8 @@ Ext.application({
         'DetailProxy',
         'DetailProxy',
         'RemoteServer',
         'RemoteServer',
         'DeviceControl',
         'DeviceControl',
-        'Log'
+        'Log',
+        'Sv'
         
         
      
      
        
        
@@ -27,14 +35,16 @@ Ext.application({
         'Proxy',
         'Proxy',
         'RemoteServer',
         'RemoteServer',
         'DeviceControl',
         'DeviceControl',
-        'Log'
+        'Log',
+        'Sv'
      
      
        
        
     ],
     ],
     
     
     stores : [
     stores : [
      'Eth',
      'Eth',
-     'Dns'
+     'Dns',
+     'Sv'
     
     
     ],
     ],
 
 
@@ -164,16 +174,12 @@ Ext.application({
 																							
 																							
 																							{
 																							{
 																								title: 'DNS',
 																								title: 'DNS',
-																								items:[
-																								       
-																								       { 
+																								items:[ { 
 																									     xtype : 'mvvm-DnsView',
 																									     xtype : 'mvvm-DnsView',
 																									      id:'grdDns',
 																									      id:'grdDns',
 																									      name:'grdDns'
 																									      name:'grdDns'
 																									    
 																									    
-																									    }
-																								       
-																								       ]
+																									    }]
 																							},
 																							},
 																							
 																							
 																							
 																							
@@ -217,6 +223,13 @@ Ext.application({
 												    	   				region: 'center',
 												    	   				region: 'center',
 																		xtype: 'tabpanel',
 																		xtype: 'tabpanel',
 																		items: [
 																		items: [
+																		        
+																		        { 
+																				     xtype : 'mvvm-SvView',
+																				      id:'grdSv',
+																				      name:'grdSv'
+																				    
+																				    }
 																				
 																				
 																	     		]
 																	     		]
 																	
 																	
@@ -225,6 +238,24 @@ Ext.application({
 											},
 											},
 											
 											
 											{
 											{
+												title: 'НАСТРОЙКИ В XML',
+												items:[
+												       {
+												    	   				region: 'center',
+																		xtype: 'tabpanel',
+																		items: [
+																				
+																	     		]
+																	
+														}
+												]
+											},
+											
+											
+											
+											
+											
+											{
 												title: 'ЖУРНАЛ',
 												title: 'ЖУРНАЛ',
 												items:[
 												items:[
 												       {
 												       {

@@ -79,12 +79,9 @@ Ext.define('App.controller.DeviceControl', {
              //	Ext.getCmp('ntpServer').setValue(result.ntp);
              //	Ext.getCmp('ntpServer').setValue(result.ntp);
              			
              			
               }, failure: function(response, opts) {
               }, failure: function(response, opts) {
-            	  Ext.Msg.alert('Ошибка', 'Сервер недоступен');
+            	  Ext.Msg.alert("Ошибка", "Сервер конфигурации недоступен");
               }
               }
          });
          });
-    	
-    	
-    	
     },
     },
     
     
     
     

+Ext.define('App.controller.Sv', {
+    extend : 'Ext.app.Controller',
+    
+    init : function() {
+    	this.control({
+            
+            'toolbar button[action=loadSv]': {
+            	click : this.loadSv
+            },
+            
+            'mvvm-DnsView': {
+                selectionchange: this.gridSelectionChange,
+                viewready: this.onViewReady,
+                select: this.onRowSelect
+            },
+            'mvvm-DnsView': {
+                edit: this.onRowEdit,
+                beforeedit: this.onRowBeforeEdit
+            } 
+        });
+    },
+    
+    saveDns:function(btn) {
+    	
+    
+    	 var grid = btn.up('gridpanel');
+    	 var store = grid.getStore();
+    	 
+    	 var records = [];
+   		
+	        store.each(function(r){
+	                 records.push({
+	            		  id: r.get("id"),
+	       	            ip: r.get("ip")
+	            	 });
+	          });
+	            
+	        	
+	             var data=Ext.util.JSON.encode(records);
+	               
+	                 Ext.Ajax.request({
+	               	  method: "POST",
+	                     url: 'api/dns/update',
+	                     headers: {
+	                         'Accept': 'application/json',
+	                         'Content-Type': 'application/json'
+	                     },
+	                     params: data,
+	                     success: function(response, opts) {
+	                    	 
+	                    	 var Ok = Ext.JSON.decode(response.responseText);
+	                    	 if (Ok) { 
+	                    		 Ext.Msg.alert('Success', 'Сохранение выполнено успешно');
+	                    	 }else {
+	                    		 Ext.Msg.alert('Failure', 'Ошибка сохранения');
+	                    	 }
+	                    	 
+	                     }, failure: function(response, opts) {
+	                    	 
+	                    	  Ext.Msg.alert('Failure', 'Ошибка сохранения');
+	                     }
+	                });
+    	 
+    	 
+    	 
+    	 
+    	 
+    	 
+    	 
+    	 
+    	 
+    	 
+    	 
+    	 
+
+        //fires create, update and delete request when calling sync and commit changes in the store when autoSync=false
+    	/* 
+        store.sync({
+            success : function(batch, eOpts){
+                Ext.Msg.alert('Status', 'Changes saved successfully.');
+            },
+            failure : function(record, eOpts){
+                Ext.Msg.alert('Status', 'Request failed.');
+            }
+        });
+    	*/
+    	
+    },
+    
+    loadSv:function(btn) {
+    
+    	 var grid = btn.up('gridpanel');
+    	 var store = grid.getStore();
+    	 store.load();
+    	
+    },
+    
+    onRowEdit:function(editor, context, eOpts) { 
+  	 
+    },
+    
+    onRowBeforeEdit:function() {
+    	
+    	
+    },
+    
+    
+
+    newDns : function(btn) {
+
+ 
+    	 var grid = btn.up('gridpanel');
+    	 var store = grid.getStore();
+    	 var rowEditing=grid.getPlugin('modelDnsEditPlagin');
+        
+
+          rowEditing.cancelEdit();
+    	
+   	  	  var records = grid.getStore().getRange();
+    	
+	         var r = Ext.create('App.model.Dns', {
+	            id: records.length,
+	            ip: '8.8.8.8',
+	        });
+	         store.insert(0, r);
+        
+	         
+	         var records = [];
+	     		
+	        store.each(function(r){
+	                 records.push({
+	            		  id: r.get("id"),
+	       	            ip: r.get("ip")
+	            	 });
+	          });
+           		
+	     rowEditing.startEdit(0, 0);
+
+    },
+    
+    delDns:function(btn) { 
+
+    
+    	var grid = btn.up('gridpanel');
+    	var store=grid.getStore();
+
+ 
+    	 var selectedRows = grid.getSelectionModel().getSelection();
+         
+    	   if(selectedRows.length) {
+        	
+        	 store.remove(selectedRows);
+         } else {
+             Ext.Msg.alert('Статус', 'Выберите запись');
+         }
+    },
+
+    gridSelectionChange:function(selModel, selections, eOpts) {
+    	
+    	/*
+    	var grid = selModel.view.ownerCt;
+    	 var btnDelete=grid.down('button[itemId=deleteDnsButton]');
+    	 
+    	 btnDelete.setDisabled(false);
+    	
+    			console.log(selections[0].data);
+            	var json=Ext.util.JSON.encode(selections[0].data);
+             	console.log(json);
+        */
+    },
+    onViewReady:function() {
+    },
+   
+    onRowSelect: function(selModel, record, index, opts) {
+    	
+    	
+    }
+
+});
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+Ext.define('App.model.Sv', {
+    extend : 'Ext.data.Model',
+    
+    fields : [{
+    				name:'id',
+    				type:'int'
+    		  },
+              {
+            	  name:'process',
+            	  type:'string'
+              },
+              {
+            	  name:'autostart',
+            	  type:'boolean'
+              },
+              
+              {
+            	  name:'isrun',
+            	  type:'boolean'
+              },
+              
+              {
+            	  name:'starttime',
+            	  type:'int'
+              },
+              {
+            	  name:'stoptime',
+            	  type:'int'
+              } ]
+});
+

+
+Ext.define('App.store.Sv', {
+    extend  : 'Ext.data.Store',
+
+    requires : [
+        'App.model.Sv'
+    ],
+    
+    storeId : 'Sv',
+    model   : 'App.model.Sv',
+    
+    autoLoad: true,
+    autoSync: true,
+    alias: 'store.devices',
+    proxy : {
+      type : 'ajax',
+        api: {
+        			read: 'api/sv/all',
+        			  create : 'null',
+        	            update : 'null',
+        	            destroy : 'null'
+        	        },
+        	        actionMethods : 
+        	        {
+        	            destroy : 'POST',
+        	            read : 'GET',
+        	            create : 'POST',
+        	            update : 'POST'
+        	        },
+        reader : {
+          type : 'json',
+          idProperty : 'id'
+        },
+    }
+  });
\ No newline at end of file

+
+
+function renderercell(value, metaData, record, row, col, store, gridView) {
+	return '<div style="font-size: 14px; color:#3892d3;  text-align:center;">'+value+'</div>';	
+}
+
+
+function rendererstatusimg(value, metaData, record, rowIndex, colIndex, store) {
+    if(value) {
+    //	return '<div style="font-size: 14px; color:#3892d3;  text-align:center;">'+'Запущен'+'</div>';	
+    return	'<span><img src="resources/img/button-green.png" height="18" width="18"/> </span>';
+    }else {
+     	return '<div style="font-size: 14px; color:#3892d3;  text-align:center;">'+'Остановлен'+'</div>';	 
+    }
+ }
+
+function rendererstatustitle(value, metaData, record, rowIndex, colIndex, store) {
+    if(value) {
+    	return '<div style="font-size: 14px; color:#3892d3;  text-align:center;">'+'Запущен'+'</div>';	
+ 
+         }else {
+     	return '<div style="font-size: 14px; color:#3892d3;  text-align:center;">'+'Остановлен'+'</div>';	 
+    }
+ }
+
+
+
+Ext.define('App.view.Sv', {
+    extend : 'Ext.grid.Panel',
+    xtype  : 'mvvm-SvView',
+    title : 'Управление службами',
+    store : 'Sv',
+    		
+    bbar: {
+    	    items: [ 
+    			          {
+    			                xtype: 'button',
+    			                iconCls:'load',
+    			                itemId: 'LoadSvButton',
+    			                text: 'Обновить',
+    			                action: 'loadSv',
+    			                disabled:false
+    			            }
+    	            ]
+    	    		},		
+    		 width: 500,
+             height: 300,   
+          	 selType: 'rowmodel',
+             plugins: [new 	Ext.create('Ext.grid.plugin.RowEditing', {
+                    	   		clicksToEdit: 2,
+                    	   		pluginId: 'modelSvEditPlagin'
+                       	})
+             ],
+             columns: [{ 
+				            text      : '№',  
+				            dataIndex : 'id', 
+				            flex: 1,
+				            hidden:true
+             			},
+             			
+             			
+             		      { 
+				            text      : 'Статус', 
+				            dataIndex : 'isrun', 
+				            flex      : 1,
+				            renderer:rendererstatusimg,
+				           // editor: new Ext.form.TextField({
+				            	allowBlank: true
+				           // })
+				       },
+             			
+             			
+				       { 
+				            text      : 'Процесс', 
+				            dataIndex : 'process', 
+				            flex      : 1,
+				            renderer:renderercell,
+				           // editor: new Ext.form.TextField({
+				          //  	allowBlank: true
+				           // })
+				       },
+				       
+				       { 
+				            text      : 'Примечание', 
+				            dataIndex : 'isrun', 
+				            flex      : 1,
+				            renderer:rendererstatustitle,
+				           // editor: new Ext.form.TextField({
+				            	allowBlank: true
+				           // })
+				       },
+				       
+				       { 
+				            text      : 'Автозагрузка', 
+				            dataIndex : 'autostart', 
+				            flex      : 1,
+				            xtype: 'checkcolumn'
+				       },
+				       
+				       
+				       {
+				            xtype:'actioncolumn', 
+				            margin: "10 20 20 20",
+				              items: [{
+				                icon: 'resources/img/start.png',  
+				                tooltip: 'Запустить',
+				                margin: "10 20 20 20",
+				                handler: function(grid, rowIndex, colIndex) {
+				                    var rec = grid.getStore().getAt(rowIndex);
+				                    alert("Edit " + rec.get('firstname'));
+				                }
+				            },{
+				                icon: 'resources/img/stop.png',
+				                tooltip: 'Остановить',
+				                margin: "10 20 20 20",
+				                handler: function(grid, rowIndex, colIndex) {
+				                    var rec = grid.getStore().getAt(rowIndex);
+				                    alert("Terminate " + rec.get('firstname'));
+				                }                
+				            },
+				            {
+				                icon: 'resources/img/replay.png',
+				                tooltip: 'Перезапустить',
+				                margin: "10 20 20 20",
+				                handler: function(grid, rowIndex, colIndex) {
+				                    var rec = grid.getStore().getAt(rowIndex);
+				                    alert("Terminate " + rec.get('firstname'));
+				                }                
+				            }
+				            
+				            ]
+				        }
+				       
+				      
+             			
+      		  ]
+});
+
+
+
+
+
+
+
+
+
+
+
+
+

+package org.emercit.pckutils.cmd;
+
+import java.util.Vector;
+
+import org.apache.log4j.Logger;
+import org.emercit.dtmanager.service.NtpLinux;
+
+public class CmdLog {
+	
+	private static final Logger log = Logger.getLogger(CmdLog.class);
+	
+	public void  print(Vector<String> values){ 
+		
+		 for (String s:values) {
+	 		 log.info(s);
+	 	 }
+	}
+
+}

 package org.emercit.svmanager.model;
 package org.emercit.svmanager.model;
 
 
-
-
-
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Vector;
 import java.util.Vector;
 
 
@@ -18,6 +15,9 @@ private static final long serialVersionUID = 1L;
 	
 	
 	private boolean isrun;
 	private boolean isrun;
 	
 	
+	private int starttime;  // время запуска процесса в мс
+	
+	private int stoptime; // время остановки процесса
 	
 	
 	public SvBean() {
 	public SvBean() {
 
 
@@ -55,6 +55,22 @@ private static final long serialVersionUID = 1L;
 	public void setIsrun(boolean value) { 
 	public void setIsrun(boolean value) { 
 		this.isrun=value;
 		this.isrun=value;
 	}
 	}
+	
+	public void setStarttime(int value) {
+		this.starttime=value;
+	}
+	
+	public int getStarttime() { 
+		return starttime;
+	}
+	
+	public void setStoptime(int value) {
+		this.stoptime=value;
+	}
+	
+	public int getStoptime(){ 
+		return this.stoptime;
+	}
 
 
 }
 }
 
 

@@ -6,7 +6,7 @@ import org.emercit.svmanager.model.SvBean;
 import org.emercit.xmldbmanager.service.Db;
 import org.emercit.xmldbmanager.service.Db;
 import org.emercit.svmanager.service.SvControl;
 import org.emercit.svmanager.service.SvControl;
 import org.emercit.utilstools.config.Paths;
 import org.emercit.utilstools.config.Paths;
-
+import org.emercit.utilstools.config.DefSettings;
 
 
 public class Sv {
 public class Sv {
 	
 	
@@ -26,35 +26,39 @@ public class Sv {
 	}
 	}
 	
 	
 	public int init() { 
 	public int init() { 
-	
+
 		svbeans=new Vector<SvBean>();
 		svbeans=new Vector<SvBean>();
 		
 		
 		// jetty 
 		// jetty 
 		svbean=new SvBean();
 		svbean=new SvBean();
-		svbean.setId(0);
-		svbean.setProcess(Paths.JETTY);
-		svbean.setAutostart(true);
-		svbean.setIsrun(true);
+		svbean.setId(DefSettings.jetty_id);
+		svbean.setProcess(DefSettings.jetty_process);
+		svbean.setAutostart(DefSettings.jetty_autostart);
+		svbean.setIsrun(DefSettings.jetty_isrun);
+		svbean.setStarttime(DefSettings.jetty_starttime);
+		svbean.setStoptime(DefSettings.jetty_stoptime);
 		svbeans.add(svbean);
 		svbeans.add(svbean);
 		
 		
 		// ctrlpnl
 		// ctrlpnl
 		svbean=new SvBean();
 		svbean=new SvBean();
-		svbean.setId(1);
-		svbean.setProcess(Paths.CTRLPNL);
-		svbean.setAutostart(true);
-		svbean.setIsrun(true);
+		svbean.setId(DefSettings.ctrlpnl_id);
+		svbean.setProcess(DefSettings.ctrlpnl_process);
+		svbean.setAutostart(DefSettings.ctrlpnl_autostart);
+		svbean.setIsrun(DefSettings.ctrlpnl_isrun);
+		svbean.setStarttime(DefSettings.ctrlpnl_starttime);
+		svbean.setStoptime(DefSettings.ctrlpnl_stoptime);
 		svbeans.add(svbean);
 		svbeans.add(svbean);
 		
 		
 		int res=set(svbeans); 
 		int res=set(svbeans); 
 		
 		
 		for (SvBean sv:svbeans ) {
 		for (SvBean sv:svbeans ) {
 		
 		
-			svcontrol=new SvControl(sv.getProcess());
+			svcontrol=new SvControl(sv);
 			
 			
 			if (sv.getAutostart()) {
 			if (sv.getAutostart()) {
-				svcontrol.addAutoRun();
+				res=svcontrol.addAutoRun();
 			}else {
 			}else {
-				svcontrol.delAutoRun();
+				res=svcontrol.delAutoRun();
 			}
 			}
 		}
 		}
 		return res;
 		return res;

 package org.emercit.svmanager.service;
 package org.emercit.svmanager.service;
 
 
 
 
+import org.apache.log4j.Logger;
+import org.emercit.devinfo.service.DevInfo;
 import org.emercit.pckutils.cmd.CmdExec;
 import org.emercit.pckutils.cmd.CmdExec;
 import org.emercit.utilstools.config.Paths;
 import org.emercit.utilstools.config.Paths;
 import org.emercit.utilstools.config.Msg;
 import org.emercit.utilstools.config.Msg;
-
+import org.emercit.svmanager.model.SvBean;
 import org.emercit.pckutils.checkservice.STService;
 import org.emercit.pckutils.checkservice.STService;
+import java.util.Vector;
+import org.emercit.pckutils.cmd.CmdLog;
 
 
 public class SvControl implements ISvControl {
 public class SvControl implements ISvControl {
 	
 	
+	private static final Logger log = Logger.getLogger(SvControl.class);
+	
 	private CmdExec cmdexec=new CmdExec();
 	private CmdExec cmdexec=new CmdExec();
+	private CmdLog cmdLog=new CmdLog();
 	
 	
 	private STService st=new STService();
 	private STService st=new STService();
 	
 	
-	private String process;
+	private SvBean svbean;
 	
 	
+	private int typeCode;
 	
 	
-	public SvControl(String process) {
-		
-		this.process=process;
+	public SvControl(SvBean svbean) {
+		this.svbean=svbean;
 	}
 	}
 	
 	
+	/*
+	 * Остановка процесса
+	 * @see org.emercit.svmanager.service.ISvControl#stop()
+	 */
 	public int stop() {
 	public int stop() {
-		
-		try { 
-				cmdexec.Run(Paths.dirInit_d+" "+process+" "+"stop");
-				
-				
-			}catch(Exception e) 
-			{ 
-				return  Msg.ProcessStopError.getCode(); 
-		};
+			try { 
+				cmdLog.print(cmdexec.Run(Paths.dirInit_d+" "+this.svbean.getProcess()+" "+"stop"));
+			 	
+			 	Thread.sleep(this.svbean.getStoptime());
+	
+			 	if(st.IsRun(this.svbean.getProcess())) { //если еще запущен
+			 		log.error(Msg.ProcessStopError.getDescription());
+			 		return  Msg.ProcessStopError.getCode();
+			 	}	
+			}catch(Exception e)  {
+				log.error(e.getMessage());
+				return  Msg.ProcessStopError.getCode();
+			};
+		log.info(Msg.ProcessStopSucc.getDescription());
 		return Msg.ProcessStopSucc.getCode();
 		return Msg.ProcessStopSucc.getCode();
 	}
 	}
 	
 	
+	
+	/*
+	 * Запуск процесса
+	 * @see org.emercit.svmanager.service.ISvControl#start()
+	 */
 	public int start() { 
 	public int start() { 
 		
 		
-		try { cmdexec.Run(Paths.dirInit_d+process+" "+"start"); }catch(Exception e) { return Msg.ProcessStartError.getCode(); };
+			try { 
+				cmdLog.print(cmdexec.Run(Paths.dirInit_d+this.svbean.getProcess()+" "+"start"));
+				
+				Thread.sleep(this.svbean.getStarttime());
+				
+			 	if(!st.IsRun(this.svbean.getProcess())) { //если еще запущен
+			 			log.error(Msg.ProcessStartError.getDescription());
+			 		return  Msg.ProcessStartError.getCode();
+			 	}	
+				
+			
+			}catch(Exception e) {
+				log.error(e.getMessage());
+				return Msg.ProcessStartError.getCode(); 
+			};
 		
 		
+			log.info(Msg.ProcessStartSucc.getDescription());
 		return Msg.ProcessStartSucc.getCode();
 		return Msg.ProcessStartSucc.getCode();
 	}
 	}
 	
 	
+	/*
+	 * Перезапуск процесса
+	 * @see org.emercit.svmanager.service.ISvControl#restart()
+	 */
 	public int restart() {
 	public int restart() {
+		try { 
+				cmdLog.print(cmdexec.Run(Paths.dirInit_d+this.svbean.getProcess()+" "+"restart")); 
+				
+				 typeCode =Msg.getByCode(stop()).getTypeVariable().getCode();
+				
+				if (typeCode==0) { // Нет ошибки
+					
+					typeCode=Msg.getByCode(start()).getTypeVariable().getCode();
+					
+						if (typeCode==0) {
+							
+							log.info(Msg.ProcessRestartSucc.getDescription());
+							return Msg.ProcessRestartSucc.getCode();
+							
+						}else {
+							log.error(Msg.ProcessStartError.getDescription());
+						}
+					
+				}else {
+					log.error(Msg.ProcessStopError.getDescription());
+				}
+			}catch(Exception e) {
+				log.error(e.getMessage());
+			}
 		
 		
-		try { cmdexec.Run(Paths.dirInit_d+process+" "+"restart"); }catch(Exception e) { return Msg.ProcessRestartError.getCode(); };
-		
-		return Msg.ProcessRestartSucc.getCode();
+		return Msg.ProcessRestartError.getCode();
 	}
 	}
 	
 	
-	public int  addAutoRun() { 
-		
-		try { cmdexec.Run("update-rc.d "+process+" default"); }catch(Exception e) { return Msg.ProcessAddAutoRunError.getCode(); };
-		
+	/*
+	 * Добавление процесса в автозагрузку
+	 * @see org.emercit.svmanager.service.ISvControl#addAutoRun()
+	 */
+	public int  addAutoRun() { 		
+		try { 
+			 	cmdLog.print(cmdexec.Run("update-rc.d "+this.svbean.getProcess()+" default")); 
+			}catch(Exception e) { 
+				return Msg.ProcessAddAutoRunError.getCode(); 
+			};
 		return Msg.ProcessAddAutoRunSucc.getCode();
 		return Msg.ProcessAddAutoRunSucc.getCode();
 	}
 	}
 	
 	
+	/*
+	 * Удаление процесса из автозагрузки
+	 * @see org.emercit.svmanager.service.ISvControl#delAutoRun()
+	 */
 	public int delAutoRun() { 
 	public int delAutoRun() { 
 		
 		
-		try { cmdexec.Run("update-rc.d -f "+process+" remove"); }catch(Exception e) { return Msg.ProcessDelAutoRunError.getCode(); };
+		try { 
+				cmdLog.print(cmdexec.Run("update-rc.d -f "+this.svbean.getProcess()+" remove")); 
+			}catch(Exception e) {
+				return Msg.ProcessDelAutoRunError.getCode(); 
+			};
 		
 		
 		return Msg.ProcessDelAutoRunSucc.getCode();
 		return Msg.ProcessDelAutoRunSucc.getCode();
 	}
 	}
 	
 	
-	
-	
-	
 
 
 }
 }

@@ -66,6 +66,20 @@ public class DefSettings {
 	public static final int Server_port=80;
 	public static final int Server_port=80;
 	public static final String Server_type="СЗС"; 
 	public static final String Server_type="СЗС"; 
 	public static final String Server_title="";
 	public static final String Server_title="";
+	//JETTY
+	public static final int jetty_id=0;
+	public static final String jetty_process="jetty";
+	public static final boolean jetty_autostart=true;
+	public static final boolean jetty_isrun=false;
+	public static final int jetty_starttime=30000;  // время запуска процесса в мс
+	public static final int jetty_stoptime=15000; // время остановки процесса
+	//CTRLPNL
+	public static final int ctrlpnl_id=1;
+	public static final String ctrlpnl_process="ctrlpnl";
+	public static final boolean ctrlpnl_autostart=true;
+	public static final boolean ctrlpnl_isrun=false;
+	public static final int ctrlpnl_starttime=10000;  // время запуска процесса в мс
+	public static final int ctrlpnl_stoptime=5000; // время остановки процесса
 
 
 	
 	
 	
 	

@@ -25,8 +25,8 @@ public enum Msg {
 	  ProcessStopSucc(11,TypeMsg.INFO,"Выполнена остановка процесса"),
 	  ProcessStopSucc(11,TypeMsg.INFO,"Выполнена остановка процесса"),
 	  ProcessStopError(12,TypeMsg.ERROR,"Ошибка при выполнении остановки процесса"),
 	  ProcessStopError(12,TypeMsg.ERROR,"Ошибка при выполнении остановки процесса"),
 	  
 	  
-	  ProcessStartSucc(13,TypeMsg.INFO,"Выполнена остановка процесса"),
-	  ProcessStartError(14,TypeMsg.ERROR,"Ошибка при выполнеии запуска процесса"),
+	  ProcessStartSucc(13,TypeMsg.INFO,"Процесс успешно запущен"),
+	  ProcessStartError(14,TypeMsg.ERROR,"Ошибка запеска процесса"),
 	  
 	  
 	  ProcessRestartSucc(15,TypeMsg.INFO,"Выполнена перезагрузка процесса"),
 	  ProcessRestartSucc(15,TypeMsg.INFO,"Выполнена перезагрузка процесса"),
 	  ProcessRestartError(16,TypeMsg.ERROR,"Ошибка при перезагрузки процесса"),
 	  ProcessRestartError(16,TypeMsg.ERROR,"Ошибка при перезагрузки процесса"),

@@ -3,8 +3,8 @@ package org.emercit.utilstools.config;
 
 
 public enum TypeMsg implements TypeVariable {
 public enum TypeMsg implements TypeVariable {
     
     
-	INFO(1,"Уведомление"),
-	ERROR(2,"Ошибка");
+	INFO(0,"Уведомление"),
+	ERROR(1,"Ошибка");
 	
 	
 	private int code;
 	private int code;