Skip to content

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

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 9c1a82d5 9c1a82d57c352dcd84e3347ff30c99fd356e7841 by root
Options

save

1 parent 59d94331
Inline Side-by-side
Showing 45 changed files with 457 additions and 416 deletions
......@@ -132,64 +132,11 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>devinfo</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>ethmanager</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>dnsmanager</artifactId>
<version>1.11</version>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>proxymanager</artifactId>
<version>1.11</version>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>remoteservers</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>pckutils</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>dtmanager</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>gsmmanager</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>xmldbmanager</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>projecttools</artifactId>
<version>1.5</version>
<artifactId>utilstools</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
......
b8e537be9abe9441768d59cf976279b9
\ No newline at end of file
216e568620c1b0aefc6de1116d2a6877116a4491
\ 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.0</version>
</project>
c0cfe20cb5a84143fe493150265bbb3a
\ No newline at end of file
e89dbf7e9452f2b5668a13a911899349c4b356bb
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<versioning>
<release>1.0</release>
<versions>
<version>1.0</version>
</versions>
<lastUpdated>20150729072820</lastUpdated>
</versioning>
</metadata>
f34fb34c127fb701e749ba391cf88fad
\ No newline at end of file
01a7014d918ebe63858409ea507342bfe788739c
\ No newline at end of file
package org.emercit.devinfo.service;
import java.beans.XMLDecoder;
import java.beans.XMLEncoder;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import org.apache.log4j.Logger;
import org.emercit.devinfo.model.DevInfoBean;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.projecttools.constants.Paths;
public class DevInfo implements IDevInfo {
private static final Logger log = Logger.getLogger(DevInfo.class);
private Db db=new Db(Paths.BEAN_DEVINFO);
public boolean set(DevInfoBean m) {
return db.create(m);
}
public DevInfoBean get() {
return (DevInfoBean)db.select();
}
}
package org.emercit.devinfo.service;
import java.beans.XMLDecoder;
import java.beans.XMLEncoder;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import org.apache.log4j.Logger;
import org.emercit.devinfo.model.DevInfoBean;
public class DevInfoImpl implements IDevInfo {
private static final Logger log = Logger.getLogger(DevInfoImpl.class);
public boolean Set(DevInfoBean m) {
try {
FileOutputStream fos = new FileOutputStream("/opt/devtools/beans/DevInfo.xml");
BufferedOutputStream bos = new BufferedOutputStream(fos);
XMLEncoder xmlEncoder = new XMLEncoder(bos);
xmlEncoder.writeObject(m);
xmlEncoder.close();
return true;
}catch(Exception e) {
log.error(e.getMessage());
return false;
}
}
public DevInfoBean Get() {
try {
XMLDecoder d = new XMLDecoder(
new BufferedInputStream(
new FileInputStream("/opt/devtools/beans/DevInfo.xml")));
DevInfoBean result =(DevInfoBean) d.readObject();
d.close();
return result;
}catch(Exception e) {
log.error(e.getMessage());
return null;
}
}
}
package org.emercit.devinfo.service;
import java.beans.XMLEncoder;
import java.beans.XMLDecoder;
import java.io.BufferedOutputStream;
import java.io.BufferedInputStream;
import java.io.FileOutputStream;
import java.io.FileInputStream;
import org.emercit.devinfo.model.DevInfoBean;
public enum DevInfoService {
INSTANCE;
public boolean Set(DevInfoBean m) throws Exception {
boolean result=false;
FileOutputStream fos = new FileOutputStream("/opt/devtools/beans/DevInfo.xml");
BufferedOutputStream bos = new BufferedOutputStream(fos);
XMLEncoder xmlEncoder = new XMLEncoder(bos);
xmlEncoder.writeObject(m);
xmlEncoder.close();
return result;
}
public DevInfoBean Get() throws Exception {
DevInfoBean result=null;
XMLDecoder d = new XMLDecoder(
new BufferedInputStream(
new FileInputStream("/opt/devtools/beans/DevInfo.xml")));
result =(DevInfoBean) d.readObject();
d.close();
return result;
}
}
......@@ -10,15 +10,9 @@ import java.io.FileOutputStream;
import org.emercit.devinfo.model.DevInfoBean;
public interface IDevInfo {
public boolean Set(DevInfoBean m);
public DevInfoBean Get();
public boolean set(DevInfoBean m);
public DevInfoBean get();
}
......
package org.emercit.dnsmanager.model;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.util.List;
import java.util.ArrayList;
import java.util.Random;
import java.util.Vector;
public class CommandExecutor {
public Vector<String> Run(String cmd) throws Exception {
Vector<String> v=new Vector<String>();
Runtime run = Runtime.getRuntime();
Process proc = run.exec(new String[]{"/bin/sh", "-c",cmd});
proc.waitFor();
BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream()));
while(br.ready()) {
v.add(br.readLine());
}
return v;
}
}
......@@ -9,22 +9,18 @@ import java.util.Vector;
import org.apache.log4j.Logger;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.dnsmanager.model.CommandExecutor;
import org.emercit.pckutils.cmd.CmdExec;
public class DnsLinux implements IDns{
private static final Logger log = Logger.getLogger(DnsLinux.class);
private CommandExecutor ce=new CommandExecutor();
private CmdExec ce=new CmdExec();
private Vector<DnsBean> dbs;
private DnsBean db;
private String json;
public void Add (String value){
......@@ -40,8 +36,6 @@ public class DnsLinux implements IDns{
}
public void Delete(String value) {
dbs=getAllDns();
......@@ -55,7 +49,6 @@ public class DnsLinux implements IDns{
Config(dbs);
}
public boolean Update(Vector<DnsBean> beans) {
......
package org.emercit.dtmanager.model;
public class DateInfo {
import java.io.Serializable;
public class DateInfo implements Serializable {
private String dt;
private String ntp;
public DateInfo() {
}
public void setDt(String value){
this.dt=value;
}
public String getDt() {
public String dt;
return dt;
}
public String ntp;
public void setNtp(String value ) {
this.ntp=value;
}
public String getNtp() {
return ntp;
}
}
......
......@@ -41,7 +41,9 @@ public class EthLinux implements IEth {
public EthLinux() {
}
public Vector<EthBean> getEthBeans(){
return (Vector<EthBean>)db.select();
}
/*
* Список интерфейсов Ethernet на данном устройстве
......
......@@ -17,6 +17,7 @@ public class Paths {
public static final String BEAN_PROXY=dirBeans+"ProxyBeans.xml";
public static final String BEAN_REMOTESERVER=dirBeans+"RemoteServerBeans.xml";
public static final String BEAN_SV=dirBeans+"SvBeans.xml";
public static final String BEAN_SETTINGS=dirBeans+"SettingsBeans.xml";
//SCRIPTS
public static final String FINDPROCESS_SCRIPT=dirScripts+"findprocess.sh";
......
......@@ -40,6 +40,10 @@ public class ProxyLinux {
return false;
}
public Vector<ProxyBean> getProxyBeans() {
return (Vector<ProxyBean>)db.select();
}
public void Config(Vector<ProxyBean> pbs) {
try {
......
package org.emercit.remoteservers.model;
package org.emercit.rserv.model;
......@@ -6,7 +6,7 @@ package org.emercit.remoteservers.model;
import java.io.Serializable;
import java.util.Vector;
public class RemoteServerBean implements Serializable {
public class RServBean implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -23,7 +23,7 @@ private static final long serialVersionUID = 1L;
private String title;
public RemoteServerBean() {
public RServBean() {
}
......
package org.emercit.remoteserver.service;
package org.emercit.rserv.service;
import java.util.Vector;
import org.emercit.remoteservers.model.RemoteServerBean;
import org.emercit.rserv.model.RServBean;
public interface IRemSrv {
public Vector<RemoteServerBean> get();
public Vector<RServBean> get();
public boolean set(Vector<RemoteServerBean> beans);
public boolean set(Vector<RServBean> beans);
public void init();
......
package org.emercit.remoteserver.service;
package org.emercit.rserv.service;
import java.util.Vector;
import java.beans.XMLEncoder;
......@@ -9,11 +9,9 @@ import java.io.FileOutputStream;
import java.io.FileInputStream;
import org.apache.log4j.Logger;
import org.emercit.remoteserver.service.IRemSrv;
import org.emercit.remoteservers.model.RemoteServerBean;
import org.emercit.rserv.model.RServBean;
import org.emercit.rserv.service.IRemSrv;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.projecttools.constants.Paths;
public class RemSrv implements IRemSrv {
......@@ -22,14 +20,14 @@ public class RemSrv implements IRemSrv {
private Db db=new Db(Paths.BEAN_REMOTESERVER);
public boolean set(Vector<RemoteServerBean> beans) {
public boolean set(Vector<RServBean> beans) {
return db.create(beans);
}
public Vector<RemoteServerBean> get() {
public Vector<RServBean> get() {
return (Vector<RemoteServerBean>)db.select();
return (Vector<RServBean>)db.select();
}
......@@ -37,9 +35,9 @@ public class RemSrv implements IRemSrv {
public void init() {
Vector<RemoteServerBean> beans=new Vector<RemoteServerBean>();
Vector<RServBean> beans=new Vector<RServBean>();
RemoteServerBean rsb=new RemoteServerBean();
RServBean rsb=new RServBean();
rsb.setId(1);
rsb.setIp("127.0.0.1");
......
......@@ -5,4 +5,4 @@
* @author root
*
*/
package org.emercit.servicemanager.model;
\ No newline at end of file
package org.emercit.svmanager.model;
\ No newline at end of file
......
package org.emercit.svmanager.service;
import org.emercit.servicemanager.model.SvBean;
import org.emercit.svmanager.model.SvBean;
import java.util.Vector;
public interface ISv {
public boolean isRun();
public void set(Vector<SvBean> m);
public Vector<SvBean> get();
......
package org.emercit.svmanager.service;
public enum ISvControl {
public interface ISvControl {
public boolean start();
public boolean stop();
public boolean restart();
}
......
package org.emercit.svmanager.service;
import java.util.Vector;
import org.emercit.svmanager.model.SvBean;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.projecttools.constants.Paths;
public class Sv {
public Db db=new Db(Paths.BEAN_SV);
public void set(Vector<SvBean> m) {
db.create(m);
}
public Vector<SvBean> get() {
return (Vector<SvBean>)db.select();
}
}
package org.emercit.svmanager.service;
import org.emercit.pckutils.cmd.CmdExec;
public class SvControl implements ISvControl {
private CmdExec cmdexec=new CmdExec();
private String process;
public SvControl(String value) {
this.process=value;
}
public boolean stop() {
try { cmdexec.Run(process+" "+"stop"); }catch(Exception e) { return false; };
return true;
}
public boolean start() {
try { cmdexec.Run(process+" "+"start"); }catch(Exception e) { return false; };
return true;
}
public boolean restart() {
try { cmdexec.Run(process+" "+"restart"); }catch(Exception e) { return false; };
return true;
}
}
package org.emercit.utilstools;
import org.emercit.utilstools.model.SettingsBean;
import org.emercit.utilstools.service.Settings;
public class App
{
public static void main( String[] args )
{
System.out.println( "UtilsTools!" );
Settings settings=new Settings();
SettingsBean sb=settings.make();
settings.set(sb);
}
}
......
package org.emercit.utilstools.model;
import java.util.Vector;
import org.emercit.devinfo.model.DevInfoBean;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.dtmanager.model.DateInfo;
import org.emercit.gsmmanager.model.GSMBean;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.proxymanager.model.ProxyBean;
import org.emercit.rserv.model.RServBean;
import org.emercit.svmanager.model.SvBean;
import java.io.Serializable;
public class SettingsBean implements Serializable {
private DevInfoBean devinfobean;
private Vector<DnsBean> dnsbeans;
private DateInfo dateinfobean;
private GSMBean gsmbean;
private Vector<EthBean> ethbeans;
private Vector<ProxyBean> proxybeans;
private Vector<RServBean> rserverbeans;
private Vector<SvBean> svbeans;
public SettingsBean() {
}
//Set
public void setDevInfoBean(DevInfoBean model){
this.devinfobean=model;
}
public void setDnsbeans(Vector<DnsBean> models) {
this.dnsbeans=models;
}
public void setDateInfo(DateInfo model) {
this.dateinfobean=model;
}
public void setGSMBean(GSMBean model) {
this.gsmbean=model;
}
public void setEthBeans(Vector<EthBean> models) {
this.ethbeans=models;
}
public void setProxyBeans(Vector<ProxyBean> models) {
this.proxybeans=models;
}
public void setRserverbeans(Vector<RServBean> models) {
this.rserverbeans=models;
}
public void setSvbeans(Vector<SvBean> models) {
this.svbeans=models;
}
//Get
public DevInfoBean getDevInfoBean(){
return devinfobean;
}
public Vector<DnsBean> getDnsbeans() {
return dnsbeans;
}
public DateInfo getDateInfo() {
return dateinfobean;
}
public GSMBean getGSMBean() {
return gsmbean;
}
public Vector<EthBean> getEthBeans() {
return ethbeans;
}
public Vector<ProxyBean> getProxyBeans() {
return proxybeans;
}
public Vector<RServBean> getRserverbeans() {
return rserverbeans;
}
public Vector<SvBean> getSvbeans() {
return svbeans;
}
}
/**
*
*/
/**
* @author root
*
*/
package org.emercit.utilstools.model;
\ No newline at end of file
package org.emercit.utilstools.service;
import java.util.Vector;
import org.emercit.utilstools.model.SettingsBean;
public interface ISettings {
public SettingsBean get();
public boolean set(SettingsBean bean);
public boolean configuring();
public SettingsBean make();
}
package org.emercit.utilstools.service;
import java.util.Vector;
import org.emercit.utilstools.model.SettingsBean;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.projecttools.constants.Paths;
import org.emercit.devinfo.model.DevInfoBean;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.dtmanager.model.DateInfo;
import org.emercit.gsmmanager.model.GSMBean;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.proxymanager.model.ProxyBean;
import org.emercit.rserv.model.RServBean;
import org.emercit.svmanager.model.SvBean;
import org.emercit.devinfo.service.DevInfo;
import org.emercit.dnsmanager.service.DnsLinux;
import org.emercit.dtmanager.service.NtpLinux;
import org.emercit.gsmmanager.service.Gsm;
import org.emercit.ethmanager.service.EthLinux;
import org.emercit.proxymanager.service.ProxyLinux;
import org.emercit.rserv.service.RemSrv;
import org.emercit.svmanager.service.Sv;
public class Settings implements ISettings {
private Db db=new Db(Paths.BEAN_SETTINGS);
private DevInfo devinfo=new DevInfo();
private DnsLinux dnslinux=new DnsLinux();
private NtpLinux ntplinux=new NtpLinux();
private Gsm gsm=new Gsm();
private EthLinux ethlinux=new EthLinux();
private ProxyLinux proxylinux=new ProxyLinux();
private RemSrv remserv=new RemSrv();
private Sv sv=new Sv();
private SettingsBean sb;
public SettingsBean get() {
return (SettingsBean)db.select();
}
public boolean set(SettingsBean bean) {
return db.create(bean);
}
public boolean configuring() {
return true;
}
public SettingsBean make() {
sb=new SettingsBean();
sb.setDevInfoBean(devinfo.get());
sb.setDnsbeans(dnslinux.getAllDns());
DateInfo dateInfo=new DateInfo();
dateInfo.setDt("");
dateInfo.setNtp(ntplinux.getUseNtpServer());
sb.setDateInfo(dateInfo);
sb.setGSMBean(gsm.get());
sb.setEthBeans(ethlinux.getEthBeans());
sb.setProxyBeans(proxylinux.getProxyBeans());
sb.setRserverbeans(remserv.get());
return sb;
}
}
/**
*
*/
/**
* @author root
*
*/
package org.emercit.utilstools.service;
\ No newline at end of file
......@@ -10,11 +10,7 @@ import junit.framework.TestSuite;
public class AppTest
extends TestCase
{
/**
* Create the test case
*
* @param testName name of the test case
*/
public AppTest( String testName )
{
super( testName );
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>XmlDbManager</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.emercit</groupId>
<artifactId>XmlDbManager</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>XmlDbManager</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<executable>${env.JAVA_HOME_7}/bin/javac</executable>
<fork>true</fork>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>projecttools</artifactId>
<version>1.5</version>
</dependency>
</dependencies>
<repositories>
<!--other repositories if any-->
<repository>
<id>project.local</id>
<name>project</name>
<url>file:/root/git/hardwareconfig/DevTools/repo</url>
</repository>
</repositories>
</project>
package org.emercit.xmldbmanager;
public class App
{
public static void main( String[] args )
{
}
}
package org.emercit.XmlDbManager;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
public class AppTest
extends TestCase
{
/**
* Create the test case
*
* @param testName name of the test case
*/
public AppTest( String testName )
{
super( testName );
}
/**
* @return the suite of tests being tested
*/
public static Test suite()
{
return new TestSuite( AppTest.class );
}
/**
* Rigourous Test :-)
*/
public void testApp()
{
assertTrue( true );
}
}