Commit c4f08700 c4f0870049d7cabf2d765d8828143fc7e6f1f426 by root

save

1 parent fa2a6557
Showing 139 changed files with 1440 additions and 2883 deletions
eclipse.preferences.version=1
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
......@@ -5,6 +5,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
<property name="context-root" value="DevTools"/>
<property name="java-output-path" value="/DevTools/target/classes"/>
</wb-module>
......
eclipse.preferences.version=1
org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true
org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=true
org.springframework.ide.eclipse.core.enable.project.preferences=false
org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.bestpractices.beansvalidator=false
org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false
org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.data.core.datavalidator=true
org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.autowire.autowire-org.springframework.ide.eclipse.beans.core.beansvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.toolAnnotation-org.springframework.ide.eclipse.beans.core.beansvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.bestpractices.com.springsource.sts.bestpractices.AvoidDriverManagerDataSource-org.springframework.ide.eclipse.bestpractices.beansvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.bestpractices.com.springsource.sts.bestpractices.ImportElementsAtTopRulee-org.springframework.ide.eclipse.bestpractices.beansvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.bestpractices.com.springsource.sts.bestpractices.ParentBeanSpecifiesAbstractClassRule-org.springframework.ide.eclipse.bestpractices.beansvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.bestpractices.com.springsource.sts.bestpractices.RefElementRule-org.springframework.ide.eclipse.bestpractices.beansvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.bestpractices.com.springsource.sts.bestpractices.TooManyBeansInFileRule-org.springframework.ide.eclipse.bestpractices.beansvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.bestpractices.com.springsource.sts.bestpractices.UnnecessaryValueElementRule-org.springframework.ide.eclipse.bestpractices.beansvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.bestpractices.com.springsource.sts.bestpractices.UseBeanInheritance-org.springframework.ide.eclipse.bestpractices.beansvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.bestpractices.legacyxmlusage.jndiobjectfactory-org.springframework.ide.eclipse.bestpractices.beansvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.data.core.invalidDerivedQuery-org.springframework.ide.eclipse.data.core.datavalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.data.core.invalidParameterType-org.springframework.ide.eclipse.data.core.datavalidator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.action-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.actionstate-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attribute-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attributemapper-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.beanaction-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationaction-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationresult-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.exceptionhandler-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.import-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.inputattribute-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.mapping-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.outputattribute-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.set-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.state-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.subflowstate-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.transition-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.variable-org.springframework.ide.eclipse.webflow.core.validator=true
org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.webflowstate-org.springframework.ide.eclipse.webflow.core.validator=true
......@@ -3,39 +3,34 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.emercit</groupId>
<artifactId>DevTools</artifactId>
<artifactId>app</artifactId>
<name>DevTools</name>
<packaging>war</packaging>
<version>1.0.0-BUILD-SNAPSHOT</version>
<properties>
<java-version>1.6</java-version>
<org.springframework-version>3.0.5.RELEASE</org.springframework-version>
<org.springframework.roo-version>1.0.2.RELEASE</org.springframework.roo-version>
<org.aspectj-version>1.6.9</org.aspectj-version>
<org.slf4j-version>1.5.10</org.slf4j-version>
<java-version>1.7</java-version>
<org.springframework-version>3.1.1.RELEASE</org.springframework-version>
<org.aspectj-version>1.6.10</org.aspectj-version>
<org.slf4j-version>1.6.6</org.slf4j-version>
</properties>
<dependencies>
<!-- Spring -->
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.12.1.GA</version>
</dependency>
<dependency>
<groupId>org.snmp4j</groupId>
<artifactId>snmp4j-agent</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.12</version>
<version>1.4.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${org.springframework-version}</version>
......@@ -44,7 +39,7 @@
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusion>
</exclusions>
</dependency>
<dependency>
......@@ -52,76 +47,14 @@
<artifactId>spring-webmvc</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.3.2.GA</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>3.3.1.GA</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-commons-annotations</artifactId>
<version>3.3.0.ga</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.6</version>
</dependency>
<!-- Roo dependencies -->
<dependency>
<groupId>org.springframework.roo</groupId>
<artifactId>org.springframework.roo.annotations</artifactId>
<version>${org.springframework.roo-version}</version>
<scope>provided</scope>
</dependency>
<!-- AspectJ -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>${org.aspectj-version}</version>
</dependency>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
......@@ -171,7 +104,7 @@
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<!-- Servlet -->
<dependency>
<groupId>javax.servlet</groupId>
......@@ -190,22 +123,36 @@
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
<!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>org.smslib</groupId>
<artifactId>smslib</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
-->
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>devinfo</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>ethmanager</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>dnsmanager</artifactId>
<version>1.8</version>
</dependency>
</dependencies>
<repositories>
<!-- For testing against latest Spring snapshots -->
<repository>
......@@ -229,95 +176,167 @@
</snapshots>
</repository>
<!--
<repository>
<id>org.repo.jfrog.artifactory.libs-releases</id>
<name>Repository1</name>
<url>http://repo.jfrog.org/artifactory/libs-releases</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>smslib-snapshots</id>
<name>SMSLib Repository</name>
<url>http://smslib.org/maven2/snapshots/</url>
</repository>
-->
<id>com.gradle.artifactoryonline.gradle.libs</id>
<name>Repository2</name>
<url>http://gradle.artifactoryonline.com/gradle/libs</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>org.mirrors.ibiblio.pub.mirrors.maven2</id>
<name>Repository3</name>
<url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>org.mvnsearch.maven2</id>
<name>Repository4</name>
<url>http://www.mvnsearch.org/maven2</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<!--
http://scala-tools.org/repo-releases/
http://repository.codehaus.org/
http://gradle.artifactoryonline.com/gradle/libs/
http://search.maven.org/
http://mirrors.ibiblio.org/pub/mirrors/maven2/
http://www.mvnsearch.org/maven2/
http://repo.typesafe.com/typesafe/releases/
http://repo.maven.apache.org/maven2
-->
<!--other repositories if any-->
<repository>
<id>project.local</id>
<name>project</name>
<url>file:${project.basedir}/repo</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java-version}</source>
<target>${java-version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>DevTools</warName>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<goals>
<goal>sources</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<!-- Have to use version 1.2 since version 1.3 does not appear to work
with ITDs -->
<version>1.2</version>
<dependencies>
<!-- You must use Maven 2.0.9 or above or these are ignored (see MNG-2972) -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>${org.aspectj-version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>${org.aspectj-version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
<configuration>
<outxml>true</outxml>
<source>${java-version}</source>
<target>${java-version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<junitArtifactName>junit:junit</junitArtifactName>
<excludes>
<exclude>**/*_Roo_*</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
<version>1.0-beta-1</version>
</plugin>
</plugins>
</build>
<name>DevTools</name>
</project>
\ No newline at end of file
<build>
<plugins>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.9</version>
<configuration>
<additionalProjectnatures>
<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
</additionalProjectnatures>
<additionalBuildcommands>
<buildcommand>org.springframework.ide.eclipse.core.springbuilder</buildcommand>
</additionalBuildcommands>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<compilerArgument>-Xlint:all</compilerArgument>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>org.test.int1.Main</mainClass>
<encoding>UTF-8</encoding>
<outputEncoding>UTF-8</outputEncoding>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</project>
......
f56ff81163f91a81980e9b17cc5313f9
\ No newline at end of file
2bbba2a6ec46affb85d5dcccaae6bd2ee4eaff0b
\ 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>devinfo</artifactId>
<version>1.0</version>
</project>
0bfc48c2a915a3b527a8e42beaf163db
\ No newline at end of file
5a1c45e132c41cec45f04991d417cd2f34b409ff
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>org.emercit</groupId>
<artifactId>devinfo</artifactId>
<versioning>
<release>1.0</release>
<versions>
<version>1.0</version>
</versions>
<lastUpdated>20150708093231</lastUpdated>
</versioning>
</metadata>
8aebfc77a89c73d5059862cf0fa54b01
\ No newline at end of file
170972e52607c45b7fb82f1fb5379f652d121d74
\ No newline at end of file
b2afba94e59e76983b4db252a1368424
\ No newline at end of file
95fa6d59f09f8cd6dc8e14734e7c14f20210b5a7
\ 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>dnsmanager</artifactId>
<version>1.0</version>
</project>
cd09ab236a4ef75b4d0bd1786a21cbbf
\ No newline at end of file
cb56dc4c41046da8dc0b05ad76d9bc38b7bb87e8
\ No newline at end of file
502419450e64dd50c27dac147e6c9e77
\ No newline at end of file
b7c833fa674affe0e6af68441cb33d532dd69801
\ 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>dnsmanager</artifactId>
<version>1.1</version>
</project>
87481e701a1bf3e65f2edfacb6a14731
\ No newline at end of file
67726fc0d85bb172af64eaea361d7086b73945e6
\ No newline at end of file
4b545c783e3895a446c8c2f788388866
\ No newline at end of file
2d20e42d1f64f0a2623316967b462dfa3ca34cf4
\ 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>dnsmanager</artifactId>
<version>1.2</version>
</project>
296d06d72ebdca69b1859d24c335e794
\ No newline at end of file
e1f3ddefdab8bc69cd8f9b0c0c3f3f4f58086d56
\ No newline at end of file
9a90f3b984a963083b570f9f0b6218b7
\ No newline at end of file
8be69e4c893c5961a8469708eeb7f3d7da52fc60
\ 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>dnsmanager</artifactId>
<version>1.3</version>
</project>
4565f2a1e1eca1e65efa7671d7507d05
\ No newline at end of file
dfa512044760b48aecea383f4a803139de6fb949
\ No newline at end of file
9311539268c59ad42743d3e4984d27fa
\ No newline at end of file
073fd28c56e403c66d38de3d85050ead7237ec8c
\ 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>dnsmanager</artifactId>
<version>1.4</version>
</project>
cbb810a09dd52c8f727113ecc5fb336b
\ No newline at end of file
b94279102cf640ddc06d1cc37e30c8425bf88b96
\ No newline at end of file
4a66bb9f57149eaabd5eb4c2535b7a35
\ No newline at end of file
25871f0c3c815c69fd49dfa597592aad6d639ca4
\ 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>dnsmanager</artifactId>
<version>1.5</version>
</project>
f278dde3ff65d6e7072b7a9a6ac7ee1a
\ No newline at end of file
49ff9dfda95e0bc769c52b9c078bb20c13f33b49
\ No newline at end of file
9e7c127e81bf3e0541bec6d7b123a1da
\ No newline at end of file
8e845c322d0424e4b9d2c2a10eec9a1d32175283
\ 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>dnsmanager</artifactId>
<version>1.6</version>
</project>
9bb3fc3d6a22e2784f06160b3fe38227
\ No newline at end of file
62026c4d08c07971e23f990e2640e0b316141945
\ No newline at end of file
2d49498ad2e92ca687bb10f80cd59906
\ No newline at end of file
268fa9db5eae6faacbcabc47d225e3bdd9621b83
\ 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>dnsmanager</artifactId>
<version>1.7</version>
</project>
3cdc9c0bc1c1554fbd9349e03e2548a0
\ No newline at end of file
7869497f318bdc5c687ebff63574f8b93abe5ec6
\ No newline at end of file
aa434943aaa29cc722d0fb27fcb16176
\ No newline at end of file
7b6c02dd0fab85d2bdaca1363984945198473e8f
\ 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>dnsmanager</artifactId>
<version>1.8</version>
</project>
a9997f4bb67c808741a461f1770e2a68
\ No newline at end of file
49837f0226aa2efaa07cf3771adede0e2c546384
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>org.emercit</groupId>
<artifactId>dnsmanager</artifactId>
<versioning>
<release>1.8</release>
<versions>
<version>1.0</version>
<version>1.1</version>
<version>1.2</version>
<version>1.3</version>
<version>1.4</version>
<version>1.5</version>
<version>1.6</version>
<version>1.7</version>
<version>1.8</version>
</versions>
<lastUpdated>20150714080952</lastUpdated>
</versioning>
</metadata>
1f9983c33d6bc0f2082bf999b8b3aad3
\ No newline at end of file
4a0053551eb215c588f2ac0829a9ae5d3194a261
\ No newline at end of file
f738cc2701b1dac67abdafd663abcd11
\ No newline at end of file
38fac77d83c9e1d0e8f098e5acdac6f265527a67
\ 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>ethmanager</artifactId>
<version>1.0</version>
</project>
53d8476bf6c495816b8574f4b345e0c0
\ No newline at end of file
93af149a62f89f462eedf898510acdf073118d91
\ No newline at end of file
e29d67ad375ae34a82d749c314f59bc5
\ No newline at end of file
71f678913cc76d8774efd66d4f17458b64e39824
\ 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>ethmanager</artifactId>
<version>1.1</version>
</project>
310f2786ca0500892923dfd3de82b89b
\ No newline at end of file
32a130707b2520bf96ee3f0a4eaf0c397b67fa8b
\ No newline at end of file
dd1cac91f317ae0d6a6a1b8ae4a29134
\ No newline at end of file
cc1d28262b80588ef930fbe4fb681704786de92a
\ 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>ethmanager</artifactId>
<version>1.2</version>
</project>
c5f310426b07fd5b30c61177024919bd
\ No newline at end of file
c99d21663ff1a12c7876c8ce513f04b002de62da
\ No newline at end of file
79984ad7192b54e76e9730038732c190
\ No newline at end of file
fab2ee3505796f571a703f94fb7b8f88a3808f1d
\ 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>ethmanager</artifactId>
<version>1.3</version>
</project>
d44b7b29dcf61e6c7e02c2505e91feff
\ No newline at end of file
7d7abad42d13c21d267112db4e46b7ee52a8151b
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>org.emercit</groupId>
<artifactId>ethmanager</artifactId>
<versioning>
<release>1.3</release>
<versions>
<version>1.0</version>
<version>1.1</version>
<version>1.2</version>
<version>1.3</version>
</versions>
<lastUpdated>20150708135629</lastUpdated>
</versioning>
</metadata>
073dd3d052d4ddd0a5af856c79766dac
\ No newline at end of file
82b6f823f5767ab35d3301dda8084ca85495d7c2
\ No newline at end of file
......@@ -4,63 +4,58 @@ 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.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RequestBody;
/**
* Handles requests for the application home page.
*/
import java.util.Vector;
import org.emercit.service.DevInfoService;
import org.emercit.devinfo.model.DevInfoBean;
@Controller
@RequestMapping("api")
public class MainConfigController {
public class DevInfoController {
/*
@RequestMapping(value = "mainconfig/get", method = RequestMethod.GET)
public @ResponseBody MainConfig get() {
try {
//return MainConfigService.get();
}
catch(Exception e)
{
return null;
}
}
@RequestMapping(value = "devinfo", method = RequestMethod.GET)
public @ResponseBody DevInfoBean getDevInfo() {
*/
/*
@RequestMapping(value="mainconfig/update" , method = RequestMethod.POST)
public @ResponseBody boolean update(@RequestBody MainConfig mainconfig) {
return DevInfoService.INSTANCE.get();
}
@RequestMapping(value="devinfo/update" , method = RequestMethod.POST)
public @ResponseBody boolean update(@RequestBody DevInfoBean m) {
try {
//MainConfigService.Update(mainconfig);
return true;
}
catch(Exception e) {
return false;
}
return DevInfoService.INSTANCE.set(m);
}
*/
}
......
package org.emercit.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 org.emercit.ethmanager.model.EthBean;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.service.EthService;
import org.emercit.service.DnsService;
import java.util.ArrayList;
import java.util.List;
@Controller
@RequestMapping("api")
public class DnsController {
@RequestMapping(value = "dns/all", method = RequestMethod.GET)
public @ResponseBody Vector<DnsBean> getAllDns() {
return DnsService.INSTANCE.getAllDnsBean();
}
@RequestMapping(value="dns/update" , method = RequestMethod.POST)
public @ResponseBody boolean update(@RequestBody DnsBean[] beans) {
Vector<DnsBean> dbs=new Vector<DnsBean>();
for (DnsBean d:beans) {
DnsBean db=new DnsBean();
db.setId(d.getId());
db.setIp(d.getIp());
dbs.add(db);
}
return DnsService.INSTANCE.Upd(dbs);
}
}
......@@ -29,40 +29,25 @@ import org.springframework.web.bind.annotation.RequestBody;
import java.util.Vector;
import org.emercit.service.NetService;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.service.EthService;
import org.emercit.service.DnsService;
import org.emercit.model.NetBean;
import org.emercit.model.DnsBean;
import org.emercit.model.EthBean;
import org.emercit.model.ProxyBean;
@Controller
@RequestMapping("api")
public class NetworkController {
/*
*
*/
@RequestMapping(value = "net/alleth", method = RequestMethod.GET)
public @ResponseBody Vector<EthBean> getAllEth() {
try {
return NetService.INSTANCE.getAllEth();
}
catch(Exception e)
{
return null;
}
}
public class EthController {
@RequestMapping(value = "net/dns", method = RequestMethod.GET)
public @ResponseBody Vector<DnsBean> getAllDns() {
@RequestMapping(value = "eth/all", method = RequestMethod.GET)
public @ResponseBody Vector<EthBean> getAllEth() {
try {
return NetService.INSTANCE.getDns();
return EthService.INSTANCE.getAllEthbean();
}
catch(Exception e)
{
......@@ -71,6 +56,7 @@ public class NetworkController {
}
/*
@RequestMapping(value = "net/proxy", method = RequestMethod.GET)
public @ResponseBody Vector<ProxyBean> getAllProxy() {
......@@ -82,12 +68,7 @@ public class NetworkController {
return null;
}
}
*/
/*
export http_proxy='http://user:password@prox-server:3128'
......@@ -95,43 +76,29 @@ public class NetworkController {
export ftp_proxy='http://user:password@prox-server:3128'
*/
/*
*
*/
@RequestMapping(value = "net/byeth/{eth}", method = RequestMethod.GET)
public @ResponseBody NetBean getEth(@PathVariable String eth) {
try {
return NetService.INSTANCE.get(eth);
}
catch(Exception e) {
}
return null;
}
@RequestMapping(value = "eth/byeth/{eth}", method = RequestMethod.GET)
public @ResponseBody EthBean getEth(@PathVariable String eth) {
return EthService.INSTANCE.getByName(eth);
}
@RequestMapping(value="eth/update" , method = RequestMethod.POST)
public @ResponseBody boolean update(@RequestBody EthBean m) {
return EthService.INSTANCE.Upd(m);
}
}
/*
@RequestMapping(value="mainconfig/update" , method = RequestMethod.POST)
public @ResponseBody boolean update(@RequestBody MainConfig mainconfig) {
try {
//MainConfigService.Update(mainconfig);
return true;
}
catch(Exception e) {
return false;
}
}
*/
......
package org.emercit.app;
public class UtilController {
}
package org.emercit.model;
import java.io.Serializable;
import java.util.Vector;
public class DnsBean implements Serializable {
private int id;
private String dns;
public DnsBean() {
}
public int getId() {
return id;
}
public void setId(int id) {
this.id=id;
}
public String getDns() {
return dns;
}
public void setDns(String value) {
this.dns=value;
}
}
package org.emercit.model;
import java.io.Serializable;
import java.util.Vector;
public class EthBean implements Serializable {
private int id;
private String eth;
public EthBean() {
}
public int getId() {
return id;
}
public void setId(int id) {
this.id=id;
}
public String getEth() {
return eth;
}
public void setEth(String value) {
this.eth=value;
}
}
package org.emercit.model;
import java.io.Serializable;
import java.util.Vector;
public class NetBean implements Serializable {
private static final long serialVersionUID = 1L;
private String ethname;
private String mac;
private boolean dhcp;
private String ip;
private String netmask;
private String gateway;
private String broadcast;
private Vector<String> extinfo;
public NetBean() {
}
public String getEthName() {
return ethname;
}
public void setEthName(String value) {
ethname=value;
}
public String getMac() {
return mac;
}
public void setMac(String value) {
this.mac=value;
}
public boolean getUseDhcp() {
return dhcp;
}
public void setUseDhcp(boolean value) {
this.dhcp = value;
}
public String getIp() {
return ip;
}
public void setIp(String value) {
this.ip = value;
}
public String getNetmask() {
return netmask;
}
public void setNetmask(String value) {
this.netmask=value;
}
public String getGateway() {
return gateway;
}
public void setGateway(String value) {
this.gateway=value;
}
public String getBroadcast() {
return broadcast;
}
public void setBroadcast(String value) {
this.broadcast=value;
}
public Vector<String> getExtInfo() {
return extinfo;
}
public void setExtInfo(Vector<String> value) {
this.extinfo=value;
}
}
package org.emercit.model;
import java.io.Serializable;
import java.util.Vector;
public class ProxyBean implements Serializable {
private int id;
private String proxy;
public ProxyBean() {
}
public int getId() {
return id;
}
public void setId(int id) {
this.id=id;
}
public String getProxy() {
return proxy;
}
public void setProxy(String value) {
this.proxy=value;
}
}
package org.emercit.model;
public class StrCmd {
}
package org.emercit.service;
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;
}
}
package org.emercit.service;
import org.emercit.model.IPAddressValidator;
import org.emercit.devinfo.model.DevInfoBean;
import org.emercit.devinfo.service.DevInfoImpl;
public enum DevInfoService {
INSTANCE;
private DevInfoImpl devinfo= new DevInfoImpl();
public DevInfoBean get() {
return devinfo.Get();
}
public boolean set(DevInfoBean m) {
return devinfo.Set(m);
}
}
package org.emercit.service;
import org.emercit.model.IPAddressValidator;
import java.util.Vector;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.dnsmanager.service.DnsLinux;
public enum DnsService {
INSTANCE;
private DnsLinux dnslinux=new DnsLinux();
private Vector<String> vStr;
private Vector<DnsBean> vDbns;
public Vector<DnsBean> getAllDnsBean() {
return dnslinux.getAllDns();
}
public boolean Upd(Vector<DnsBean> beans) {
return dnslinux.Config(beans);
}
}
\ No newline at end of file
package org.emercit.service;
import org.emercit.model.IPAddressValidator;
import java.util.Vector;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.ethmanager.service.EthLinux;
public enum EthService {
INSTANCE;
private EthLinux ethlinux=new EthLinux();
private Vector<String> vStr;
private Vector<EthBean> vEbns;
public Vector<EthBean> getAllEthbean() {
vEbns=new Vector<EthBean>();
vStr=ethlinux.getListEth();
for (String val:vStr) {
EthBean eb=ethlinux.getEthByName(val);
vEbns.add(eb);
}
return vEbns;
}
public boolean ApplyConfig(EthBean eb) {
//return ethlinux.;
return true;
}
public EthBean getByName(String value) {
return ethlinux.getEthByName(value);
}
public boolean Upd(EthBean m) {
return ethlinux.Update(m);
}
}
\ No newline at end of file
package org.emercit.service;
import org.emercit.model.NetBean;
import org.emercit.model.EthBean;
import org.emercit.model.DnsBean;
import org.emercit.model.ProxyBean;
import org.emercit.model.IPAddressValidator;
import java.util.Vector;
public enum NetService {
INSTANCE;
private IPAddressValidator ipvalidator=new IPAddressValidator();
private CommandExecutor ce=new CommandExecutor();
private NetBean nb=new NetBean();
private final String urlZabixAgent="zabbix_get -s 127.0.0.1 -p 10050 -k";
public NetBean get(String eth) throws Exception {
nb.setEthName(eth);
String strUseDhcp=ce.Run(urlZabixAgent+" 'custom.utils.net.eth.usedhcp['"+eth+"'"+"]'").get(1);
if (!strUseDhcp.equals("dhcp")) {
nb.setUseDhcp(false);
// Получение шлюза из файла /etc/networ/interfaces
nb.setGateway(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.gwstatic[]'").firstElement());
nb.setMac(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.mac["+eth+"]'").firstElement());
nb.setIp(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.addrstatic[]'").firstElement());
nb.setBroadcast(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.bcaststatic[]'").firstElement());
nb.setNetmask(ce.Run(urlZabixAgent+ " 'custom.utils.net.eth.netmaskstatic[]'").firstElement());
}else {
nb.setUseDhcp(true);
// Получение шлюза по умолчанию
nb.setGateway(ce.Run(urlZabixAgent+" 'custom.utils.net.gwdefault[]'").firstElement());
nb.setMac(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.mac["+eth+"]'").firstElement());
nb.setIp(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.inetaddr["+eth+"]'").firstElement());
nb.setBroadcast(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.bcast["+eth+"]'").firstElement());
nb.setNetmask(ce.Run(urlZabixAgent+ " 'custom.utils.net.eth.mask["+eth+"]'").firstElement());
}
// ExtInfo
Vector<String> buff=ce.Run(urlZabixAgent+ " 'custom.utils.net.extinfo["+eth+"]'");
buff.remove(0);
buff.remove(0);
for (int i=0;i<buff.size();i++) {
String v=buff.get(i).trim();
buff.remove(i);
buff.insertElementAt(v, i);
}
nb.setExtInfo(buff);
return nb;
}
public Vector<String> set(NetBean m) throws Exception{
Vector<String> result=new Vector<String>();
if (!ipvalidator.validate(m.getIp())) {
new Exception(m.getIp()+"- неверный формат");
}
if (!ipvalidator.validate(m.getNetmask())) {
new Exception(m.getNetmask()+"- неверный формат");
}
if (!ipvalidator.validate(m.getGateway())) {
new Exception(m.getGateway()+"- неверный формат");
}
if (m.getUseDhcp()) {
ce.Run("");
}else {
ce.Run("");
}
this.nb=m;
return result;
}
public Vector<EthBean> getAllEth() throws Exception {
Vector<EthBean> result=new Vector<EthBean>();
Vector<String> v=ce.Run("zabbix_get -s 127.0.0.1 -p 10050 -k 'custom.utils.net.eths[]'");
int i=0;
for (String s:v) {
EthBean eb=new EthBean();
eb.setId(i);
eb.setEth(s);
result.add(eb);
i++;
}
return result;
}
public Vector<DnsBean> getDns() throws Exception {
Vector<DnsBean> result=new Vector<DnsBean>();
Vector<String> v=ce.Run("zabbix_get -s 127.0.0.1 -p 10050 -k 'custom.utils.net.dns[]'");
int i=0;
for (String s:v) {
DnsBean db=new DnsBean();
db.setId(i);
db.setDns(s);
result.add(db);
i++;
}
return result;
}
public Vector<ProxyBean> getProxy() throws Exception {
Vector<ProxyBean> result=new Vector<ProxyBean>();
Vector<String> v=ce.Run("zabbix_get -s 127.0.0.1 -p 10050 -k 'custom.utils.net.globalproxy[]'");
int i=0;
for (String s:v) {
ProxyBean db=new ProxyBean();
db.setId(i);
db.setProxy(s);
result.add(db);
i++;
}
return result;
}
}
package org.emercit.service;
public class UtilService {
}
FTDKERNEL-MIB DEFINITIONS ::= BEGIN
IMPORTS
NOTIFICATION-TYPE, OBJECT-TYPE, MODULE-IDENTITY,
enterprises, Integer32
FROM SNMPv2-SMI;
ftdkernel MODULE-IDENTITY
LAST-UPDATED "201408141315Z"
ORGANIZATION
"E M E R C I T"
CONTACT-INFO
"Krasnodar, Vishnikova 2"
DESCRIPTION
""
::= { prjUFK 1 }
emercit OBJECT IDENTIFIER ::= { enterprises 43896 }
prjUFK OBJECT IDENTIFIER ::= { emercit 7 }
aligners OBJECT IDENTIFIER ::= { ftdkernel 1 }
aligner OBJECT IDENTIFIER ::= { aligners 1 }
prime OBJECT IDENTIFIER ::= { aligner 1 }
bounds OBJECT IDENTIFIER ::= { aligner 2 }
conditioner1 OBJECT IDENTIFIER ::= { aligner 3 }
conditioner2 OBJECT IDENTIFIER ::= { aligner 4 }
conditioner3 OBJECT IDENTIFIER ::= { aligner 5 }
params OBJECT IDENTIFIER ::= { aligner 6 }
configuration OBJECT IDENTIFIER ::= { aligner 7 }
repair OBJECT IDENTIFIER ::= { aligner 8 }
status OBJECT IDENTIFIER ::= { aligner 9 }
commands OBJECT IDENTIFIER ::= { aligner 10 }
eventsAligner OBJECT IDENTIFIER ::= { aligner 11 }
sensorst OBJECT IDENTIFIER ::= { ftdkernel 2 }
sensorT1 OBJECT IDENTIFIER ::= { sensorst 1 }
primeT1 OBJECT IDENTIFIER ::= { sensorT1 1 }
statusT1 OBJECT IDENTIFIER ::= { sensorT1 2 }
boundsT1 OBJECT IDENTIFIER ::= { sensorT1 3 }
limitsT1 OBJECT IDENTIFIER ::= { sensorT1 4 }
commandsT1 OBJECT IDENTIFIER ::= { sensorT1 5 }
eventsT1 OBJECT IDENTIFIER ::= { sensorT1 6 }
sensorT2 OBJECT IDENTIFIER ::= { sensorst 2 }
primeT2 OBJECT IDENTIFIER ::= { sensorT2 1 }
statusT2 OBJECT IDENTIFIER ::= { sensorT2 2 }
boundsT2 OBJECT IDENTIFIER ::= { sensorT2 3 }
limitsT2 OBJECT IDENTIFIER ::= { sensorT2 4 }
commandsT2 OBJECT IDENTIFIER ::= { sensorT2 5 }
eventsT2 OBJECT IDENTIFIER ::= { sensorT2 6 }
sensorT3 OBJECT IDENTIFIER ::= { sensorst 3 }
primeT3 OBJECT IDENTIFIER ::= { sensorT3 1 }
statusT3 OBJECT IDENTIFIER ::= { sensorT3 2 }
boundsT3 OBJECT IDENTIFIER ::= { sensorT3 3 }
limitsT3 OBJECT IDENTIFIER ::= { sensorT3 4 }
commandsT3 OBJECT IDENTIFIER ::= { sensorT3 5 }
eventsT3 OBJECT IDENTIFIER ::= { sensorT3 6 }
sensorT4 OBJECT IDENTIFIER ::= { sensorst 4 }
primeT4 OBJECT IDENTIFIER ::= { sensorT4 1 }
statusT4 OBJECT IDENTIFIER ::= { sensorT4 2 }
boundsT4 OBJECT IDENTIFIER ::= { sensorT4 3 }
limitsT4 OBJECT IDENTIFIER ::= { sensorT4 4 }
commandsT4 OBJECT IDENTIFIER ::= { sensorT4 5 }
eventsT4 OBJECT IDENTIFIER ::= { sensorT4 6 }
sensorsth OBJECT IDENTIFIER ::= { ftdkernel 3 }
sensorTH1 OBJECT IDENTIFIER ::= { sensorsth 1 }
primeTH1 OBJECT IDENTIFIER ::= { sensorTH1 1 }
boundsTH1 OBJECT IDENTIFIER ::= { sensorTH1 2 }
cnfSensorTTH1 OBJECT IDENTIFIER ::= { sensorTH1 3 }
cnfSensorHTH1 OBJECT IDENTIFIER ::= { sensorTH1 4 }
limitsTH1 OBJECT IDENTIFIER ::= { sensorTH1 5 }
statusTempTH1 OBJECT IDENTIFIER ::= { sensorTH1 6 }
statusHumTH1 OBJECT IDENTIFIER ::= { sensorTH1 7 }
commandsTH1 OBJECT IDENTIFIER ::= { sensorTH1 8 }
eventsTH1 OBJECT IDENTIFIER ::= { sensorTH1 9 }
sensorTH2 OBJECT IDENTIFIER ::= { sensorsth 2 }
primeTH2 OBJECT IDENTIFIER ::= { sensorTH2 1 }
boundsTH2 OBJECT IDENTIFIER ::= { sensorTH2 2 }
cnfSensorTTH2 OBJECT IDENTIFIER ::= { sensorTH2 3 }
cnfSensorHTH2 OBJECT IDENTIFIER ::= { sensorTH2 4 }
limitsTH2 OBJECT IDENTIFIER ::= { sensorTH2 5 }
statusTempTH2 OBJECT IDENTIFIER ::= { sensorTH2 6 }
statusHumTH2 OBJECT IDENTIFIER ::= { sensorTH2 7 }
commandsTH2 OBJECT IDENTIFIER ::= { sensorTH2 8 }
eventsTH2 OBJECT IDENTIFIER ::= { sensorTH2 9 }
firesystems OBJECT IDENTIFIER ::= { ftdkernel 4 }
firesystem OBJECT IDENTIFIER ::= { firesystems 1 }
primeFSys OBJECT IDENTIFIER ::= { firesystem 1 }
boundsFSys OBJECT IDENTIFIER ::= { firesystem 2 }
paramsFSys OBJECT IDENTIFIER ::= { firesystem 3 }
commandsFSys OBJECT IDENTIFIER ::= { firesystem 4 }
statusFSys OBJECT IDENTIFIER ::= { firesystem 5 }
eventsFireSystem OBJECT IDENTIFIER ::= { firesystem 6 }
systems OBJECT IDENTIFIER ::= { ftdkernel 5 }
ufk OBJECT IDENTIFIER ::= { systems 1 }
primeufk OBJECT IDENTIFIER ::= { ufk 1 }
commandsufk OBJECT IDENTIFIER ::= { ufk 2 }
eventsUfk OBJECT IDENTIFIER ::= { ufk 3 }
primeEnabled OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { prime 1 }
primeTitle OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { prime 2 }
primeGuid OBJECT-TYPE
SYNTAX OCTET STRING
UNITS "1"
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { prime 3 }
primeAddr OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { prime 4 }
boundsX OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { bounds 1 }
boundsY OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { bounds 2 }
boundsWidth OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { bounds 3 }
boundsHeight OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { bounds 4 }
conditioner1Enabled OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner1 1 }
conditioner1X OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner1 2 }
conditioner1Y OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner1 3 }
conditioner1Width OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner1 4 }
conditioner1Height OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner1 5 }
conditioner1Title OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner1 6 }
conditioner2Enabled OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner2 1 }
conditioner2X OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner2 2 }
conditioner2Y OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner2 3 }
conditioner2Width OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner2 4 }
conditioner2Height OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner2 5 }
conditioner2Title OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner2 6 }
conditioner3Enabled OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner3 1 }
conditioner3X OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner3 2 }
conditioner3Y OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner3 3 }
conditioner3Width OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner3 4 }
conditioner3Height OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner3 5 }
conditioner3Title OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { conditioner3 6 }
paramsTemp OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { params 1 }
paramsError OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { params 2 }
paramsErrorCLR OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { params 3 }
configurationRelay1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { configuration 1 }
configurationRelay2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { configuration 2 }
configurationRelay3 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { configuration 3 }
configurationLanguage OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { configuration 4 }
configurationZeroConditioners OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { configuration 5 }
configurationConditioner1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { configuration 6 }
configurationConditioner2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { configuration 7 }
configurationConditioner3 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { configuration 8 }
repairConditioner1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { repair 1 }
repairConditioner2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { repair 2 }
repairConditioner3 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { repair 3 }
repairTSensorRoom OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { repair 4 }
repairTSensorConditioner1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { repair 5 }
repairTSensorConditioner2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { repair 6 }
repairTSensorConditioner3 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { repair 7 }
statusConditioner1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { status 1 }
statusConditioner2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { status 2 }
statusConditioner3 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { status 3 }
statusLuminodiode OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { status 4 }
statusAlarmluminodiode OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { status 5 }
statusRun OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { status 6 }
statusMode OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { status 7 }
commandsReboot OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commands 1 }
commandOn OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commands 2 }
commandsOff OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commands 3 }
commandsUpdate OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commands 4 }
eventAlignerStatus NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsAligner 1 }
eventAlignerRepair NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsAligner 2 }
eventAlignerConfiguration NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsAligner 3 }
eventAlignerUpdate NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsAligner 4 }
eventAlignerError NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsAligner 5 }
primeT1Guid OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT1 1 }
primeT1Title OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT1 2 }
primeT1Addr OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT1 3 }
primeT1Reg OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT1 4 }
primeT1Enabled OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT1 5 }
statusT1Value OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT1 1 }
statusT1Error OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT1 2 }
statusT1Alarm OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT1 3 }
boundsT1X OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT1 1 }
boundsT1Y OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT1 2 }
boundsT1Width OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT1 3 }
boundsT1Height OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT1 4 }
limitsT1Limit1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsT1 1 }
limitsT1Limit2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsT1 2 }
commandsT1Update OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commandsT1 1 }
eventT1Alarm NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT1 1 }
eventT1Update NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT1 2 }
eventT1Error NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT1 3 }
primeT2Guid OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT2 1 }
primeT2Title OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT2 2 }
primeT2Addr OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT2 3 }
primeT2Reg OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT2 4 }
primeT2Enabled OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT2 5 }
statusT2Value OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT2 1 }
statusT2Error OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT2 2 }
statusT2Alarm OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT2 3 }
boundsT2X OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT2 1 }
boundsT2Y OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT2 2 }
boundsT2Width OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT2 3 }
boundsT2Height OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT2 4 }
limitsT2Limit1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsT2 1 }
limitsT2Limit2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsT2 2 }
commandsT2Update OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commandsT2 1 }
eventT2Alarm NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT2 1 }
eventT2Update NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT2 2 }
eventT2Error NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT2 3 }
primeT3Guid OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT3 1 }
primeT3Title OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT3 2 }
primeT3Addr OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT3 3 }
primeT3Reg OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT3 4 }
primeT3Enabled OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT3 5 }
statusT3Value OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT3 1 }
statusT3Error OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT3 2 }
statusT3Alarm OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT3 3 }
boundsT3X OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT3 1 }
boundsT3Y OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT3 2 }
boundsT3Width OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT3 3 }
boundsT3Height OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT3 4 }
limitsT3Limit1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsT3 1 }
limitsT3Limit2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsT3 2 }
commandsT3Update OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commandsT3 1 }
eventT3Alarm NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT3 1 }
eventT3Update NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT3 2 }
eventT3Error NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT3 3 }
primeT4Guid OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT4 1 }
primeT4Title OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT4 2 }
primeT4Addr OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT4 3 }
primeT4Reg OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT4 4 }
primeT4Enabled OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeT4 5 }
statusT4Value OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT4 1 }
statusT4Error OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT4 2 }
statusT4Alarm OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusT4 3 }
boundsT4X OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT4 1 }
boundsT4Y OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT4 2 }
boundsT4Width OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT4 3 }
boundsT4Height OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsT4 4 }
limitsT4Limit1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsT4 1 }
limitsT4Limit2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsT4 2 }
commandsT4Update OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commandsT4 1 }
eventT4Alarm NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT4 1 }
eventT4Update NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT4 2 }
eventT4Error NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsT4 3 }
primeTH1Guid OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeTH1 1 }
primeTH1Title OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeTH1 2 }
primeTH1Enabled OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeTH1 3 }
boundsTH1X OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsTH1 1 }
boundsTH1Y OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsTH1 2 }
boundsTH1Width OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsTH1 3 }
boundsTH1Height OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsTH1 4 }
cnfSensorTTH1Addr OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { cnfSensorTTH1 1 }
cnfSensorTTH1Reg OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { cnfSensorTTH1 2 }
cnfSensorHTH1Addr OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { cnfSensorHTH1 1 }
cnfSensorHTH1Reg OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { cnfSensorHTH1 2 }
limitsTH1LimitT1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsTH1 1 }
limitsTH1LimitT2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsTH1 2 }
limitsTH1LimitH1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsTH1 3 }
limitsTH1LimitH2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsTH1 4 }
statusTempTH1Value OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusTempTH1 1 }
statusTempTH1Error OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusTempTH1 2 }
statusTempTH1Alarm OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusTempTH1 3 }
statusHumTH1Value OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusHumTH1 1 }
statusHumTH1Error OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusHumTH1 2 }
statusHumTH1Alarm OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusHumTH1 3 }
commandsTH1Update OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commandsTH1 1 }
eventTH1Alarm NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsTH1 1 }
eventTH1Update NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsTH1 2 }
eventTH1Error NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsTH1 3 }
primeTH2Guid OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeTH2 1 }
primeTH2Title OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeTH2 2 }
primeTH2Enabled OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeTH2 3 }
boundsTH2X OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsTH2 1 }
boundsTH2Y OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsTH2 2 }
boundsTH2Width OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsTH2 3 }
boundsTH2Height OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsTH2 4 }
cnfSensorTTH2Addr OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { cnfSensorTTH2 1 }
cnfSensorTTH2Reg OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { cnfSensorTTH2 2 }
cnfSensorHTH2Addr OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { cnfSensorHTH2 1 }
cnfSensorHTH2Reg OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { cnfSensorHTH2 2 }
limitsTH2LimitT1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsTH2 1 }
limitsTH2LimitT2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsTH2 2 }
limitsTH2LimitH1 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsTH2 3 }
limitsTH2LimitH2 OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { limitsTH2 4 }
statusTempTH2Value OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusTempTH2 1 }
statusTempTH2Error OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusTempTH2 2 }
statusTempTH2Alarm OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusTempTH2 3 }
statusHumTH2Value OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusHumTH2 1 }
statusHumTH2Error OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusHumTH2 2 }
statusHumTH2Alarm OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusHumTH2 3 }
commandsTH2Update OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commandsTH2 1 }
eventTH2Alarm NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsTH2 1 }
eventTH2Update NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsTH2 2 }
eventTH2Error NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsTH2 3 }
primeFSysEnabled OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeFSys 1 }
primeFSysGuid OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeFSys 2 }
primeFSysTitle OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeFSys 3 }
boundsFSysX OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsFSys 1 }
boundsFSysY OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsFSys 2 }
boundsFSysWidth OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsFSys 3 }
boundsFSysHeight OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { boundsFSys 4 }
paramsFSysAddr OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { paramsFSys 1 }
paramsFSysReg OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { paramsFSys 2 }
commandsFSysUpdate OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commandsFSys 1 }
statusFSysRepair OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusFSys 1 }
statusFSysAttantion OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusFSys 2 }
statusFSysFire OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusFSys 3 }
statusFSysError OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { statusFSys 4 }
eventFireSystemAlarm NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsFireSystem 1 }
eventFireSystemUpdate NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsFireSystem 2 }
eventFireSystemError NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsFireSystem 3 }
primeUfkTitle OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeufk 1 }
primeUfkGuid OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { primeufk 2 }
commandsUfkUpdate OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-write
STATUS current
DESCRIPTION
""
::= { commandsufk 1 }
eventUfkUpdate NOTIFICATION-TYPE
STATUS current
DESCRIPTION
""
::= { eventsUfk 1 }
END
-- This MIB was created using NuDesign Team's Visual MIBuilder (Ver 4.7).
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Device Tools</title>
<script type="text/javascript" src="resources/js/extjs5.0.0/build/ext-all-debug.js"></script>
<script type="text/javascript" src="resources/js/extjs5.0.0/packages/ext-theme-crisp/build/ext-theme-crisp.js"></script>
<link rel="stylesheet" href="resources/js/extjs5.0.0/packages/ext-theme-crisp/build/resources/ext-theme-crisp-all-debug.css" />
<script type="text/javascript" src="resources/js/app.js"></script>
<script src="resources/js/jquery.min.js"></script>
<style>
.new {
background-image:url(resources/img/new.png) !important;
}
.remove {
background-image:url(resources/img/remove.png) !important;
}
.save {
background-image:url(resources/img/save.png) !important;
}
.load {
background-image:url(resources/img/load.png) !important;
}
</style>
</head>
<body>
</body>
</html>
\ No newline at end of file
......
......@@ -7,15 +7,22 @@ Ext.application({
'PingUtil',
'Eth',
'Dns',
'Gprs',
'Proxy',
'DetailDns',
'DetailProxy'
'DetailProxy',
],
controllers : [
'NetworkSetting',
'MainConfig',
'PingUtil'
'PingUtil',
'DetailDns',
'Dns'
],
stores : [
......@@ -99,25 +106,26 @@ Ext.application({
title: 'Описание',
items:[{
xtype : 'mvvm-MainConfigView',
id:'formmainconfig',
viewModel : {
data : {
rec : {
title:"",
description:"",
guid:""
}
}
}
}]
},
{
title: 'Дата/время',
title: 'Управление',
items:[]
}
}
]
}
......@@ -133,7 +141,7 @@ Ext.application({
xtype: 'tabpanel',
items: [
{
title: 'Eth - интерфейсы',
title: 'ETH',
items:[{
xtype : 'mvvm-EthView',
id:'cbxeth'
......@@ -143,14 +151,7 @@ Ext.application({
id:'fromnetwork',
viewModel : {
data:{
broadcast: "",
ethName: "",
gateway: "",
ip: "",
mac: "",
netmask: "",
useDhcp: 0,
extInfo:[""]
}
}
......@@ -161,74 +162,50 @@ Ext.application({
},
{
title: 'Dns',
title: 'DNS',
items:[
{
xtype : 'mvvm-DnsView',
id:'grdDns'
id:'grdDns',
name:'grdDns'
}
]
},
{
title: 'Proxy',
title: 'PROXY',
items:[{
xtype : 'mvvm-ProxyView',
id:'grdProxy'
xtype : 'mvvm-ProxyView',
id:'formproxy'
}]
}]
}
},
{
title: 'GPRS',
items:[{
xtype : 'mvvm-GprsView',
id:'formgprs'
}]
},
]
}
]
},
{
title: 'УТИЛИТЫ',
items:[{
xtype : 'mvvm-PingUtilView',
viewModel : {
data : {
rec : {
host:"",
result:"",
}
}
}
}
]
},
/*
{
title: 'ПЕРЕМЕННЫЕ',
items:[
......@@ -244,14 +221,7 @@ Ext.application({
{
title: 'Дискретные',
items:[]
},
{
title: 'Параметры устройства',
items:[]
}
]
......@@ -264,99 +234,30 @@ Ext.application({
]
},
*/
/*
{
title: 'СЕРВИСЫ',
items:[
{
region: 'center',
region: 'center',
xtype: 'tabpanel',
items: [
{
title: 'SNMP Агент',
items:[
]
},
{
items: [
{
title: 'SNMP Клиент',
items:[
]
items:[]
},
{
title: 'SNMP Агент',
items:[]
}
]
]
}
]
},
{
title: 'ФАЙЛОВЫЙ МЕНЕДЖЕР',
items:[
]
},
{
title: 'ЛОГИ',
items:[{
region: 'center',
xtype: 'tabpanel',
items: [
{
title: 'Web Tools',
items:[
]
},
{
title: 'SNMP Агент',
items:[
]
},
{
title: 'SNMP Клиент',
items:[
]
},
{
title: 'NTP',
items:[
]
}
]
}]
}
*/
]
}
]
......
Ext.define('App.controller.DetailDns', {
extend : 'Ext.app.Controller',
init : function() {
this.control({
'mvvm-DetailDnsView > button#SaveRecord' : {
click : this.onSaveButtonClick
}
});
},
onSaveButtonClick : function(btn) {
console.log('result:');
var store=Ext.getCmp('grdDns').getStore();
store.each(function(rec){
console.log(rec);
});
/*
if (records) {
var data=Ext.util.JSON.encode(records.data);
Ext.Ajax.request({
method: "POST",
url: 'api/net/upddns',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
params: data,
success: function(response, opts) {
var result = Ext.JSON.decode(response.responseText);
if(result) {
Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!');
//record.commit();
}
else
{
Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
}
}, failure: function(response, opts) {
Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
}
});
}
*/
}
});
Ext.define('App.controller.Dns', {
extend : 'Ext.app.Controller',
init : function() {
this.control({
'toolbar button[action=add]' : {
click : this.newDns
},
'toolbar button[action=delete]' : {
click : this.delDns
},
'toolbar button[action=save]' : {
click : this.saveDns
},
'toolbar button[action=load]': {
click : this.loadDns
},
'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.');
}
});
*/
},
loadDns: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) {
}
});
......@@ -9,24 +9,41 @@ Ext.define('App.controller.MainConfig', {
click : this.onSaveButtonClick
}
});
Ext.Ajax.request({
method: "GET",
url: 'api/devinfo/',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
success: function(response, opts) {
var result = Ext.JSON.decode(response.responseText);
Ext.getCmp('guid').setValue(result.guid);
Ext.getCmp('title').setValue(result.description);
}, failure: function(response, opts) {
}
});
},
onSaveButtonClick : function(btn) {
//get reference to the form
var mainconfigView = btn.up('mvvm-MainConfigView');
//get the bound record
var record = mainconfigView.getViewModel().getData().rec;
var record = mainconfigView.getViewModel().getData();
if (record) {
var data=Ext.util.JSON.encode(record);
Ext.Ajax.request({
method: "POST",
url: 'api/mainconfig/update',
url: 'api/devinfo/update',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
......@@ -34,8 +51,9 @@ Ext.define('App.controller.MainConfig', {
params: data,
success: function(response, opts) {
var result = Ext.JSON.decode(response.responseText);
// var result = Ext.JSON.decode(response.responseText);
/*
if(result) {
Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!');
//record.commit();
......@@ -45,15 +63,16 @@ Ext.define('App.controller.MainConfig', {
Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
}
*/
}, failure: function(response, opts) {
Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
// Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
}
});
}
else {
Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
// Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
}
}
});
......
......@@ -3,20 +3,25 @@ Ext.define('App.controller.NetworkSetting', {
init : function() {
this.control({
'mvvm-NetworkSettingView > button#SaveRecord' : {
click : this.onSaveButtonClick
}
});
/*
Ext.TaskManager.start({
run: this.ReloadData,
interval: 10000 ,
scope: this
});
*/
},
ReloadData: function() {
var combo=Ext.getCmp('cbxeth');
......@@ -34,7 +39,7 @@ Ext.define('App.controller.NetworkSetting', {
});
var eth=record ? record.get(combo.displayField) : null;
Ext.Ajax.request({
method: "GET",
url: 'api/net/byeth/'+eth,
......@@ -46,73 +51,14 @@ Ext.define('App.controller.NetworkSetting', {
success: function(response, opts) {
var result = Ext.JSON.decode(response.responseText);
console.log(result);
//var detailFireSystemView = btn.up('mvvm-DetailFireSystemView');
//var record = detailFireSystemView.getViewModel().getData().rec;
Ext.getCmp('fromnetwork').viewModel.setData(result);
//Ext.getCmp('fromnetwork').viewModel.bind(result);
console.log(Ext.getCmp('fromnetwork').getViewModel().getData());
Ext.getCmp('fromnetwork').viewModel.setData(result);
Ext.getCmp('ttt').setValue(result.extInfo);
var checkbox = Ext.getCmp('dhcp');
console.log("result.useDhcp:"+result.useDhcp);
if (result.useDhcp) {
checkbox.checked = true;
checkbox.addCls('x-form-cb-checked x-form-dirty');
Ext.getCmp('ip').setDisabled(true);
Ext.getCmp('netmask').setDisabled(true);
Ext.getCmp('gateway').setDisabled(true);
Ext.getCmp('broadcast').setDisabled(true);
}else {
checkbox.checked = false;
checkbox.removeCls('x-form-cb-checked x-form-dirty');
Ext.getCmp('ip').setDisabled(false);
Ext.getCmp('netmask').setDisabled(false);
Ext.getCmp('gateway').setDisabled(false);
Ext.getCmp('broadcast').setDisabled(false);
}
checkbox.checkChange();
Ext.getCmp('mac').setValue(result.mac);
Ext.getCmp('ip').setValue(result.ip);
Ext.getCmp('netmask').setValue(result.netmask);
Ext.getCmp('gateway').setValue(result.gateway);
Ext.getCmp('broadcast').setValue(result.broadcast);
Ext.getCmp('mac').setDisabled(true);
// me.viewModel.setData(record);
//if(result) {
// Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!');
//record.commit();
//}
//else
//{
// Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
//}
}, failure: function(response, opts) {
// Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
}
});
......@@ -120,19 +66,18 @@ Ext.define('App.controller.NetworkSetting', {
},
onSaveButtonClick : function(btn) {
//get reference to the form
var networksettingView = btn.up('mvvm-NetworkSettingView');
//get the bound record
var record = networksettingView.getViewModel().getData().rec;
var networksettingView = btn.up('mvvm-NetworkSettingView');
var record = networksettingView.getViewModel().getData();
if (record) {
var data=Ext.util.JSON.encode(record);
Ext.Ajax.request({
method: "POST",
url: 'api/mainconfig/update',
url: 'api/net/update',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
......@@ -143,23 +88,21 @@ Ext.define('App.controller.NetworkSetting', {
var result = Ext.JSON.decode(response.responseText);
if(result) {
Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!');
//record.commit();
}
else
{
Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
}
}, failure: function(response, opts) {
Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
}
});
}
else {
Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
}
}
});
......
......@@ -6,7 +6,7 @@ Ext.define('App.model.Dns', {
type:'int'
},
{
name:'dns',
name:'ip',
type:'string'
}]
});
......
......@@ -7,9 +7,48 @@ Ext.define('App.model.Eth', {
type : 'int'
},
{
name : 'eth',
name : 'name',
type : 'string'
}
},
{
name : 'info',
type : 'auto'
},
{
name : 'mac',
type : 'string'
},
{
name : 'ip',
type : 'string'
},
{
name : 'netmask',
type : 'string'
},
{
name : 'dhcp',
type : 'boolean'
},
{
name : 'gateway',
type : 'string'
},
{
name : 'broadcast',
type : 'string'
}
]
});
\ No newline at end of file
});
......
......@@ -3,7 +3,7 @@ Ext.define('App.model.MainConfig', {
fields : [
{
name : 'title',
name : 'description',
type : 'string'
},
{
......
......@@ -2,64 +2,54 @@ Ext.define('App.model.NetworkSetting', {
extend : 'Ext.data.Model',
fields : [
{
name : 'mac',
type : 'string'
name : 'id',
type : 'int'
},
{
name : 'ethName',
name : 'name',
type : 'string'
},
{
name : 'useDhcp',
type : 'boolean'
name : 'info',
type : 'auto'
},
{
name : 'ip',
name : 'mac',
type : 'string'
},
{
name : 'gateway',
name : 'ip',
type : 'string'
},
{
name : 'netmask',
type : 'string'
},
{
name : 'broadcast',
type : 'string'
name : 'dhcp',
type : 'boolean'
},
{
name : 'extInfo'
// type:'auto'
}
name : 'gateway',
type : 'string'
},
{
name : 'broadcast',
type : 'string'
}
],
autoLoad: true,
autoSync: true,
// alias: 'store.devices',
proxy : {
type : 'ajax',
api: {
read: 'api/mainconfig/get'
},
reader : {
type : 'json'
}
}
});
\ No newline at end of file
......
......@@ -15,11 +15,21 @@ Ext.define('App.store.Dns', {
proxy : {
type : 'ajax',
api: {
read: 'api/net/dns'
},
read: 'api/dns/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
},
}
});
\ No newline at end of file
......
function renderercell(value, metaData, record, row, col, store, gridView) {
return '<div style="font-size: 18px; color:#FFFFFF; background-color:#3892d3 !important; text-align:center;">'+value+'</div>';
}
Ext.define('App.view.Dns', {
extend : 'Ext.grid.Panel',
xtype : 'mvvm-DnsView',
title : 'DNS сервера',
title : 'DNS сервера',
store : 'Dns',
tbar: [
{
text:'Добавить',
handler: function(){
if (winadddns==null) {
var winadddns = Ext.create('widget.window', { // создание окна
title:'Добавить',
maximize: function(){
this.callParent([true]); //animate
},
tbar: {
items: [{
xtype: 'button',
iconCls:'new',
itemId: 'newDnsButton',
text: 'Добавить',
action: 'add'
},
{
xtype: 'button',
iconCls:'remove',
itemId: 'deleteDnsButton',
text: 'Удалить',
action: 'delete',
disabled:false
},
]
},
bbar: {
items: [ {
xtype: 'button',
iconCls:'save',
itemId: 'SaveDnsButton',
text: 'Сохранить',
action: 'save',
disabled:false
},
{
xtype: 'button',
iconCls:'load',
itemId: 'LoadDnsButton',
text: 'Обновить',
action: 'load',
disabled:false
}
]
},
width: 500,
height: 300,
selType: 'rowmodel',
plugins: [new Ext.create('Ext.grid.plugin.RowEditing', {
clicksToEdit: 2,
pluginId: 'modelDnsEditPlagin'
})
],
columns: [{
text : '№',
dataIndex : 'id',
flex: 1,
hidden:true
},
{
text : 'HOST',
dataIndex : 'ip',
flex : 5,
renderer:renderercell,
editor: new Ext.form.TextField({
allowBlank: true
})
}
]
});
restore: function(){
this.callParent([true]); //animate
},
closeAction: 'hide',
items: [
{
xtype : 'mvvm-DetailDnsView',
viewModel : {
data : {
rec : {
dns:'127.0.0.1'
}
}
}
}
]
});
winadddns.show();
}
}
}] ,
columns: [{
text : '№',
dataIndex : 'id',
flex: 1
},
{
text : 'HOST',
dataIndex : 'dns',
flex : 5
},
{
xtype: 'actioncolumn',
text : '#',
flex:1,
dataIndex: 'guid',
items: [{
icon: 'resources/img/tools.png',
handler: function (grid, rowIndex, colIndex) {
var rec = grid.getStore().getAt(rowIndex);
if (wintoolsdns==null) {
var wintoolsdns = Ext.create('widget.window', { // создание окна
title:'Изменить',
maximize: function(){
this.callParent([true]); //animate
},
restore: function(){
this.callParent([true]); //animate
},
closeAction: 'hide',
items: [
{
xtype : 'mvvm-DetailDnsView',
viewModel : {
data : {
rec : rec
}
}
}
]
});
wintoolsdns.show();
}
}
}
],
action: 'tools'
},
]
});
\ No newline at end of file
......
......@@ -7,7 +7,7 @@ Ext.define('App.view.Eth', {
store : 'Eth',
fieldLabel: 'Eth',
valueField:'id',
displayField:'eth',
displayField:'name',
queryMode:'local',
margin:'5 5 5 5',
action:'cbxeth' ,
......@@ -20,7 +20,7 @@ Ext.define('App.view.Eth', {
Ext.Ajax.request({
method: "GET",
url: 'api/net/byeth/'+records[0].get('eth'),
url: 'api/net/byeth/'+records[0].get('name'),
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
......@@ -33,71 +33,10 @@ Ext.define('App.view.Eth', {
success: function(response, opts) {
var result = Ext.JSON.decode(response.responseText);
console.log(result);
//var detailFireSystemView = btn.up('mvvm-DetailFireSystemView');
//var record = detailFireSystemView.getViewModel().getData().rec;
Ext.getCmp('fromnetwork').viewModel.setData(result);
//Ext.getCmp('fromnetwork').viewModel.bind(result);
console.log(Ext.getCmp('fromnetwork').getViewModel().getData());
Ext.getCmp('ttt').setValue(result.extInfo);
var checkbox = Ext.getCmp('dhcp');
console.log("result.useDhcp:"+result.useDhcp);
if (result.useDhcp) {
checkbox.checked = true;
checkbox.addCls('x-form-cb-checked x-form-dirty');
Ext.getCmp('ip').setDisabled(true);
Ext.getCmp('netmask').setDisabled(true);
Ext.getCmp('gateway').setDisabled(true);
Ext.getCmp('broadcast').setDisabled(true);
}else {
checkbox.checked = false;
checkbox.removeCls('x-form-cb-checked x-form-dirty');
Ext.getCmp('ip').setDisabled(false);
Ext.getCmp('netmask').setDisabled(false);
Ext.getCmp('gateway').setDisabled(false);
Ext.getCmp('broadcast').setDisabled(false);
}
checkbox.checkChange();
Ext.getCmp('mac').setValue(result.mac);
Ext.getCmp('ip').setValue(result.ip);
Ext.getCmp('netmask').setValue(result.netmask);
Ext.getCmp('gateway').setValue(result.gateway);
Ext.getCmp('broadcast').setValue(result.broadcast);
Ext.getCmp('mac').setDisabled(true);
// me.viewModel.setData(record);
//if(result) {
// Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!');
//record.commit();
//}
//else
//{
// Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
//}
}, failure: function(response, opts) {
// Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
}
......
Ext.define('App.view.Gprs', {
extend : 'Ext.form.Panel',
xtype : 'mvvm-GprsView',
requires : [
'App.view.GprsViewModel'
],
frame : true,
padding : 10,
bind : {
},
viewModel: {
type: 'gprsform'
},
items : [
{
xtype: 'radiogroup',
fieldLabel: 'Оператор связи',
width:500,
columns: 2,
itemId: 'internetGprs',
items: [
{
xtype: 'radiofield',
boxLabel: '<img src="resources/img/mts.jpg"/>',
name: 'framework',
checked: true,
width:100,
inputValue: 'mts'
},
{
xtype: 'radiofield',
boxLabel: 'Megafon',
name: 'framework',
width:100,
inputValue: 'megafon'
},
{
xtype: 'radiofield',
boxLabel: 'Beeline',
name: 'framework',
width:100,
inputValue: 'beeline'
}
]
},
{
xtype: 'button',
text: 'Применить'
}
]
});
\ No newline at end of file
Ext.define('App.view.GprsViewModel', {
extend: 'Ext.app.ViewModel',
alias: 'viewmodel.gprsform',
data : {
}
});
\ No newline at end of file
......@@ -9,46 +9,31 @@ Ext.define('App.view.MainConfig', {
padding : 10,
bind : {
// reference : 'App.model.MainConfig',
// title : '{rec.title}'
},
viewModel: {
type: 'mainconfigform' // references DetailViewModel
},
items : [
{
items : [{
xtype : 'textfield',
bind : '{rec.guid}',
bind : '{guid}',
fieldLabel : 'GUID',
id:'guid',
disable:true,
width:500,
margin:'5 5 10 3'
},
{
},
{
xtype : 'textarea',
bind : '{rec.title}',
bind : '{description}',
fieldLabel : 'ОПИСАНИЕ',
height:50,
width:500,
id:'title',
margin:'5 5 10 3'
},
{
xtype : 'button',
......
......@@ -4,6 +4,6 @@ Ext.define('App.view.MainConfigViewModel', {
alias: 'viewmodel.mainconfigform',
data : {
rec : null
}
});
\ No newline at end of file
......
......@@ -15,8 +15,9 @@ Ext.define('App.view.NetworkSetting', {
fieldLabel : 'DHCP',
id:'dhcp',
inputValue: '1',
uncheckedValue: '0',
bind : '{dhcp}',
inputValue: 'false',
uncheckedValue: 'true',
margin:'5 5 10 3'
},
......@@ -70,7 +71,7 @@ Ext.define('App.view.NetworkSetting', {
{
xtype : 'textarea',
// bind : '{extInfo}',
bind : '{info}',
id:'ttt',
fieldLabel : 'СТАТУС',
margin:'5 5 10 3',
......
......@@ -8,6 +8,7 @@ Ext.define('App.view.Proxy', {
tbar: [
{
text:'Добавить',
margin:'5 5 5 5',
handler: function(){
if (winaddproxy==null) {
......@@ -102,5 +103,37 @@ Ext.define('App.view.Proxy', {
action: 'tools'
},
{
xtype: 'actioncolumn',
text : '#',
flex:1,
dataIndex: 'id',
items: [{
icon: 'resources/img/delete.png',
handler: function (grid, rowIndex, colIndex) {
var selectedRecord = grid.getStore().getAt(rowIndex);
grid.getStore().each(function(rec) {
if (rec == selectedRecord) {
grid.store.remove(rec);
}
});
grid.getView().refresh();
}
}],
action: 'delete'
}
]
});
\ No newline at end of file
......