save

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

+16117fd6379ed57fe0046bb0de18f258
\ No newline at end of file

+03ad0f7dfd1c45c0bfabd9c6e6c206beb59ade83
\ 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.1</version>
+</project>

+1bb9f90634c777d837381876fea9bb9b
\ No newline at end of file

+4f195a8499993e1608ea8cab6e16687c20c0b8dd
\ No newline at end of file

+c81e13b606304cd62e0b9f43381a9221
\ No newline at end of file

+55ce6c05f1d2023c2069fab505ca16dec6fb4266
\ 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.2</version>
+</project>

+79193d5fe0cbd1646a94084ff100e35f
\ No newline at end of file

+88dcd98566f7be34a2427cc4d4a876f540c9c836
\ No newline at end of file

@@ -3,10 +3,12 @@
   <groupId>org.emercit</groupId>
   <artifactId>utilstools</artifactId>
   <versioning>
-    <release>1.0</release>
+    <release>1.2</release>
     <versions>
       <version>1.0</version>
+      <version>1.1</version>
+      <version>1.2</version>
     </versions>
-    <lastUpdated>20150729072820</lastUpdated>
+    <lastUpdated>20150729141622</lastUpdated>
   </versioning>
 </metadata>

-f34fb34c127fb701e749ba391cf88fad
\ No newline at end of file
+257acae17b94e3780bb730b4a34a7be6
\ No newline at end of file

-01a7014d918ebe63858409ea507342bfe788739c
\ No newline at end of file
+a822e807f8f47856f57c62d6d43e7213053d06d9
\ No newline at end of file

@@ -43,57 +43,31 @@ public class DevControlController {
 	@RequestMapping(value="devcontrol/ntp" , method = RequestMethod.POST)
 	public @ResponseBody boolean  changeNtp(@RequestBody DateInfo m) {
 	
-		return DevControlService.INSTANCE.ChangeNtp(m.ntp);
-	
-		
-		
+		return DevControlService.INSTANCE.ChangeNtp(m.getNtp());	
 	}
 	
-	
 	@RequestMapping(value = "devcontrol/dateinfo",  method = RequestMethod.GET)
 	public @ResponseBody DateInfo getDi() {
 		
-	
-			return DevControlService.INSTANCE.getDateInfo();
-		
+		return DevControlService.INSTANCE.getDateInfo();
 	}
 	
-	
-	
-	
-	
 	@RequestMapping(value = "devcontrol/reboot",  method = RequestMethod.GET)
 	public @ResponseBody boolean DevReboot() {
-		
 	
-		 DevControlService.INSTANCE.Reboot();
+		DevControlService.INSTANCE.Reboot();
 		 
 		 return true;
-		
 	}
 
-	
-	
 	@RequestMapping(value = "devcontrol/calibration",  method = RequestMethod.GET)
 	public @ResponseBody boolean DvCalibration() {
 		
-	
-		 DevControlService.INSTANCE.Calibration();
+		DevControlService.INSTANCE.Calibration();
 		 
 		 return true;
-		
 	}
-	
-
-
-	
  
 }
 
 
-/*
-url: 'api/devcontrol/ntp',
-url: 'api/devcontrol/reboot',
-  url: 'api/devcontrol/off',
-url: 'api/devcontrol/dateinfo',
-*/
\ No newline at end of file

@@ -32,7 +32,7 @@ import java.util.Vector;
 import org.emercit.devtools.service.EthService;
 import org.emercit.devtools.service.RemoteServerManager;
 import org.emercit.ethmanager.model.EthBean;
-import org.emercit.remoteservers.model.RemoteServerBean;
+import org.emercit.servers.model.ServerBean;
 
 
 
@@ -44,7 +44,7 @@ public class RemoteServerController {
 
 	
 	@RequestMapping(value = "remoteserver/bytype/{type}",  method = RequestMethod.GET)
-	public @ResponseBody RemoteServerBean getRemoteServerByType(@PathVariable String type)  {
+	public @ResponseBody ServerBean getRemoteServerByType(@PathVariable String type)  {
 
 		return RemoteServerManager.INSTANCE.getByType(type);
 	
@@ -54,7 +54,7 @@ public class RemoteServerController {
 	
 
 	 @RequestMapping(value="remoteserver/update" , method = RequestMethod.POST)
-	    public @ResponseBody boolean update(@RequestBody RemoteServerBean b) {
+	    public @ResponseBody boolean update(@RequestBody ServerBean b) {
 	    
 			return RemoteServerManager.INSTANCE.Update(b);
 		 

@@ -27,7 +27,7 @@ public enum DevControlService {
 		DateInfo dateinfo=new DateInfo();
 		
 		
-		dateinfo.ntp=ntplinux.getUseNtpServer();
+		dateinfo.setNtp(ntplinux.getUseNtpServer());
 		
 		Calendar calendar =  Calendar.getInstance();
           
@@ -37,7 +37,7 @@ public enum DevControlService {
    	
    	
        Date date=calendar.getTime();
-       dateinfo.dt = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss").format(new Date());
+       dateinfo.setDt(new SimpleDateFormat("dd.MM.yyyy HH:mm:ss").format(new Date()));
       
 		return dateinfo;
 	}

@@ -6,7 +6,7 @@ import org.emercit.model.IPAddressValidator;
 
 import org.emercit.devinfo.model.DevInfoBean;
 
-import org.emercit.devinfo.service.DevInfoImpl;
+import org.emercit.devinfo.service.DevInfo;
 
 
 
@@ -14,17 +14,16 @@ public enum DevInfoService {
 
 	INSTANCE;
 		
-	private DevInfoImpl devinfo= new DevInfoImpl();
-	
+	private DevInfo devinfo= new DevInfo();
 	
 	public DevInfoBean get() {
 		
-		return devinfo.Get();
+		return devinfo.get();
 	}
 
 	public boolean set(DevInfoBean m) {
 		
-		return devinfo.Set(m);
+		return devinfo.set(m);
 	}
 	
 }

@@ -7,31 +7,27 @@ import org.emercit.model.IPAddressValidator;
 import java.util.Vector;
 
 
-import org.emercit.remoteservers.model.RemoteServerBean;
-import org.emercit.remoteserver.service.RemSrv;
-
-
-
+import org.emercit.servers.model.ServerBean;
+import org.emercit.servers.service.Servers;
 public enum RemoteServerManager {
 
 	INSTANCE;
 		
-	private  RemSrv store=new RemSrv();
+	private  Servers store=new Servers();
 
-	private Vector<RemoteServerBean> beans;
+	private Vector<ServerBean> beans;
 	
 	
-	public Vector<RemoteServerBean> getAll() {
+	public Vector<ServerBean> getAll() {
 		return store.get();
 		
 	}
 	
-	
-	public RemoteServerBean getByType(String type) { 
+	public ServerBean getByType(String type) { 
 		
 		beans=store.get();
 		
-		for (RemoteServerBean b:beans) { 
+		for (ServerBean b:beans) { 
 			
 			if (b.getType().equals(type)) { 
 				return b;
@@ -42,11 +38,11 @@ public enum RemoteServerManager {
 	}
 	
 	
-	public boolean Update(RemoteServerBean b) {
+	public boolean Update(ServerBean b) {
 		
 		  beans=store.get();
 		
-		for (RemoteServerBean bean:beans) { 
+		for (ServerBean bean:beans) { 
 			
 			
 			if (bean.getId()==b.getId()) {

@@ -10,26 +10,53 @@
 		</layout>
 	</appender>
 	
+	  <appender name="file" class="org.apache.log4j.FileAppender">
+       <param name="File" value="/var/log/devtools.log" />
+       <layout class="org.apache.log4j.PatternLayout">
+          <param name="ConversionPattern" value="%-7p %d [%t] %c %x - %m%n"/>
+       </layout>
+    </appender>
+	
+	
 	<!-- Application Loggers -->
 	<logger name="org.emercit.app">
+	
+		<level value="info" />
+		<appender-ref ref="console" />
+			<appender-ref ref="file" />
+	</logger>
+	
+	
+	<logger name="org.emercit">
 		<level value="info" />
+		<appender-ref ref="console" />
+		<appender-ref ref="file" />
 	</logger>
 	
-	<!-- 3rdparty Loggers -->
+	
+	<!-- rdparty Loggers -->
 	<logger name="org.springframework.core">
 		<level value="info" />
+		<appender-ref ref="console" />
+		<appender-ref ref="file" />
 	</logger>
 	
 	<logger name="org.springframework.beans">
 		<level value="info" />
+		<appender-ref ref="console" />
+		<appender-ref ref="file" />
 	</logger>
 	
 	<logger name="org.springframework.context">
 		<level value="info" />
+		<appender-ref ref="console" />
+		<appender-ref ref="file" />
 	</logger>
 
 	<logger name="org.springframework.web">
 		<level value="info" />
+		<appender-ref ref="console" />
+		<appender-ref ref="file" />
 	</logger>
 
 	<!-- Root Logger -->
@@ -38,4 +65,4 @@
 		<appender-ref ref="console" />
 	</root>
 	
-</log4j:configuration>
+</log4j:configuration>
\ No newline at end of file

@@ -12,6 +12,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8

@@ -49,10 +49,12 @@
     
     
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-		</dependency>
+   <groupId>log4j</groupId>
+   <artifactId>log4j</artifactId>
+   <version>1.2.14</version>
+   <type>jar</type>
+   <scope>compile</scope>
+</dependency>
     
     
 	<dependency>

@@ -6,13 +6,16 @@ import java.io.InputStreamReader;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Random;
-
 import java.util.Vector;
 
+import org.apache.log4j.Logger;
+import org.emercit.devinfo.service.DevInfo;
+
 
 
 public class CmdExec {
 	
+	private static final Logger log = Logger.getLogger(CmdExec.class);
 	
 	public Vector<String>  Run(String cmd) throws Exception {
 		
@@ -24,7 +27,10 @@ public class CmdExec {
 	    proc.waitFor();
 	    BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream()));
 		    while(br.ready())  {
-		    	v.add(br.readLine());
+		    	
+		    	String message=br.readLine();
+		    	v.add(message);
+		    	log.info(message);
 		    }
 	   
 	    return v;

@@ -2,12 +2,9 @@ package org.emercit.projecttools.constants;
 
 public class Paths {
 	
-	
-	
-	private static final String dirBeans="/opt/apps/beans/";
-	private static final String dirScripts="/opt/apps/scripts/";
-	private static final String dirInit_d="/etc/init.d";
-	
+	public static final String dirBeans="/opt/apps/beans/";
+	public static final String dirScripts="/opt/apps/scripts/";
+	public static final String dirInit_d="/etc/init.d";
 	
 	//BEANS
 	public static final String BEAN_GSM=dirBeans+"GSMBean.xml";
@@ -23,12 +20,7 @@ public class Paths {
 	public static final String FINDPROCESS_SCRIPT=dirScripts+"findprocess.sh"; 
 	
 	//PROCESS
-	public static final String PROC_JETTY=dirInit_d+"jetty";
-	public static final String PROC_CTRLPNL=dirInit_d+"ctrlpnl";
-	public static final String PROC_SNMPAGENT=dirInit_d+"snmpagent";
-	public static final String PROC_SNMPCLIENT=dirInit_d+"snmpclient";
-	
-	
-	
+	public static final String JETTY="jetty";
+	public static final String CTRLPNL="ctrlpnl";
 
 }

@@ -32,6 +32,14 @@ private static final long serialVersionUID = 1L;
 		this.id=value;
 	}
 	
+	public void setProcess(String value) {
+		this.process=value;
+	}
+	
+	public String getProcess() {
+		return process;
+	}
+	
 	public boolean getAutostart() { 
 		return autostart;
 	}

@@ -9,5 +9,8 @@ public interface ISv {
 	public void set(Vector<SvBean> m);
 	
 	public Vector<SvBean> get();
+	
+	public void init();
 
+	
 }

@@ -8,4 +8,9 @@ public interface ISvControl {
 	
 	public boolean restart();
 	
+	
+	public boolean addAutoRun();
+	
+	public boolean delAutoRun();
+	
 }

@@ -6,10 +6,19 @@ import org.emercit.svmanager.model.SvBean;
 import org.emercit.xmldbmanager.service.Db;
 import org.emercit.projecttools.constants.Paths;
 
+import org.emercit.svmanager.service.SvControl;
+
+
 public class Sv {
 	
 	public Db db=new Db(Paths.BEAN_SV);
 
+	private SvBean svbean;
+	
+	private Vector<SvBean> svbeans;
+	
+	private SvControl svcontrol;
+	
 	public void set(Vector<SvBean> m) {
 
 		db.create(m);		
@@ -19,5 +28,38 @@ public class Sv {
 		
 		return (Vector<SvBean>)db.select();
 	}
-
+	
+	public void init() { 
+	
+		svbeans=new Vector<SvBean>();
+		
+		// jetty 
+		svbean=new SvBean();
+		svbean.setId(0);
+		svbean.setProcess(Paths.JETTY);
+		svbean.setAutostart(true);
+		svbean.setIsrun(true);
+		svbeans.add(svbean);
+		
+		// ctrlpnl
+		svbean=new SvBean();
+		svbean.setId(1);
+		svbean.setProcess(Paths.CTRLPNL);
+		svbean.setAutostart(true);
+		svbean.setIsrun(true);
+		svbeans.add(svbean);
+		
+		set(svbeans); 
+		
+		for (SvBean sv:svbeans ) {
+		
+			svcontrol=new SvControl(sv.getProcess());
+			
+			if (sv.getAutostart()) {
+				svcontrol.addAutoRun();
+			}else {
+				svcontrol.delAutoRun();
+			}
+		}
+	}
 }

@@ -3,36 +3,56 @@ package org.emercit.svmanager.service;
 
 import org.emercit.pckutils.cmd.CmdExec;
 
+import org.emercit.projecttools.constants.Paths;
+
 public class SvControl implements ISvControl {
 	
 	private CmdExec cmdexec=new CmdExec();
 	
 	private String process;
 	
-	public SvControl(String value) {
+	public SvControl(String process) {
 		
-		this.process=value;
+		this.process=process;
 	}
 	
 	public boolean stop() {
 		
-		try { cmdexec.Run(process+" "+"stop"); }catch(Exception e) { return false; };
+		try { cmdexec.Run(Paths.dirInit_d+" "+process+" "+"stop"); }catch(Exception e) { return false; };
 		
 		return true;
 	}
 	
 	public boolean start() { 
 		
-		try { cmdexec.Run(process+" "+"start"); }catch(Exception e) { return false; };
+		try { cmdexec.Run(Paths.dirInit_d+process+" "+"start"); }catch(Exception e) { return false; };
 		
 		return true;
 	}
 	
 	public boolean restart() {
 		
-		try { cmdexec.Run(process+" "+"restart"); }catch(Exception e) { return false; };
+		try { cmdexec.Run(Paths.dirInit_d+process+" "+"restart"); }catch(Exception e) { return false; };
+		
+		return true;
+	}
+	
+	public boolean  addAutoRun() { 
+		
+		try { cmdexec.Run("update-rc.d "+process+" default"); }catch(Exception e) { return false; };
 		
 		return true;
 	}
+	
+	public boolean delAutoRun() { 
+		
+		try { cmdexec.Run("update-rc.d -f "+process+" remove"); }catch(Exception e) { return false; };
+		
+		return true;
+	}
+	
+	
+	
+	
 
 }

 package org.emercit.utilstools;
 
-import org.emercit.utilstools.model.SettingsBean;
-import org.emercit.utilstools.service.Settings;
-
-import org.emercit.devinfo.model.DevInfoBean;
+import org.emercit.devinfo.service.DevInfo;
+import org.emercit.svmanager.model.SvBean;
+import org.emercit.svmanager.service.SvControl;
+import org.emercit.svmanager.service.Sv;
 
+import org.apache.log4j.Logger;
 
 public class App 
 {
-	
-	
+	private static final Logger log = Logger.getLogger(App.class);
+		
     public static void main( String[] args )
     {
+    	
+    	
+    	
+    	
+    	
         System.out.println( "UtilsTools!" );
         
-        Settings settings=new Settings();
+        Sv sv=new Sv();
+        
+        // Процесс инит 
         
-        settings.init();
+        sv.init();
         
         
        

+log4j.debug=TRUE
+log4j.rootLogger=INFO, R
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=/var/log/UtilsTools.log
+log4j.appender.R.MaxFileSize=100KB
+log4j.appender.R.MaxBackupIndex=5
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSSS} %p %t %c \u2013 %m%n
\ No newline at end of file