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/06/10 14:08:48 UTC
camel git commit: Explicitly add javax.servlet-api depedency in
camel-cometd and camel-websocket
Repository: camel
Updated Branches:
refs/heads/master 6bce8a15a -> e42ef725c
Explicitly add javax.servlet-api depedency in camel-cometd and camel-websocket
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e42ef725
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e42ef725
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e42ef725
Branch: refs/heads/master
Commit: e42ef725cd2d6dd09ebfaf24b0ead6b2fa393174
Parents: 6bce8a1
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Jun 10 16:02:55 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Jun 10 16:06:15 2016 +0200
----------------------------------------------------------------------
components/camel-cometd/pom.xml | 4 ++++
.../cometd/springboot/CometdComponentAutoConfiguration.java | 3 +--
components/camel-websocket/pom.xml | 5 +++++
.../springboot/WebsocketComponentAutoConfiguration.java | 3 +--
.../websocket/springboot/WebsocketComponentConfiguration.java | 6 +++---
5 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e42ef725/components/camel-cometd/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 4c365c8..10fe5d6 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -78,6 +78,10 @@
<artifactId>cometd-java-server</artifactId>
<version>${cometd-java-server}</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/e42ef725/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
index ed11ce3..f6eaf4f 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
@@ -42,8 +42,7 @@ public class CometdComponentAutoConfiguration {
CometdComponent component = new CometdComponent();
component.setCamelContext(camelContext);
Map<String, Object> parameters = new HashMap<>();
- IntrospectionSupport.getProperties(configuration, parameters, null,
- false);
+ IntrospectionSupport.getProperties(configuration, parameters, null);
IntrospectionSupport.setProperties(camelContext,
camelContext.getTypeConverter(), component, parameters);
return component;
http://git-wip-us.apache.org/repos/asf/camel/blob/e42ef725/components/camel-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index 9b262f5..3ebd172 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -80,6 +80,11 @@
<artifactId>jetty-jmx</artifactId>
<version>${jetty-version}</version>
</dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/e42ef725/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
index 92a74be..2b5dda8 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
@@ -43,8 +43,7 @@ public class WebsocketComponentAutoConfiguration {
WebsocketComponent component = new WebsocketComponent();
component.setCamelContext(camelContext);
Map<String, Object> parameters = new HashMap<>();
- IntrospectionSupport.getProperties(configuration, parameters, null,
- false);
+ IntrospectionSupport.getProperties(configuration, parameters, null);
IntrospectionSupport.setProperties(camelContext,
camelContext.getTypeConverter(), component, parameters);
return component;
http://git-wip-us.apache.org/repos/asf/camel/blob/e42ef725/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
index a40d156..76a2821 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
@@ -64,7 +64,7 @@ public class WebsocketComponentConfiguration {
* If this option is true Jetty JMX support will be enabled for this
* endpoint. See Jetty JMX support for more details.
*/
- private Boolean enableJmx = false;
+ private boolean enableJmx;
/**
* To set a value for minimum number of threads in server thread pool.
* MaxThreads/minThreads or threadPool fields are required due to switch to
@@ -141,11 +141,11 @@ public class WebsocketComponentConfiguration {
this.sslKeystore = sslKeystore;
}
- public Boolean getEnableJmx() {
+ public boolean isEnableJmx() {
return enableJmx;
}
- public void setEnableJmx(Boolean enableJmx) {
+ public void setEnableJmx(boolean enableJmx) {
this.enableJmx = enableJmx;
}