[camel] branch master updated (2bc791f -> b305eed)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (2bc791f -> b305eed)

acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 2bc791f  Added a Karaf feature test for camel-restlet-gson
     new 474cc04  Upgrade Ekstazi to version 5.1.0
     new b305eed  CAMEL-12068: Enable http2 for undertow component

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../camel/component/undertow/DefaultUndertowHost.java    |  6 +++++-
 .../camel/component/undertow/UndertowHostOptions.java    | 16 +++++++++++++++-
 parent/pom.xml                                           |  2 +-
 .../springboot/UndertowComponentConfiguration.java       | 12 ++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

--
To stop receiving notification emails like this one, please contact
['"[hidden email]" <[hidden email]>'].
Reply | Threaded
Open this post in threaded view
|

[camel] 01/02: Upgrade Ekstazi to version 5.1.0

acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 474cc04555455317d0f6b7093a406f2b6dab6313
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Thu Dec 7 09:46:28 2017 +0100

    Upgrade Ekstazi to version 5.1.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 27cba82..38b158d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -196,7 +196,7 @@
     <egit-github-core-bundle-version>2.1.5_1</egit-github-core-bundle-version>
     <ehcache-version>2.10.1</ehcache-version>
     <ehcache3-version>3.4.0</ehcache3-version>
-    <ekstazi-maven-plugin-version>5.0.1</ekstazi-maven-plugin-version>
+    <ekstazi-maven-plugin-version>5.1.0</ekstazi-maven-plugin-version>
     <elasticsearch-bundle-version>2.4.4_1</elasticsearch-bundle-version>
     <elasticsearch-guava-version>18.0</elasticsearch-guava-version>
     <elasticsearch-version>2.4.4</elasticsearch-version>

--
To stop receiving notification emails like this one, please contact
"[hidden email]" <[hidden email]>.
Reply | Threaded
Open this post in threaded view
|

[camel] 02/02: CAMEL-12068: Enable http2 for undertow component

acosentino
In reply to this post by acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit b305eed1af4824355f9e9ee98fd7899e13b4d071
Author: cpandey <[hidden email]>
AuthorDate: Wed Dec 6 21:51:48 2017 +0530

    CAMEL-12068: Enable http2 for undertow component
---
 .../camel/component/undertow/DefaultUndertowHost.java    |  6 +++++-
 .../camel/component/undertow/UndertowHostOptions.java    | 16 +++++++++++++++-
 .../springboot/UndertowComponentConfiguration.java       | 12 ++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHost.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHost.java
index 89447ef..4ef6126 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHost.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHost.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.undertow;
 import java.net.URI;
 
 import io.undertow.Undertow;
+import io.undertow.UndertowOptions;
 import io.undertow.server.HttpHandler;
 
 import org.apache.camel.component.undertow.handlers.CamelRootHandler;
@@ -76,6 +77,9 @@ public class DefaultUndertowHost implements UndertowHost {
                 if (options.getDirectBuffers() != null) {
                     builder.setDirectBuffers(options.getDirectBuffers());
                 }
+                if (options.getHttp2Enabled() != null) {
+                    builder.setServerOption(UndertowOptions.ENABLE_HTTP2, options.getHttp2Enabled());
+                }
             }
 
             undertow = builder.setHandler(rootHandler).build();
@@ -130,4 +134,4 @@ public class DefaultUndertowHost implements UndertowHost {
         }
         return hostString;
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostOptions.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostOptions.java
index fb50ba9..81933c9 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostOptions.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostOptions.java
@@ -40,6 +40,11 @@ public final class UndertowHostOptions {
      * Set if the Undertow host should use direct buffers.
      */
     private Boolean directBuffers;
+    
+    /**
+     * Set if the Undertow host should use http2 protocol.
+     */
+    private Boolean http2Enabled;
 
     public UndertowHostOptions() {
     }
@@ -76,6 +81,14 @@ public final class UndertowHostOptions {
         this.directBuffers = directBuffers;
     }
 
+    public Boolean getHttp2Enabled() {
+        return http2Enabled;
+    }
+
+    public void setHttp2Enabled(Boolean http2Enabled) {
+        this.http2Enabled = http2Enabled;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("UndertowHostOptions{");
@@ -83,8 +96,9 @@ public final class UndertowHostOptions {
         sb.append(", ioThreads=").append(ioThreads);
         sb.append(", bufferSize=").append(bufferSize);
         sb.append(", directBuffers=").append(directBuffers);
+        sb.append(", http2Enabled=").append(http2Enabled);
         sb.append('}');
         return sb.toString();
     }
 
-}
\ No newline at end of file
+}
diff --git a/platforms/spring-boot/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java
index ce3df2d..8a179c3 100644
--- a/platforms/spring-boot/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java
@@ -123,6 +123,10 @@ public class UndertowComponentConfiguration
          * Set if the Undertow host should use direct buffers.
          */
         private Boolean directBuffers;
+        /**
+         * Set if the Undertow host should use http2 protocol.
+         */
+        private Boolean http2Enabled;
 
         public Integer getWorkerThreads() {
             return workerThreads;
@@ -155,5 +159,13 @@ public class UndertowComponentConfiguration
         public void setDirectBuffers(Boolean directBuffers) {
             this.directBuffers = directBuffers;
         }
+
+        public Boolean getHttp2Enabled() {
+            return http2Enabled;
+        }
+
+        public void setHttp2Enabled(Boolean http2Enabled) {
+            this.http2Enabled = http2Enabled;
+        }
     }
 }
\ No newline at end of file

--
To stop receiving notification emails like this one, please contact
"[hidden email]" <[hidden email]>.