Skip to content

Commit

Permalink
Fix #357 Make netty-http dependent on netty and remove the duplicatio…
Browse files Browse the repository at this point in the history
…ns (#365)
  • Loading branch information
ppalaga authored and davsclaus committed Nov 1, 2019
1 parent 91bd05b commit f8fd325
Show file tree
Hide file tree
Showing 10 changed files with 64 additions and 138 deletions.
44 changes: 44 additions & 0 deletions docs/modules/ROOT/pages/extensions/netty-http.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[[netty]]
= Netty HTTP Extension

*Since Camel Quarkus 0.2*

The Netty HTTP extension provides HTTP transport on top of the xref:extensions/netty.adoc[Netty extension].

Maven users will need to add the following dependency to their `pom.xml` for this extension.

[source,xml]
------------------------------------------------------------
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-netty-http</artifactId>
</dependency>
------------------------------------------------------------

== Usage

Please refer to the https://camel.apache.org/components/latest/netty-http-component.html[Netty HTTP] component page.

Also read the xref:extensions/netty.adoc[Netty extension] page that may contain some Quarkus specific information.

=== Example Usage

[source,java]
----
public class CamelRoute extends RouteBuilder {
@Override
public void configure() {
/* consumer */
from("netty-http:http://0.0.0.0:8999/foo")
.transform().constant("Netty Hello World");
/* /producer is proxying /foo */
from("netty-http:http://0.0.0.0:8999/producer")
.to("netty-http:http://localhost:8999/foo");
}
}
----

2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/extensions/netty.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Maven users will need to add the following dependency to their `pom.xml` for thi

== Usage

The extension provides experimental support for the Camel https://camel.apache.org/components/latest/netty-component.html[Netty Component].
The extension provides support for the Camel https://camel.apache.org/components/latest/netty-component.html[Netty Component].

=== Example Usage

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Number of Camel components: 27 in 23 JAR artifacts (0 deprecated)
| xref:extensions/netty.adoc[Netty] (camel-quarkus-netty) +
`netty:protocol:host:port` | 0.4 | Socket level networking using TCP or UDP with the Netty 4.x library.

| link:https://camel.apache.org/components/latest/netty-http-component.html[Netty HTTP] (camel-quarkus-netty-http) +
| xref:extensions/netty-http.adoc[Netty HTTP] (camel-quarkus-netty-http) +
`netty-http:protocol:host:port/path` | 0.2 | Netty HTTP server and client using the Netty 4.x library.

| link:https://camel.apache.org/components/latest/paho-component.html[Paho] (camel-quarkus-paho) +
Expand Down
20 changes: 12 additions & 8 deletions extensions/netty-http/deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,28 @@

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-netty-deployment</artifactId>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-caffeine-deployment</artifactId>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-netty-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core-deployment</artifactId>
<artifactId>camel-quarkus-http-common-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-netty-http</artifactId>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-netty-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-caffeine-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-http-common-deployment</artifactId>
<artifactId>camel-quarkus-netty-http</artifactId>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

class NettyHTTPProcessor {

private static final String FEATURE = "camel-netty-http4";
private static final String FEATURE = "camel-netty-http";

@BuildStep
FeatureBuildItem feature() {
Expand Down
9 changes: 4 additions & 5 deletions extensions/netty-http/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-netty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-http-common</artifactId>
Expand All @@ -71,11 +75,6 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.oracle.substratevm</groupId>
<artifactId>svm</artifactId>
</dependency>
</dependencies>

<build>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion extensions/readme.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Number of Camel components: 27 in 23 JAR artifacts (0 deprecated)
| xref:extensions/netty.adoc[Netty] (camel-quarkus-netty) +
`netty:protocol:host:port` | 0.4 | Socket level networking using TCP or UDP with the Netty 4.x library.

| link:https://camel.apache.org/components/latest/netty-http-component.html[Netty HTTP] (camel-quarkus-netty-http) +
| xref:extensions/netty-http.adoc[Netty HTTP] (camel-quarkus-netty-http) +
`netty-http:protocol:host:port/path` | 0.2 | Netty HTTP server and client using the Netty 4.x library.

| link:https://camel.apache.org/components/latest/paho-component.html[Paho] (camel-quarkus-paho) +
Expand Down

0 comments on commit f8fd325

Please sign in to comment.