You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/07/06 04:19:58 UTC
[1/2] camel git commit: Fixed the CS error in camel-jetty-common
Repository: camel
Updated Branches:
refs/heads/master a2c1b7126 -> cac126393
Fixed the CS error in camel-jetty-common
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cac12639
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cac12639
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cac12639
Branch: refs/heads/master
Commit: cac1263936e0077534537f08dfe4674d591aa9be
Parents: 29ca57c
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Jul 6 10:17:50 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Jul 6 10:18:06 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/jetty/JettyHttpComponent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cac12639/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 95b1185..f98cee5 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -482,7 +482,8 @@ public abstract class JettyHttpComponent extends HttpComponent implements RestCo
/**
* The key password, which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option).
*/
- @Metadata(description = "The key password, which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option).")
+ @Metadata(description = "The key password, which is used to access the certificate's key entry in the keystore "
+ + "(this is the same password that is supplied to the keystore command's -keypass option).")
public void setSslKeyPassword(String sslKeyPassword) {
this.sslKeyPassword = sslKeyPassword;
}
[2/2] camel git commit: Fixed the CS error in camel-cxf
Posted by ni...@apache.org.
Fixed the CS error in camel-cxf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/29ca57c1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/29ca57c1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/29ca57c1
Branch: refs/heads/master
Commit: 29ca57c189fced80614786669544e1d20005ed44
Parents: a2c1b71
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Jul 6 10:16:57 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Jul 6 10:18:06 2015 +0800
----------------------------------------------------------------------
.../org/apache/camel/component/cxf/CxfEndpoint.java | 13 ++++++++-----
.../camel/component/cxf/jaxrs/CxfRsEndpoint.java | 5 +++--
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/29ca57c1/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 5ea1acd..090e1ca 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -37,6 +37,10 @@ import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.handler.Handler;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
import org.apache.camel.CamelContext;
import org.apache.camel.CamelException;
import org.apache.camel.Consumer;
@@ -99,9 +103,7 @@ import org.apache.cxf.staxutils.StaxSource;
import org.apache.cxf.staxutils.StaxUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
+
/**
@@ -114,6 +116,9 @@ import org.w3c.dom.Node;
public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategyAware, Service, Cloneable {
private static final Logger LOG = LoggerFactory.getLogger(CxfEndpoint.class);
+
+ @UriPath
+ protected Bus bus;
private AtomicBoolean getBusHasBeenCalled = new AtomicBoolean(false);
private volatile boolean createBus;
@@ -135,8 +140,6 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
private String beanId;
@UriPath
private String address;
- @UriPath
- protected Bus bus;
@UriParam
private String wsdlURL;
private Class<?> serviceClass;
http://git-wip-us.apache.org/repos/asf/camel/blob/29ca57c1/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index 47e54cf..c3251fa 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -81,6 +81,9 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
}
private static final Logger LOG = LoggerFactory.getLogger(CxfRsEndpoint.class);
+
+ @UriPath
+ protected Bus bus;
private final InterceptorHolder interceptorHolder = new InterceptorHolder();
@@ -97,8 +100,6 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
private String modelRef;
@UriParam(defaultValue = "Default")
private BindingStyle bindingStyle = BindingStyle.Default;
- @UriPath
- protected Bus bus;
@UriParam
private HeaderFilterStrategy headerFilterStrategy;
@UriParam