Skip to content

Commit a8d9f8b

Browse files
committed
Merge branch 'develop'
2 parents 349ed77 + dc2c78f commit a8d9f8b

File tree

111 files changed

+2896
-460
lines changed

Some content is hidden

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

111 files changed

+2896
-460
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,7 @@ hs_err_pid*
2525
.project
2626
nbactions.xml
2727
.settings
28+
/nbproject/
29+
.idea
30+
.vertx
31+
api-framwork.iml

README.adoc

Lines changed: 17 additions & 0 deletions

config-layers/common/Initial.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
$class=in.erail.glue.component.Initial
33

44
initial=\
5-
/in/erail/server/Server
5+
/in/erail/security/SecurityTools,\
6+
/in/erail/server/Server,\
7+
/io/vertx/core/VerticalDeployer
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#/in/erail/common/FrameworkConfiguration
2+
$class=in.erail.common.FrameworkConfiguration
3+
$scope=GLOBAL
4+
5+
redisClient=/io/vertx/redis/RedisClient
6+
oAuth2Auth=/io/vertx/ext/auth/oauth2/OAuth2Auth
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#/in/erail/factory/MethodInstanceFactory
2+
$class=in.erail.glue.factory.MethodInstanceFactory
3+
$scope=GLOBAL
4+
log=true
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#/in/erail/factory/ParameterConstructorInstanceFactory
2+
$class=in.erail.glue.factory.ParameterConstructorInstanceFactory
3+
$scope=GLOBAL
4+
log=true
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#/in/erail/metrics/Registry
2+
$class=in.erail.metrics.Registry
3+
4+
vertx=/io/vertx/core/Vertx
5+
registryName^=/io/vertx/ext/dropwizard/DropwizardMetricsOptions.registryName
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#/in/erail/route/CORSRouteBuilder
2+
$class=in.erail.route.CORSRouteBuilder
3+
4+
vertx=/io/vertx/core/Vertx
5+
log=true
6+
enable=true
7+
8+
allowedOrigin=*
9+
allowedMethod=GET,POST,OPTIONS
10+
allowedCredentials=false
11+
maxAgeSeconds=86400
12+
allowedHeaders=
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#/in/erail/route/LoadUserFromAccessTokenRouteBuilder
2+
$class=in.erail.route.LoadUserFromAccessTokenRouteBuillder
3+
4+
vertx=/io/vertx/core/Vertx
5+
log=true
6+
oAuth2Auth=/io/vertx/ext/auth/oauth2/OAuth2Auth
7+
enable^=/in/erail/common/FrameworkConfiguration.oAuth2AuthEnable

config-layers/common/in/erail/route/LoadUserFromAccessTokenRouteBuillder.properties

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)