Skip to content

Commit f94ff20

Browse files
vinscomvinscom
authored
Merge pull request #11 from vinscom/develop
Release 2.0
2 parents e5816d1 + 1bf1eed commit f94ff20

File tree

21 files changed

+606
-144
lines changed

21 files changed

+606
-144
lines changed

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,8 @@
2020

2121
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
2222
hs_err_pid*
23-
/target/
23+
/target/
24+
.classpath
25+
.project
26+
nbactions.xml
27+
.settings

‎config-layers/common/Initial.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#/Initial
12
$class=in.erail.glue.component.Initial
23

34
initial=\

‎config-layers/common/io/vertx/ext/mongo/LoadMongoDataService.properties‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#/io/vertx/ext/mongo/LoadMongoDataService
2+
$class=io.vertx.reactivex.ext.mongo.LoadMongoDataService
3+
4+
#Example Data JSON
5+
#{
6+
# "test": [
7+
# {
8+
# "name": "data1"
9+
# },
10+
# {
11+
# "name": "data2"
12+
# }
13+
# ],
14+
# "test2": [
15+
# {
16+
# "name": "data1"
17+
# },
18+
# {
19+
# "name": "data2"
20+
# }
21+
# ]
22+
#}
23+
24+
enable=false
25+
mongoClient^=/io/vertx/ext/mongo/MongoClientInstance.mongoClient
26+
data=data.json
27+

‎config-layers/common/io/vertx/ext/mongo/MongoClientInstance.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#/io/vertx/ext/mongo/MongoClientInstance
2+
$class=io.vertx.reactivex.ext.mongo.MongoClientInstance
3+
4+
vertx^=/io/vertx/core/VertxInstance.vertx
5+
config=mongoConfig.json
6+
enable=false

‎config-layers/common/io/vertx/ext/mongo/data.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

‎config-layers/common/io/vertx/ext/mongo/mongoConfig.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"db_name" : "",
3+
"connection_string" : "mongodb://localhost:27017"
4+
}

‎config-layers/common/io/vertx/ext/web/handler/sockjs/BridgeEventHandler.properties‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
#/io/vertx/ext/web/handler/sockjs/BridgeEventHandler
2-
$class=io.vertx.reactivex.ext.web.handler.sockjs.DefaultBridgeEventHandler
2+
$class=io.vertx.reactivex.ext.web.handler.sockjs.BridgeEventHandler
3+
4+
addressAllowedToRegister=
5+
addressAllowedToRegisterRegex=

‎config-layers/common/io/vertx/ext/web/handler/sockjs/BridgeOptions.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ inboundAddressRegex=
77
outboundAddressRegex=
88
inboundRequiredAuthority=
99
outboundRequiredAuthority=
10+
log=true

‎pom.xml‎

Lines changed: 141 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,145 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>in.erail</groupId>
6-
<artifactId>api-framwork</artifactId>
7-
<version>1.0-SNAPSHOT</version>
8-
<packaging>jar</packaging>
9-
<dependencies>
10-
<dependency>
11-
<groupId>in.erail</groupId>
12-
<artifactId>glue</artifactId>
13-
<version>1.0-SNAPSHOT</version>
14-
</dependency>
15-
<dependency>
16-
<groupId>io.vertx</groupId>
17-
<artifactId>vertx-core</artifactId>
18-
<version>3.5.0</version>
19-
</dependency>
20-
<dependency>
21-
<groupId>io.vertx</groupId>
22-
<artifactId>vertx-rx-java2</artifactId>
23-
<version>3.5.0</version>
24-
</dependency>
25-
<dependency>
26-
<groupId>io.vertx</groupId>
27-
<artifactId>vertx-unit</artifactId>
28-
<version>3.5.0</version>
29-
<scope>test</scope>
30-
</dependency>
31-
<dependency>
32-
<groupId>io.vertx</groupId>
33-
<artifactId>vertx-web-api-contract</artifactId>
34-
<version>3.5.0</version>
35-
</dependency>
36-
<dependency>
37-
<groupId>junit</groupId>
38-
<artifactId>junit</artifactId>
39-
<version>4.12</version>
40-
<scope>test</scope>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.hamcrest</groupId>
44-
<artifactId>hamcrest-core</artifactId>
45-
<version>1.3</version>
46-
<scope>test</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>io.vertx</groupId>
50-
<artifactId>vertx-web</artifactId>
51-
<version>3.5.0</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>io.vertx</groupId>
55-
<artifactId>vertx-hazelcast</artifactId>
56-
<version>3.5.0</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>io.vertx</groupId>
60-
<artifactId>vertx-auth-jwt</artifactId>
61-
<version>3.5.0</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>io.vertx</groupId>
65-
<artifactId>vertx-auth-oauth2</artifactId>
66-
<version>3.5.0</version>
67-
</dependency>
68-
</dependencies>
69-
<properties>
70-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
71-
<maven.compiler.source>1.8</maven.compiler.source>
72-
<maven.compiler.target>1.8</maven.compiler.target>
73-
<argLine>-Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -Dglue.layers=${project.basedir}/config-layers/common,${project.basedir}/config-layers/test</argLine>
74-
</properties>
75-
<build>
76-
<plugins>
77-
<plugin>
78-
<groupId>org.apache.maven.plugins</groupId>
79-
<artifactId>maven-surefire-plugin</artifactId>
80-
<version>2.20.1</version>
81-
</plugin>
82-
<plugin>
83-
<groupId>org.jacoco</groupId>
84-
<artifactId>jacoco-maven-plugin</artifactId>
85-
<version>0.7.9</version>
86-
<executions>
87-
<execution>
88-
<id>prepare-agent</id>
89-
<goals>
90-
<goal>prepare-agent</goal>
91-
</goals>
92-
</execution>
93-
<execution>
94-
<id>report</id>
95-
<phase>prepare-package</phase>
96-
<goals>
97-
<goal>report</goal>
98-
</goals>
99-
</execution>
100-
<execution>
101-
<id>post-unit-test</id>
102-
<phase>test</phase>
103-
<goals>
104-
<goal>report</goal>
105-
</goals>
106-
<configuration>
107-
<!-- Sets the path to the file which contains the execution data. -->
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>in.erail</groupId>
6+
<artifactId>api-framwork</artifactId>
7+
<version>1.0-SNAPSHOT</version>
8+
<packaging>jar</packaging>
9+
<dependencies>
10+
<dependency>
11+
<groupId>in.erail</groupId>
12+
<artifactId>glue</artifactId>
13+
<version>1.0-SNAPSHOT</version>
14+
</dependency>
15+
<dependency>
16+
<groupId>io.vertx</groupId>
17+
<artifactId>vertx-core</artifactId>
18+
<version>3.5.0</version>
19+
</dependency>
20+
<dependency>
21+
<groupId>io.vertx</groupId>
22+
<artifactId>vertx-rx-java2</artifactId>
23+
<version>3.5.0</version>
24+
</dependency>
25+
<dependency>
26+
<groupId>io.vertx</groupId>
27+
<artifactId>vertx-web-api-contract</artifactId>
28+
<version>3.5.0</version>
29+
</dependency>
30+
<dependency>
31+
<groupId>io.vertx</groupId>
32+
<artifactId>vertx-unit</artifactId>
33+
<version>3.5.0</version>
34+
<scope>test</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>junit</groupId>
38+
<artifactId>junit</artifactId>
39+
<version>4.12</version>
40+
<scope>test</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.hamcrest</groupId>
44+
<artifactId>hamcrest-core</artifactId>
45+
<version>1.3</version>
46+
<scope>test</scope>
47+
</dependency>
48+
<dependency>
49+
<groupId>io.vertx</groupId>
50+
<artifactId>vertx-web</artifactId>
51+
<version>3.5.0</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>io.vertx</groupId>
55+
<artifactId>vertx-hazelcast</artifactId>
56+
<version>3.5.0</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>io.vertx</groupId>
60+
<artifactId>vertx-auth-jwt</artifactId>
61+
<version>3.5.0</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>io.vertx</groupId>
65+
<artifactId>vertx-auth-oauth2</artifactId>
66+
<version>3.5.0</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>io.vertx</groupId>
70+
<artifactId>vertx-mongo-client</artifactId>
71+
<version>3.5.0</version>
72+
</dependency>
73+
</dependencies>
74+
<properties>
75+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
76+
<maven.compiler.source>1.8</maven.compiler.source>
77+
<maven.compiler.target>1.8</maven.compiler.target>
78+
<argLine>-Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -Dglue.layers=${project.basedir}/config-layers/common,${project.basedir}/config-layers/test</argLine>
79+
</properties>
80+
<build>
81+
<plugins>
82+
<plugin>
83+
<artifactId>maven-assembly-plugin</artifactId>
84+
<version>2.5.3</version>
85+
<configuration>
86+
<descriptor>src/assembly/dep.xml</descriptor>
87+
</configuration>
88+
<executions>
89+
<execution>
90+
<id>create-archive</id>
91+
<phase>package</phase>
92+
<goals>
93+
<goal>single</goal>
94+
</goals>
95+
</execution>
96+
</executions>
97+
</plugin>
98+
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
100+
<artifactId>maven-surefire-plugin</artifactId>
101+
<version>2.20.1</version>
102+
</plugin>
103+
<plugin>
104+
<groupId>org.jacoco</groupId>
105+
<artifactId>jacoco-maven-plugin</artifactId>
106+
<version>0.7.9</version>
107+
<executions>
108+
<execution>
109+
<id>prepare-agent</id>
110+
<goals>
111+
<goal>prepare-agent</goal>
112+
</goals>
113+
</execution>
114+
<execution>
115+
<id>report</id>
116+
<phase>prepare-package</phase>
117+
<goals>
118+
<goal>report</goal>
119+
</goals>
120+
</execution>
121+
<execution>
122+
<id>post-unit-test</id>
123+
<phase>test</phase>
124+
<goals>
125+
<goal>report</goal>
126+
</goals>
127+
<configuration>
128+
<!-- Sets the path to the file which contains the execution data. -->
108129

109-
<dataFile>target/jacoco.exec</dataFile>
110-
<!-- Sets the output directory for the code coverage report. -->
111-
<outputDirectory>target/jacoco-ut</outputDirectory>
112-
</configuration>
113-
</execution>
114-
</executions>
115-
<configuration>
116-
<systemPropertyVariables>
117-
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
118-
</systemPropertyVariables>
119-
</configuration>
120-
</plugin>
121-
</plugins>
122-
</build>
123-
<name>api-framwork</name>
130+
<dataFile>target/jacoco.exec</dataFile>
131+
<!-- Sets the output directory for the code coverage report. -->
132+
<outputDirectory>target/jacoco-ut</outputDirectory>
133+
</configuration>
134+
</execution>
135+
</executions>
136+
<configuration>
137+
<systemPropertyVariables>
138+
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
139+
</systemPropertyVariables>
140+
</configuration>
141+
</plugin>
142+
</plugins>
143+
</build>
144+
<name>api-framwork</name>
124145
</project>

‎src/assembly/dep.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
5+
<id>config</id>
6+
<formats>
7+
<format>zip</format>
8+
</formats>
9+
<fileSets>
10+
<fileSet>
11+
<directory>${project.basedir}/config-layers/common</directory>
12+
<outputDirectory>/config</outputDirectory>
13+
</fileSet>
14+
</fileSets>
15+
</assembly>

0 commit comments

Comments
 (0)