Skip to content

Commit

Permalink
Revert "Add SSL support (issue #106)."
Browse files Browse the repository at this point in the history
This reverts commit f71f24e.
  • Loading branch information
Tomasz Bak committed Jun 24, 2014
1 parent f71f24e commit c30e833
Show file tree
Hide file tree
Showing 21 changed files with 20 additions and 1,125 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=0.3.6
netty_version=4.0.20.Final
netty_version=4.0.14.Final
slf4j_version=1.7.6
rxjava_version=[0.17,)
2 changes: 0 additions & 2 deletions rx-netty-examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ Examples Catalog
Protocol | Example / Test | Description
---------|---------|------------
HTTP | [Hello World](src/main/java/io/reactivex/netty/examples/http/helloworld/README.md) | Simple HTTP GET client/server implementation.
HTTP | [SSL Hello World](src/main/java/io/reactivex/netty/examples/ssl/README.md) | Hello World version with SSL connection.
HTTP | [Simple POST](src/main/java/io/reactivex/netty/examples/http/post/README.md) | Simple HTTP POST client/server implementation.
HTTP | [Chunked GET](src/main/java/io/reactivex/netty/examples/http/chunk/README.md) | An example of how to handle large, chunked reply that is not pre-aggregated by the default pipline configurator.
HTTP | [Server Side Events](src/main/java/io/reactivex/netty/examples/http/sse/README.md) | This examples demonstrates how to implement server side event stream, and how to handle it on the client side.
HTTP | [Log tail](src/main/java/io/reactivex/netty/examples/http/logtail/README.md) | A more sophisticated server side event example, with multiple event sources and an intermediary aggregating separate data streams.
HTTP | [Word Counter](src/main/java/io/reactivex/netty/examples/http/wordcounter/README.md) | More complex HTTP POST example demonstrating how to use ContentSource framework to upload a file onto the server.
TCP | [Echo Server](src/main/java/io/reactivex/netty/examples/tcp/echo/README.md) | A simple echo client.
TCP | [SSL Echo Server](src/main/java/io/reactivex/netty/examples/tcp/ssl/README.md) | A simple echo client with SSL connection.
TCP | [TCP Server Side Event Stream](src/main/java/io/reactivex/netty/examples/tcp/event/README.md) | TCP server side event stream example, with configurable client side processing delay.
TCP | [Interval](src/main/java/io/reactivex/netty/examples/tcp/interval/README.md) | A bit more sophisticated event stream example, with explicit subscribe/unsubscribe control mechanism.
UDP | [Hello World](src/main/java/io/reactivex/netty/examples/udp/README.md) | UDP version of a simple request - reply client/server implementation.
Expand Down
31 changes: 0 additions & 31 deletions rx-netty-examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ targetCompatibility = JavaVersion.VERSION_1_6

dependencies {
compile project(':rx-netty')
compile "org.slf4j:slf4j-log4j12:${slf4j_version}"
testCompile 'junit:junit:4.10'
}

Expand All @@ -42,21 +41,6 @@ task runHelloWorldServer (dependsOn: [classes], type: JavaExec) {
classpath = sourceSets.main.runtimeClasspath
}

task runSslHelloWorldClient (dependsOn: [classes], type: JavaExec) {
group = "Examples"
description = "Run SSL Hello World client"

main = "io.reactivex.netty.examples.http.ssl.SslHelloWorldClient"
classpath = sourceSets.main.runtimeClasspath
}
task runSslHelloWorldServer (dependsOn: [classes], type: JavaExec) {
group = "Examples"
description = "Run SSL Hello World server"

main = "io.reactivex.netty.examples.http.ssl.SslHelloWorldServer"
classpath = sourceSets.main.runtimeClasspath
}

task runSimplePostClient (dependsOn: [classes], type: JavaExec) {
group = "Examples"
description = "Run simple POST client"
Expand Down Expand Up @@ -174,21 +158,6 @@ task runTcpEchoServer (dependsOn: [classes], type: JavaExec) {
classpath = sourceSets.main.runtimeClasspath
}

task runSslTcpEchoClient (dependsOn: [classes], type: JavaExec) {
group = "Examples"
description = "Run SSL TCP echo client"

main = "io.reactivex.netty.examples.tcp.ssl.SslTcpEchoClient"
classpath = sourceSets.main.runtimeClasspath
}
task runSslTcpEchoServer (dependsOn: [classes], type: JavaExec) {
group = "Examples"
description = "Run SSL TCP echo server"

main = "io.reactivex.netty.examples.tcp.ssl.SslTcpEchoServer"
classpath = sourceSets.main.runtimeClasspath
}

task runTcpEventStreamClient (dependsOn: [classes], type: JavaExec) {
group = "Examples"
description = "Run TCP event stream client"
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit c30e833

Please sign in to comment.