You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2015/11/08 13:14:06 UTC
[1/3] camel git commit: Fix Checkstyle issues
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x ca9a05a2c -> 7a5fd88f3
Fix Checkstyle issues
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/805486ba
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/805486ba
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/805486ba
Branch: refs/heads/camel-2.16.x
Commit: 805486bad1cb3018de28b1fdef16d820da08c5c5
Parents: ca9a05a
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Sat Oct 17 21:34:21 2015 +0200
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Sun Nov 8 13:08:57 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/805486ba/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java
index cd90a0d..d04d651 100644
--- a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java
+++ b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java
@@ -23,8 +23,6 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
-import org.apache.camel.spi.DataFormatName;
-import org.apache.camel.support.ServiceSupport;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -33,6 +31,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.xmlrpc.XmlRpcConstants;
import org.apache.camel.component.xmlrpc.XmlRpcRequestImpl;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.DataFormatName;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.IOHelper;
import org.apache.ws.commons.serialize.CharSetXMLWriter;
import org.apache.ws.commons.serialize.XMLWriter;
[2/3] camel git commit: Fix Checkstyle issues
Posted by gz...@apache.org.
Fix Checkstyle issues
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/231a24d5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/231a24d5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/231a24d5
Branch: refs/heads/camel-2.16.x
Commit: 231a24d56f284007fb991dc33aecc6d3edeaaf56
Parents: 805486b
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Sat Oct 17 21:39:08 2015 +0200
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Sun Nov 8 13:11:20 2015 +0100
----------------------------------------------------------------------
.../camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/231a24d5/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
index 25da8f4..1261df2 100755
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
@@ -40,8 +40,6 @@ import javax.crypto.spec.DESedeKeySpec;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.transform.dom.DOMSource;
-import org.apache.camel.spi.DataFormatName;
-import org.apache.camel.support.ServiceSupport;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -52,6 +50,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.xml.DefaultNamespaceContext;
import org.apache.camel.builder.xml.XPathBuilder;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.DataFormatName;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.jsse.KeyStoreParameters;
import org.apache.xml.security.encryption.EncryptedData;
[3/3] camel git commit: Fix Checkstyle issues
Posted by gz...@apache.org.
Fix Checkstyle issues
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7a5fd88f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7a5fd88f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7a5fd88f
Branch: refs/heads/camel-2.16.x
Commit: 7a5fd88f34ebdf16477171b0d75e444f68cd6740
Parents: 231a24d
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Sat Oct 17 10:31:31 2015 +0200
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Sun Nov 8 13:13:26 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/xmpp/XmppBinding.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7a5fd88f/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
index ddb198b..b33bdbb 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
@@ -135,12 +135,12 @@ public class XmppBinding {
Map<String, Object> answer = new HashMap<String, Object>();
PacketExtension jpe = xmppPacket.getExtension(JivePropertiesExtension.NAMESPACE);
- if (jpe !=null && jpe instanceof JivePropertiesExtension) {
+ if (jpe != null && jpe instanceof JivePropertiesExtension) {
extractHeadersFrom((JivePropertiesExtension)jpe, exchange, answer);
}
- if (jpe !=null && jpe instanceof DefaultPacketExtension) {
+ if (jpe != null && jpe instanceof DefaultPacketExtension) {
extractHeadersFrom((DefaultPacketExtension)jpe, exchange, answer);
- }
+ }
if (xmppPacket instanceof Message) {
Message xmppMessage = (Message) xmppPacket;