You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/04/21 15:41:15 UTC
[1/4] camel git commit: CAMEL-8637: Upgrade Jetty version to 9.x in
Camel-CometD - Fixed CS
Repository: camel
Updated Branches:
refs/heads/master 25461f9d4 -> 6f3e8d29d
CAMEL-8637: Upgrade Jetty version to 9.x in Camel-CometD - Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/720e76d2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/720e76d2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/720e76d2
Branch: refs/heads/master
Commit: 720e76d2554c29d647be8a2c634991c8d4929f32
Parents: 0b641ee
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Apr 21 14:42:25 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Apr 21 15:18:40 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/cometd/CometdComponent.java | 4 ++--
.../org/apache/camel/component/cometd/CometdConsumerTest.java | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/720e76d2/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index 61179c7..00734d3 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -100,7 +100,7 @@ public class CometdComponent extends UriEndpointComponent {
* Connects the URL specified on the endpoint to the specified processor.
*/
public void connect(CometdProducerConsumer prodcon) throws Exception {
- Server server = null;
+ Server server = null;
// Make sure that there is a connector for the requested endpoint.
CometdEndpoint endpoint = prodcon.getEndpoint();
String connectorKey = endpoint.getProtocol() + ":" + endpoint.getUri().getHost() + ":" + endpoint.getPort();
@@ -175,7 +175,7 @@ public class CometdComponent extends UriEndpointComponent {
}
protected CometDServlet createServletForConnector(Server server, Connector connector, CometdEndpoint endpoint) throws Exception {
- CometDServlet servlet = new CometDServlet();
+ CometDServlet servlet = new CometDServlet();
ServletContextHandler context = new ServletContextHandler(server, "/", ServletContextHandler.NO_SECURITY | ServletContextHandler.NO_SESSIONS);
http://git-wip-us.apache.org/repos/asf/camel/blob/720e76d2/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
index 8cd8bd2..ca9fdf6 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
@@ -39,7 +39,6 @@ import org.mockito.runners.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
[2/4] camel git commit: CAMEL-8637: Upgrade Jetty version to 9.x in
Camel-CometD - Fixed Karaf feature
Posted by ac...@apache.org.
CAMEL-8637: Upgrade Jetty version to 9.x in Camel-CometD - Fixed Karaf feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0b641eeb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0b641eeb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0b641eeb
Branch: refs/heads/master
Commit: 0b641eeb92c3da756e6cae498cad64d7f294db23
Parents: 2a2505f
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Apr 21 14:38:33 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Apr 21 15:18:40 2016 +0200
----------------------------------------------------------------------
components/camel-cometd/pom.xml | 5 ++---
parent/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 6 ++++--
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0b641eeb/components/camel-cometd/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 814e1c7..83b5c56 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -33,8 +33,7 @@
<camel.osgi.export.pkg>org.apache.camel.component.cometd.*</camel.osgi.export.pkg>
<camel.osgi.import.pkg>
!org.apache.camel.component.cometd.*,
- org.eclipse.jetty.util.ssl;version="[8,9)";resolution:=optional,
- javax.servlet.*;version="${servlet-version-range}",
+ org.eclipse.jetty.util.ssl;version="[9,9.5)";resolution:=optional,
${camel.osgi.import.defaults},
*
</camel.osgi.import.pkg>
@@ -77,7 +76,7 @@
<dependency>
<groupId>org.cometd.java</groupId>
<artifactId>cometd-java-server</artifactId>
- <version>3.0.9</version>
+ <version>${cometd-java-server}</version>
</dependency>
<!-- Test Dependencies -->
http://git-wip-us.apache.org/repos/asf/camel/blob/0b641eeb/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cba0edb..b9b2604 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -102,7 +102,7 @@
<cometd-bayeux-version>6.1.11</cometd-bayeux-version>
<cometd-java-client-version>2.4.3</cometd-java-client-version>
<cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
- <cometd-java-server>2.3.1</cometd-java-server>
+ <cometd-java-server>3.0.9</cometd-java-server>
<commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
<commons-codec-version>1.10</commons-codec-version>
<commons-collections-version>3.2.2</commons-collections-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/0b641eeb/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index a7d3ba0..feac278 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -319,10 +319,12 @@
</feature>
<feature name='camel-cometd' version='${project.version}' resolver='(obr)' start-level='50'>
<details>camel-cometd currently requires jetty 8</details>
- <feature version="[8,9)">jetty</feature>
+ <feature>jetty</feature>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.cometd.java/cometd-java-server/${cometd-java-server}</bundle>
+ <bundle dependency='true'>mvn:org.cometd.java/bayeux-api/${cometd-java-server}</bundle>
+ <bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-server}</bundle>
<bundle>mvn:org.apache.camel/camel-cometd/${project.version}</bundle>
</feature>
<feature name='camel-context' version='${project.version}' resolver='(obr)' start-level='50'>
[4/4] camel git commit: Updated camel-cometd docs,
by enabling options documentation automatic upgrade
Posted by ac...@apache.org.
Updated camel-cometd docs, by enabling options documentation automatic upgrade
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6f3e8d29
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6f3e8d29
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6f3e8d29
Branch: refs/heads/master
Commit: 6f3e8d29dfb514b77ec7a07992267dfe35e7a257
Parents: 720e76d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Apr 21 14:47:19 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Apr 21 15:18:41 2016 +0200
----------------------------------------------------------------------
.../camel-cometd/src/main/docs/cometd.adoc | 77 ++++++++++----------
1 file changed, 39 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6f3e8d29/components/camel-cometd/src/main/docs/cometd.adoc
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/docs/cometd.adoc b/components/camel-cometd/src/main/docs/cometd.adoc
index 01cf2d6..efb4dca 100644
--- a/components/camel-cometd/src/main/docs/cometd.adoc
+++ b/components/camel-cometd/src/main/docs/cometd.adoc
@@ -49,54 +49,55 @@ where `cometds:` represents an SSL configured endpoint.
[[Cometd-Options]]
Options
^^^^^^^
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Name |Default Value |Description
-
-|`resourceBase` | | The root directory for the web resources or classpath. Use the protocol
-file: or classpath: depending if you want that the component loads the
-resource from file system or classpath. Classpath is required for OSGI
-deployment where the resources are packaged in the jar. Notice this
-option has been renamed to `baseResource` from *Camel 2.7* onwards.
-
-|`baseResource` | | *Camel 2.7:* The root directory for the web resources or classpath. Use
-the protocol file: or classpath: depending if you want that the
-component loads the resource from file system or classpath. Classpath is
-required for OSGI deployment where the resources are packaged in the jar
-
-|`timeout` |`240000` |The server side poll timeout in milliseconds. This is how long the
-server will hold a reconnect request before responding.
-|`interval` |`0` |The client side poll timeout in milliseconds. How long a client will
-wait between reconnects
-|`maxInterval` |`30000` |The max client side poll timeout in milliseconds. A client will be
-removed if a connection is not received in this time.
+// component options: START
+The CometD component supports 6 options which are listed below.
-|`multiFrameInterval` |`1500` |The client side poll timeout, if multiple connections are detected from
-the same browser.
-|`jsonCommented` |`true` |If `true`, the server will accept JSON wrapped in a comment and will
-generate JSON wrapped in a comment. This is a defence against Ajax
-Hijacking.
-|`logLevel` |`1` |`0`=none, `1`=info, `2`=debug.
+[width="100%",cols="2s,1m,8",options="header"]
+|=======================================================================
+| Name | Java Type | Description
+| sslKeyPassword | String | The password for the keystore when using SSL.
+| sslPassword | String | The password when using SSL.
+| sslKeystore | String | The path to the keystore.
+| securityPolicy | SecurityPolicy | To use a custom configured SecurityPolicy to control authorization
+| extensions | List | To use a list of custom BayeuxServer.Extension that allows modifying incoming and outgoing requests.
+| sslContextParameters | SSLContextParameters | To configure security using SSLContextParameters
+|=======================================================================
+// component options: END
-|`crossOriginFilterOn` |`false` |*Camel 2.10:* If `true`, the server will support for cross-domain
-filtering
-|`allowedOrigins` |`*` |*Camel 2.10:* The origins domain that support to cross, if the
-`crosssOriginFilterOn` is `true`
-|`filterPath` | | *Camel 2.10:* The filterPath will be used by the CrossOriginFilter, if
-the `crosssOriginFilterOn` is `true`
+// endpoint options: START
+The CometD component supports 19 endpoint options which are listed below:
-|`disconnectLocalSession` | | *Camel 2.10.5/2.11.1: (Producer only)*: Whether to disconnect local
-sessions after publishing a message to its channel. Disconnecting local
-session is needed as they are not swept by default by CometD, and
-therefore you can run out of memory. In Camel 2.16.1/2.15.5 or older the
-default value is true. From newer versions the default value is false.
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
|=======================================================================
+| Name | Group | Default | Java Type | Description
+| host | common | | String | *Required* Hostname
+| port | common | | int | *Required* Host port number
+| channelName | common | | String | *Required* The channelName represents a topic that can be subscribed to by the Camel endpoints.
+| allowedOrigins | common | * | String | The origins domain that support to cross if the crosssOriginFilterOn is true
+| baseResource | common | | String | The root directory for the web resources or classpath. Use the protocol file: or classpath: depending if you want that the component loads the resource from file system or classpath. Classpath is required for OSGI deployment where the resources are packaged in the jar
+| crossOriginFilterOn | common | false | boolean | If true the server will support for cross-domain filtering
+| filterPath | common | | String | The filterPath will be used by the CrossOriginFilter if the crosssOriginFilterOn is true
+| interval | common | | int | The client side poll timeout in milliseconds. How long a client will wait between reconnects
+| jsonCommented | common | true | boolean | If true the server will accept JSON wrapped in a comment and will generate JSON wrapped in a comment. This is a defence against Ajax Hijacking.
+| logLevel | common | 1 | int | Logging level. 0=none 1=info 2=debug.
+| maxInterval | common | 30000 | int | The max client side poll timeout in milliseconds. A client will be removed if a connection is not received in this time.
+| multiFrameInterval | common | 1500 | int | The client side poll timeout if multiple connections are detected from the same browser.
+| timeout | common | 240000 | int | The server side poll timeout in milliseconds. This is how long the server will hold a reconnect request before responding.
+| bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored.
+| sessionHeadersEnabled | consumer | false | boolean | Whether to include the server session headers in the Camel message when creating a Camel Message for incoming requests.
+| exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR level and ignored.
+| disconnectLocalSession | producer | false | boolean | Whether to disconnect local sessions after publishing a message to its channel. Disconnecting local session is needed as they are not swept by default by CometD and therefore you can run out of memory.
+| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
+| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
+|=======================================================================
+// endpoint options: END
+
You can append query options to the URI in the following format,
`?option=value&option=value&...`
[3/4] camel git commit: CAMEL-8637: Upgrade Jetty version to 9.x in
Camel-CometD
Posted by ac...@apache.org.
CAMEL-8637: Upgrade Jetty version to 9.x in Camel-CometD
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2a2505f6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2a2505f6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2a2505f6
Branch: refs/heads/master
Commit: 2a2505f69c5676d77601342fcbcceaed4850fd5a
Parents: 25461f9
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Apr 21 14:21:32 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Apr 21 15:18:40 2016 +0200
----------------------------------------------------------------------
components/camel-cometd/pom.xml | 12 ++---
.../camel/component/cometd/CometdComponent.java | 53 ++++++++------------
.../camel/component/cometd/CometdConsumer.java | 4 +-
.../component/cometd/CometdConsumerTest.java | 10 +++-
4 files changed, 39 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2a2505f6/components/camel-cometd/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 82a94f5..814e1c7 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -52,32 +52,32 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty8-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty8-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>${jetty8-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty8-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
- <version>${jetty8-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.cometd.java</groupId>
<artifactId>cometd-java-server</artifactId>
- <version>${cometd-java-server}</version>
+ <version>3.0.9</version>
</dependency>
<!-- Test Dependencies -->
http://git-wip-us.apache.org/repos/asf/camel/blob/2a2505f6/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index 50e3b53..61179c7 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -26,21 +26,18 @@ import javax.net.ssl.SSLContext;
import javax.servlet.DispatcherType;
import org.apache.camel.Endpoint;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.cometd.bayeux.server.BayeuxServer;
import org.cometd.bayeux.server.SecurityPolicy;
import org.cometd.server.BayeuxServerImpl;
-import org.cometd.server.CometdServlet;
+import org.cometd.server.CometDServlet;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.session.HashSessionManager;
import org.eclipse.jetty.server.session.SessionHandler;
-import org.eclipse.jetty.server.ssl.SslConnector;
-import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -68,11 +65,11 @@ public class CometdComponent extends UriEndpointComponent {
class ConnectorRef {
Connector connector;
- CometdServlet servlet;
+ CometDServlet servlet;
Server server;
int refCount;
- public ConnectorRef(Connector connector, CometdServlet servlet, Server server) {
+ public ConnectorRef(Connector connector, CometDServlet servlet, Server server) {
this.connector = connector;
this.servlet = servlet;
this.server = server;
@@ -103,6 +100,7 @@ public class CometdComponent extends UriEndpointComponent {
* Connects the URL specified on the endpoint to the specified processor.
*/
public void connect(CometdProducerConsumer prodcon) throws Exception {
+ Server server = null;
// Make sure that there is a connector for the requested endpoint.
CometdEndpoint endpoint = prodcon.getEndpoint();
String connectorKey = endpoint.getProtocol() + ":" + endpoint.getUri().getHost() + ":" + endpoint.getPort();
@@ -110,11 +108,12 @@ public class CometdComponent extends UriEndpointComponent {
synchronized (connectors) {
ConnectorRef connectorRef = connectors.get(connectorKey);
if (connectorRef == null) {
- Connector connector;
+ ServerConnector connector;
+ server = createServer();
if ("cometds".equals(endpoint.getProtocol())) {
- connector = getSslSocketConnector();
+ connector = getSslSocketConnector(server);
} else {
- connector = new SelectChannelConnector();
+ connector = new ServerConnector(server);
}
connector.setPort(endpoint.getPort());
connector.setHost(endpoint.getUri().getHost());
@@ -122,10 +121,10 @@ public class CometdComponent extends UriEndpointComponent {
LOG.warn("You use localhost interface! It means that no external connections will be available."
+ " Don't you want to use 0.0.0.0 instead (all network interfaces)?");
}
- Server server = createServer();
+
server.addConnector(connector);
- CometdServlet servlet = createServletForConnector(server, connector, endpoint);
+ CometDServlet servlet = createServletForConnector(server, connector, endpoint);
connectorRef = new ConnectorRef(connector, servlet, server);
server.start();
@@ -175,11 +174,10 @@ public class CometdComponent extends UriEndpointComponent {
}
}
- protected CometdServlet createServletForConnector(Server server, Connector connector, CometdEndpoint endpoint) throws Exception {
- CometdServlet servlet = new CometdServlet();
+ protected CometDServlet createServletForConnector(Server server, Connector connector, CometdEndpoint endpoint) throws Exception {
+ CometDServlet servlet = new CometDServlet();
ServletContextHandler context = new ServletContextHandler(server, "/", ServletContextHandler.NO_SECURITY | ServletContextHandler.NO_SESSIONS);
- context.setConnectorNames(new String[]{connector.getName()});
ServletHolder holder = new ServletHolder();
holder.setServlet(servlet);
@@ -218,29 +216,22 @@ public class CometdComponent extends UriEndpointComponent {
return servlet;
}
- protected SslConnector getSslSocketConnector() {
- SslSelectChannelConnector sslSocketConnector = null;
+ protected ServerConnector getSslSocketConnector(Server server) throws Exception {
+ ServerConnector sslSocketConnector = null;
if (sslContextParameters != null) {
SslContextFactory sslContextFactory = new CometdComponentSslContextFactory();
- try {
- sslContextFactory.setSslContext(sslContextParameters.createSSLContext());
- } catch (Exception e) {
- throw new RuntimeCamelException("Error initiating SSLContext.", e);
- }
- sslSocketConnector = new SslSelectChannelConnector(sslContextFactory);
+ sslContextFactory.setSslContext(sslContextParameters.createSSLContext());
+ sslSocketConnector = new ServerConnector(server, sslContextFactory);
} else {
-
- sslSocketConnector = new SslSelectChannelConnector();
- // with default null values, jetty ssl system properties
- // and console will be read by jetty implementation
- sslSocketConnector.getSslContextFactory().setKeyManagerPassword(sslPassword);
- sslSocketConnector.getSslContextFactory().setKeyStorePassword(sslKeyPassword);
+ SslContextFactory sslContextFactory = new SslContextFactory();
+ sslContextFactory.setKeyStorePassword(sslKeyPassword);
+ sslContextFactory.setKeyManagerPassword(sslPassword);
if (sslKeystore != null) {
- sslSocketConnector.getSslContextFactory().setKeyStorePath(sslKeystore);
+ sslContextFactory.setKeyStorePath(sslKeystore);
}
+ sslSocketConnector = new ServerConnector(server, sslContextFactory);
}
-
return sslSocketConnector;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2a2505f6/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
index 3ddf9f6..175715a 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
@@ -75,12 +75,14 @@ public class CometdConsumer extends DefaultConsumer implements CometdProducerCon
private final CometdEndpoint endpoint;
private final CometdConsumer consumer;
private final CometdBinding binding;
+ private final String channelName;
public ConsumerService(String channel, BayeuxServerImpl bayeux, CometdConsumer consumer) {
super(bayeux, channel);
this.endpoint = consumer.getEndpoint();
this.binding = createBinding(bayeux);
this.consumer = consumer;
+ this.channelName = channel;
addService(channel, "push");
}
@@ -89,7 +91,7 @@ public class CometdConsumer extends DefaultConsumer implements CometdProducerCon
return new CometdBinding(bayeux, enableSessionHeaders);
}
- public void push(ServerSession remote, String channelName, ServerMessage cometdMessage, String messageId) throws Exception {
+ public void push(ServerSession remote, ServerMessage cometdMessage) throws Exception {
Object data = null;
Message message = binding.createCamelMessage(remote, cometdMessage, data);
http://git-wip-us.apache.org/repos/asf/camel/blob/2a2505f6/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
index 9e5c6ba..8cd8bd2 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.component.cometd.CometdConsumer.ConsumerService;
+import org.cometd.bayeux.MarkedReference;
import org.cometd.bayeux.server.LocalSession;
import org.cometd.bayeux.server.ServerChannel;
import org.cometd.bayeux.server.ServerMessage;
@@ -38,6 +39,7 @@ import org.mockito.runners.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -62,12 +64,16 @@ public class CometdConsumerTest {
private ServerChannel serverChannel;
@Mock
private ServerSession remote;
+ @Mock
+ private MarkedReference<ServerChannel> markedReferenceServerChannel;
@Before
public void before() {
when(bayeuxServerImpl.newLocalSession(anyString())).thenReturn(localSession);
- when(bayeuxServerImpl.getLogger()).thenReturn(logger);
+ //when(bayeuxServerImpl.get).thenReturn(logger);
when(bayeuxServerImpl.getChannel(anyString())).thenReturn(serverChannel);
+ when(bayeuxServerImpl.createChannelIfAbsent(anyString())).thenReturn(markedReferenceServerChannel);
+ when(markedReferenceServerChannel.getReference()).thenReturn(serverChannel);
testObj = new CometdConsumer(endpoint, processor);
testObj.setBayeux(bayeuxServerImpl);
@@ -104,7 +110,7 @@ public class CometdConsumerTest {
ArgumentCaptor<Message> transferredMessage = ArgumentCaptor.forClass(Message.class);
// act
- testObj.getConsumerService().push(remote, "channelName", cometdMessage, "messageId");
+ testObj.getConsumerService().push(remote, cometdMessage);
// verify
verify(exchange).setIn(transferredMessage.capture());