Skip to content

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

Go to a project
Toggle navigation
Toggle navigation pinning
Commit c4f08700 c4f0870049d7cabf2d765d8828143fc7e6f1f426 by root
Options

save

1 parent fa2a6557
Inline Side-by-side
Showing 139 changed files with 1440 additions and 2883 deletions
1 eclipse.preferences.version=1
2 org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
5 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> 5 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
6 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> 6 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
7 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/> 7 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
8 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
8 <property name="context-root" value="DevTools"/> 9 <property name="context-root" value="DevTools"/>
9 <property name="java-output-path" value="/DevTools/target/classes"/> 10 <property name="java-output-path" value="/DevTools/target/classes"/>
10 </wb-module> 11 </wb-module>
......
1 eclipse.preferences.version=1
2 org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true
3 org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=true
4 org.springframework.ide.eclipse.core.enable.project.preferences=false
5 org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=true
6 org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.bestpractices.beansvalidator=false
7 org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false
8 org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.data.core.datavalidator=true
9 org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.webflow.core.validator=true
10 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.autowire.autowire-org.springframework.ide.eclipse.beans.core.beansvalidator=false
11 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=true
12 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=true
13 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=true
14 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=true
15 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=true
16 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=true
17 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=true
18 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=true
19 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=true
20 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=true
21 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=true
22 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
23 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.toolAnnotation-org.springframework.ide.eclipse.beans.core.beansvalidator=false
24 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
25 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
26 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
27 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
28 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
29 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
30 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
31 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.bestpractices.legacyxmlusage.jndiobjectfactory-org.springframework.ide.eclipse.bestpractices.beansvalidator=false
32 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false
33 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.data.core.invalidDerivedQuery-org.springframework.ide.eclipse.data.core.datavalidator=true
34 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.data.core.invalidParameterType-org.springframework.ide.eclipse.data.core.datavalidator=true
35 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.action-org.springframework.ide.eclipse.webflow.core.validator=true
36 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.actionstate-org.springframework.ide.eclipse.webflow.core.validator=true
37 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attribute-org.springframework.ide.eclipse.webflow.core.validator=true
38 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attributemapper-org.springframework.ide.eclipse.webflow.core.validator=true
39 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.beanaction-org.springframework.ide.eclipse.webflow.core.validator=true
40 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationaction-org.springframework.ide.eclipse.webflow.core.validator=true
41 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationresult-org.springframework.ide.eclipse.webflow.core.validator=true
42 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.exceptionhandler-org.springframework.ide.eclipse.webflow.core.validator=true
43 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.import-org.springframework.ide.eclipse.webflow.core.validator=true
44 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.inputattribute-org.springframework.ide.eclipse.webflow.core.validator=true
45 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.mapping-org.springframework.ide.eclipse.webflow.core.validator=true
46 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.outputattribute-org.springframework.ide.eclipse.webflow.core.validator=true
47 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.set-org.springframework.ide.eclipse.webflow.core.validator=true
48 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.state-org.springframework.ide.eclipse.webflow.core.validator=true
49 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.subflowstate-org.springframework.ide.eclipse.webflow.core.validator=true
50 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.transition-org.springframework.ide.eclipse.webflow.core.validator=true
51 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.variable-org.springframework.ide.eclipse.webflow.core.validator=true
52 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 @@ ...@@ -3,39 +3,34 @@
3 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 3 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4 <modelVersion>4.0.0</modelVersion> 4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId> 5 <groupId>org.emercit</groupId>
6 <artifactId>DevTools</artifactId> 6 <artifactId>app</artifactId>
7 <name>DevTools</name>
7 <packaging>war</packaging> 8 <packaging>war</packaging>
8 <version>1.0.0-BUILD-SNAPSHOT</version> 9 <version>1.0.0-BUILD-SNAPSHOT</version>
9 <properties> 10 <properties>
10 <java-version>1.6</java-version> 11 <java-version>1.7</java-version>
11 <org.springframework-version>3.0.5.RELEASE</org.springframework-version> 12 <org.springframework-version>3.1.1.RELEASE</org.springframework-version>
12 <org.springframework.roo-version>1.0.2.RELEASE</org.springframework.roo-version> 13 <org.aspectj-version>1.6.10</org.aspectj-version>
13 <org.aspectj-version>1.6.9</org.aspectj-version> 14 <org.slf4j-version>1.6.6</org.slf4j-version>
14 <org.slf4j-version>1.5.10</org.slf4j-version>
15 </properties> 15 </properties>
16 <dependencies> 16 <dependencies>
17 <!-- Spring --> 17 <!-- Spring -->
18 18
19 <dependency> 19 <dependency>
20 <groupId>javassist</groupId>
21 <artifactId>javassist</artifactId>
22 <version>3.12.1.GA</version>
23 </dependency>
24
25 <dependency>
26 <groupId>org.snmp4j</groupId>
27 <artifactId>snmp4j-agent</artifactId>
28 <version>1.3.1</version>
29 </dependency>
30
31
32 <dependency>
33 <groupId>org.codehaus.jackson</groupId> 20 <groupId>org.codehaus.jackson</groupId>
34 <artifactId>jackson-mapper-asl</artifactId> 21 <artifactId>jackson-mapper-asl</artifactId>
35 <version>1.9.12</version> 22 <version>1.4.4</version>
36 </dependency> 23 </dependency>
37 24
38 <dependency> 25 <dependency>
26 <groupId>org.apache.httpcomponents</groupId>
27 <artifactId>httpclient</artifactId>
28 <version>4.3.2</version>
29 </dependency>
30
31
32
33 <dependency>
39 <groupId>org.springframework</groupId> 34 <groupId>org.springframework</groupId>
40 <artifactId>spring-context</artifactId> 35 <artifactId>spring-context</artifactId>
41 <version>${org.springframework-version}</version> 36 <version>${org.springframework-version}</version>
...@@ -44,7 +39,7 @@ ...@@ -44,7 +39,7 @@
44 <exclusion> 39 <exclusion>
45 <groupId>commons-logging</groupId> 40 <groupId>commons-logging</groupId>
46 <artifactId>commons-logging</artifactId> 41 <artifactId>commons-logging</artifactId>
47 </exclusion> 42 </exclusion>
48 </exclusions> 43 </exclusions>
49 </dependency> 44 </dependency>
50 <dependency> 45 <dependency>
...@@ -52,76 +47,14 @@ ...@@ -52,76 +47,14 @@
52 <artifactId>spring-webmvc</artifactId> 47 <artifactId>spring-webmvc</artifactId>
53 <version>${org.springframework-version}</version> 48 <version>${org.springframework-version}</version>
54 </dependency> 49 </dependency>
55 50
56 <dependency>
57 <groupId>org.springframework.security</groupId>
58 <artifactId>spring-security-web</artifactId>
59 <version>${org.springframework-version}</version>
60 </dependency>
61 <dependency>
62 <groupId>org.springframework.security</groupId>
63 <artifactId>spring-security-config</artifactId>
64 <version>${org.springframework-version}</version>
65 </dependency>
66 <dependency>
67 <groupId>org.springframework.security</groupId>
68 <artifactId>spring-security-core</artifactId>
69 <version>${org.springframework-version}</version>
70 </dependency>
71
72
73 <dependency>
74 <groupId>javax.persistence</groupId>
75 <artifactId>persistence-api</artifactId>
76 <version>1.0</version>
77 </dependency>
78 <dependency>
79 <groupId>org.hibernate</groupId>
80 <artifactId>hibernate-core</artifactId>
81 <version>3.3.2.GA</version>
82 </dependency>
83 <dependency>
84 <groupId>org.hibernate</groupId>
85 <artifactId>hibernate-annotations</artifactId>
86 <version>3.3.1.GA</version>
87 </dependency>
88 <dependency>
89 <groupId>org.hibernate</groupId>
90 <artifactId>hibernate-commons-annotations</artifactId>
91 <version>3.3.0.ga</version>
92 </dependency>
93 <dependency>
94 <groupId>org.springframework</groupId>
95 <artifactId>spring-tx</artifactId>
96 <version>${org.springframework-version}</version>
97 </dependency>
98
99 <dependency>
100 <groupId>org.springframework</groupId>
101 <artifactId>spring-orm</artifactId>
102 <version>${org.springframework-version}</version>
103 </dependency>
104 <dependency>
105 <groupId>mysql</groupId>
106 <artifactId>mysql-connector-java</artifactId>
107 <version>5.1.6</version>
108 </dependency>
109
110 <!-- Roo dependencies -->
111 <dependency>
112 <groupId>org.springframework.roo</groupId>
113 <artifactId>org.springframework.roo.annotations</artifactId>
114 <version>${org.springframework.roo-version}</version>
115 <scope>provided</scope>
116 </dependency>
117
118 <!-- AspectJ --> 51 <!-- AspectJ -->
119 <dependency> 52 <dependency>
120 <groupId>org.aspectj</groupId> 53 <groupId>org.aspectj</groupId>
121 <artifactId>aspectjrt</artifactId> 54 <artifactId>aspectjrt</artifactId>
122 <version>${org.aspectj-version}</version> 55 <version>${org.aspectj-version}</version>
123 </dependency> 56 </dependency>
124 57
125 <!-- Logging --> 58 <!-- Logging -->
126 <dependency> 59 <dependency>
127 <groupId>org.slf4j</groupId> 60 <groupId>org.slf4j</groupId>
...@@ -171,7 +104,7 @@ ...@@ -171,7 +104,7 @@
171 <artifactId>javax.inject</artifactId> 104 <artifactId>javax.inject</artifactId>
172 <version>1</version> 105 <version>1</version>
173 </dependency> 106 </dependency>
174 107
175 <!-- Servlet --> 108 <!-- Servlet -->
176 <dependency> 109 <dependency>
177 <groupId>javax.servlet</groupId> 110 <groupId>javax.servlet</groupId>
...@@ -190,22 +123,36 @@ ...@@ -190,22 +123,36 @@
190 <artifactId>jstl</artifactId> 123 <artifactId>jstl</artifactId>
191 <version>1.2</version> 124 <version>1.2</version>
192 </dependency> 125 </dependency>
193 126
194 <!-- Test --> 127 <!-- Test -->
195 <dependency> 128 <dependency>
196 <groupId>junit</groupId> 129 <groupId>junit</groupId>
197 <artifactId>junit</artifactId> 130 <artifactId>junit</artifactId>
198 <version>4.7</version> 131 <version>4.7</version>
199 <scope>test</scope> 132 <scope>test</scope>
200 </dependency> 133 </dependency>
201 <!-- 134
202 <dependency> 135 <dependency>
203 <groupId>org.smslib</groupId> 136 <groupId>org.emercit</groupId>
204 <artifactId>smslib</artifactId> 137 <artifactId>devinfo</artifactId>
205 <version>dev-SNAPSHOT</version> 138 <version>1.0</version>
206 </dependency> 139 </dependency>
207 --> 140
141 <dependency>
142 <groupId>org.emercit</groupId>
143 <artifactId>ethmanager</artifactId>
144 <version>1.3</version>
145 </dependency>
146
147 <dependency>
148 <groupId>org.emercit</groupId>
149 <artifactId>dnsmanager</artifactId>
150 <version>1.8</version>
151 </dependency>
152
208 </dependencies> 153 </dependencies>
154
155
209 <repositories> 156 <repositories>
210 <!-- For testing against latest Spring snapshots --> 157 <!-- For testing against latest Spring snapshots -->
211 <repository> 158 <repository>
...@@ -229,95 +176,167 @@ ...@@ -229,95 +176,167 @@
229 </snapshots> 176 </snapshots>
230 </repository> 177 </repository>
231 178
232 <!-- 179
180
181 <repository>
182 <id>org.repo.jfrog.artifactory.libs-releases</id>
183 <name>Repository1</name>
184 <url>http://repo.jfrog.org/artifactory/libs-releases</url>
185 <snapshots>
186 <enabled>true</enabled>
187 </snapshots>
188
189 </repository>
190
191
192
233 <repository> 193 <repository>
234 <id>smslib-snapshots</id> 194 <id>com.gradle.artifactoryonline.gradle.libs</id>
235 <name>SMSLib Repository</name> 195 <name>Repository2</name>
236 <url>http://smslib.org/maven2/snapshots/</url> 196 <url>http://gradle.artifactoryonline.com/gradle/libs</url>
237 </repository> 197 <snapshots>
238 --> 198 <enabled>true</enabled>
199 </snapshots>
200
201 </repository>
202
203
204 <repository>
205 <id>org.mirrors.ibiblio.pub.mirrors.maven2</id>
206 <name>Repository3</name>
207 <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
208 <snapshots>
209 <enabled>true</enabled>
210 </snapshots>
211
212 </repository>
213
214
215 <repository>
216 <id>org.mvnsearch.maven2</id>
217 <name>Repository4</name>
218 <url>http://www.mvnsearch.org/maven2</url>
219 <snapshots>
220 <enabled>true</enabled>
221 </snapshots>
222
223 </repository>
224
225
226 <!--
227 http://scala-tools.org/repo-releases/
228 http://repository.codehaus.org/
229 http://gradle.artifactoryonline.com/gradle/libs/
230 http://search.maven.org/
231 http://mirrors.ibiblio.org/pub/mirrors/maven2/
232 http://www.mvnsearch.org/maven2/
233 http://repo.typesafe.com/typesafe/releases/
234
235 http://repo.maven.apache.org/maven2
236 -->
237
238
239 <!--other repositories if any-->
240 <repository>
241 <id>project.local</id>
242 <name>project</name>
243 <url>file:${project.basedir}/repo</url>
244 </repository>
245
246
239 247
240 </repositories> 248 </repositories>
241 <build>
242 <plugins>
243 <plugin>
244 <groupId>org.apache.maven.plugins</groupId>
245 <artifactId>maven-compiler-plugin</artifactId>
246 <configuration>
247 <source>${java-version}</source>
248 <target>${java-version}</target>
249 </configuration>
250 </plugin>
251 <plugin>
252 <groupId>org.apache.maven.plugins</groupId>
253 <artifactId>maven-war-plugin</artifactId>
254 <configuration>
255 <warName>DevTools</warName>
256 </configuration>
257 </plugin>
258 <plugin>
259 <groupId>org.apache.maven.plugins</groupId>
260 <artifactId>maven-dependency-plugin</artifactId>
261 <executions>
262 <execution>
263 <id>install</id>
264 <phase>install</phase>
265 <goals>
266 <goal>sources</goal>
267 </goals>
268 </execution>
269 </executions>
270 </plugin>
271 <plugin>
272 <groupId>org.codehaus.mojo</groupId>
273 <artifactId>aspectj-maven-plugin</artifactId>
274 <!-- Have to use version 1.2 since version 1.3 does not appear to work
275 with ITDs -->
276 <version>1.2</version>
277 <dependencies>
278 <!-- You must use Maven 2.0.9 or above or these are ignored (see MNG-2972) -->
279 <dependency>
280 <groupId>org.aspectj</groupId>
281 <artifactId>aspectjrt</artifactId>
282 <version>${org.aspectj-version}</version>
283 </dependency>
284 <dependency>
285 <groupId>org.aspectj</groupId>
286 <artifactId>aspectjtools</artifactId>
287 <version>${org.aspectj-version}</version>
288 </dependency>
289 </dependencies>
290 <executions>
291 <execution>
292 <goals>
293 <goal>compile</goal>
294 <goal>test-compile</goal>
295 </goals>
296 </execution>
297 </executions>
298 <configuration>
299 <outxml>true</outxml>
300 <source>${java-version}</source>
301 <target>${java-version}</target>
302 </configuration>
303 </plugin>
304 <plugin>
305 <groupId>org.apache.maven.plugins</groupId>
306 <artifactId>maven-surefire-plugin</artifactId>
307 <configuration>
308 <junitArtifactName>junit:junit</junitArtifactName>
309 <excludes>
310 <exclude>**/*_Roo_*</exclude>
311 </excludes>
312 </configuration>
313 </plugin>
314 <plugin>
315 <groupId>org.codehaus.mojo</groupId>
316 <artifactId>tomcat-maven-plugin</artifactId>
317 <version>1.0-beta-1</version>
318 </plugin>
319 </plugins>
320 </build>
321 249
322 <name>DevTools</name>
323 </project>
...\ No newline at end of file ...\ No newline at end of file
250
251
252 <build>
253 <plugins>
254 <plugin>
255 <artifactId>maven-eclipse-plugin</artifactId>
256 <version>2.9</version>
257 <configuration>
258 <additionalProjectnatures>
259 <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
260 </additionalProjectnatures>
261 <additionalBuildcommands>
262 <buildcommand>org.springframework.ide.eclipse.core.springbuilder</buildcommand>
263 </additionalBuildcommands>
264 <downloadSources>true</downloadSources>
265 <downloadJavadocs>true</downloadJavadocs>
266 </configuration>
267 </plugin>
268 <plugin>
269 <groupId>org.apache.maven.plugins</groupId>
270 <artifactId>maven-compiler-plugin</artifactId>
271 <version>2.5.1</version>
272 <configuration>
273 <source>1.6</source>
274 <target>1.6</target>
275 <compilerArgument>-Xlint:all</compilerArgument>
276 <showWarnings>true</showWarnings>
277 <showDeprecation>true</showDeprecation>
278 </configuration>
279 </plugin>
280 <plugin>
281 <groupId>org.codehaus.mojo</groupId>
282 <artifactId>exec-maven-plugin</artifactId>
283 <version>1.2.1</version>
284 <configuration>
285 <mainClass>org.test.int1.Main</mainClass>
286 <encoding>UTF-8</encoding>
287 <outputEncoding>UTF-8</outputEncoding>
288 </configuration>
289 </plugin>
290
291
292
293
294
295 </plugins>
296
297
298
299
300
301 <resources>
302 <resource>
303 <directory>src/main/resources</directory>
304 <filtering>true</filtering>
305 </resource>
306
307 <resource>
308 <directory>src/test/resources</directory>
309 <filtering>true</filtering>
310 </resource>
311
312 </resources>
313
314
315
316 </build>
317 </project>
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
......
1 f56ff81163f91a81980e9b17cc5313f9
...\ No newline at end of file ...\ No newline at end of file
1 2bbba2a6ec46affb85d5dcccaae6bd2ee4eaff0b
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>devinfo</artifactId>
7 <version>1.0</version>
8 </project>
1 0bfc48c2a915a3b527a8e42beaf163db
...\ No newline at end of file ...\ No newline at end of file
1 5a1c45e132c41cec45f04991d417cd2f34b409ff
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <metadata>
3 <groupId>org.emercit</groupId>
4 <artifactId>devinfo</artifactId>
5 <versioning>
6 <release>1.0</release>
7 <versions>
8 <version>1.0</version>
9 </versions>
10 <lastUpdated>20150708093231</lastUpdated>
11 </versioning>
12 </metadata>
1 8aebfc77a89c73d5059862cf0fa54b01
...\ No newline at end of file ...\ No newline at end of file
1 170972e52607c45b7fb82f1fb5379f652d121d74
...\ No newline at end of file ...\ No newline at end of file
1 b2afba94e59e76983b4db252a1368424
...\ No newline at end of file ...\ No newline at end of file
1 95fa6d59f09f8cd6dc8e14734e7c14f20210b5a7
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>dnsmanager</artifactId>
7 <version>1.0</version>
8 </project>
1 cd09ab236a4ef75b4d0bd1786a21cbbf
...\ No newline at end of file ...\ No newline at end of file
1 cb56dc4c41046da8dc0b05ad76d9bc38b7bb87e8
...\ No newline at end of file ...\ No newline at end of file
1 502419450e64dd50c27dac147e6c9e77
...\ No newline at end of file ...\ No newline at end of file
1 b7c833fa674affe0e6af68441cb33d532dd69801
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>dnsmanager</artifactId>
7 <version>1.1</version>
8 </project>
1 87481e701a1bf3e65f2edfacb6a14731
...\ No newline at end of file ...\ No newline at end of file
1 67726fc0d85bb172af64eaea361d7086b73945e6
...\ No newline at end of file ...\ No newline at end of file
1 4b545c783e3895a446c8c2f788388866
...\ No newline at end of file ...\ No newline at end of file
1 2d20e42d1f64f0a2623316967b462dfa3ca34cf4
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>dnsmanager</artifactId>
7 <version>1.2</version>
8 </project>
1 296d06d72ebdca69b1859d24c335e794
...\ No newline at end of file ...\ No newline at end of file
1 e1f3ddefdab8bc69cd8f9b0c0c3f3f4f58086d56
...\ No newline at end of file ...\ No newline at end of file
1 9a90f3b984a963083b570f9f0b6218b7
...\ No newline at end of file ...\ No newline at end of file
1 8be69e4c893c5961a8469708eeb7f3d7da52fc60
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>dnsmanager</artifactId>
7 <version>1.3</version>
8 </project>
1 4565f2a1e1eca1e65efa7671d7507d05
...\ No newline at end of file ...\ No newline at end of file
1 dfa512044760b48aecea383f4a803139de6fb949
...\ No newline at end of file ...\ No newline at end of file
1 9311539268c59ad42743d3e4984d27fa
...\ No newline at end of file ...\ No newline at end of file
1 073fd28c56e403c66d38de3d85050ead7237ec8c
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>dnsmanager</artifactId>
7 <version>1.4</version>
8 </project>
1 cbb810a09dd52c8f727113ecc5fb336b
...\ No newline at end of file ...\ No newline at end of file
1 b94279102cf640ddc06d1cc37e30c8425bf88b96
...\ No newline at end of file ...\ No newline at end of file
1 4a66bb9f57149eaabd5eb4c2535b7a35
...\ No newline at end of file ...\ No newline at end of file
1 25871f0c3c815c69fd49dfa597592aad6d639ca4
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>dnsmanager</artifactId>
7 <version>1.5</version>
8 </project>
1 f278dde3ff65d6e7072b7a9a6ac7ee1a
...\ No newline at end of file ...\ No newline at end of file
1 49ff9dfda95e0bc769c52b9c078bb20c13f33b49
...\ No newline at end of file ...\ No newline at end of file
1 9e7c127e81bf3e0541bec6d7b123a1da
...\ No newline at end of file ...\ No newline at end of file
1 8e845c322d0424e4b9d2c2a10eec9a1d32175283
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>dnsmanager</artifactId>
7 <version>1.6</version>
8 </project>
1 9bb3fc3d6a22e2784f06160b3fe38227
...\ No newline at end of file ...\ No newline at end of file
1 62026c4d08c07971e23f990e2640e0b316141945
...\ No newline at end of file ...\ No newline at end of file
1 2d49498ad2e92ca687bb10f80cd59906
...\ No newline at end of file ...\ No newline at end of file
1 268fa9db5eae6faacbcabc47d225e3bdd9621b83
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>dnsmanager</artifactId>
7 <version>1.7</version>
8 </project>
1 3cdc9c0bc1c1554fbd9349e03e2548a0
...\ No newline at end of file ...\ No newline at end of file
1 7869497f318bdc5c687ebff63574f8b93abe5ec6
...\ No newline at end of file ...\ No newline at end of file
1 aa434943aaa29cc722d0fb27fcb16176
...\ No newline at end of file ...\ No newline at end of file
1 7b6c02dd0fab85d2bdaca1363984945198473e8f
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>dnsmanager</artifactId>
7 <version>1.8</version>
8 </project>
1 a9997f4bb67c808741a461f1770e2a68
...\ No newline at end of file ...\ No newline at end of file
1 49837f0226aa2efaa07cf3771adede0e2c546384
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <metadata>
3 <groupId>org.emercit</groupId>
4 <artifactId>dnsmanager</artifactId>
5 <versioning>
6 <release>1.8</release>
7 <versions>
8 <version>1.0</version>
9 <version>1.1</version>
10 <version>1.2</version>
11 <version>1.3</version>
12 <version>1.4</version>
13 <version>1.5</version>
14 <version>1.6</version>
15 <version>1.7</version>
16 <version>1.8</version>
17 </versions>
18 <lastUpdated>20150714080952</lastUpdated>
19 </versioning>
20 </metadata>
1 1f9983c33d6bc0f2082bf999b8b3aad3
...\ No newline at end of file ...\ No newline at end of file
1 4a0053551eb215c588f2ac0829a9ae5d3194a261
...\ No newline at end of file ...\ No newline at end of file
1 f738cc2701b1dac67abdafd663abcd11
...\ No newline at end of file ...\ No newline at end of file
1 38fac77d83c9e1d0e8f098e5acdac6f265527a67
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>ethmanager</artifactId>
7 <version>1.0</version>
8 </project>
1 53d8476bf6c495816b8574f4b345e0c0
...\ No newline at end of file ...\ No newline at end of file
1 93af149a62f89f462eedf898510acdf073118d91
...\ No newline at end of file ...\ No newline at end of file
1 e29d67ad375ae34a82d749c314f59bc5
...\ No newline at end of file ...\ No newline at end of file
1 71f678913cc76d8774efd66d4f17458b64e39824
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>ethmanager</artifactId>
7 <version>1.1</version>
8 </project>
1 310f2786ca0500892923dfd3de82b89b
...\ No newline at end of file ...\ No newline at end of file
1 32a130707b2520bf96ee3f0a4eaf0c397b67fa8b
...\ No newline at end of file ...\ No newline at end of file
1 dd1cac91f317ae0d6a6a1b8ae4a29134
...\ No newline at end of file ...\ No newline at end of file
1 cc1d28262b80588ef930fbe4fb681704786de92a
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>ethmanager</artifactId>
7 <version>1.2</version>
8 </project>
1 c5f310426b07fd5b30c61177024919bd
...\ No newline at end of file ...\ No newline at end of file
1 c99d21663ff1a12c7876c8ce513f04b002de62da
...\ No newline at end of file ...\ No newline at end of file
1 79984ad7192b54e76e9730038732c190
...\ No newline at end of file ...\ No newline at end of file
1 fab2ee3505796f571a703f94fb7b8f88a3808f1d
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>ethmanager</artifactId>
7 <version>1.3</version>
8 </project>
1 d44b7b29dcf61e6c7e02c2505e91feff
...\ No newline at end of file ...\ No newline at end of file
1 7d7abad42d13c21d267112db4e46b7ee52a8151b
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <metadata>
3 <groupId>org.emercit</groupId>
4 <artifactId>ethmanager</artifactId>
5 <versioning>
6 <release>1.3</release>
7 <versions>
8 <version>1.0</version>
9 <version>1.1</version>
10 <version>1.2</version>
11 <version>1.3</version>
12 </versions>
13 <lastUpdated>20150708135629</lastUpdated>
14 </versioning>
15 </metadata>
1 073dd3d052d4ddd0a5af856c79766dac
...\ No newline at end of file ...\ No newline at end of file
1 82b6f823f5767ab35d3301dda8084ca85495d7c2
...\ No newline at end of file ...\ No newline at end of file
...@@ -4,63 +4,58 @@ import java.util.Locale; ...@@ -4,63 +4,58 @@ import java.util.Locale;
4 4
5 import org.slf4j.Logger; 5 import org.slf4j.Logger;
6 import org.slf4j.LoggerFactory; 6 import org.slf4j.LoggerFactory;
7
8 import org.springframework.web.bind.annotation.RequestMapping; 7 import org.springframework.web.bind.annotation.RequestMapping;
9 import org.springframework.web.bind.annotation.RequestMethod; 8 import org.springframework.web.bind.annotation.RequestMethod;
10 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
11 10
12
13 import javax.servlet.http.*; 11 import javax.servlet.http.*;
14 import javax.servlet.ServletContext; 12 import javax.servlet.ServletContext;
13
15 import java.io.*; 14 import java.io.*;
16 15
17 import org.springframework.stereotype.Controller; 16 import org.springframework.stereotype.Controller;
18 import org.springframework.validation.BindingResult; 17 import org.springframework.validation.BindingResult;
19 import org.springframework.web.bind.annotation.ModelAttribute; 18 import org.springframework.web.bind.annotation.ModelAttribute;
19 import org.springframework.web.bind.annotation.PathVariable;
20 import org.springframework.web.bind.annotation.RequestMapping; 20 import org.springframework.web.bind.annotation.RequestMapping;
21 import org.springframework.web.bind.annotation.RequestMethod; 21 import org.springframework.web.bind.annotation.RequestMethod;
22 import org.springframework.web.bind.annotation.RequestParam; 22 import org.springframework.web.bind.annotation.RequestParam;
23
24 import org.springframework.stereotype.Controller; 23 import org.springframework.stereotype.Controller;
25 import org.springframework.web.bind.annotation.RequestMapping; 24 import org.springframework.web.bind.annotation.RequestMapping;
26 import org.springframework.web.bind.annotation.RequestMethod; 25 import org.springframework.web.bind.annotation.RequestMethod;
27 import org.springframework.web.bind.annotation.ResponseBody; 26 import org.springframework.web.bind.annotation.ResponseBody;
28
29 import org.springframework.web.bind.annotation.RequestBody; 27 import org.springframework.web.bind.annotation.RequestBody;
30 28
31 /** 29 import java.util.Vector;
32 * Handles requests for the application home page. 30
33 */ 31 import org.emercit.service.DevInfoService;
32
33
34 import org.emercit.devinfo.model.DevInfoBean;
35
36
37
34 @Controller 38 @Controller
35 @RequestMapping("api") 39 @RequestMapping("api")
36 public class MainConfigController { 40 public class DevInfoController {
41
37 42
38 /* 43 @RequestMapping(value = "devinfo", method = RequestMethod.GET)
39 @RequestMapping(value = "mainconfig/get", method = RequestMethod.GET) 44 public @ResponseBody DevInfoBean getDevInfo() {
40 public @ResponseBody MainConfig get() { 45
41
42 try {
43 //return MainConfigService.get();
44 }
45 catch(Exception e)
46 {
47 return null;
48 }
49 }
50 46
51 */ 47 return DevInfoService.INSTANCE.get();
52 /* 48
53 @RequestMapping(value="mainconfig/update" , method = RequestMethod.POST) 49 }
54 public @ResponseBody boolean update(@RequestBody MainConfig mainconfig) { 50
51
52
53
54 @RequestMapping(value="devinfo/update" , method = RequestMethod.POST)
55 public @ResponseBody boolean update(@RequestBody DevInfoBean m) {
55 56
56 try { 57 return DevInfoService.INSTANCE.set(m);
57 //MainConfigService.Update(mainconfig); 58
58 return true;
59 }
60 catch(Exception e) {
61 return false;
62 }
63 } 59 }
64 */
65
66 } 60 }
61
......
1 package org.emercit.app;
2
3 import java.util.Locale;
4
5 import org.slf4j.Logger;
6 import org.slf4j.LoggerFactory;
7 import org.springframework.web.bind.annotation.RequestMapping;
8 import org.springframework.web.bind.annotation.RequestMethod;
9 import org.springframework.beans.factory.annotation.Autowired;
10
11 import javax.servlet.http.*;
12 import javax.servlet.ServletContext;
13
14 import java.io.*;
15
16 import org.springframework.stereotype.Controller;
17 import org.springframework.validation.BindingResult;
18 import org.springframework.web.bind.annotation.ModelAttribute;
19 import org.springframework.web.bind.annotation.PathVariable;
20 import org.springframework.web.bind.annotation.ResponseBody;
21 import org.springframework.web.bind.annotation.RequestBody;
22
23 import java.util.Vector;
24
25 import org.emercit.ethmanager.model.EthBean;
26 import org.emercit.dnsmanager.model.DnsBean;
27
28 import org.emercit.service.EthService;
29 import org.emercit.service.DnsService;
30
31
32 import java.util.ArrayList;
33 import java.util.List;
34
35
36 @Controller
37 @RequestMapping("api")
38 public class DnsController {
39
40
41
42
43 @RequestMapping(value = "dns/all", method = RequestMethod.GET)
44 public @ResponseBody Vector<DnsBean> getAllDns() {
45 return DnsService.INSTANCE.getAllDnsBean();
46 }
47
48 @RequestMapping(value="dns/update" , method = RequestMethod.POST)
49 public @ResponseBody boolean update(@RequestBody DnsBean[] beans) {
50
51
52 Vector<DnsBean> dbs=new Vector<DnsBean>();
53
54 for (DnsBean d:beans) {
55
56 DnsBean db=new DnsBean();
57 db.setId(d.getId());
58 db.setIp(d.getIp());
59
60 dbs.add(db);
61 }
62
63
64
65 return DnsService.INSTANCE.Upd(dbs);
66 }
67
68 }
69
70
71
72
73
74
...@@ -29,40 +29,25 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -29,40 +29,25 @@ import org.springframework.web.bind.annotation.RequestBody;
29 29
30 import java.util.Vector; 30 import java.util.Vector;
31 31
32 import org.emercit.service.NetService; 32 import org.emercit.ethmanager.model.EthBean;
33 import org.emercit.dnsmanager.model.DnsBean;
33 34
35 import org.emercit.service.EthService;
36 import org.emercit.service.DnsService;
34 37
35 import org.emercit.model.NetBean;
36 import org.emercit.model.DnsBean;
37 import org.emercit.model.EthBean;
38 import org.emercit.model.ProxyBean;
39 38
40 39
41 @Controller 40 @Controller
42 @RequestMapping("api") 41 @RequestMapping("api")
43 public class NetworkController { 42 public class EthController {
44
45 /*
46 *
47 */
48 @RequestMapping(value = "net/alleth", method = RequestMethod.GET)
49 public @ResponseBody Vector<EthBean> getAllEth() {
50
51 try {
52 return NetService.INSTANCE.getAllEth();
53 }
54 catch(Exception e)
55 {
56 return null;
57 }
58 }
59 43
44
60 45
61 @RequestMapping(value = "net/dns", method = RequestMethod.GET) 46 @RequestMapping(value = "eth/all", method = RequestMethod.GET)
62 public @ResponseBody Vector<DnsBean> getAllDns() { 47 public @ResponseBody Vector<EthBean> getAllEth() {
63 48
64 try { 49 try {
65 return NetService.INSTANCE.getDns(); 50 return EthService.INSTANCE.getAllEthbean();
66 } 51 }
67 catch(Exception e) 52 catch(Exception e)
68 { 53 {
...@@ -71,6 +56,7 @@ public class NetworkController { ...@@ -71,6 +56,7 @@ public class NetworkController {
71 } 56 }
72 57
73 58
59 /*
74 @RequestMapping(value = "net/proxy", method = RequestMethod.GET) 60 @RequestMapping(value = "net/proxy", method = RequestMethod.GET)
75 public @ResponseBody Vector<ProxyBean> getAllProxy() { 61 public @ResponseBody Vector<ProxyBean> getAllProxy() {
76 62
...@@ -82,12 +68,7 @@ public class NetworkController { ...@@ -82,12 +68,7 @@ public class NetworkController {
82 return null; 68 return null;
83 } 69 }
84 } 70 }
85 71 */
86
87
88
89
90
91 72
92 /* 73 /*
93 export http_proxy='http://user:password@prox-server:3128' 74 export http_proxy='http://user:password@prox-server:3128'
...@@ -95,43 +76,29 @@ public class NetworkController { ...@@ -95,43 +76,29 @@ public class NetworkController {
95 export ftp_proxy='http://user:password@prox-server:3128' 76 export ftp_proxy='http://user:password@prox-server:3128'
96 77
97 */ 78 */
98 79
99
100 /* 80 /*
101 * 81 *
102 */ 82 */
103 83
104 @RequestMapping(value = "net/byeth/{eth}", method = RequestMethod.GET) 84
105 public @ResponseBody NetBean getEth(@PathVariable String eth) { 85 @RequestMapping(value = "eth/byeth/{eth}", method = RequestMethod.GET)
106 86 public @ResponseBody EthBean getEth(@PathVariable String eth) {
107 try {
108 return NetService.INSTANCE.get(eth);
109 }
110 catch(Exception e) {
111
112 }
113 return null;
114 }
115
116 87
88 return EthService.INSTANCE.getByName(eth);
117 89
90 }
118 91
92 @RequestMapping(value="eth/update" , method = RequestMethod.POST)
93 public @ResponseBody boolean update(@RequestBody EthBean m) {
119 94
95 return EthService.INSTANCE.Upd(m);
96 }
97
120 } 98 }
121 99
100
101
122 102
123 /*
124 @RequestMapping(value="mainconfig/update" , method = RequestMethod.POST)
125 public @ResponseBody boolean update(@RequestBody MainConfig mainconfig) {
126
127 try {
128 //MainConfigService.Update(mainconfig);
129 return true;
130 }
131 catch(Exception e) {
132 return false;
133 }
134 }
135 */
136 103
137 104
......
1 package org.emercit.app;
2
3 public class UtilController {
4
5 }
1 package org.emercit.model;
2
3
4 import java.io.Serializable;
5 import java.util.Vector;
6
7 public class DnsBean implements Serializable {
8
9
10 private int id;
11
12 private String dns;
13
14 public DnsBean() {
15
16 }
17
18 public int getId() {
19 return id;
20 }
21
22 public void setId(int id) {
23 this.id=id;
24 }
25
26 public String getDns() {
27 return dns;
28 }
29
30 public void setDns(String value) {
31 this.dns=value;
32 }
33 }
34
1 package org.emercit.model;
2
3
4 import java.io.Serializable;
5 import java.util.Vector;
6
7 public class EthBean implements Serializable {
8
9
10 private int id;
11
12 private String eth;
13
14 public EthBean() {
15
16 }
17
18 public int getId() {
19 return id;
20 }
21
22 public void setId(int id) {
23 this.id=id;
24 }
25
26 public String getEth() {
27 return eth;
28 }
29
30 public void setEth(String value) {
31 this.eth=value;
32 }
33 }
34
35
36
37
38
39
40
1 package org.emercit.model;
2
3 import java.io.Serializable;
4 import java.util.Vector;
5
6 public class NetBean implements Serializable {
7
8 private static final long serialVersionUID = 1L;
9
10 private String ethname;
11
12 private String mac;
13
14 private boolean dhcp;
15
16 private String ip;
17
18 private String netmask;
19
20 private String gateway;
21
22 private String broadcast;
23
24 private Vector<String> extinfo;
25
26
27 public NetBean() {
28
29 }
30
31 public String getEthName() {
32 return ethname;
33 }
34
35 public void setEthName(String value) {
36 ethname=value;
37 }
38
39 public String getMac() {
40 return mac;
41 }
42
43
44 public void setMac(String value) {
45 this.mac=value;
46 }
47
48 public boolean getUseDhcp() {
49 return dhcp;
50 }
51
52 public void setUseDhcp(boolean value) {
53 this.dhcp = value;
54 }
55
56 public String getIp() {
57 return ip;
58 }
59
60 public void setIp(String value) {
61 this.ip = value;
62 }
63
64 public String getNetmask() {
65 return netmask;
66 }
67
68 public void setNetmask(String value) {
69 this.netmask=value;
70 }
71
72 public String getGateway() {
73 return gateway;
74 }
75
76 public void setGateway(String value) {
77 this.gateway=value;
78 }
79
80 public String getBroadcast() {
81 return broadcast;
82 }
83
84 public void setBroadcast(String value) {
85 this.broadcast=value;
86 }
87
88 public Vector<String> getExtInfo() {
89 return extinfo;
90 }
91
92 public void setExtInfo(Vector<String> value) {
93 this.extinfo=value;
94 }
95
96
97
98
99
100 }
101
102
103
104
105
106
107
1 package org.emercit.model;
2
3 import java.io.Serializable;
4 import java.util.Vector;
5
6 public class ProxyBean implements Serializable {
7
8 private int id;
9
10 private String proxy;
11
12 public ProxyBean() {
13
14 }
15
16 public int getId() {
17 return id;
18 }
19
20
21 public void setId(int id) {
22 this.id=id;
23 }
24
25
26 public String getProxy() {
27 return proxy;
28 }
29
30
31 public void setProxy(String value) {
32 this.proxy=value;
33 }
34
35 }
36
37
38
39
40
1 package org.emercit.model;
2
3 public class StrCmd {
4
5
6
7
8 }
1 package org.emercit.service;
2
3
4 import java.io.BufferedReader;
5 import java.io.InputStreamReader;
6 import java.util.List;
7 import java.util.ArrayList;
8 import java.util.Random;
9
10 import java.util.Vector;
11
12
13
14 public class CommandExecutor {
15
16
17 public Vector<String> Run(String cmd) throws Exception {
18
19 Vector<String> v=new Vector<String>();
20
21 Runtime run = Runtime.getRuntime();
22
23 Process proc = run.exec(new String[]{"/bin/sh", "-c",cmd});
24 proc.waitFor();
25 BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream()));
26 while(br.ready()) {
27 v.add(br.readLine());
28 }
29
30 return v;
31 }
32
33
34 }
1 package org.emercit.service;
2
3
4 import org.emercit.model.IPAddressValidator;
5
6
7 import org.emercit.devinfo.model.DevInfoBean;
8
9 import org.emercit.devinfo.service.DevInfoImpl;
10
11
12
13 public enum DevInfoService {
14
15 INSTANCE;
16
17 private DevInfoImpl devinfo= new DevInfoImpl();
18
19
20 public DevInfoBean get() {
21
22 return devinfo.Get();
23 }
24
25 public boolean set(DevInfoBean m) {
26
27 return devinfo.Set(m);
28 }
29
30 }
1 package org.emercit.service;
2
3
4 import org.emercit.model.IPAddressValidator;
5
6 import java.util.Vector;
7
8
9 import org.emercit.dnsmanager.model.DnsBean;
10 import org.emercit.dnsmanager.service.DnsLinux;
11
12
13 public enum DnsService {
14
15 INSTANCE;
16
17 private DnsLinux dnslinux=new DnsLinux();
18 private Vector<String> vStr;
19 private Vector<DnsBean> vDbns;
20
21 public Vector<DnsBean> getAllDnsBean() {
22 return dnslinux.getAllDns();
23
24 }
25
26
27
28 public boolean Upd(Vector<DnsBean> beans) {
29
30 return dnslinux.Config(beans);
31
32 }
33
34
35
36
37
38 }
...\ No newline at end of file ...\ No newline at end of file
1 package org.emercit.service;
2
3
4 import org.emercit.model.IPAddressValidator;
5
6 import java.util.Vector;
7
8 import org.emercit.ethmanager.model.EthBean;
9 import org.emercit.ethmanager.service.EthLinux;
10
11
12
13 public enum EthService {
14
15 INSTANCE;
16
17 private EthLinux ethlinux=new EthLinux();
18 private Vector<String> vStr;
19 private Vector<EthBean> vEbns;
20
21 public Vector<EthBean> getAllEthbean() {
22
23 vEbns=new Vector<EthBean>();
24 vStr=ethlinux.getListEth();
25
26 for (String val:vStr) {
27 EthBean eb=ethlinux.getEthByName(val);
28
29 vEbns.add(eb);
30 }
31
32 return vEbns;
33 }
34
35 public boolean ApplyConfig(EthBean eb) {
36
37 //return ethlinux.;
38 return true;
39 }
40
41 public EthBean getByName(String value) {
42
43 return ethlinux.getEthByName(value);
44
45 }
46
47
48 public boolean Upd(EthBean m) {
49
50
51 return ethlinux.Update(m);
52
53
54 }
55
56
57 }
58
...\ No newline at end of file ...\ No newline at end of file
1 package org.emercit.service;
2
3
4 import org.emercit.model.NetBean;
5 import org.emercit.model.EthBean;
6 import org.emercit.model.DnsBean;
7 import org.emercit.model.ProxyBean;
8
9
10
11
12 import org.emercit.model.IPAddressValidator;
13
14 import java.util.Vector;
15
16 public enum NetService {
17
18 INSTANCE;
19
20 private IPAddressValidator ipvalidator=new IPAddressValidator();
21
22 private CommandExecutor ce=new CommandExecutor();
23
24 private NetBean nb=new NetBean();
25
26
27
28 private final String urlZabixAgent="zabbix_get -s 127.0.0.1 -p 10050 -k";
29
30
31 public NetBean get(String eth) throws Exception {
32
33 nb.setEthName(eth);
34
35 String strUseDhcp=ce.Run(urlZabixAgent+" 'custom.utils.net.eth.usedhcp['"+eth+"'"+"]'").get(1);
36
37 if (!strUseDhcp.equals("dhcp")) {
38 nb.setUseDhcp(false);
39 // Получение шлюза из файла /etc/networ/interfaces
40 nb.setGateway(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.gwstatic[]'").firstElement());
41
42 nb.setMac(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.mac["+eth+"]'").firstElement());
43 nb.setIp(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.addrstatic[]'").firstElement());
44 nb.setBroadcast(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.bcaststatic[]'").firstElement());
45 nb.setNetmask(ce.Run(urlZabixAgent+ " 'custom.utils.net.eth.netmaskstatic[]'").firstElement());
46
47
48 }else {
49 nb.setUseDhcp(true);
50 // Получение шлюза по умолчанию
51 nb.setGateway(ce.Run(urlZabixAgent+" 'custom.utils.net.gwdefault[]'").firstElement());
52
53 nb.setMac(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.mac["+eth+"]'").firstElement());
54 nb.setIp(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.inetaddr["+eth+"]'").firstElement());
55 nb.setBroadcast(ce.Run(urlZabixAgent+" 'custom.utils.net.eth.bcast["+eth+"]'").firstElement());
56 nb.setNetmask(ce.Run(urlZabixAgent+ " 'custom.utils.net.eth.mask["+eth+"]'").firstElement());
57 }
58
59
60 // ExtInfo
61 Vector<String> buff=ce.Run(urlZabixAgent+ " 'custom.utils.net.extinfo["+eth+"]'");
62
63 buff.remove(0);
64 buff.remove(0);
65
66 for (int i=0;i<buff.size();i++) {
67
68 String v=buff.get(i).trim();
69
70 buff.remove(i);
71 buff.insertElementAt(v, i);
72 }
73
74
75 nb.setExtInfo(buff);
76
77
78 return nb;
79 }
80
81 public Vector<String> set(NetBean m) throws Exception{
82
83 Vector<String> result=new Vector<String>();
84
85
86 if (!ipvalidator.validate(m.getIp())) {
87 new Exception(m.getIp()+"- неверный формат");
88 }
89
90 if (!ipvalidator.validate(m.getNetmask())) {
91 new Exception(m.getNetmask()+"- неверный формат");
92 }
93
94 if (!ipvalidator.validate(m.getGateway())) {
95 new Exception(m.getGateway()+"- неверный формат");
96 }
97
98 if (m.getUseDhcp()) {
99
100 ce.Run("");
101
102 }else {
103
104
105 ce.Run("");
106
107 }
108
109
110
111 this.nb=m;
112
113
114
115 return result;
116 }
117
118
119 public Vector<EthBean> getAllEth() throws Exception {
120
121 Vector<EthBean> result=new Vector<EthBean>();
122
123 Vector<String> v=ce.Run("zabbix_get -s 127.0.0.1 -p 10050 -k 'custom.utils.net.eths[]'");
124 int i=0;
125 for (String s:v) {
126
127 EthBean eb=new EthBean();
128 eb.setId(i);
129 eb.setEth(s);
130 result.add(eb);
131 i++;
132 }
133 return result;
134 }
135
136
137 public Vector<DnsBean> getDns() throws Exception {
138
139
140 Vector<DnsBean> result=new Vector<DnsBean>();
141
142 Vector<String> v=ce.Run("zabbix_get -s 127.0.0.1 -p 10050 -k 'custom.utils.net.dns[]'");
143 int i=0;
144 for (String s:v) {
145
146 DnsBean db=new DnsBean();
147 db.setId(i);
148 db.setDns(s);
149 result.add(db);
150 i++;
151 }
152 return result;
153
154
155 }
156
157
158 public Vector<ProxyBean> getProxy() throws Exception {
159
160
161 Vector<ProxyBean> result=new Vector<ProxyBean>();
162
163 Vector<String> v=ce.Run("zabbix_get -s 127.0.0.1 -p 10050 -k 'custom.utils.net.globalproxy[]'");
164 int i=0;
165 for (String s:v) {
166
167 ProxyBean db=new ProxyBean();
168 db.setId(i);
169 db.setProxy(s);
170 result.add(db);
171 i++;
172 }
173 return result;
174
175
176
177
178
179 }
180
181
182 }
1 package org.emercit.service;
2
3 public class UtilService {
4
5
6
7
8
9 }
1
2 FTDKERNEL-MIB DEFINITIONS ::= BEGIN
3
4 IMPORTS
5 NOTIFICATION-TYPE, OBJECT-TYPE, MODULE-IDENTITY,
6 enterprises, Integer32
7 FROM SNMPv2-SMI;
8
9 ftdkernel MODULE-IDENTITY
10 LAST-UPDATED "201408141315Z"
11 ORGANIZATION
12 "E M E R C I T"
13 CONTACT-INFO
14 "Krasnodar, Vishnikova 2"
15 DESCRIPTION
16 ""
17 ::= { prjUFK 1 }
18
19 emercit OBJECT IDENTIFIER ::= { enterprises 43896 }
20 prjUFK OBJECT IDENTIFIER ::= { emercit 7 }
21 aligners OBJECT IDENTIFIER ::= { ftdkernel 1 }
22 aligner OBJECT IDENTIFIER ::= { aligners 1 }
23 prime OBJECT IDENTIFIER ::= { aligner 1 }
24 bounds OBJECT IDENTIFIER ::= { aligner 2 }
25 conditioner1 OBJECT IDENTIFIER ::= { aligner 3 }
26 conditioner2 OBJECT IDENTIFIER ::= { aligner 4 }
27 conditioner3 OBJECT IDENTIFIER ::= { aligner 5 }
28 params OBJECT IDENTIFIER ::= { aligner 6 }
29 configuration OBJECT IDENTIFIER ::= { aligner 7 }
30 repair OBJECT IDENTIFIER ::= { aligner 8 }
31 status OBJECT IDENTIFIER ::= { aligner 9 }
32 commands OBJECT IDENTIFIER ::= { aligner 10 }
33 eventsAligner OBJECT IDENTIFIER ::= { aligner 11 }
34 sensorst OBJECT IDENTIFIER ::= { ftdkernel 2 }
35 sensorT1 OBJECT IDENTIFIER ::= { sensorst 1 }
36 primeT1 OBJECT IDENTIFIER ::= { sensorT1 1 }
37 statusT1 OBJECT IDENTIFIER ::= { sensorT1 2 }
38 boundsT1 OBJECT IDENTIFIER ::= { sensorT1 3 }
39 limitsT1 OBJECT IDENTIFIER ::= { sensorT1 4 }
40 commandsT1 OBJECT IDENTIFIER ::= { sensorT1 5 }
41 eventsT1 OBJECT IDENTIFIER ::= { sensorT1 6 }
42 sensorT2 OBJECT IDENTIFIER ::= { sensorst 2 }
43 primeT2 OBJECT IDENTIFIER ::= { sensorT2 1 }
44 statusT2 OBJECT IDENTIFIER ::= { sensorT2 2 }
45 boundsT2 OBJECT IDENTIFIER ::= { sensorT2 3 }
46 limitsT2 OBJECT IDENTIFIER ::= { sensorT2 4 }
47 commandsT2 OBJECT IDENTIFIER ::= { sensorT2 5 }
48 eventsT2 OBJECT IDENTIFIER ::= { sensorT2 6 }
49 sensorT3 OBJECT IDENTIFIER ::= { sensorst 3 }
50 primeT3 OBJECT IDENTIFIER ::= { sensorT3 1 }
51 statusT3 OBJECT IDENTIFIER ::= { sensorT3 2 }
52 boundsT3 OBJECT IDENTIFIER ::= { sensorT3 3 }
53 limitsT3 OBJECT IDENTIFIER ::= { sensorT3 4 }
54 commandsT3 OBJECT IDENTIFIER ::= { sensorT3 5 }
55 eventsT3 OBJECT IDENTIFIER ::= { sensorT3 6 }
56 sensorT4 OBJECT IDENTIFIER ::= { sensorst 4 }
57 primeT4 OBJECT IDENTIFIER ::= { sensorT4 1 }
58 statusT4 OBJECT IDENTIFIER ::= { sensorT4 2 }
59 boundsT4 OBJECT IDENTIFIER ::= { sensorT4 3 }
60 limitsT4 OBJECT IDENTIFIER ::= { sensorT4 4 }
61 commandsT4 OBJECT IDENTIFIER ::= { sensorT4 5 }
62 eventsT4 OBJECT IDENTIFIER ::= { sensorT4 6 }
63 sensorsth OBJECT IDENTIFIER ::= { ftdkernel 3 }
64 sensorTH1 OBJECT IDENTIFIER ::= { sensorsth 1 }
65 primeTH1 OBJECT IDENTIFIER ::= { sensorTH1 1 }
66 boundsTH1 OBJECT IDENTIFIER ::= { sensorTH1 2 }
67 cnfSensorTTH1 OBJECT IDENTIFIER ::= { sensorTH1 3 }
68 cnfSensorHTH1 OBJECT IDENTIFIER ::= { sensorTH1 4 }
69 limitsTH1 OBJECT IDENTIFIER ::= { sensorTH1 5 }
70 statusTempTH1 OBJECT IDENTIFIER ::= { sensorTH1 6 }
71 statusHumTH1 OBJECT IDENTIFIER ::= { sensorTH1 7 }
72 commandsTH1 OBJECT IDENTIFIER ::= { sensorTH1 8 }
73 eventsTH1 OBJECT IDENTIFIER ::= { sensorTH1 9 }
74 sensorTH2 OBJECT IDENTIFIER ::= { sensorsth 2 }
75 primeTH2 OBJECT IDENTIFIER ::= { sensorTH2 1 }
76 boundsTH2 OBJECT IDENTIFIER ::= { sensorTH2 2 }
77 cnfSensorTTH2 OBJECT IDENTIFIER ::= { sensorTH2 3 }
78 cnfSensorHTH2 OBJECT IDENTIFIER ::= { sensorTH2 4 }
79 limitsTH2 OBJECT IDENTIFIER ::= { sensorTH2 5 }
80 statusTempTH2 OBJECT IDENTIFIER ::= { sensorTH2 6 }
81 statusHumTH2 OBJECT IDENTIFIER ::= { sensorTH2 7 }
82 commandsTH2 OBJECT IDENTIFIER ::= { sensorTH2 8 }
83 eventsTH2 OBJECT IDENTIFIER ::= { sensorTH2 9 }
84 firesystems OBJECT IDENTIFIER ::= { ftdkernel 4 }
85 firesystem OBJECT IDENTIFIER ::= { firesystems 1 }
86 primeFSys OBJECT IDENTIFIER ::= { firesystem 1 }
87 boundsFSys OBJECT IDENTIFIER ::= { firesystem 2 }
88 paramsFSys OBJECT IDENTIFIER ::= { firesystem 3 }
89 commandsFSys OBJECT IDENTIFIER ::= { firesystem 4 }
90 statusFSys OBJECT IDENTIFIER ::= { firesystem 5 }
91 eventsFireSystem OBJECT IDENTIFIER ::= { firesystem 6 }
92 systems OBJECT IDENTIFIER ::= { ftdkernel 5 }
93 ufk OBJECT IDENTIFIER ::= { systems 1 }
94 primeufk OBJECT IDENTIFIER ::= { ufk 1 }
95 commandsufk OBJECT IDENTIFIER ::= { ufk 2 }
96 eventsUfk OBJECT IDENTIFIER ::= { ufk 3 }
97
98 primeEnabled OBJECT-TYPE
99 SYNTAX Integer32
100 MAX-ACCESS read-write
101 STATUS current
102 DESCRIPTION
103 ""
104 ::= { prime 1 }
105
106 primeTitle OBJECT-TYPE
107 SYNTAX OCTET STRING
108 MAX-ACCESS read-write
109 STATUS current
110 DESCRIPTION
111 ""
112 ::= { prime 2 }
113
114 primeGuid OBJECT-TYPE
115 SYNTAX OCTET STRING
116 UNITS "1"
117 MAX-ACCESS read-write
118 STATUS current
119 DESCRIPTION
120 ""
121 ::= { prime 3 }
122
123 primeAddr OBJECT-TYPE
124 SYNTAX Integer32
125 MAX-ACCESS read-write
126 STATUS current
127 DESCRIPTION
128 ""
129 ::= { prime 4 }
130
131 boundsX OBJECT-TYPE
132 SYNTAX Integer32
133 MAX-ACCESS read-write
134 STATUS current
135 DESCRIPTION
136 ""
137 ::= { bounds 1 }
138
139 boundsY OBJECT-TYPE
140 SYNTAX Integer32
141 MAX-ACCESS read-write
142 STATUS current
143 DESCRIPTION
144 ""
145 ::= { bounds 2 }
146
147 boundsWidth OBJECT-TYPE
148 SYNTAX Integer32
149 MAX-ACCESS read-write
150 STATUS current
151 DESCRIPTION
152 ""
153 ::= { bounds 3 }
154
155 boundsHeight OBJECT-TYPE
156 SYNTAX Integer32
157 MAX-ACCESS read-write
158 STATUS current
159 DESCRIPTION
160 ""
161 ::= { bounds 4 }
162
163 conditioner1Enabled OBJECT-TYPE
164 SYNTAX Integer32
165 MAX-ACCESS read-write
166 STATUS current
167 DESCRIPTION
168 ""
169 ::= { conditioner1 1 }
170
171 conditioner1X OBJECT-TYPE
172 SYNTAX Integer32
173 MAX-ACCESS read-write
174 STATUS current
175 DESCRIPTION
176 ""
177 ::= { conditioner1 2 }
178
179 conditioner1Y OBJECT-TYPE
180 SYNTAX Integer32
181 MAX-ACCESS read-write
182 STATUS current
183 DESCRIPTION
184 ""
185 ::= { conditioner1 3 }
186
187 conditioner1Width OBJECT-TYPE
188 SYNTAX Integer32
189 MAX-ACCESS read-write
190 STATUS current
191 DESCRIPTION
192 ""
193 ::= { conditioner1 4 }
194
195 conditioner1Height OBJECT-TYPE
196 SYNTAX Integer32
197 MAX-ACCESS read-write
198 STATUS current
199 DESCRIPTION
200 ""
201 ::= { conditioner1 5 }
202
203 conditioner1Title OBJECT-TYPE
204 SYNTAX OCTET STRING
205 MAX-ACCESS read-write
206 STATUS current
207 DESCRIPTION
208 ""
209 ::= { conditioner1 6 }
210
211 conditioner2Enabled OBJECT-TYPE
212 SYNTAX Integer32
213 MAX-ACCESS read-write
214 STATUS current
215 DESCRIPTION
216 ""
217 ::= { conditioner2 1 }
218
219 conditioner2X OBJECT-TYPE
220 SYNTAX Integer32
221 MAX-ACCESS read-write
222 STATUS current
223 DESCRIPTION
224 ""
225 ::= { conditioner2 2 }
226
227 conditioner2Y OBJECT-TYPE
228 SYNTAX Integer32
229 MAX-ACCESS read-write
230 STATUS current
231 DESCRIPTION
232 ""
233 ::= { conditioner2 3 }
234
235 conditioner2Width OBJECT-TYPE
236 SYNTAX Integer32
237 MAX-ACCESS read-write
238 STATUS current
239 DESCRIPTION
240 ""
241 ::= { conditioner2 4 }
242
243 conditioner2Height OBJECT-TYPE
244 SYNTAX Integer32
245 MAX-ACCESS read-write
246 STATUS current
247 DESCRIPTION
248 ""
249 ::= { conditioner2 5 }
250
251 conditioner2Title OBJECT-TYPE
252 SYNTAX OCTET STRING
253 MAX-ACCESS read-write
254 STATUS current
255 DESCRIPTION
256 ""
257 ::= { conditioner2 6 }
258
259 conditioner3Enabled OBJECT-TYPE
260 SYNTAX Integer32
261 MAX-ACCESS read-write
262 STATUS current
263 DESCRIPTION
264 ""
265 ::= { conditioner3 1 }
266
267 conditioner3X OBJECT-TYPE
268 SYNTAX Integer32
269 MAX-ACCESS read-write
270 STATUS current
271 DESCRIPTION
272 ""
273 ::= { conditioner3 2 }
274
275 conditioner3Y OBJECT-TYPE
276 SYNTAX Integer32
277 MAX-ACCESS read-write
278 STATUS current
279 DESCRIPTION
280 ""
281 ::= { conditioner3 3 }
282
283 conditioner3Width OBJECT-TYPE
284 SYNTAX Integer32
285 MAX-ACCESS read-write
286 STATUS current
287 DESCRIPTION
288 ""
289 ::= { conditioner3 4 }
290
291 conditioner3Height OBJECT-TYPE
292 SYNTAX Integer32
293 MAX-ACCESS read-write
294 STATUS current
295 DESCRIPTION
296 ""
297 ::= { conditioner3 5 }
298
299 conditioner3Title OBJECT-TYPE
300 SYNTAX OCTET STRING
301 MAX-ACCESS read-write
302 STATUS current
303 DESCRIPTION
304 ""
305 ::= { conditioner3 6 }
306
307 paramsTemp OBJECT-TYPE
308 SYNTAX Integer32
309 MAX-ACCESS read-write
310 STATUS current
311 DESCRIPTION
312 ""
313 ::= { params 1 }
314
315 paramsError OBJECT-TYPE
316 SYNTAX Integer32
317 MAX-ACCESS read-write
318 STATUS current
319 DESCRIPTION
320 ""
321 ::= { params 2 }
322
323 paramsErrorCLR OBJECT-TYPE
324 SYNTAX Integer32
325 MAX-ACCESS read-write
326 STATUS current
327 DESCRIPTION
328 ""
329 ::= { params 3 }
330
331 configurationRelay1 OBJECT-TYPE
332 SYNTAX Integer32
333 MAX-ACCESS read-write
334 STATUS current
335 DESCRIPTION
336 ""
337 ::= { configuration 1 }
338
339 configurationRelay2 OBJECT-TYPE
340 SYNTAX Integer32
341 MAX-ACCESS read-write
342 STATUS current
343 DESCRIPTION
344 ""
345 ::= { configuration 2 }
346
347 configurationRelay3 OBJECT-TYPE
348 SYNTAX Integer32
349 MAX-ACCESS read-write
350 STATUS current
351 DESCRIPTION
352 ""
353 ::= { configuration 3 }
354
355 configurationLanguage OBJECT-TYPE
356 SYNTAX Integer32
357 MAX-ACCESS read-write
358 STATUS current
359 DESCRIPTION
360 ""
361 ::= { configuration 4 }
362
363 configurationZeroConditioners OBJECT-TYPE
364 SYNTAX Integer32
365 MAX-ACCESS read-write
366 STATUS current
367 DESCRIPTION
368 ""
369 ::= { configuration 5 }
370
371 configurationConditioner1 OBJECT-TYPE
372 SYNTAX Integer32
373 MAX-ACCESS read-write
374 STATUS current
375 DESCRIPTION
376 ""
377 ::= { configuration 6 }
378
379 configurationConditioner2 OBJECT-TYPE
380 SYNTAX Integer32
381 MAX-ACCESS read-write
382 STATUS current
383 DESCRIPTION
384 ""
385 ::= { configuration 7 }
386
387 configurationConditioner3 OBJECT-TYPE
388 SYNTAX Integer32
389 MAX-ACCESS read-write
390 STATUS current
391 DESCRIPTION
392 ""
393 ::= { configuration 8 }
394
395 repairConditioner1 OBJECT-TYPE
396 SYNTAX Integer32
397 MAX-ACCESS read-write
398 STATUS current
399 DESCRIPTION
400 ""
401 ::= { repair 1 }
402
403 repairConditioner2 OBJECT-TYPE
404 SYNTAX Integer32
405 MAX-ACCESS read-write
406 STATUS current
407 DESCRIPTION
408 ""
409 ::= { repair 2 }
410
411 repairConditioner3 OBJECT-TYPE
412 SYNTAX Integer32
413 MAX-ACCESS read-write
414 STATUS current
415 DESCRIPTION
416 ""
417 ::= { repair 3 }
418
419 repairTSensorRoom OBJECT-TYPE
420 SYNTAX Integer32
421 MAX-ACCESS read-write
422 STATUS current
423 DESCRIPTION
424 ""
425 ::= { repair 4 }
426
427 repairTSensorConditioner1 OBJECT-TYPE
428 SYNTAX Integer32
429 MAX-ACCESS read-write
430 STATUS current
431 DESCRIPTION
432 ""
433 ::= { repair 5 }
434
435 repairTSensorConditioner2 OBJECT-TYPE
436 SYNTAX Integer32
437 MAX-ACCESS read-write
438 STATUS current
439 DESCRIPTION
440 ""
441 ::= { repair 6 }
442
443 repairTSensorConditioner3 OBJECT-TYPE
444 SYNTAX Integer32
445 MAX-ACCESS read-write
446 STATUS current
447 DESCRIPTION
448 ""
449 ::= { repair 7 }
450
451 statusConditioner1 OBJECT-TYPE
452 SYNTAX Integer32
453 MAX-ACCESS read-write
454 STATUS current
455 DESCRIPTION
456 ""
457 ::= { status 1 }
458
459 statusConditioner2 OBJECT-TYPE
460 SYNTAX Integer32
461 MAX-ACCESS read-write
462 STATUS current
463 DESCRIPTION
464 ""
465 ::= { status 2 }
466
467 statusConditioner3 OBJECT-TYPE
468 SYNTAX Integer32
469 MAX-ACCESS read-write
470 STATUS current
471 DESCRIPTION
472 ""
473 ::= { status 3 }
474
475 statusLuminodiode OBJECT-TYPE
476 SYNTAX Integer32
477 MAX-ACCESS read-write
478 STATUS current
479 DESCRIPTION
480 ""
481 ::= { status 4 }
482
483 statusAlarmluminodiode OBJECT-TYPE
484 SYNTAX Integer32
485 MAX-ACCESS read-write
486 STATUS current
487 DESCRIPTION
488 ""
489 ::= { status 5 }
490
491 statusRun OBJECT-TYPE
492 SYNTAX Integer32
493 MAX-ACCESS read-write
494 STATUS current
495 DESCRIPTION
496 ""
497 ::= { status 6 }
498
499 statusMode OBJECT-TYPE
500 SYNTAX Integer32
501 MAX-ACCESS read-write
502 STATUS current
503 DESCRIPTION
504 ""
505 ::= { status 7 }
506
507 commandsReboot OBJECT-TYPE
508 SYNTAX Integer32
509 MAX-ACCESS read-write
510 STATUS current
511 DESCRIPTION
512 ""
513 ::= { commands 1 }
514
515 commandOn OBJECT-TYPE
516 SYNTAX Integer32
517 MAX-ACCESS read-write
518 STATUS current
519 DESCRIPTION
520 ""
521 ::= { commands 2 }
522
523 commandsOff OBJECT-TYPE
524 SYNTAX Integer32
525 MAX-ACCESS read-write
526 STATUS current
527 DESCRIPTION
528 ""
529 ::= { commands 3 }
530
531 commandsUpdate OBJECT-TYPE
532 SYNTAX Integer32
533 MAX-ACCESS read-write
534 STATUS current
535 DESCRIPTION
536 ""
537 ::= { commands 4 }
538
539 eventAlignerStatus NOTIFICATION-TYPE
540 STATUS current
541 DESCRIPTION
542 ""
543 ::= { eventsAligner 1 }
544
545 eventAlignerRepair NOTIFICATION-TYPE
546 STATUS current
547 DESCRIPTION
548 ""
549 ::= { eventsAligner 2 }
550
551 eventAlignerConfiguration NOTIFICATION-TYPE
552 STATUS current
553 DESCRIPTION
554 ""
555 ::= { eventsAligner 3 }
556
557 eventAlignerUpdate NOTIFICATION-TYPE
558 STATUS current
559 DESCRIPTION
560 ""
561 ::= { eventsAligner 4 }
562
563 eventAlignerError NOTIFICATION-TYPE
564 STATUS current
565 DESCRIPTION
566 ""
567 ::= { eventsAligner 5 }
568
569 primeT1Guid OBJECT-TYPE
570 SYNTAX OCTET STRING
571 MAX-ACCESS read-write
572 STATUS current
573 DESCRIPTION
574 ""
575 ::= { primeT1 1 }
576
577 primeT1Title OBJECT-TYPE
578 SYNTAX OCTET STRING
579 MAX-ACCESS read-write
580 STATUS current
581 DESCRIPTION
582 ""
583 ::= { primeT1 2 }
584
585 primeT1Addr OBJECT-TYPE
586 SYNTAX Integer32
587 MAX-ACCESS read-write
588 STATUS current
589 DESCRIPTION
590 ""
591 ::= { primeT1 3 }
592
593 primeT1Reg OBJECT-TYPE
594 SYNTAX Integer32
595 MAX-ACCESS read-write
596 STATUS current
597 DESCRIPTION
598 ""
599 ::= { primeT1 4 }
600
601 primeT1Enabled OBJECT-TYPE
602 SYNTAX Integer32
603 MAX-ACCESS read-write
604 STATUS current
605 DESCRIPTION
606 ""
607 ::= { primeT1 5 }
608
609 statusT1Value OBJECT-TYPE
610 SYNTAX Integer32
611 MAX-ACCESS read-write
612 STATUS current
613 DESCRIPTION
614 ""
615 ::= { statusT1 1 }
616
617 statusT1Error OBJECT-TYPE
618 SYNTAX Integer32
619 MAX-ACCESS read-write
620 STATUS current
621 DESCRIPTION
622 ""
623 ::= { statusT1 2 }
624
625 statusT1Alarm OBJECT-TYPE
626 SYNTAX Integer32
627 MAX-ACCESS read-write
628 STATUS current
629 DESCRIPTION
630 ""
631 ::= { statusT1 3 }
632
633 boundsT1X OBJECT-TYPE
634 SYNTAX Integer32
635 MAX-ACCESS read-write
636 STATUS current
637 DESCRIPTION
638 ""
639 ::= { boundsT1 1 }
640
641 boundsT1Y OBJECT-TYPE
642 SYNTAX Integer32
643 MAX-ACCESS read-write
644 STATUS current
645 DESCRIPTION
646 ""
647 ::= { boundsT1 2 }
648
649 boundsT1Width OBJECT-TYPE
650 SYNTAX Integer32
651 MAX-ACCESS read-write
652 STATUS current
653 DESCRIPTION
654 ""
655 ::= { boundsT1 3 }
656
657 boundsT1Height OBJECT-TYPE
658 SYNTAX Integer32
659 MAX-ACCESS read-write
660 STATUS current
661 DESCRIPTION
662 ""
663 ::= { boundsT1 4 }
664
665 limitsT1Limit1 OBJECT-TYPE
666 SYNTAX Integer32
667 MAX-ACCESS read-write
668 STATUS current
669 DESCRIPTION
670 ""
671 ::= { limitsT1 1 }
672
673 limitsT1Limit2 OBJECT-TYPE
674 SYNTAX Integer32
675 MAX-ACCESS read-write
676 STATUS current
677 DESCRIPTION
678 ""
679 ::= { limitsT1 2 }
680
681 commandsT1Update OBJECT-TYPE
682 SYNTAX Integer32
683 MAX-ACCESS read-write
684 STATUS current
685 DESCRIPTION
686 ""
687 ::= { commandsT1 1 }
688
689 eventT1Alarm NOTIFICATION-TYPE
690 STATUS current
691 DESCRIPTION
692 ""
693 ::= { eventsT1 1 }
694
695 eventT1Update NOTIFICATION-TYPE
696 STATUS current
697 DESCRIPTION
698 ""
699 ::= { eventsT1 2 }
700
701 eventT1Error NOTIFICATION-TYPE
702 STATUS current
703 DESCRIPTION
704 ""
705 ::= { eventsT1 3 }
706
707 primeT2Guid OBJECT-TYPE
708 SYNTAX OCTET STRING
709 MAX-ACCESS read-write
710 STATUS current
711 DESCRIPTION
712 ""
713 ::= { primeT2 1 }
714
715 primeT2Title OBJECT-TYPE
716 SYNTAX OCTET STRING
717 MAX-ACCESS read-write
718 STATUS current
719 DESCRIPTION
720 ""
721 ::= { primeT2 2 }
722
723 primeT2Addr OBJECT-TYPE
724 SYNTAX Integer32
725 MAX-ACCESS read-write
726 STATUS current
727 DESCRIPTION
728 ""
729 ::= { primeT2 3 }
730
731 primeT2Reg OBJECT-TYPE
732 SYNTAX Integer32
733 MAX-ACCESS read-write
734 STATUS current
735 DESCRIPTION
736 ""
737 ::= { primeT2 4 }
738
739 primeT2Enabled OBJECT-TYPE
740 SYNTAX Integer32
741 MAX-ACCESS read-write
742 STATUS current
743 DESCRIPTION
744 ""
745 ::= { primeT2 5 }
746
747 statusT2Value OBJECT-TYPE
748 SYNTAX Integer32
749 MAX-ACCESS read-write
750 STATUS current
751 DESCRIPTION
752 ""
753 ::= { statusT2 1 }
754
755 statusT2Error OBJECT-TYPE
756 SYNTAX Integer32
757 MAX-ACCESS read-write
758 STATUS current
759 DESCRIPTION
760 ""
761 ::= { statusT2 2 }
762
763 statusT2Alarm OBJECT-TYPE
764 SYNTAX Integer32
765 MAX-ACCESS read-write
766 STATUS current
767 DESCRIPTION
768 ""
769 ::= { statusT2 3 }
770
771 boundsT2X OBJECT-TYPE
772 SYNTAX Integer32
773 MAX-ACCESS read-write
774 STATUS current
775 DESCRIPTION
776 ""
777 ::= { boundsT2 1 }
778
779 boundsT2Y OBJECT-TYPE
780 SYNTAX Integer32
781 MAX-ACCESS read-write
782 STATUS current
783 DESCRIPTION
784 ""
785 ::= { boundsT2 2 }
786
787 boundsT2Width OBJECT-TYPE
788 SYNTAX Integer32
789 MAX-ACCESS read-write
790 STATUS current
791 DESCRIPTION
792 ""
793 ::= { boundsT2 3 }
794
795 boundsT2Height OBJECT-TYPE
796 SYNTAX Integer32
797 MAX-ACCESS read-write
798 STATUS current
799 DESCRIPTION
800 ""
801 ::= { boundsT2 4 }
802
803 limitsT2Limit1 OBJECT-TYPE
804 SYNTAX Integer32
805 MAX-ACCESS read-write
806 STATUS current
807 DESCRIPTION
808 ""
809 ::= { limitsT2 1 }
810
811 limitsT2Limit2 OBJECT-TYPE
812 SYNTAX Integer32
813 MAX-ACCESS read-write
814 STATUS current
815 DESCRIPTION
816 ""
817 ::= { limitsT2 2 }
818
819 commandsT2Update OBJECT-TYPE
820 SYNTAX Integer32
821 MAX-ACCESS read-write
822 STATUS current
823 DESCRIPTION
824 ""
825 ::= { commandsT2 1 }
826
827 eventT2Alarm NOTIFICATION-TYPE
828 STATUS current
829 DESCRIPTION
830 ""
831 ::= { eventsT2 1 }
832
833 eventT2Update NOTIFICATION-TYPE
834 STATUS current
835 DESCRIPTION
836 ""
837 ::= { eventsT2 2 }
838
839 eventT2Error NOTIFICATION-TYPE
840 STATUS current
841 DESCRIPTION
842 ""
843 ::= { eventsT2 3 }
844
845 primeT3Guid OBJECT-TYPE
846 SYNTAX OCTET STRING
847 MAX-ACCESS read-write
848 STATUS current
849 DESCRIPTION
850 ""
851 ::= { primeT3 1 }
852
853 primeT3Title OBJECT-TYPE
854 SYNTAX OCTET STRING
855 MAX-ACCESS read-write
856 STATUS current
857 DESCRIPTION
858 ""
859 ::= { primeT3 2 }
860
861 primeT3Addr OBJECT-TYPE
862 SYNTAX Integer32
863 MAX-ACCESS read-write
864 STATUS current
865 DESCRIPTION
866 ""
867 ::= { primeT3 3 }
868
869 primeT3Reg OBJECT-TYPE
870 SYNTAX Integer32
871 MAX-ACCESS read-write
872 STATUS current
873 DESCRIPTION
874 ""
875 ::= { primeT3 4 }
876
877 primeT3Enabled OBJECT-TYPE
878 SYNTAX Integer32
879 MAX-ACCESS read-write
880 STATUS current
881 DESCRIPTION
882 ""
883 ::= { primeT3 5 }
884
885 statusT3Value OBJECT-TYPE
886 SYNTAX Integer32
887 MAX-ACCESS read-write
888 STATUS current
889 DESCRIPTION
890 ""
891 ::= { statusT3 1 }
892
893 statusT3Error OBJECT-TYPE
894 SYNTAX Integer32
895 MAX-ACCESS read-write
896 STATUS current
897 DESCRIPTION
898 ""
899 ::= { statusT3 2 }
900
901 statusT3Alarm OBJECT-TYPE
902 SYNTAX Integer32
903 MAX-ACCESS read-write
904 STATUS current
905 DESCRIPTION
906 ""
907 ::= { statusT3 3 }
908
909 boundsT3X OBJECT-TYPE
910 SYNTAX Integer32
911 MAX-ACCESS read-write
912 STATUS current
913 DESCRIPTION
914 ""
915 ::= { boundsT3 1 }
916
917 boundsT3Y OBJECT-TYPE
918 SYNTAX Integer32
919 MAX-ACCESS read-write
920 STATUS current
921 DESCRIPTION
922 ""
923 ::= { boundsT3 2 }
924
925 boundsT3Width OBJECT-TYPE
926 SYNTAX Integer32
927 MAX-ACCESS read-write
928 STATUS current
929 DESCRIPTION
930 ""
931 ::= { boundsT3 3 }
932
933 boundsT3Height OBJECT-TYPE
934 SYNTAX Integer32
935 MAX-ACCESS read-write
936 STATUS current
937 DESCRIPTION
938 ""
939 ::= { boundsT3 4 }
940
941 limitsT3Limit1 OBJECT-TYPE
942 SYNTAX Integer32
943 MAX-ACCESS read-write
944 STATUS current
945 DESCRIPTION
946 ""
947 ::= { limitsT3 1 }
948
949 limitsT3Limit2 OBJECT-TYPE
950 SYNTAX Integer32
951 MAX-ACCESS read-write
952 STATUS current
953 DESCRIPTION
954 ""
955 ::= { limitsT3 2 }
956
957 commandsT3Update OBJECT-TYPE
958 SYNTAX Integer32
959 MAX-ACCESS read-write
960 STATUS current
961 DESCRIPTION
962 ""
963 ::= { commandsT3 1 }
964
965 eventT3Alarm NOTIFICATION-TYPE
966 STATUS current
967 DESCRIPTION
968 ""
969 ::= { eventsT3 1 }
970
971 eventT3Update NOTIFICATION-TYPE
972 STATUS current
973 DESCRIPTION
974 ""
975 ::= { eventsT3 2 }
976
977 eventT3Error NOTIFICATION-TYPE
978 STATUS current
979 DESCRIPTION
980 ""
981 ::= { eventsT3 3 }
982
983 primeT4Guid OBJECT-TYPE
984 SYNTAX OCTET STRING
985 MAX-ACCESS read-write
986 STATUS current
987 DESCRIPTION
988 ""
989 ::= { primeT4 1 }
990
991 primeT4Title OBJECT-TYPE
992 SYNTAX OCTET STRING
993 MAX-ACCESS read-write
994 STATUS current
995 DESCRIPTION
996 ""
997 ::= { primeT4 2 }
998
999 primeT4Addr OBJECT-TYPE
1000 SYNTAX Integer32
1001 MAX-ACCESS read-write
1002 STATUS current
1003 DESCRIPTION
1004 ""
1005 ::= { primeT4 3 }
1006
1007 primeT4Reg OBJECT-TYPE
1008 SYNTAX Integer32
1009 MAX-ACCESS read-write
1010 STATUS current
1011 DESCRIPTION
1012 ""
1013 ::= { primeT4 4 }
1014
1015 primeT4Enabled OBJECT-TYPE
1016 SYNTAX Integer32
1017 MAX-ACCESS read-write
1018 STATUS current
1019 DESCRIPTION
1020 ""
1021 ::= { primeT4 5 }
1022
1023 statusT4Value OBJECT-TYPE
1024 SYNTAX Integer32
1025 MAX-ACCESS read-write
1026 STATUS current
1027 DESCRIPTION
1028 ""
1029 ::= { statusT4 1 }
1030
1031 statusT4Error OBJECT-TYPE
1032 SYNTAX Integer32
1033 MAX-ACCESS read-write
1034 STATUS current
1035 DESCRIPTION
1036 ""
1037 ::= { statusT4 2 }
1038
1039 statusT4Alarm OBJECT-TYPE
1040 SYNTAX Integer32
1041 MAX-ACCESS read-write
1042 STATUS current
1043 DESCRIPTION
1044 ""
1045 ::= { statusT4 3 }
1046
1047 boundsT4X OBJECT-TYPE
1048 SYNTAX Integer32
1049 MAX-ACCESS read-write
1050 STATUS current
1051 DESCRIPTION
1052 ""
1053 ::= { boundsT4 1 }
1054
1055 boundsT4Y OBJECT-TYPE
1056 SYNTAX Integer32
1057 MAX-ACCESS read-write
1058 STATUS current
1059 DESCRIPTION
1060 ""
1061 ::= { boundsT4 2 }
1062
1063 boundsT4Width OBJECT-TYPE
1064 SYNTAX Integer32
1065 MAX-ACCESS read-write
1066 STATUS current
1067 DESCRIPTION
1068 ""
1069 ::= { boundsT4 3 }
1070
1071 boundsT4Height OBJECT-TYPE
1072 SYNTAX Integer32
1073 MAX-ACCESS read-write
1074 STATUS current
1075 DESCRIPTION
1076 ""
1077 ::= { boundsT4 4 }
1078
1079 limitsT4Limit1 OBJECT-TYPE
1080 SYNTAX Integer32
1081 MAX-ACCESS read-write
1082 STATUS current
1083 DESCRIPTION
1084 ""
1085 ::= { limitsT4 1 }
1086
1087 limitsT4Limit2 OBJECT-TYPE
1088 SYNTAX Integer32
1089 MAX-ACCESS read-write
1090 STATUS current
1091 DESCRIPTION
1092 ""
1093 ::= { limitsT4 2 }
1094
1095 commandsT4Update OBJECT-TYPE
1096 SYNTAX Integer32
1097 MAX-ACCESS read-write
1098 STATUS current
1099 DESCRIPTION
1100 ""
1101 ::= { commandsT4 1 }
1102
1103 eventT4Alarm NOTIFICATION-TYPE
1104 STATUS current
1105 DESCRIPTION
1106 ""
1107 ::= { eventsT4 1 }
1108
1109 eventT4Update NOTIFICATION-TYPE
1110 STATUS current
1111 DESCRIPTION
1112 ""
1113 ::= { eventsT4 2 }
1114
1115 eventT4Error NOTIFICATION-TYPE
1116 STATUS current
1117 DESCRIPTION
1118 ""
1119 ::= { eventsT4 3 }
1120
1121 primeTH1Guid OBJECT-TYPE
1122 SYNTAX OCTET STRING
1123 MAX-ACCESS read-write
1124 STATUS current
1125 DESCRIPTION
1126 ""
1127 ::= { primeTH1 1 }
1128
1129 primeTH1Title OBJECT-TYPE
1130 SYNTAX OCTET STRING
1131 MAX-ACCESS read-write
1132 STATUS current
1133 DESCRIPTION
1134 ""
1135 ::= { primeTH1 2 }
1136
1137 primeTH1Enabled OBJECT-TYPE
1138 SYNTAX Integer32
1139 MAX-ACCESS read-write
1140 STATUS current
1141 DESCRIPTION
1142 ""
1143 ::= { primeTH1 3 }
1144
1145 boundsTH1X OBJECT-TYPE
1146 SYNTAX Integer32
1147 MAX-ACCESS read-write
1148 STATUS current
1149 DESCRIPTION
1150 ""
1151 ::= { boundsTH1 1 }
1152
1153 boundsTH1Y OBJECT-TYPE
1154 SYNTAX Integer32
1155 MAX-ACCESS read-write
1156 STATUS current
1157 DESCRIPTION
1158 ""
1159 ::= { boundsTH1 2 }
1160
1161 boundsTH1Width OBJECT-TYPE
1162 SYNTAX Integer32
1163 MAX-ACCESS read-write
1164 STATUS current
1165 DESCRIPTION
1166 ""
1167 ::= { boundsTH1 3 }
1168
1169 boundsTH1Height OBJECT-TYPE
1170 SYNTAX Integer32
1171 MAX-ACCESS read-write
1172 STATUS current
1173 DESCRIPTION
1174 ""
1175 ::= { boundsTH1 4 }
1176
1177 cnfSensorTTH1Addr OBJECT-TYPE
1178 SYNTAX Integer32
1179 MAX-ACCESS read-write
1180 STATUS current
1181 DESCRIPTION
1182 ""
1183 ::= { cnfSensorTTH1 1 }
1184
1185 cnfSensorTTH1Reg OBJECT-TYPE
1186 SYNTAX Integer32
1187 MAX-ACCESS read-write
1188 STATUS current
1189 DESCRIPTION
1190 ""
1191 ::= { cnfSensorTTH1 2 }
1192
1193 cnfSensorHTH1Addr OBJECT-TYPE
1194 SYNTAX Integer32
1195 MAX-ACCESS read-write
1196 STATUS current
1197 DESCRIPTION
1198 ""
1199 ::= { cnfSensorHTH1 1 }
1200
1201 cnfSensorHTH1Reg OBJECT-TYPE
1202 SYNTAX Integer32
1203 MAX-ACCESS read-write
1204 STATUS current
1205 DESCRIPTION
1206 ""
1207 ::= { cnfSensorHTH1 2 }
1208
1209 limitsTH1LimitT1 OBJECT-TYPE
1210 SYNTAX Integer32
1211 MAX-ACCESS read-write
1212 STATUS current
1213 DESCRIPTION
1214 ""
1215 ::= { limitsTH1 1 }
1216
1217 limitsTH1LimitT2 OBJECT-TYPE
1218 SYNTAX Integer32
1219 MAX-ACCESS read-write
1220 STATUS current
1221 DESCRIPTION
1222 ""
1223 ::= { limitsTH1 2 }
1224
1225 limitsTH1LimitH1 OBJECT-TYPE
1226 SYNTAX Integer32
1227 MAX-ACCESS read-write
1228 STATUS current
1229 DESCRIPTION
1230 ""
1231 ::= { limitsTH1 3 }
1232
1233 limitsTH1LimitH2 OBJECT-TYPE
1234 SYNTAX Integer32
1235 MAX-ACCESS read-write
1236 STATUS current
1237 DESCRIPTION
1238 ""
1239 ::= { limitsTH1 4 }
1240
1241 statusTempTH1Value OBJECT-TYPE
1242 SYNTAX Integer32
1243 MAX-ACCESS read-write
1244 STATUS current
1245 DESCRIPTION
1246 ""
1247 ::= { statusTempTH1 1 }
1248
1249 statusTempTH1Error OBJECT-TYPE
1250 SYNTAX Integer32
1251 MAX-ACCESS read-write
1252 STATUS current
1253 DESCRIPTION
1254 ""
1255 ::= { statusTempTH1 2 }
1256
1257 statusTempTH1Alarm OBJECT-TYPE
1258 SYNTAX Integer32
1259 MAX-ACCESS read-write
1260 STATUS current
1261 DESCRIPTION
1262 ""
1263 ::= { statusTempTH1 3 }
1264
1265 statusHumTH1Value OBJECT-TYPE
1266 SYNTAX Integer32
1267 MAX-ACCESS read-write
1268 STATUS current
1269 DESCRIPTION
1270 ""
1271 ::= { statusHumTH1 1 }
1272
1273 statusHumTH1Error OBJECT-TYPE
1274 SYNTAX Integer32
1275 MAX-ACCESS read-write
1276 STATUS current
1277 DESCRIPTION
1278 ""
1279 ::= { statusHumTH1 2 }
1280
1281 statusHumTH1Alarm OBJECT-TYPE
1282 SYNTAX Integer32
1283 MAX-ACCESS read-write
1284 STATUS current
1285 DESCRIPTION
1286 ""
1287 ::= { statusHumTH1 3 }
1288
1289 commandsTH1Update OBJECT-TYPE
1290 SYNTAX Integer32
1291 MAX-ACCESS read-write
1292 STATUS current
1293 DESCRIPTION
1294 ""
1295 ::= { commandsTH1 1 }
1296
1297 eventTH1Alarm NOTIFICATION-TYPE
1298 STATUS current
1299 DESCRIPTION
1300 ""
1301 ::= { eventsTH1 1 }
1302
1303 eventTH1Update NOTIFICATION-TYPE
1304 STATUS current
1305 DESCRIPTION
1306 ""
1307 ::= { eventsTH1 2 }
1308
1309 eventTH1Error NOTIFICATION-TYPE
1310 STATUS current
1311 DESCRIPTION
1312 ""
1313 ::= { eventsTH1 3 }
1314
1315 primeTH2Guid OBJECT-TYPE
1316 SYNTAX OCTET STRING
1317 MAX-ACCESS read-write
1318 STATUS current
1319 DESCRIPTION
1320 ""
1321 ::= { primeTH2 1 }
1322
1323 primeTH2Title OBJECT-TYPE
1324 SYNTAX OCTET STRING
1325 MAX-ACCESS read-write
1326 STATUS current
1327 DESCRIPTION
1328 ""
1329 ::= { primeTH2 2 }
1330
1331 primeTH2Enabled OBJECT-TYPE
1332 SYNTAX Integer32
1333 MAX-ACCESS read-write
1334 STATUS current
1335 DESCRIPTION
1336 ""
1337 ::= { primeTH2 3 }
1338
1339 boundsTH2X OBJECT-TYPE
1340 SYNTAX Integer32
1341 MAX-ACCESS read-write
1342 STATUS current
1343 DESCRIPTION
1344 ""
1345 ::= { boundsTH2 1 }
1346
1347 boundsTH2Y OBJECT-TYPE
1348 SYNTAX Integer32
1349 MAX-ACCESS read-write
1350 STATUS current
1351 DESCRIPTION
1352 ""
1353 ::= { boundsTH2 2 }
1354
1355 boundsTH2Width OBJECT-TYPE
1356 SYNTAX Integer32
1357 MAX-ACCESS read-write
1358 STATUS current
1359 DESCRIPTION
1360 ""
1361 ::= { boundsTH2 3 }
1362
1363 boundsTH2Height OBJECT-TYPE
1364 SYNTAX Integer32
1365 MAX-ACCESS read-write
1366 STATUS current
1367 DESCRIPTION
1368 ""
1369 ::= { boundsTH2 4 }
1370
1371 cnfSensorTTH2Addr OBJECT-TYPE
1372 SYNTAX Integer32
1373 MAX-ACCESS read-write
1374 STATUS current
1375 DESCRIPTION
1376 ""
1377 ::= { cnfSensorTTH2 1 }
1378
1379 cnfSensorTTH2Reg OBJECT-TYPE
1380 SYNTAX Integer32
1381 MAX-ACCESS read-write
1382 STATUS current
1383 DESCRIPTION
1384 ""
1385 ::= { cnfSensorTTH2 2 }
1386
1387 cnfSensorHTH2Addr OBJECT-TYPE
1388 SYNTAX Integer32
1389 MAX-ACCESS read-write
1390 STATUS current
1391 DESCRIPTION
1392 ""
1393 ::= { cnfSensorHTH2 1 }
1394
1395 cnfSensorHTH2Reg OBJECT-TYPE
1396 SYNTAX Integer32
1397 MAX-ACCESS read-write
1398 STATUS current
1399 DESCRIPTION
1400 ""
1401 ::= { cnfSensorHTH2 2 }
1402
1403 limitsTH2LimitT1 OBJECT-TYPE
1404 SYNTAX Integer32
1405 MAX-ACCESS read-write
1406 STATUS current
1407 DESCRIPTION
1408 ""
1409 ::= { limitsTH2 1 }
1410
1411 limitsTH2LimitT2 OBJECT-TYPE
1412 SYNTAX Integer32
1413 MAX-ACCESS read-write
1414 STATUS current
1415 DESCRIPTION
1416 ""
1417 ::= { limitsTH2 2 }
1418
1419 limitsTH2LimitH1 OBJECT-TYPE
1420 SYNTAX Integer32
1421 MAX-ACCESS read-write
1422 STATUS current
1423 DESCRIPTION
1424 ""
1425 ::= { limitsTH2 3 }
1426
1427 limitsTH2LimitH2 OBJECT-TYPE
1428 SYNTAX Integer32
1429 MAX-ACCESS read-write
1430 STATUS current
1431 DESCRIPTION
1432 ""
1433 ::= { limitsTH2 4 }
1434
1435 statusTempTH2Value OBJECT-TYPE
1436 SYNTAX Integer32
1437 MAX-ACCESS read-write
1438 STATUS current
1439 DESCRIPTION
1440 ""
1441 ::= { statusTempTH2 1 }
1442
1443 statusTempTH2Error OBJECT-TYPE
1444 SYNTAX Integer32
1445 MAX-ACCESS read-write
1446 STATUS current
1447 DESCRIPTION
1448 ""
1449 ::= { statusTempTH2 2 }
1450
1451 statusTempTH2Alarm OBJECT-TYPE
1452 SYNTAX Integer32
1453 MAX-ACCESS read-write
1454 STATUS current
1455 DESCRIPTION
1456 ""
1457 ::= { statusTempTH2 3 }
1458
1459 statusHumTH2Value OBJECT-TYPE
1460 SYNTAX Integer32
1461 MAX-ACCESS read-write
1462 STATUS current
1463 DESCRIPTION
1464 ""
1465 ::= { statusHumTH2 1 }
1466
1467 statusHumTH2Error OBJECT-TYPE
1468 SYNTAX Integer32
1469 MAX-ACCESS read-write
1470 STATUS current
1471 DESCRIPTION
1472 ""
1473 ::= { statusHumTH2 2 }
1474
1475 statusHumTH2Alarm OBJECT-TYPE
1476 SYNTAX Integer32
1477 MAX-ACCESS read-write
1478 STATUS current
1479 DESCRIPTION
1480 ""
1481 ::= { statusHumTH2 3 }
1482
1483 commandsTH2Update OBJECT-TYPE
1484 SYNTAX Integer32
1485 MAX-ACCESS read-write
1486 STATUS current
1487 DESCRIPTION
1488 ""
1489 ::= { commandsTH2 1 }
1490
1491 eventTH2Alarm NOTIFICATION-TYPE
1492 STATUS current
1493 DESCRIPTION
1494 ""
1495 ::= { eventsTH2 1 }
1496
1497 eventTH2Update NOTIFICATION-TYPE
1498 STATUS current
1499 DESCRIPTION
1500 ""
1501 ::= { eventsTH2 2 }
1502
1503 eventTH2Error NOTIFICATION-TYPE
1504 STATUS current
1505 DESCRIPTION
1506 ""
1507 ::= { eventsTH2 3 }
1508
1509 primeFSysEnabled OBJECT-TYPE
1510 SYNTAX Integer32
1511 MAX-ACCESS read-write
1512 STATUS current
1513 DESCRIPTION
1514 ""
1515 ::= { primeFSys 1 }
1516
1517 primeFSysGuid OBJECT-TYPE
1518 SYNTAX OCTET STRING
1519 MAX-ACCESS read-write
1520 STATUS current
1521 DESCRIPTION
1522 ""
1523 ::= { primeFSys 2 }
1524
1525 primeFSysTitle OBJECT-TYPE
1526 SYNTAX OCTET STRING
1527 MAX-ACCESS read-write
1528 STATUS current
1529 DESCRIPTION
1530 ""
1531 ::= { primeFSys 3 }
1532
1533 boundsFSysX OBJECT-TYPE
1534 SYNTAX Integer32
1535 MAX-ACCESS read-write
1536 STATUS current
1537 DESCRIPTION
1538 ""
1539 ::= { boundsFSys 1 }
1540
1541 boundsFSysY OBJECT-TYPE
1542 SYNTAX Integer32
1543 MAX-ACCESS read-write
1544 STATUS current
1545 DESCRIPTION
1546 ""
1547 ::= { boundsFSys 2 }
1548
1549 boundsFSysWidth OBJECT-TYPE
1550 SYNTAX Integer32
1551 MAX-ACCESS read-write
1552 STATUS current
1553 DESCRIPTION
1554 ""
1555 ::= { boundsFSys 3 }
1556
1557 boundsFSysHeight OBJECT-TYPE
1558 SYNTAX Integer32
1559 MAX-ACCESS read-write
1560 STATUS current
1561 DESCRIPTION
1562 ""
1563 ::= { boundsFSys 4 }
1564
1565 paramsFSysAddr OBJECT-TYPE
1566 SYNTAX Integer32
1567 MAX-ACCESS read-write
1568 STATUS current
1569 DESCRIPTION
1570 ""
1571 ::= { paramsFSys 1 }
1572
1573 paramsFSysReg OBJECT-TYPE
1574 SYNTAX Integer32
1575 MAX-ACCESS read-write
1576 STATUS current
1577 DESCRIPTION
1578 ""
1579 ::= { paramsFSys 2 }
1580
1581 commandsFSysUpdate OBJECT-TYPE
1582 SYNTAX Integer32
1583 MAX-ACCESS read-write
1584 STATUS current
1585 DESCRIPTION
1586 ""
1587 ::= { commandsFSys 1 }
1588
1589 statusFSysRepair OBJECT-TYPE
1590 SYNTAX Integer32
1591 MAX-ACCESS read-write
1592 STATUS current
1593 DESCRIPTION
1594 ""
1595 ::= { statusFSys 1 }
1596
1597 statusFSysAttantion OBJECT-TYPE
1598 SYNTAX Integer32
1599 MAX-ACCESS read-write
1600 STATUS current
1601 DESCRIPTION
1602 ""
1603 ::= { statusFSys 2 }
1604
1605 statusFSysFire OBJECT-TYPE
1606 SYNTAX Integer32
1607 MAX-ACCESS read-write
1608 STATUS current
1609 DESCRIPTION
1610 ""
1611 ::= { statusFSys 3 }
1612
1613 statusFSysError OBJECT-TYPE
1614 SYNTAX Integer32
1615 MAX-ACCESS read-write
1616 STATUS current
1617 DESCRIPTION
1618 ""
1619 ::= { statusFSys 4 }
1620
1621 eventFireSystemAlarm NOTIFICATION-TYPE
1622 STATUS current
1623 DESCRIPTION
1624 ""
1625 ::= { eventsFireSystem 1 }
1626
1627 eventFireSystemUpdate NOTIFICATION-TYPE
1628 STATUS current
1629 DESCRIPTION
1630 ""
1631 ::= { eventsFireSystem 2 }
1632
1633 eventFireSystemError NOTIFICATION-TYPE
1634 STATUS current
1635 DESCRIPTION
1636 ""
1637 ::= { eventsFireSystem 3 }
1638
1639 primeUfkTitle OBJECT-TYPE
1640 SYNTAX OCTET STRING
1641 MAX-ACCESS read-write
1642 STATUS current
1643 DESCRIPTION
1644 ""
1645 ::= { primeufk 1 }
1646
1647 primeUfkGuid OBJECT-TYPE
1648 SYNTAX OCTET STRING
1649 MAX-ACCESS read-write
1650 STATUS current
1651 DESCRIPTION
1652 ""
1653 ::= { primeufk 2 }
1654
1655 commandsUfkUpdate OBJECT-TYPE
1656 SYNTAX Integer32
1657 MAX-ACCESS read-write
1658 STATUS current
1659 DESCRIPTION
1660 ""
1661 ::= { commandsufk 1 }
1662
1663 eventUfkUpdate NOTIFICATION-TYPE
1664 STATUS current
1665 DESCRIPTION
1666 ""
1667 ::= { eventsUfk 1 }
1668 END
1669
1670
1671 -- This MIB was created using NuDesign Team's Visual MIBuilder (Ver 4.7).
1672
1 1
2 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> 2 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
3 3
4
5 <html> 4 <html>
6 <head> 5 <head>
7 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 6 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
8 <title>Device Tools</title> 7 <title>Device Tools</title>
9
10 <script type="text/javascript" src="resources/js/extjs5.0.0/build/ext-all-debug.js"></script> 8 <script type="text/javascript" src="resources/js/extjs5.0.0/build/ext-all-debug.js"></script>
11 <script type="text/javascript" src="resources/js/extjs5.0.0/packages/ext-theme-crisp/build/ext-theme-crisp.js"></script> 9 <script type="text/javascript" src="resources/js/extjs5.0.0/packages/ext-theme-crisp/build/ext-theme-crisp.js"></script>
12 <link rel="stylesheet" href="resources/js/extjs5.0.0/packages/ext-theme-crisp/build/resources/ext-theme-crisp-all-debug.css" /> 10 <link rel="stylesheet" href="resources/js/extjs5.0.0/packages/ext-theme-crisp/build/resources/ext-theme-crisp-all-debug.css" />
13 <script type="text/javascript" src="resources/js/app.js"></script> 11 <script type="text/javascript" src="resources/js/app.js"></script>
14 <script src="resources/js/jquery.min.js"></script> 12 <script src="resources/js/jquery.min.js"></script>
13
14 <style>
15
16 .new {
17 background-image:url(resources/img/new.png) !important;
18 }
19
20 .remove {
21 background-image:url(resources/img/remove.png) !important;
22 }
23
24
25 .save {
26 background-image:url(resources/img/save.png) !important;
27 }
28
29
30 .load {
31 background-image:url(resources/img/load.png) !important;
32 }
33
34 </style>
35
36
15 </head> 37 </head>
16 <body> 38 <body>
17
18
19
20 </body> 39 </body>
21 </html> 40 </html>
22 41
23 42
43
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -7,15 +7,22 @@ Ext.application({ ...@@ -7,15 +7,22 @@ Ext.application({
7 'PingUtil', 7 'PingUtil',
8 'Eth', 8 'Eth',
9 'Dns', 9 'Dns',
10 'Gprs',
10 'Proxy', 11 'Proxy',
11 'DetailDns', 12 'DetailDns',
12 'DetailProxy' 13 'DetailProxy',
14
15
13 16
14 ], 17 ],
15 controllers : [ 18 controllers : [
16 'NetworkSetting', 19 'NetworkSetting',
17 'MainConfig', 20 'MainConfig',
18 'PingUtil' 21 'PingUtil',
22 'DetailDns',
23 'Dns'
24
25
19 ], 26 ],
20 27
21 stores : [ 28 stores : [
...@@ -99,25 +106,26 @@ Ext.application({ ...@@ -99,25 +106,26 @@ Ext.application({
99 title: 'Описание', 106 title: 'Описание',
100 items:[{ 107 items:[{
101 xtype : 'mvvm-MainConfigView', 108 xtype : 'mvvm-MainConfigView',
109 id:'formmainconfig',
102 viewModel : { 110 viewModel : {
103 data : { 111 data : {
104 rec : { 112 description:"",
105 title:"",
106 guid:"" 113 guid:""
107 } 114
108 } 115 }
109 } 116 }
110 117
111 }] 118 }]
112 }, 119 },
113 120
114
115 { 121 {
116 title: 'Дата/время', 122 title: 'Управление',
117 items:[] 123 items:[]
118 } 124 }
119 125
120 126
127
128
121 ] 129 ]
122 } 130 }
123 131
...@@ -133,7 +141,7 @@ Ext.application({ ...@@ -133,7 +141,7 @@ Ext.application({
133 xtype: 'tabpanel', 141 xtype: 'tabpanel',
134 items: [ 142 items: [
135 { 143 {
136 title: 'Eth - интерфейсы', 144 title: 'ETH',
137 items:[{ 145 items:[{
138 xtype : 'mvvm-EthView', 146 xtype : 'mvvm-EthView',
139 id:'cbxeth' 147 id:'cbxeth'
...@@ -143,14 +151,7 @@ Ext.application({ ...@@ -143,14 +151,7 @@ Ext.application({
143 id:'fromnetwork', 151 id:'fromnetwork',
144 viewModel : { 152 viewModel : {
145 data:{ 153 data:{
146 broadcast: "", 154
147 ethName: "",
148 gateway: "",
149 ip: "",
150 mac: "",
151 netmask: "",
152 useDhcp: 0,
153 extInfo:[""]
154 } 155 }
155 156
156 } 157 }
...@@ -161,74 +162,50 @@ Ext.application({ ...@@ -161,74 +162,50 @@ Ext.application({
161 }, 162 },
162 163
163 { 164 {
164 title: 'Dns', 165 title: 'DNS',
165 items:[ 166 items:[
166 167
167 { 168 {
168 xtype : 'mvvm-DnsView', 169 xtype : 'mvvm-DnsView',
169 id:'grdDns' 170 id:'grdDns',
171 name:'grdDns'
170 172
171 } 173 }
172 174
173 ] 175 ]
174 }, 176 },
175 177
178
176 { 179 {
177 title: 'Proxy', 180 title: 'PROXY',
178 items:[{ 181 items:[{
179 xtype : 'mvvm-ProxyView', 182 xtype : 'mvvm-ProxyView',
180 id:'grdProxy' 183 id:'formproxy'
181 184
182 }] 185 }]
183 }] 186 },
184 }
185
186
187
188
189
190
191
192
193
194
195
196
197
198 187
199 188
200 189
190 {
191 title: 'GPRS',
192 items:[{
193 xtype : 'mvvm-GprsView',
194 id:'formgprs'
195
196 }]
197 },
201 198
202 199
203 200
204 201
205 202 ]
206 203 }
207
208
209 204
210 ] 205 ]
211 }, 206 },
212 207
213 { 208 /*
214 title: 'УТИЛИТЫ',
215 items:[{
216 xtype : 'mvvm-PingUtilView',
217 viewModel : {
218 data : {
219 rec : {
220 host:"",
221 result:"",
222
223 }
224 }
225 }
226
227 }
228 ]
229 },
230
231
232 { 209 {
233 title: 'ПЕРЕМЕННЫЕ', 210 title: 'ПЕРЕМЕННЫЕ',
234 items:[ 211 items:[
...@@ -244,14 +221,7 @@ Ext.application({ ...@@ -244,14 +221,7 @@ Ext.application({
244 { 221 {
245 title: 'Дискретные', 222 title: 'Дискретные',
246 items:[] 223 items:[]
247 },
248
249 {
250 title: 'Параметры устройства',
251 items:[]
252 } 224 }
253
254
255 225
256 ] 226 ]
257 227
...@@ -264,99 +234,30 @@ Ext.application({ ...@@ -264,99 +234,30 @@ Ext.application({
264 234
265 ] 235 ]
266 }, 236 },
237 */
267 238
268 239 /*
269 { 240 {
270 title: 'СЕРВИСЫ', 241 title: 'СЕРВИСЫ',
271 items:[ 242 items:[
272 { 243 {
273 region: 'center', 244 region: 'center',
274 xtype: 'tabpanel', 245 xtype: 'tabpanel',
275 items: [ 246 items: [
276 { 247 {
277 title: 'SNMP Агент',
278 items:[
279
280
281
282 ]
283 },
284 {
285 title: 'SNMP Клиент', 248 title: 'SNMP Клиент',
286 items:[ 249 items:[]
287 250 },
288 ] 251 {
252 title: 'SNMP Агент',
253 items:[]
289 } 254 }
290 ] 255 ]
291 256
292 } 257 }
293 ] 258 ]
294 },
295
296
297
298 {
299 title: 'ФАЙЛОВЫЙ МЕНЕДЖЕР',
300 items:[
301 ]
302 },
303
304
305
306
307
308
309 {
310 title: 'ЛОГИ',
311 items:[{
312 region: 'center',
313 xtype: 'tabpanel',
314 items: [
315 {
316 title: 'Web Tools',
317 items:[
318
319
320
321 ]
322 },
323 {
324 title: 'SNMP Агент',
325 items:[
326
327
328
329 ]
330 },
331
332 {
333 title: 'SNMP Клиент',
334 items:[
335
336
337
338 ]
339 },
340
341 {
342 title: 'NTP',
343 items:[
344
345
346
347 ]
348 }
349
350 ]
351
352 }]
353 } 259 }
354 260 */
355
356
357
358
359
360 ] 261 ]
361 } 262 }
362 ] 263 ]
......
1 Ext.define('App.controller.DetailDns', {
2 extend : 'Ext.app.Controller',
3
4 init : function() {
5
6
7 this.control({
8 'mvvm-DetailDnsView > button#SaveRecord' : {
9 click : this.onSaveButtonClick
10 }
11 });
12 },
13
14 onSaveButtonClick : function(btn) {
15
16 console.log('result:');
17
18 var store=Ext.getCmp('grdDns').getStore();
19
20
21 store.each(function(rec){
22 console.log(rec);
23 });
24
25
26
27
28
29
30
31 /*
32
33 if (records) {
34
35 var data=Ext.util.JSON.encode(records.data);
36
37 Ext.Ajax.request({
38 method: "POST",
39 url: 'api/net/upddns',
40 headers: {
41 'Accept': 'application/json',
42 'Content-Type': 'application/json'
43 },
44 params: data,
45 success: function(response, opts) {
46
47 var result = Ext.JSON.decode(response.responseText);
48
49 if(result) {
50 Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!');
51 //record.commit();
52 }
53 else
54 {
55 Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
56 }
57
58
59 }, failure: function(response, opts) {
60 Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
61 }
62 });
63
64
65 }
66 */
67
68 }
69 });
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
1 Ext.define('App.controller.Dns', {
2 extend : 'Ext.app.Controller',
3
4 init : function() {
5 this.control({
6 'toolbar button[action=add]' : {
7 click : this.newDns
8 },
9 'toolbar button[action=delete]' : {
10 click : this.delDns
11 },
12
13 'toolbar button[action=save]' : {
14 click : this.saveDns
15 },
16
17 'toolbar button[action=load]': {
18 click : this.loadDns
19 },
20
21 'mvvm-DnsView': {
22 selectionchange: this.gridSelectionChange,
23 viewready: this.onViewReady,
24 select: this.onRowSelect
25 },
26 'mvvm-DnsView': {
27 edit: this.onRowEdit,
28 beforeedit: this.onRowBeforeEdit
29 }
30 });
31 },
32
33 saveDns:function(btn) {
34
35
36 var grid = btn.up('gridpanel');
37 var store = grid.getStore();
38
39 var records = [];
40
41 store.each(function(r){
42 records.push({
43 id: r.get("id"),
44 ip: r.get("ip")
45 });
46 });
47
48
49 var data=Ext.util.JSON.encode(records);
50
51 Ext.Ajax.request({
52 method: "POST",
53 url: 'api/dns/update',
54 headers: {
55 'Accept': 'application/json',
56 'Content-Type': 'application/json'
57 },
58 params: data,
59 success: function(response, opts) {
60
61 var Ok = Ext.JSON.decode(response.responseText);
62 if (Ok) {
63 Ext.Msg.alert('Success', 'Сохранение выполнено успешно');
64 }else {
65 Ext.Msg.alert('Failure', 'Ошибка сохранения');
66 }
67
68 }, failure: function(response, opts) {
69
70 Ext.Msg.alert('Failure', 'Ошибка сохранения');
71 }
72 });
73
74
75
76
77
78
79
80
81
82
83
84
85
86 //fires create, update and delete request when calling sync and commit changes in the store when autoSync=false
87 /*
88 store.sync({
89 success : function(batch, eOpts){
90 Ext.Msg.alert('Status', 'Changes saved successfully.');
91 },
92 failure : function(record, eOpts){
93 Ext.Msg.alert('Status', 'Request failed.');
94 }
95 });
96 */
97
98 },
99
100 loadDns:function(btn) {
101
102 var grid = btn.up('gridpanel');
103 var store = grid.getStore();
104 store.load();
105
106 },
107
108 onRowEdit:function(editor, context, eOpts) {
109
110 },
111
112 onRowBeforeEdit:function() {
113
114
115 },
116
117
118
119 newDns : function(btn) {
120
121
122 var grid = btn.up('gridpanel');
123 var store = grid.getStore();
124 var rowEditing=grid.getPlugin('modelDnsEditPlagin');
125
126
127 rowEditing.cancelEdit();
128
129 var records = grid.getStore().getRange();
130
131 var r = Ext.create('App.model.Dns', {
132 id: records.length,
133 ip: '8.8.8.8',
134 });
135 store.insert(0, r);
136
137
138 var records = [];
139
140 store.each(function(r){
141 records.push({
142 id: r.get("id"),
143 ip: r.get("ip")
144 });
145 });
146
147 rowEditing.startEdit(0, 0);
148
149 },
150
151 delDns:function(btn) {
152
153
154 var grid = btn.up('gridpanel');
155 var store=grid.getStore();
156
157
158 var selectedRows = grid.getSelectionModel().getSelection();
159
160 if(selectedRows.length) {
161
162 store.remove(selectedRows);
163 } else {
164 Ext.Msg.alert('Статус', 'Выберите запись');
165 }
166 },
167
168 gridSelectionChange:function(selModel, selections, eOpts) {
169
170 /*
171 var grid = selModel.view.ownerCt;
172 var btnDelete=grid.down('button[itemId=deleteDnsButton]');
173
174 btnDelete.setDisabled(false);
175
176 console.log(selections[0].data);
177 var json=Ext.util.JSON.encode(selections[0].data);
178 console.log(json);
179 */
180 },
181 onViewReady:function() {
182 },
183
184 onRowSelect: function(selModel, record, index, opts) {
185
186
187 }
188
189 });
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
...@@ -9,24 +9,41 @@ Ext.define('App.controller.MainConfig', { ...@@ -9,24 +9,41 @@ Ext.define('App.controller.MainConfig', {
9 click : this.onSaveButtonClick 9 click : this.onSaveButtonClick
10 } 10 }
11 }); 11 });
12
13
14 Ext.Ajax.request({
15 method: "GET",
16 url: 'api/devinfo/',
17 headers: {
18 'Accept': 'application/json',
19 'Content-Type': 'application/json'
20 },
21
22 success: function(response, opts) {
23
24 var result = Ext.JSON.decode(response.responseText);
25
26 Ext.getCmp('guid').setValue(result.guid);
27 Ext.getCmp('title').setValue(result.description);
28
29 }, failure: function(response, opts) {
30 }
31 });
12 }, 32 },
13 33
14 onSaveButtonClick : function(btn) { 34 onSaveButtonClick : function(btn) {
15 //get reference to the form 35
16 var mainconfigView = btn.up('mvvm-MainConfigView'); 36 var mainconfigView = btn.up('mvvm-MainConfigView');
17 37
18 //get the bound record 38 var record = mainconfigView.getViewModel().getData();
19 var record = mainconfigView.getViewModel().getData().rec; 39
20
21 if (record) { 40 if (record) {
22 41
23 var data=Ext.util.JSON.encode(record); 42 var data=Ext.util.JSON.encode(record);
24 43
25
26
27 Ext.Ajax.request({ 44 Ext.Ajax.request({
28 method: "POST", 45 method: "POST",
29 url: 'api/mainconfig/update', 46 url: 'api/devinfo/update',
30 headers: { 47 headers: {
31 'Accept': 'application/json', 48 'Accept': 'application/json',
32 'Content-Type': 'application/json' 49 'Content-Type': 'application/json'
...@@ -34,8 +51,9 @@ Ext.define('App.controller.MainConfig', { ...@@ -34,8 +51,9 @@ Ext.define('App.controller.MainConfig', {
34 params: data, 51 params: data,
35 success: function(response, opts) { 52 success: function(response, opts) {
36 53
37 var result = Ext.JSON.decode(response.responseText); 54 // var result = Ext.JSON.decode(response.responseText);
38 55
56 /*
39 if(result) { 57 if(result) {
40 Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!'); 58 Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!');
41 //record.commit(); 59 //record.commit();
...@@ -45,15 +63,16 @@ Ext.define('App.controller.MainConfig', { ...@@ -45,15 +63,16 @@ Ext.define('App.controller.MainConfig', {
45 Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!'); 63 Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
46 } 64 }
47 65
66 */
48 67
49 }, failure: function(response, opts) { 68 }, failure: function(response, opts) {
50 Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!'); 69 // Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
51 } 70 }
52 }); 71 });
53 72
54 } 73 }
55 else { 74 else {
56 Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!'); 75 // Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
57 } 76 }
58 } 77 }
59 }); 78 });
......
...@@ -3,20 +3,25 @@ Ext.define('App.controller.NetworkSetting', { ...@@ -3,20 +3,25 @@ Ext.define('App.controller.NetworkSetting', {
3 3
4 init : function() { 4 init : function() {
5 5
6
6 this.control({ 7 this.control({
7 'mvvm-NetworkSettingView > button#SaveRecord' : { 8 'mvvm-NetworkSettingView > button#SaveRecord' : {
8 click : this.onSaveButtonClick 9 click : this.onSaveButtonClick
9 } 10 }
10 }); 11 });
11 12
12 13 /*
13 Ext.TaskManager.start({ 14 Ext.TaskManager.start({
14 run: this.ReloadData, 15 run: this.ReloadData,
15 interval: 10000 , 16 interval: 10000 ,
16 scope: this 17 scope: this
17 }); 18 });
19 */
18 }, 20 },
19 21
22
23
24
20 ReloadData: function() { 25 ReloadData: function() {
21 26
22 var combo=Ext.getCmp('cbxeth'); 27 var combo=Ext.getCmp('cbxeth');
...@@ -34,7 +39,7 @@ Ext.define('App.controller.NetworkSetting', { ...@@ -34,7 +39,7 @@ Ext.define('App.controller.NetworkSetting', {
34 }); 39 });
35 var eth=record ? record.get(combo.displayField) : null; 40 var eth=record ? record.get(combo.displayField) : null;
36 41
37 42
38 Ext.Ajax.request({ 43 Ext.Ajax.request({
39 method: "GET", 44 method: "GET",
40 url: 'api/net/byeth/'+eth, 45 url: 'api/net/byeth/'+eth,
...@@ -46,73 +51,14 @@ Ext.define('App.controller.NetworkSetting', { ...@@ -46,73 +51,14 @@ Ext.define('App.controller.NetworkSetting', {
46 success: function(response, opts) { 51 success: function(response, opts) {
47 52
48 var result = Ext.JSON.decode(response.responseText); 53 var result = Ext.JSON.decode(response.responseText);
49 console.log(result);
50
51 //var detailFireSystemView = btn.up('mvvm-DetailFireSystemView');
52 //var record = detailFireSystemView.getViewModel().getData().rec;
53 54
54 Ext.getCmp('fromnetwork').viewModel.setData(result); 55 Ext.getCmp('fromnetwork').viewModel.setData(result);
55 //Ext.getCmp('fromnetwork').viewModel.bind(result);
56 console.log(Ext.getCmp('fromnetwork').getViewModel().getData());
57 56
58 57
59 Ext.getCmp('ttt').setValue(result.extInfo);
60
61 58
62 var checkbox = Ext.getCmp('dhcp');
63
64
65 console.log("result.useDhcp:"+result.useDhcp);
66 if (result.useDhcp) {
67 checkbox.checked = true;
68 checkbox.addCls('x-form-cb-checked x-form-dirty');
69
70
71
72 Ext.getCmp('ip').setDisabled(true);
73 Ext.getCmp('netmask').setDisabled(true);
74 Ext.getCmp('gateway').setDisabled(true);
75 Ext.getCmp('broadcast').setDisabled(true);
76
77
78 }else {
79
80 checkbox.checked = false;
81 checkbox.removeCls('x-form-cb-checked x-form-dirty');
82
83
84 Ext.getCmp('ip').setDisabled(false);
85 Ext.getCmp('netmask').setDisabled(false);
86 Ext.getCmp('gateway').setDisabled(false);
87 Ext.getCmp('broadcast').setDisabled(false);
88
89 }
90
91 checkbox.checkChange();
92
93
94
95
96 Ext.getCmp('mac').setValue(result.mac);
97 Ext.getCmp('ip').setValue(result.ip);
98 Ext.getCmp('netmask').setValue(result.netmask);
99 Ext.getCmp('gateway').setValue(result.gateway);
100 Ext.getCmp('broadcast').setValue(result.broadcast);
101
102
103 Ext.getCmp('mac').setDisabled(true); 59 Ext.getCmp('mac').setDisabled(true);
104 60
105 // me.viewModel.setData(record);
106 //if(result) {
107 // Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!');
108 //record.commit();
109 //}
110 //else
111 //{
112 // Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
113 //}
114 }, failure: function(response, opts) { 61 }, failure: function(response, opts) {
115 // Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
116 } 62 }
117 }); 63 });
118 64
...@@ -120,19 +66,18 @@ Ext.define('App.controller.NetworkSetting', { ...@@ -120,19 +66,18 @@ Ext.define('App.controller.NetworkSetting', {
120 }, 66 },
121 67
122 onSaveButtonClick : function(btn) { 68 onSaveButtonClick : function(btn) {
123 //get reference to the form
124 var networksettingView = btn.up('mvvm-NetworkSettingView');
125 69
126 //get the bound record 70 var networksettingView = btn.up('mvvm-NetworkSettingView');
127 var record = networksettingView.getViewModel().getData().rec; 71
128 72 var record = networksettingView.getViewModel().getData();
129 if (record) { 73 if (record) {
130 74
131 var data=Ext.util.JSON.encode(record); 75 var data=Ext.util.JSON.encode(record);
76
132 77
133 Ext.Ajax.request({ 78 Ext.Ajax.request({
134 method: "POST", 79 method: "POST",
135 url: 'api/mainconfig/update', 80 url: 'api/net/update',
136 headers: { 81 headers: {
137 'Accept': 'application/json', 82 'Accept': 'application/json',
138 'Content-Type': 'application/json' 83 'Content-Type': 'application/json'
...@@ -143,23 +88,21 @@ Ext.define('App.controller.NetworkSetting', { ...@@ -143,23 +88,21 @@ Ext.define('App.controller.NetworkSetting', {
143 var result = Ext.JSON.decode(response.responseText); 88 var result = Ext.JSON.decode(response.responseText);
144 89
145 if(result) { 90 if(result) {
146 Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!'); 91
147 //record.commit();
148 } 92 }
149 else
150 {
151 Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
152 }
153 93
154 }, failure: function(response, opts) { 94 }, failure: function(response, opts) {
155 Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!'); 95 Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
156 } 96 }
157 }); 97 });
158 98
99
100
159 } 101 }
160 else { 102
161 Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!'); 103
162 } 104
105
163 } 106 }
164 }); 107 });
165 108
......
...@@ -6,7 +6,7 @@ Ext.define('App.model.Dns', { ...@@ -6,7 +6,7 @@ Ext.define('App.model.Dns', {
6 type:'int' 6 type:'int'
7 }, 7 },
8 { 8 {
9 name:'dns', 9 name:'ip',
10 type:'string' 10 type:'string'
11 }] 11 }]
12 }); 12 });
......
...@@ -7,9 +7,48 @@ Ext.define('App.model.Eth', { ...@@ -7,9 +7,48 @@ Ext.define('App.model.Eth', {
7 type : 'int' 7 type : 'int'
8 }, 8 },
9 { 9 {
10 name : 'eth', 10 name : 'name',
11 type : 'string' 11 type : 'string'
12 } 12 },
13
14 {
15 name : 'info',
16 type : 'auto'
17 },
18
19 {
20 name : 'mac',
21 type : 'string'
22 },
23
24 {
25 name : 'ip',
26 type : 'string'
27 },
28
29 {
30 name : 'netmask',
31 type : 'string'
32 },
33
34 {
35 name : 'dhcp',
36 type : 'boolean'
37 },
13 38
39 {
40 name : 'gateway',
41 type : 'string'
42 },
43
44 {
45 name : 'broadcast',
46 type : 'string'
47 }
48
14 ] 49 ]
15 });
...\ No newline at end of file ...\ No newline at end of file
50 });
51
52
53
54
......
...@@ -3,7 +3,7 @@ Ext.define('App.model.MainConfig', { ...@@ -3,7 +3,7 @@ Ext.define('App.model.MainConfig', {
3 3
4 fields : [ 4 fields : [
5 { 5 {
6 name : 'title', 6 name : 'description',
7 type : 'string' 7 type : 'string'
8 }, 8 },
9 { 9 {
......
...@@ -2,64 +2,54 @@ Ext.define('App.model.NetworkSetting', { ...@@ -2,64 +2,54 @@ Ext.define('App.model.NetworkSetting', {
2 extend : 'Ext.data.Model', 2 extend : 'Ext.data.Model',
3 3
4 fields : [ 4 fields : [
5
6 { 5 {
7 name : 'mac', 6 name : 'id',
8 type : 'string' 7 type : 'int'
9 }, 8 },
10
11 { 9 {
12 name : 'ethName', 10 name : 'name',
13 type : 'string' 11 type : 'string'
14 }, 12 },
15 13
16 { 14 {
17 name : 'useDhcp', 15 name : 'info',
18 type : 'boolean' 16 type : 'auto'
19 }, 17 },
18
20 { 19 {
21 name : 'ip', 20 name : 'mac',
22 type : 'string' 21 type : 'string'
23 }, 22 },
23
24 { 24 {
25 name : 'gateway', 25 name : 'ip',
26 type : 'string' 26 type : 'string'
27 }, 27 },
28
28 { 29 {
29 name : 'netmask', 30 name : 'netmask',
30 type : 'string' 31 type : 'string'
31 }, 32 },
33
32 { 34 {
33 name : 'broadcast', 35 name : 'dhcp',
34 type : 'string' 36 type : 'boolean'
35 }, 37 },
36 38
37 { 39 {
38 name : 'extInfo' 40 name : 'gateway',
39 // type:'auto' 41 type : 'string'
40 } 42 },
41
42
43
44
45
46 43
44 {
45 name : 'broadcast',
46 type : 'string'
47 }
47 ], 48 ],
48 49
49 autoLoad: true, 50 autoLoad: true,
50 autoSync: true, 51 autoSync: true,
51 // alias: 'store.devices', 52
52 proxy : {
53 type : 'ajax',
54 api: {
55
56 read: 'api/mainconfig/get'
57
58 },
59 reader : {
60 type : 'json'
61 }
62 }
63 53
64 54
65 }); 55 });
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -15,11 +15,21 @@ Ext.define('App.store.Dns', { ...@@ -15,11 +15,21 @@ Ext.define('App.store.Dns', {
15 proxy : { 15 proxy : {
16 type : 'ajax', 16 type : 'ajax',
17 api: { 17 api: {
18 read: 'api/net/dns' 18 read: 'api/dns/all',
19 }, 19 create : 'null',
20 update : 'null',
21 destroy : 'null'
22 },
23 actionMethods :
24 {
25 destroy : 'POST',
26 read : 'GET',
27 create : 'POST',
28 update : 'POST'
29 },
20 reader : { 30 reader : {
21 type : 'json', 31 type : 'json',
22 idProperty : 'id' 32 idProperty : 'id'
23 }
24 }
25 });
...\ No newline at end of file ...\ No newline at end of file
33 },
34 }
35 });
...\ No newline at end of file ...\ No newline at end of file
......
1 1
2
3 function renderercell(value, metaData, record, row, col, store, gridView) {
4 return '<div style="font-size: 18px; color:#FFFFFF; background-color:#3892d3 !important; text-align:center;">'+value+'</div>';
5 }
6
7
2 Ext.define('App.view.Dns', { 8 Ext.define('App.view.Dns', {
3 extend : 'Ext.grid.Panel', 9 extend : 'Ext.grid.Panel',
4 xtype : 'mvvm-DnsView', 10 xtype : 'mvvm-DnsView',
5 title : 'DNS сервера', 11 title : 'DNS сервера',
6 store : 'Dns', 12 store : 'Dns',
7 13
8 tbar: [ 14 tbar: {
9 { 15 items: [{
10 text:'Добавить', 16 xtype: 'button',
11 handler: function(){ 17 iconCls:'new',
12 18 itemId: 'newDnsButton',
13 if (winadddns==null) { 19 text: 'Добавить',
14 var winadddns = Ext.create('widget.window', { // создание окна 20 action: 'add'
15 title:'Добавить', 21 },
16 22 {
17 maximize: function(){ 23 xtype: 'button',
18 this.callParent([true]); //animate 24 iconCls:'remove',
19 }, 25 itemId: 'deleteDnsButton',
26 text: 'Удалить',
27 action: 'delete',
28 disabled:false
29 },
30 ]
31 },
32
33
34
35 bbar: {
36 items: [ {
37 xtype: 'button',
38 iconCls:'save',
39 itemId: 'SaveDnsButton',
40 text: 'Сохранить',
41 action: 'save',
42 disabled:false
43 },
44 {
45 xtype: 'button',
46 iconCls:'load',
47 itemId: 'LoadDnsButton',
48 text: 'Обновить',
49 action: 'load',
50 disabled:false
51 }
52 ]
53 },
54
55
56
57 width: 500,
58 height: 300,
59 selType: 'rowmodel',
60 plugins: [new Ext.create('Ext.grid.plugin.RowEditing', {
61 clicksToEdit: 2,
62 pluginId: 'modelDnsEditPlagin'
63 })
64 ],
65 columns: [{
66 text : '№',
67 dataIndex : 'id',
68 flex: 1,
69 hidden:true
70 },
71 {
72 text : 'HOST',
73 dataIndex : 'ip',
74 flex : 5,
75 renderer:renderercell,
76 editor: new Ext.form.TextField({
77 allowBlank: true
78 })
79 }
80 ]
81 });
82
83
84
85
86
87
20 88
21 restore: function(){
22 this.callParent([true]); //animate
23 },
24
25 closeAction: 'hide',
26 items: [
27 {
28 xtype : 'mvvm-DetailDnsView',
29 viewModel : {
30 data : {
31 rec : {
32 dns:'127.0.0.1'
33 }
34 }
35 }
36 }
37 ]
38 });
39
40 winadddns.show();
41 }
42
43
44
45 }
46 }] ,
47
48
49
50 columns: [{
51 text : '№',
52 dataIndex : 'id',
53 flex: 1
54 },
55 {
56 text : 'HOST',
57 dataIndex : 'dns',
58 flex : 5
59 },
60 {
61 xtype: 'actioncolumn',
62 text : '#',
63 flex:1,
64 dataIndex: 'guid',
65 items: [{
66 icon: 'resources/img/tools.png',
67 handler: function (grid, rowIndex, colIndex) {
68 var rec = grid.getStore().getAt(rowIndex);
69
70 if (wintoolsdns==null) {
71 var wintoolsdns = Ext.create('widget.window', { // создание окна
72 title:'Изменить',
73
74 maximize: function(){
75 this.callParent([true]); //animate
76 },
77 89
78 restore: function(){
79 this.callParent([true]); //animate
80 },
81
82 closeAction: 'hide',
83 items: [
84 {
85 xtype : 'mvvm-DetailDnsView',
86 viewModel : {
87 data : {
88 rec : rec
89 }
90 }
91 }
92 ]
93
94
95
96 });
97
98 wintoolsdns.show();
99 }
100 }
101 }
102 ],
103
104
105
106
107 action: 'tools'
108 },
109 ]
110 });
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -7,7 +7,7 @@ Ext.define('App.view.Eth', { ...@@ -7,7 +7,7 @@ Ext.define('App.view.Eth', {
7 store : 'Eth', 7 store : 'Eth',
8 fieldLabel: 'Eth', 8 fieldLabel: 'Eth',
9 valueField:'id', 9 valueField:'id',
10 displayField:'eth', 10 displayField:'name',
11 queryMode:'local', 11 queryMode:'local',
12 margin:'5 5 5 5', 12 margin:'5 5 5 5',
13 action:'cbxeth' , 13 action:'cbxeth' ,
...@@ -20,7 +20,7 @@ Ext.define('App.view.Eth', { ...@@ -20,7 +20,7 @@ Ext.define('App.view.Eth', {
20 20
21 Ext.Ajax.request({ 21 Ext.Ajax.request({
22 method: "GET", 22 method: "GET",
23 url: 'api/net/byeth/'+records[0].get('eth'), 23 url: 'api/net/byeth/'+records[0].get('name'),
24 headers: { 24 headers: {
25 'Accept': 'application/json', 25 'Accept': 'application/json',
26 'Content-Type': 'application/json' 26 'Content-Type': 'application/json'
...@@ -33,71 +33,10 @@ Ext.define('App.view.Eth', { ...@@ -33,71 +33,10 @@ Ext.define('App.view.Eth', {
33 success: function(response, opts) { 33 success: function(response, opts) {
34 34
35 var result = Ext.JSON.decode(response.responseText); 35 var result = Ext.JSON.decode(response.responseText);
36 console.log(result); 36
37
38 //var detailFireSystemView = btn.up('mvvm-DetailFireSystemView');
39 //var record = detailFireSystemView.getViewModel().getData().rec;
40
41 Ext.getCmp('fromnetwork').viewModel.setData(result); 37 Ext.getCmp('fromnetwork').viewModel.setData(result);
42 //Ext.getCmp('fromnetwork').viewModel.bind(result);
43 console.log(Ext.getCmp('fromnetwork').getViewModel().getData());
44
45
46 Ext.getCmp('ttt').setValue(result.extInfo);
47
48
49 var checkbox = Ext.getCmp('dhcp');
50
51
52 console.log("result.useDhcp:"+result.useDhcp);
53 if (result.useDhcp) {
54 checkbox.checked = true;
55 checkbox.addCls('x-form-cb-checked x-form-dirty');
56
57
58
59 Ext.getCmp('ip').setDisabled(true);
60 Ext.getCmp('netmask').setDisabled(true);
61 Ext.getCmp('gateway').setDisabled(true);
62 Ext.getCmp('broadcast').setDisabled(true);
63
64
65 }else {
66
67 checkbox.checked = false;
68 checkbox.removeCls('x-form-cb-checked x-form-dirty');
69
70
71 Ext.getCmp('ip').setDisabled(false);
72 Ext.getCmp('netmask').setDisabled(false);
73 Ext.getCmp('gateway').setDisabled(false);
74 Ext.getCmp('broadcast').setDisabled(false);
75
76 }
77
78 checkbox.checkChange();
79
80
81
82
83 Ext.getCmp('mac').setValue(result.mac);
84 Ext.getCmp('ip').setValue(result.ip);
85 Ext.getCmp('netmask').setValue(result.netmask);
86 Ext.getCmp('gateway').setValue(result.gateway);
87 Ext.getCmp('broadcast').setValue(result.broadcast);
88
89
90 Ext.getCmp('mac').setDisabled(true);
91 38
92 // me.viewModel.setData(record); 39
93 //if(result) {
94 // Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!');
95 //record.commit();
96 //}
97 //else
98 //{
99 // Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
100 //}
101 }, failure: function(response, opts) { 40 }, failure: function(response, opts) {
102 // Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!'); 41 // Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
103 } 42 }
......
1
2
3
4
5 Ext.define('App.view.Gprs', {
6 extend : 'Ext.form.Panel',
7 xtype : 'mvvm-GprsView',
8 requires : [
9 'App.view.GprsViewModel'
10 ],
11
12 frame : true,
13 padding : 10,
14
15 bind : {
16 },
17
18 viewModel: {
19 type: 'gprsform'
20 },
21
22 items : [
23
24 {
25 xtype: 'radiogroup',
26 fieldLabel: 'Оператор связи',
27 width:500,
28 columns: 2,
29 itemId: 'internetGprs',
30 items: [
31 {
32 xtype: 'radiofield',
33 boxLabel: '<img src="resources/img/mts.jpg"/>',
34 name: 'framework',
35 checked: true,
36 width:100,
37 inputValue: 'mts'
38 },
39 {
40 xtype: 'radiofield',
41 boxLabel: 'Megafon',
42 name: 'framework',
43 width:100,
44 inputValue: 'megafon'
45 },
46 {
47 xtype: 'radiofield',
48 boxLabel: 'Beeline',
49 name: 'framework',
50 width:100,
51 inputValue: 'beeline'
52 }
53 ]
54 },
55 {
56 xtype: 'button',
57 text: 'Применить'
58 }
59
60 ]
61 });
...\ No newline at end of file ...\ No newline at end of file
1 Ext.define('App.view.GprsViewModel', {
2 extend: 'Ext.app.ViewModel',
3 alias: 'viewmodel.gprsform',
4 data : {
5 }
6 });
...\ No newline at end of file ...\ No newline at end of file
...@@ -9,46 +9,31 @@ Ext.define('App.view.MainConfig', { ...@@ -9,46 +9,31 @@ Ext.define('App.view.MainConfig', {
9 padding : 10, 9 padding : 10,
10 10
11 bind : { 11 bind : {
12 // reference : 'App.model.MainConfig',
13 // title : '{rec.title}'
14 }, 12 },
15 13
16 viewModel: { 14 viewModel: {
17 type: 'mainconfigform' // references DetailViewModel 15 type: 'mainconfigform' // references DetailViewModel
18 }, 16 },
19 17
20 items : [ 18 items : [{
21
22 {
23 xtype : 'textfield', 19 xtype : 'textfield',
24 bind : '{rec.guid}', 20 bind : '{guid}',
25 fieldLabel : 'GUID', 21 fieldLabel : 'GUID',
22 id:'guid',
26 disable:true, 23 disable:true,
27 width:500, 24 width:500,
28 margin:'5 5 10 3' 25 margin:'5 5 10 3'
29 }, 26 },
30 { 27 {
31 xtype : 'textarea', 28 xtype : 'textarea',
32 bind : '{rec.title}', 29 bind : '{description}',
33 fieldLabel : 'ОПИСАНИЕ', 30 fieldLabel : 'ОПИСАНИЕ',
34 height:50, 31 height:50,
35 width:500, 32 width:500,
33 id:'title',
36 margin:'5 5 10 3' 34 margin:'5 5 10 3'
37 }, 35 },
38 36
39
40
41
42
43
44
45
46
47
48
49
50
51
52 37
53 { 38 {
54 xtype : 'button', 39 xtype : 'button',
......
...@@ -4,6 +4,6 @@ Ext.define('App.view.MainConfigViewModel', { ...@@ -4,6 +4,6 @@ Ext.define('App.view.MainConfigViewModel', {
4 alias: 'viewmodel.mainconfigform', 4 alias: 'viewmodel.mainconfigform',
5 5
6 data : { 6 data : {
7 rec : null 7
8 } 8 }
9 }); 9 });
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -15,8 +15,9 @@ Ext.define('App.view.NetworkSetting', { ...@@ -15,8 +15,9 @@ Ext.define('App.view.NetworkSetting', {
15 15
16 fieldLabel : 'DHCP', 16 fieldLabel : 'DHCP',
17 id:'dhcp', 17 id:'dhcp',
18 inputValue: '1', 18 bind : '{dhcp}',
19 uncheckedValue: '0', 19 inputValue: 'false',
20 uncheckedValue: 'true',
20 margin:'5 5 10 3' 21 margin:'5 5 10 3'
21 }, 22 },
22 23
...@@ -70,7 +71,7 @@ Ext.define('App.view.NetworkSetting', { ...@@ -70,7 +71,7 @@ Ext.define('App.view.NetworkSetting', {
70 71
71 { 72 {
72 xtype : 'textarea', 73 xtype : 'textarea',
73 // bind : '{extInfo}', 74 bind : '{info}',
74 id:'ttt', 75 id:'ttt',
75 fieldLabel : 'СТАТУС', 76 fieldLabel : 'СТАТУС',
76 margin:'5 5 10 3', 77 margin:'5 5 10 3',
......
...@@ -8,6 +8,7 @@ Ext.define('App.view.Proxy', { ...@@ -8,6 +8,7 @@ Ext.define('App.view.Proxy', {
8 tbar: [ 8 tbar: [
9 { 9 {
10 text:'Добавить', 10 text:'Добавить',
11 margin:'5 5 5 5',
11 handler: function(){ 12 handler: function(){
12 13
13 if (winaddproxy==null) { 14 if (winaddproxy==null) {
...@@ -102,5 +103,37 @@ Ext.define('App.view.Proxy', { ...@@ -102,5 +103,37 @@ Ext.define('App.view.Proxy', {
102 103
103 action: 'tools' 104 action: 'tools'
104 }, 105 },
106 {
107 xtype: 'actioncolumn',
108 text : '#',
109 flex:1,
110 dataIndex: 'id',
111 items: [{
112 icon: 'resources/img/delete.png',
113 handler: function (grid, rowIndex, colIndex) {
114
115
116
117
118 var selectedRecord = grid.getStore().getAt(rowIndex);
119 grid.getStore().each(function(rec) {
120 if (rec == selectedRecord) {
121 grid.store.remove(rec);
122 }
123 });
124 grid.getView().refresh();
125
126
127
128
129
130 }
131 }],
132
133 action: 'delete'
134 }
135
136
137
105 ] 138 ]
106 }); 139 });
...\ No newline at end of file ...\ No newline at end of file
......