Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add HTTP proxy, multiple connections to client, clustering to server #11

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Add HTTP proxy, multiple connections to client, clustering to server #11

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3e5aa56
Add initial cluster support
seanf Oct 30, 2017
fe9a380
Disable coroutine compiler warnings
seanf Oct 31, 2017
304adfb
Convert ProxyHookServer to coroutines
seanf Oct 30, 2017
c19c42d
Update main method to use cluster mode
seanf Oct 31, 2017
f33d505
Use openjdk18-openshift for docker base
seanf Oct 31, 2017
86921cf
Extract buildAndTest()
seanf Nov 3, 2017
d25e169
Update Kotlin
seanf Dec 15, 2017
5dd17b0
Upgrade Gradle
seanf Dec 15, 2017
ece1a27
Use JDK from RH Container Catalog for client
seanf Dec 15, 2017
30b34dc
Refactor http proxy code
seanf Dec 15, 2017
11ec71b
Support running with or without cluster
seanf Dec 15, 2017
f436095
Upgrade Kotlin to 1.2.30
seanf Mar 6, 2018
15c5495
Upgrade to vert.x 3.5.1
seanf Mar 7, 2018
8396496
Allow client to use multiple websockets
seanf Mar 7, 2018
967821c
Simplify using AsyncMap/HashMap, no LocalMap/Counter
seanf Mar 9, 2018
6297650
Remove FakeClusterManager
seanf Mar 9, 2018
6e812a5
Merge remote-tracking branch 'origin/master' into cluster-support
seanf Mar 9, 2018
8fa886a
Clean up for codacy
seanf Mar 9, 2018
5661330
Merge remote-tracking branch 'origin/master' into cluster-support
seanf Sep 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Upgrade to vert.x 3.5.1
  • Loading branch information
@seanf
seanf committed Mar 7, 2018
commit 15c54954ea48fc5aeeed357f30992c9fefd15933
9 changes: 5 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
buildscript {
ext.kotlin_version = '1.2.30'
ext.vertx_version = '3.5.1'
repositories {
mavenCentral()
}
Expand Down Expand Up @@ -28,10 +29,10 @@ subprojects {

dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
compile 'io.vertx:vertx-core:3.5.0'
compile 'io.vertx:vertx-web:3.5.0'
// testCompile 'io.vertx:vertx-unit:3.5.0'
compile 'io.vertx:vertx-lang-kotlin-coroutines:3.5.0'
compile "io.vertx:vertx-core:$vertx_version"
compile "io.vertx:vertx-web:$vertx_version"
// testCompile "io.vertx:vertx-unit:$vertx_version"
compile "io.vertx:vertx-lang-kotlin-coroutines:$vertx_version"
testCompile 'junit:junit:4.12'
testCompile 'net.wuerl.kotlin:assertj-core-kotlin:0.2.1'
}
Expand Down
10 changes: 6 additions & 4 deletions client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,23 @@ sourceSets {

dependencies {
compile project(':common')
compile 'com.xenomachina:kotlin-argparser:2.0.4'
compile "io.vertx:vertx-shell:$vertx_version"
testCompile project(':server')
testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.18'
testCompile 'org.asynchttpclient:async-http-client:2.1.0-alpha20'
testRuntime 'org.slf4j:slf4j-simple:1.7.25'
testCompile 'org.mock-server:mockserver-netty:3.11'
// for FakeClusterManager: https://github.com/eclipse/vert.x/issues/2191
testCompile 'io.vertx:vertx-core:3.5.0:tests'
testCompile "io.vertx:vertx-core:$vertx_version:tests"
// Enabling this should cause the IDE to download the source for
// FakeClusterManager. (You'll still have to select Choose Sources on
// FakeClusterManager.class, then browse to the test-sources jar in a
// nearby directory.)
// testSourcesCompile 'io.vertx:vertx-core:3.5.0:test-sources'
// testSourcesCompile "io.vertx:vertx-core:$vertx_version:test-sources"

// compile 'io.vertx:vertx-hazelcast:3.5.0'
// compile 'io.vertx:vertx-infinispan:3.5.0'
// compile "io.vertx:vertx-hazelcast:$vertx_version"
// compile "io.vertx:vertx-infinispan:$vertx_version"
// // http://vertx.io/docs/vertx-infinispan/java/#_configuring_for_kubernetes_or_openshift_3
// compile 'org.infinispan:infinispan-cloud:9.1.2.Final'
// compile 'org.jgroups.kubernetes:jgroups-kubernetes:1.0.3.Final'
Expand Down
2 changes: 1 addition & 1 deletion server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
dependencies {
compile project(':common')
compile 'de.svenkubiak:jBCrypt:0.4.1'
runtime 'io.vertx:vertx-infinispan:3.5.0'
runtime "io.vertx:vertx-infinispan:$vertx_version"
// // http://vertx.io/docs/vertx-infinispan/java/#_configuring_for_kubernetes_or_openshift_3
runtime 'org.infinispan:infinispan-cloud:9.1.2.Final'
}
Expand Down