Skip to content

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

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

save

1 parent fa2a6557
Expand all
Inline Side-by-side
Showing 139 changed files with 547 additions and 184 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,37 +3,32 @@ ...@@ -3,37 +3,32 @@
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> 20 <groupId>org.codehaus.jackson</groupId>
21 <artifactId>javassist</artifactId> 21 <artifactId>jackson-mapper-asl</artifactId>
22 <version>3.12.1.GA</version> 22 <version>1.4.4</version>
23 </dependency> 23 </dependency>
24 24
25 <dependency> 25 <dependency>
26 <groupId>org.snmp4j</groupId> 26 <groupId>org.apache.httpcomponents</groupId>
27 <artifactId>snmp4j-agent</artifactId> 27 <artifactId>httpclient</artifactId>
28 <version>1.3.1</version> 28 <version>4.3.2</version>
29 </dependency> 29 </dependency>
30 30
31 31
32 <dependency>
33 <groupId>org.codehaus.jackson</groupId>
34 <artifactId>jackson-mapper-asl</artifactId>
35 <version>1.9.12</version>
36 </dependency>
37 32
38 <dependency> 33 <dependency>
39 <groupId>org.springframework</groupId> 34 <groupId>org.springframework</groupId>
...@@ -53,68 +48,6 @@ ...@@ -53,68 +48,6 @@
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>
...@@ -198,14 +131,28 @@ ...@@ -198,14 +131,28 @@
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
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
193 <repository>
194 <id>com.gradle.artifactoryonline.gradle.libs</id>
195 <name>Repository2</name>
196 <url>http://gradle.artifactoryonline.com/gradle/libs</url>
197 <snapshots>
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
232 <!-- 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-->
233 <repository> 240 <repository>
234 <id>smslib-snapshots</id> 241 <id>project.local</id>
235 <name>SMSLib Repository</name> 242 <name>project</name>
236 <url>http://smslib.org/maven2/snapshots/</url> 243 <url>file:${project.basedir}/repo</url>
237 </repository> 244 </repository>
238 --> 245
246
239 247
240 </repositories> 248 </repositories>
249
250
251
241 <build> 252 <build>
242 <plugins> 253 <plugins>
243 <plugin> 254 <plugin>
244 <groupId>org.apache.maven.plugins</groupId> 255 <artifactId>maven-eclipse-plugin</artifactId>
245 <artifactId>maven-compiler-plugin</artifactId> 256 <version>2.9</version>
246 <configuration> 257 <configuration>
247 <source>${java-version}</source> 258 <additionalProjectnatures>
248 <target>${java-version}</target> 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>
249 </configuration> 266 </configuration>
250 </plugin> 267 </plugin>
251 <plugin> 268 <plugin>
252 <groupId>org.apache.maven.plugins</groupId> 269 <groupId>org.apache.maven.plugins</groupId>
253 <artifactId>maven-war-plugin</artifactId> 270 <artifactId>maven-compiler-plugin</artifactId>
271 <version>2.5.1</version>
254 <configuration> 272 <configuration>
255 <warName>DevTools</warName> 273 <source>1.6</source>
274 <target>1.6</target>
275 <compilerArgument>-Xlint:all</compilerArgument>
276 <showWarnings>true</showWarnings>
277 <showDeprecation>true</showDeprecation>
256 </configuration> 278 </configuration>
257 </plugin> 279 </plugin>
258 <plugin> 280 <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> 281 <groupId>org.codehaus.mojo</groupId>
273 <artifactId>aspectj-maven-plugin</artifactId> 282 <artifactId>exec-maven-plugin</artifactId>
274 <!-- Have to use version 1.2 since version 1.3 does not appear to work 283 <version>1.2.1</version>
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> 284 <configuration>
308 <junitArtifactName>junit:junit</junitArtifactName> 285 <mainClass>org.test.int1.Main</mainClass>
309 <excludes> 286 <encoding>UTF-8</encoding>
310 <exclude>**/*_Roo_*</exclude> 287 <outputEncoding>UTF-8</outputEncoding>
311 </excludes>
312 </configuration> 288 </configuration>
313 </plugin> 289 </plugin>
314 <plugin> 290
315 <groupId>org.codehaus.mojo</groupId> 291
316 <artifactId>tomcat-maven-plugin</artifactId> 292
317 <version>1.0-beta-1</version> 293
318 </plugin> 294
319 </plugins> 295 </plugins>
320 </build>
321 296
322 <name>DevTools</name> 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>
323 </project> 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 {
37 41
38 /*
39 @RequestMapping(value = "mainconfig/get", method = RequestMethod.GET)
40 public @ResponseBody MainConfig get() {
41 42
42 try { 43 @RequestMapping(value = "devinfo", method = RequestMethod.GET)
43 //return MainConfigService.get(); 44 public @ResponseBody DevInfoBean getDevInfo() {
44 }
45 catch(Exception e)
46 {
47 return null;
48 }
49 }
50 45
51 */
52 /*
53 @RequestMapping(value="mainconfig/update" , method = RequestMethod.POST)
54 public @ResponseBody boolean update(@RequestBody MainConfig mainconfig) {
55 46
56 try { 47 return DevInfoService.INSTANCE.get();
57 //MainConfigService.Update(mainconfig); 48
58 return true;
59 }
60 catch(Exception e) {
61 return false;
62 }
63 } 49 }
64 */
65 50
51
52
53
54 @RequestMapping(value="devinfo/update" , method = RequestMethod.POST)
55 public @ResponseBody boolean update(@RequestBody DevInfoBean m) {
56
57 return DevInfoService.INSTANCE.set(m);
58
59 }
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