Skip to content

Commit bc3af61

Browse files
zfizfi
authored
Merge pull request #1636 from zfi/master
Release 1.1 merge to master
2 parents 1c83444 + d854660 commit bc3af61

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1143
-238
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,8 @@ pip-log.txt
243243

244244
#Mr Developer
245245
.mr.developer.cfg
246+
247+
###########
248+
## MacOS
249+
###########
250+
._.DS_Store

‎LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2018 Parallax Inc.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎pom.xml‎

Lines changed: 57 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<artifactId>BlocklyProp</artifactId>
66
<version>1.0-SNAPSHOT</version>
77
<packaging>war</packaging>
8+
89
<properties>
910
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1011
<maven.compiler.source>1.8</maven.compiler.source>
@@ -16,18 +17,11 @@
1617

1718
<!-- jOOQ version 3.7 and above requires Java 1.8.x JDK -->
1819
<jooq-version>3.7.4</jooq-version>
19-
20+
<gson.version>2.8.5</gson.version>
2021
<shiro-version>1.3.2</shiro-version>
2122
<metrics-version>3.1.0</metrics-version>
2223
<jersey.version>1.19</jersey.version>
2324
</properties>
24-
25-
<repositories>
26-
<repository>
27-
<id>netbeans.maven2.repository</id>
28-
<url>http://bits.netbeans.org/maven2/</url>
29-
</repository>
30-
</repositories>
3125

3226
<build>
3327
<resources>
@@ -40,29 +34,30 @@
4034
</resources>
4135

4236
<plugins>
43-
<!--
44-
codehaus.org shut down on 6/2015.
45-
This is now the MojoHaus Project http://www.mojohaus.org/
46-
-->
4737
<plugin>
38+
<!-- Read external property resource files -->
4839
<groupId>org.codehaus.mojo</groupId>
4940
<artifactId>properties-maven-plugin</artifactId>
50-
<version>1.0-alpha-2</version>
41+
<version>1.0.0</version>
5142
<executions>
5243
<execution>
5344
<phase>initialize</phase>
5445
<goals>
46+
<!-- Reads property files or properties from URLs as Project properties -->
5547
<goal>read-project-properties</goal>
5648
</goals>
49+
<configuration>
50+
<files>
51+
<!-- Location of the property file(s) -->
52+
<file>build.properties</file>
53+
</files>
54+
<!--
55+
<properties combine.self="append" />
56+
<outputFile combine.self="append" />
57+
-->
58+
</configuration>
5759
</execution>
5860
</executions>
59-
<configuration>
60-
<files>
61-
<file>build.properties</file>
62-
</files>
63-
<properties combine.self="append" />
64-
<outputFile combine.self="append" />
65-
</configuration>
6661
</plugin>
6762

6863
<plugin>
@@ -101,7 +96,9 @@
10196
<!-- Include the <execution> element to generate a new set of -->
10297
<!-- source files that represent the current state of the -->
10398
<!-- target database schema. -->
104-
<!-- <executions>
99+
100+
<!--
101+
<executions>
105102
<execution>
106103
<id>jooq-codegen</id>
107104
<phase>generate-sources</phase>
@@ -110,11 +107,11 @@
110107
</goals>
111108
</execution>
112109
</executions>
113-
-->
110+
-->
111+
114112
<!-- Comment out the <executions> block to disable jooq -->
115113
<!-- from generating database code -->
116-
117-
114+
118115
<dependencies>
119116
<dependency>
120117
<groupId>mysql</groupId>
@@ -201,6 +198,14 @@
201198
</generator>
202199
</configuration>
203200
</plugin>
201+
<plugin>
202+
<groupId>org.apache.maven.plugins</groupId>
203+
<artifactId>maven-surefire-plugin</artifactId>
204+
<version>2.22.1</version>
205+
<configuration>
206+
<skipTests>true</skipTests>
207+
</configuration>
208+
</plugin>
204209
</plugins>
205210
</build>
206211

@@ -223,6 +228,12 @@
223228
</profiles>
224229

225230
<dependencies>
231+
<dependency>
232+
<groupId>org.codehaus.mojo</groupId>
233+
<artifactId>properties-maven-plugin</artifactId>
234+
<version>1.0.0</version>
235+
</dependency>
236+
226237
<!-- Servlet and jsp libs provided by tomcat -->
227238
<dependency>
228239
<groupId>javax.servlet</groupId>
@@ -262,13 +273,13 @@
262273
<dependency>
263274
<groupId>ch.qos.logback</groupId>
264275
<artifactId>logback-classic</artifactId>
265-
<version>1.1.8</version>
276+
<version>1.2.3</version>
266277
</dependency>
267278

268279
<dependency>
269280
<groupId>ch.qos.logback</groupId>
270281
<artifactId>logback-core</artifactId>
271-
<version>1.1.8</version>
282+
<version>1.2.3</version>
272283
</dependency>
273284
<!-- END Logging Dependencies -->
274285

@@ -285,13 +296,11 @@
285296
<version>4.0</version>
286297
</dependency>
287298

288-
289299
<dependency>
290300
<groupId>com.google.inject.extensions</groupId>
291301
<artifactId>guice-persist</artifactId>
292302
<version>4.0</version>
293303
</dependency>
294-
295304
<!-- END Guice Dependencies -->
296305

297306
<!-- Dependencies for JOOQ -->
@@ -345,10 +354,23 @@
345354
<dependency>
346355
<groupId>commons-collections</groupId>
347356
<artifactId>commons-collections</artifactId>
348-
<version>3.2.1</version>
357+
<version>3.2.2</version>
358+
</dependency>
359+
360+
<!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
361+
<dependency>
362+
<groupId>commons-beanutils</groupId>
363+
<artifactId>commons-beanutils</artifactId>
364+
<version>1.9.2</version>
365+
</dependency>
366+
367+
<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
368+
<dependency>
369+
<groupId>commons-logging</groupId>
370+
<artifactId>commons-logging</artifactId>
371+
<version>1.2</version>
349372
</dependency>
350373

351-
<!-- -->
352374
<dependency>
353375
<groupId>org.apache.commons</groupId>
354376
<artifactId>commons-dbcp2</artifactId>
@@ -373,7 +395,6 @@
373395
<artifactId>commons-validator</artifactId>
374396
<version>1.6</version>
375397
</dependency>
376-
377398
<!-- END Apache commons Dependencies -->
378399

379400
<!-- Rest API -->
@@ -382,21 +403,25 @@
382403
<artifactId>jersey-server</artifactId>
383404
<version>${jersey.version}</version>
384405
</dependency>
406+
385407
<dependency>
386408
<groupId>com.sun.jersey</groupId>
387409
<artifactId>jersey-json</artifactId>
388410
<version>${jersey.version}</version>
389411
</dependency>
412+
390413
<dependency>
391414
<groupId>org.codehaus.jackson</groupId>
392415
<artifactId>jackson-core-asl</artifactId>
393416
<version>1.9.13</version>
394417
</dependency>
418+
395419
<dependency>
396420
<groupId>org.codehaus.jackson</groupId>
397421
<artifactId>jackson-mapper-asl</artifactId>
398422
<version>1.9.13</version>
399423
</dependency>
424+
400425
<dependency>
401426
<groupId>org.codehaus.jackson</groupId>
402427
<artifactId>jackson-jaxrs</artifactId>
@@ -414,22 +439,8 @@
414439
<artifactId>cuubez-api-visualizer</artifactId>
415440
<version>1.0.1</version>
416441
</dependency>
417-
418442
<!-- END Rest API -->
419443

420-
<!-- Raven / Sentry API -->
421-
<dependency>
422-
<groupId>com.getsentry.raven</groupId>
423-
<artifactId>raven</artifactId>
424-
<version>7.8.1</version>
425-
</dependency>
426-
427-
<dependency>
428-
<groupId>com.getsentry.raven</groupId>
429-
<artifactId>raven-logback</artifactId>
430-
<version>7.8.1</version>
431-
</dependency>
432-
433444
<!-- Lucene search engine -->
434445
<dependency>
435446
<groupId>org.apache.lucene</groupId>
@@ -497,7 +508,7 @@
497508
<dependency>
498509
<groupId>com.google.code.gson</groupId>
499510
<artifactId>gson</artifactId>
500-
<version>2.3.1</version>
511+
<version>${gson.version}</version>
501512
</dependency>
502513

503514
<dependency>

‎src/main/java/com/parallax/server/blocklyprop/config/DaoModule.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
/*
2-
* To change this license header, choose License Headers in Project Properties.
3-
* To change this template file, choose Tools | Templates
4-
* and open the template in the editor.
2+
* Copyright (c) 2018 Parallax Inc.
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
5+
* and associated documentation files (the “Software”), to deal in the Software without
6+
* restriction, including without limitation the rights to use, copy, modify, merge, publish,
7+
* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
8+
* Software is furnished to do so, subject to the following conditions:
9+
*
10+
* The above copyright notice and this permission notice shall be included in all copies or
11+
* substantial portions of the Software.
12+
*
13+
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
* SOFTWARE.
520
*/
21+
622
package com.parallax.server.blocklyprop.config;
723

824
import com.google.inject.AbstractModule;

‎src/main/java/com/parallax/server/blocklyprop/config/PersistenceModule.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
/*
2-
* To change this license header, choose License Headers in Project Properties.
3-
* To change this template file, choose Tools | Templates
4-
* and open the template in the editor.
2+
* Copyright (c) 2018 Parallax Inc.
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
5+
* and associated documentation files (the “Software”), to deal in the Software without
6+
* restriction, including without limitation the rights to use, copy, modify, merge, publish,
7+
* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
8+
* Software is furnished to do so, subject to the following conditions:
9+
*
10+
* The above copyright notice and this permission notice shall be included in all copies or
11+
* substantial portions of the Software.
12+
*
13+
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
* SOFTWARE.
520
*/
21+
622
package com.parallax.server.blocklyprop.config;
723

824
import com.adamlewis.guice.persist.jooq.JooqPersistModule;

‎src/main/java/com/parallax/server/blocklyprop/config/RestAPIVisualizeBootstrap.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
/*
2-
* To change this license header, choose License Headers in Project Properties.
3-
* To change this template file, choose Tools | Templates
4-
* and open the template in the editor.
2+
* Copyright (c) 2018 Parallax Inc.
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
5+
* and associated documentation files (the “Software”), to deal in the Software without
6+
* restriction, including without limitation the rights to use, copy, modify, merge, publish,
7+
* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
8+
* Software is furnished to do so, subject to the following conditions:
9+
*
10+
* The above copyright notice and this permission notice shall be included in all copies or
11+
* substantial portions of the Software.
12+
*
13+
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
* SOFTWARE.
520
*/
21+
622
package com.parallax.server.blocklyprop.config;
723

824
import com.cuubez.visualizer.domain.ApplicationConfigurationContext;

‎src/main/java/com/parallax/server/blocklyprop/config/RestModule.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
/*
2-
* To change this license header, choose License Headers in Project Properties.
3-
* To change this template file, choose Tools | Templates
4-
* and open the template in the editor.
2+
* Copyright (c) 2018 Parallax Inc.
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
5+
* and associated documentation files (the “Software”), to deal in the Software without
6+
* restriction, including without limitation the rights to use, copy, modify, merge, publish,
7+
* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
8+
* Software is furnished to do so, subject to the following conditions:
9+
*
10+
* The above copyright notice and this permission notice shall be included in all copies or
11+
* substantial portions of the Software.
12+
*
13+
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
* SOFTWARE.
520
*/
21+
622
package com.parallax.server.blocklyprop.config;
723

824
import com.parallax.server.blocklyprop.rest.RestCompile;

0 commit comments

Comments
 (0)