Skip to content

Commit a6c329a

Browse files
committed
1.0.12.Final release.
1 parent c0528e7 commit a6c329a

File tree

4 files changed

+45
-18
lines changed

4 files changed

+45
-18
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
mvn clean package -P Apache-HttpClient,RESTEasy,MySQL,JDBC-CP-Hikari,JPA-EclipseLink,AWS,iText,Thymeleaf
2+
mvn clean package -P Apache-HttpClient,RESTEasy,MySQL,JDBC-CP-Hikari,JPA-EclipseLink,AWS,iText

haproxy.cfg

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,70 @@
1616
# #
1717
###############################################################################
1818

19+
# Default settings for AdeptJ Runtime load balancing Using HAProxy
20+
# Please update as per your needs.
21+
1922
global
2023
daemon
24+
# log 127.0.0.1 local2
25+
# log global
26+
# option httplog
27+
# option dontlognull
2128
pidfile haproxy.pid
2229
maxconn 10240
2330
hard-stop-after 30s
2431

2532
defaults
2633
mode http
34+
# log 127.0.0.1 local0
2735
# log global
2836
# option httplog
2937
# option dontlognull
30-
timeout http-request 5s
31-
timeout connect 5s
32-
timeout server 10s
38+
timeout http-request 15s
39+
timeout connect 15s
40+
timeout server 30s
3341
timeout client 30s
3442

3543
listen stats
3644
bind *:9015
3745
# mode http
3846
stats enable
39-
stats uri /
47+
stats uri /ha-stats
4048
stats hide-version
49+
stats realm HAProxy\ Statistics
4150
stats refresh 30s
4251
stats show-node
43-
stats auth admin:admin
52+
stats auth admin:HaPr0xy@Qc1
4453

4554
frontend www-haproxy
46-
bind *:80
47-
# bind *:443 ssl crt server.crt
55+
bind :80,:9007
56+
# bind *:443 ssl crt teachr.crt
4857
# mode http
49-
compression algo gzip
50-
compression type application/json text/html text/plain text/javascript application/javascript application/xml text/css
58+
# option httplog
59+
# log global
60+
# compression algo gzip
61+
# compression type application/json text/html text/plain text/javascript application/javascript application/xml text/css
62+
acl is_that_page path_beg /a/b /myPage
63+
use_backend dummy if is_that_page
64+
acl is_stats path_beg /ha-stats
65+
use_backend haproxy-stats if is_stats
5166
default_backend adeptj-rt-nodes
52-
67+
5368
backend adeptj-rt-nodes
5469
# mode http
5570
balance roundrobin
5671
# cookie JSESSIONID prefix nocache
5772
cookie SERVERID insert indirect nocache httponly
58-
server AdeptJ_RT1 0.0.0.0:9007 maxconn 5000 check cookie AdeptJ_RT1
59-
server AdeptJ_RT2 0.0.0.0:9008 maxconn 5000 check cookie AdeptJ_RT2
73+
# Add an entry for each of your backend servers and their resolvable hostnames
74+
server AdeptJ_RT1 127.0.0.1:7007 maxconn 5000 check cookie AdeptJ_RT1
75+
server AdeptJ_RT2 127.0.0.1:8007 maxconn 5000 check cookie AdeptJ_RT2
76+
server AdeptJ_RT3 127.0.0.1:9007 maxconn 5000 check cookie AdeptJ_RT3
77+
78+
backend dummy
79+
balance roundrobin
80+
server Dummy1 127.0.0.1:9091 check
81+
server Dummy2 127.0.0.1:9092 check
82+
server Dummy3 127.0.0.1:9093 check
83+
84+
backend haproxy-stats
85+
server HAProxy_Stats_Local 127.0.0.1:9015

pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<version>1.0.13.Final</version>
2828
</parent>
2929
<artifactId>adeptj-runtime</artifactId>
30-
<version>1.0.12-SNAPSHOT</version>
30+
<version>1.0.12.Final</version>
3131
<packaging>jar</packaging>
3232
<name>AdeptJ Runtime</name>
3333
<description>AdeptJ Runtime for deploying various modules(OSGi Bundles)</description>
@@ -42,6 +42,7 @@
4242
<maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
4343
<maven-dependency-plugin.version>3.0.1</maven-dependency-plugin.version>
4444
<jansi.version>1.16</jansi.version>
45+
<hikaricp.version>2.7.2</hikaricp.version>
4546

4647
<!-- Apache Felix and OSGi Dependencies Version -->
4748
<felix.framework.version>5.6.8</felix.framework.version>
@@ -1001,7 +1002,7 @@
10011002
<dependency>
10021003
<groupId>com.adeptj</groupId>
10031004
<artifactId>adeptj-modules-websecurity-jwt</artifactId>
1004-
<version>1.0.6.Final</version>
1005+
<version>1.0.7.Final</version>
10051006
<scope>provided</scope>
10061007
</dependency>
10071008

@@ -1375,7 +1376,7 @@
13751376
<dependency>
13761377
<groupId>com.adeptj</groupId>
13771378
<artifactId>adeptj-modules-commons-datasource</artifactId>
1378-
<version>1.0.2.Final</version>
1379+
<version>1.0.3.Final</version>
13791380
<scope>provided</scope>
13801381
</dependency>
13811382

@@ -1448,7 +1449,7 @@
14481449
<dependency>
14491450
<groupId>com.adeptj</groupId>
14501451
<artifactId>adeptj-modules-data-jpa</artifactId>
1451-
<version>1.0.3.Final</version>
1452+
<version>1.0.4.Final</version>
14521453
<scope>provided</scope>
14531454
</dependency>
14541455

src/test/java/com/adeptj/runtime/common/BundleContextHolderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void testIsBundleContextSetWhenSetBundleContextCalled() {
4141

4242
@Test
4343
public void testIsBundleContextSetWhenSetBundleContextNotCalled() {
44-
//Assert.assertFalse(BundleContextHolder.INSTANCE.isBundleContextSet());
44+
Assert.assertFalse(BundleContextHolder.INSTANCE.isBundleContextAvailable());
4545
Mockito.eq(BundleContextHolder.INSTANCE.isBundleContextAvailable());
4646
}
4747
}

0 commit comments

Comments
 (0)