camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject camel git commit: [CAMEL-8335]upgrade smack version to 4.0.6
Date Sat, 28 Feb 2015 06:20:49 GMT
Repository: camel
Updated Branches:
  refs/heads/master e72b19c06 -> b909dec53


[CAMEL-8335]upgrade smack version to 4.0.6


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b909dec5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b909dec5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b909dec5

Branch: refs/heads/master
Commit: b909dec53fca1b27e8f0d9c2c49425835b0fd21a
Parents: e72b19c
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Sat Feb 28 14:20:32 2015 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Sat Feb 28 14:20:32 2015 +0800

----------------------------------------------------------------------
 components/camel-xmpp/pom.xml                   | 28 ++++++++++++++--
 .../camel/component/xmpp/XmppBinding.java       | 13 ++++----
 .../camel/component/xmpp/XmppConsumer.java      | 23 +++++++------
 .../camel/component/xmpp/XmppEndpoint.java      | 34 +++++++-------------
 .../component/xmpp/XmppGroupChatProducer.java   | 24 ++++++++------
 .../component/xmpp/XmppPrivateChatProducer.java | 16 ++++-----
 parent/pom.xml                                  |  4 +--
 .../features/src/main/resources/features.xml    |  8 +++--
 8 files changed, 86 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b909dec5/components/camel-xmpp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
index d848a7f..e8ce810 100644
--- a/components/camel-xmpp/pom.xml
+++ b/components/camel-xmpp/pom.xml
@@ -47,14 +47,20 @@
     </dependency>
     <dependency>
       <groupId>org.igniterealtime.smack</groupId>
-      <artifactId>smack</artifactId>
+      <artifactId>smack-core</artifactId>
       <version>${smack-version}</version>
     </dependency>
     <dependency>
       <groupId>org.igniterealtime.smack</groupId>
-      <artifactId>smackx</artifactId>
+      <artifactId>smack-extensions</artifactId>
       <version>${smack-version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.igniterealtime.smack</groupId>
+      <artifactId>smack-tcp</artifactId>
+      <version>${smack-version}</version>
+    </dependency>
+
 
     <!-- test dependencies -->
     <dependency>
@@ -87,6 +93,24 @@
     </dependency>
   </dependencies>
 
+  <build>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <forkMode>pertest</forkMode>
+              <systemProperties>
+                <property>
+                  <name>javax.net.ssl.trustStore</name>
+                  <value>${basedir}/src/test/resources/xmppServer.jks</value>
+                </property>
+              </systemProperties>
+            </configuration>
+          </plugin> 
+      </plugins>
+  </build>
+
     <!-- skip tests on Windows and AIX -->
     <profiles>
         <profile>

http://git-wip-us.apache.org/repos/asf/camel/blob/b909dec5/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 0ea7717..1960540 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
@@ -26,6 +26,7 @@ import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.util.ObjectHelper;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smackx.jiveproperties.JivePropertiesManager;
 import org.jivesoftware.smackx.pubsub.packet.PubSub;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -70,7 +71,7 @@ public class XmppBinding {
                     message.setLanguage(language);
                 } else {
                     try {
-                        message.setProperty(name, value);
+                        JivePropertiesManager.addProperty(message, name, value);
                         LOG.trace("Added property name: {} value: {}", name, value.toString());
                     } catch (IllegalArgumentException iae) {
                         if (LOG.isDebugEnabled()) {
@@ -83,7 +84,7 @@ public class XmppBinding {
 
         String id = exchange.getExchangeId();
         if (id != null) {
-            message.setProperty("exchangeId", id);
+            JivePropertiesManager.addProperty(message, "exchangeId", id);
         }
     }
 
@@ -97,7 +98,7 @@ public class XmppBinding {
             Object value = entry.getValue();
             if (!headerFilterStrategy.applyFilterToCamelHeaders(name, value, exchange)) {
                 try {
-                    packet.setProperty(name, value);
+                    JivePropertiesManager.addProperty(packet, name, value);
                     LOG.debug("Added property name: " + name + " value: " + value.toString());
                 } catch (IllegalArgumentException iae) {
                     LOG.debug("Not adding property " + name + " to XMPP message due to "
+ iae);
@@ -106,7 +107,7 @@ public class XmppBinding {
         }
         String id = exchange.getExchangeId();
         if (id != null) {
-            packet.setProperty("exchangeId", id);
+            JivePropertiesManager.addProperty(packet, "exchangeId", id);
         }
     }
 
@@ -130,8 +131,8 @@ public class XmppBinding {
     public Map<String, Object> extractHeadersFromXmpp(Packet xmppPacket, Exchange exchange)
{
         Map<String, Object> answer = new HashMap<String, Object>();
 
-        for (String name : xmppPacket.getPropertyNames()) {
-            Object value = xmppPacket.getProperty(name);
+        for (String name : JivePropertiesManager.getPropertiesNames(xmppPacket)) {
+            Object value = JivePropertiesManager.getProperty(xmppPacket, name);
 
             if (!headerFilterStrategy.applyFilterToExternalHeaders(name, value, exchange))
{
                 answer.put(name, value);

http://git-wip-us.apache.org/repos/asf/camel/blob/b909dec5/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
index ee0044f..5bc0d35 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
@@ -29,13 +29,12 @@ import org.jivesoftware.smack.ChatManagerListener;
 import org.jivesoftware.smack.MessageListener;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.SmackConfiguration;
+import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
-import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.AndFilter;
 import org.jivesoftware.smack.filter.MessageTypeFilter;
 import org.jivesoftware.smack.filter.OrFilter;
 import org.jivesoftware.smack.filter.PacketTypeFilter;
-import org.jivesoftware.smack.filter.ToContainsFilter;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Message.Type;
 import org.jivesoftware.smack.packet.Packet;
@@ -66,20 +65,20 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener,
Mes
     protected void doStart() throws Exception {
         try {
             connection = endpoint.createConnection();
-        } catch (XMPPException e) {
+        } catch (SmackException e) {
             if (endpoint.isTestConnectionOnStartup()) {
                 throw new RuntimeException("Could not connect to XMPP server.", e);
             } else {
-                LOG.warn(XmppEndpoint.getXmppExceptionLogMessage(e));
+                LOG.warn(e.getMessage());
                 if (getExceptionHandler() != null) {
-                    getExceptionHandler().handleException(XmppEndpoint.getXmppExceptionLogMessage(e),
e);
+                    getExceptionHandler().handleException(e.getMessage(), e);
                 }
                 scheduleDelayedStart();
                 return;
             }
         }
 
-        chatManager = connection.getChatManager();
+        chatManager = ChatManager.getInstanceFor(connection);
         chatManager.addChatListener(this);
 
         OrFilter pubsubPacketFilter = new OrFilter();
@@ -99,7 +98,7 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener,
Mes
                 }
                 privateChat.addMessageListener(this);
             } else {
-                privateChat = connection.getChatManager().createChat(endpoint.getParticipant(),
endpoint.getChatId(), this);
+                privateChat = ChatManager.getInstanceFor(connection).createChat(endpoint.getParticipant(),
endpoint.getChatId(), this);
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Opening private chat to " + privateChat.getParticipant());
                 }
@@ -107,8 +106,8 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener,
Mes
         } else {
             // add the presence packet listener to the connection so we only get packets
that concerns us
             // we must add the listener before creating the muc
-            final ToContainsFilter toFilter = new ToContainsFilter(endpoint.getParticipant());
-            final AndFilter packetFilter = new AndFilter(new PacketTypeFilter(Presence.class),
toFilter);
+           
+            final AndFilter packetFilter = new AndFilter(new PacketTypeFilter(Presence.class));
             connection.addPacketListener(this, packetFilter);
 
             muc = new MultiUserChat(connection, endpoint.resolveRoom(connection));
@@ -116,7 +115,7 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener,
Mes
             DiscussionHistory history = new DiscussionHistory();
             history.setMaxChars(0); // we do not want any historical messages
 
-            muc.join(endpoint.getNickname(), null, history, SmackConfiguration.getPacketReplyTimeout());
+            muc.join(endpoint.getNickname(), null, history, SmackConfiguration.getDefaultPacketReplyTimeout());
             if (LOG.isInfoEnabled()) {
                 LOG.info("Joined room: {} as: {}", muc.getRoom(), endpoint.getNickname());
             }
@@ -163,8 +162,8 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener,
Mes
             LOG.info("Attempting to reconnect to: {}", XmppEndpoint.getConnectionMessage(connection));
             try {
                 connection.connect();
-            } catch (XMPPException e) {
-                LOG.warn(XmppEndpoint.getXmppExceptionLogMessage(e));
+            } catch (SmackException e) {
+                LOG.warn(e.getMessage());
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/b909dec5/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
index ffe053e..ad26724 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.xmpp;
 
+import java.io.IOException;
 import java.util.Iterator;
 
 import org.apache.camel.Consumer;
@@ -34,11 +35,14 @@ import org.apache.camel.spi.UriPath;
 import org.apache.camel.util.ObjectHelper;
 import org.jivesoftware.smack.AccountManager;
 import org.jivesoftware.smack.ConnectionConfiguration;
+import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.XMPPError;
+import org.jivesoftware.smack.tcp.XMPPTCPConnection;
 import org.jivesoftware.smackx.muc.MultiUserChat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -157,7 +161,7 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg
         return true;
     }
 
-    public synchronized XMPPConnection createConnection() throws XMPPException {
+    public synchronized XMPPConnection createConnection() throws XMPPException, SmackException,
IOException {
 
         if (connection != null && connection.isConnected()) {
             return connection;
@@ -166,12 +170,12 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg
         if (connection == null) {
             if (port > 0) {
                 if (getServiceName() == null) {
-                    connection = new XMPPConnection(new ConnectionConfiguration(host, port));
+                    connection = new XMPPTCPConnection(new ConnectionConfiguration(host,
port));
                 } else {
-                    connection = new XMPPConnection(new ConnectionConfiguration(host, port,
serviceName));
+                    connection = new XMPPTCPConnection(new ConnectionConfiguration(host,
port, serviceName));
                 }
             } else {
-                connection = new XMPPConnection(host);
+                connection = new XMPPTCPConnection(host);
             }
         }
 
@@ -198,7 +202,7 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg
                 }
 
                 if (createAccount) {
-                    AccountManager accountManager = new AccountManager(connection);
+                    AccountManager accountManager = AccountManager.getInstance(connection);
                     accountManager.createAccount(user, password);
                 }
                 if (login) {
@@ -225,7 +229,7 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg
      * If there is no "@" symbol in the room, find the chat service JID and
      * return fully qualified JID for the room as room@conference.server.domain
      */
-    public String resolveRoom(XMPPConnection connection) throws XMPPException {
+    public String resolveRoom(XMPPConnection connection) throws XMPPException, SmackException
{
         ObjectHelper.notEmpty(room, "room");
 
         if (room.indexOf('@', 0) != -1) {
@@ -234,7 +238,8 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg
 
         Iterator<String> iterator = MultiUserChat.getServiceNames(connection).iterator();
         if (!iterator.hasNext()) {
-            throw new XMPPException("Cannot find Multi User Chat service on connection: "
+ getConnectionMessage(connection));
+            throw new XMPPErrorException("Cannot find Multi User Chat service",
+                                         new XMPPError(new XMPPError.Condition("Cannot find
Multi User Chat service on connection: " + getConnectionMessage(connection))));
         }
 
         String chatServer = iterator.next();
@@ -251,21 +256,6 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg
         return connection.getHost() + ":" + connection.getPort() + "/" + connection.getServiceName();
     }
 
-    public static String getXmppExceptionLogMessage(XMPPException e) {
-        XMPPError xmppError = e.getXMPPError();
-        Throwable t = e.getWrappedThrowable();
-        StringBuilder strBuff = new StringBuilder();
-        if (xmppError != null) {
-            strBuff.append("[ ").append(xmppError.getCode()).append(" ] ")
-                    .append(xmppError.getCondition()).append(" : ")
-                    .append(xmppError.getMessage());
-        }
-        if (t != null) {
-            strBuff.append(" ( ").append(e.getWrappedThrowable().getMessage()).append(" )");
-        }
-        return strBuff.toString();
-    }
-
     public String getChatId() {
         return "Chat:" + getParticipant() + ":" + getUser();
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/b909dec5/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
index 67d7227..1b2bf63 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
@@ -16,10 +16,13 @@
  */
 package org.apache.camel.component.xmpp;
 
+import java.io.IOException;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.RuntimeExchangeException;
 import org.apache.camel.impl.DefaultProducer;
 import org.jivesoftware.smack.SmackConfiguration;
+import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Message;
@@ -48,11 +51,12 @@ public class XmppGroupChatProducer extends DefaultProducer {
         if (connection == null) {
             try {
                 connection = endpoint.createConnection();
-            } catch (XMPPException e) {
+            } catch (Exception e) {
                 throw new RuntimeExchangeException("Could not connect to XMPP server.", exchange,
e);
-            }
+            }   
+            
         }
-
+ 
         if (chat == null) {
             try {
                 initializeChat();
@@ -79,12 +83,12 @@ public class XmppGroupChatProducer extends DefaultProducer {
             // must invoke nextMessage to consume the response from the server
             // otherwise the client local queue will fill up (CAMEL-1467)
             chat.pollMessage();
-        } catch (XMPPException e) {
+        } catch (Exception e) {
             throw new RuntimeExchangeException("Could not send XMPP message: " + message,
exchange, e);
-        }
+        } 
     }
 
-    private synchronized void reconnect() throws XMPPException {
+    private synchronized void reconnect() throws XMPPException, SmackException, IOException
{
         if (!connection.isConnected()) {
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Reconnecting to: {}", XmppEndpoint.getConnectionMessage(connection));
@@ -98,11 +102,11 @@ public class XmppGroupChatProducer extends DefaultProducer {
         if (connection == null) {
             try {
                 connection = endpoint.createConnection();
-            } catch (XMPPException e) {
+            } catch (SmackException e) {
                 if (endpoint.isTestConnectionOnStartup()) {
                     throw new RuntimeException("Could not connect to XMPP server:  " + endpoint.getConnectionDescription(),
e);
                 } else {
-                    LOG.warn("Could not connect to XMPP server. {}  Producer will attempt
lazy connection when needed.", XmppEndpoint.getXmppExceptionLogMessage(e));
+                    LOG.warn("Could not connect to XMPP server. {}  Producer will attempt
lazy connection when needed.", e.getMessage());
                 }
             }
         }
@@ -114,13 +118,13 @@ public class XmppGroupChatProducer extends DefaultProducer {
         super.doStart();
     }
 
-    protected synchronized void initializeChat() throws XMPPException {
+    protected synchronized void initializeChat() throws XMPPException, SmackException {
         if (chat == null) {
             room = endpoint.resolveRoom(connection);
             chat = new MultiUserChat(connection, room);
             DiscussionHistory history = new DiscussionHistory();
             history.setMaxChars(0); // we do not want any historical messages
-            chat.join(endpoint.getNickname(), null, history, SmackConfiguration.getPacketReplyTimeout());
+            chat.join(endpoint.getNickname(), null, history, SmackConfiguration.getDefaultPacketReplyTimeout());
             if (LOG.isInfoEnabled()) {
                 LOG.info("Joined room: {} as: {}", room, endpoint.getNickname());
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/b909dec5/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
index 33644d0..322980b 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.xmpp;
 
+import java.io.IOException;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.RuntimeExchangeException;
 import org.apache.camel.impl.DefaultProducer;
@@ -23,6 +25,7 @@ import org.apache.camel.util.ObjectHelper;
 import org.jivesoftware.smack.Chat;
 import org.jivesoftware.smack.ChatManager;
 import org.jivesoftware.smack.MessageListener;
+import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Message;
@@ -58,7 +61,7 @@ public class XmppPrivateChatProducer extends DefaultProducer {
             if (!connection.isConnected()) {
                 this.reconnect();
             }
-        } catch (XMPPException e) {
+        } catch (Exception e) {
             throw new RuntimeException("Could not connect to XMPP server.", e);
         }
 
@@ -70,7 +73,7 @@ public class XmppPrivateChatProducer extends DefaultProducer {
             thread = "Chat:" + participant + ":" + endpoint.getUser();
         }
 
-        ChatManager chatManager = connection.getChatManager();
+        ChatManager chatManager = ChatManager.getInstanceFor(connection);
         Chat chat = getOrCreateChat(chatManager, participant, thread);
         Message message = null;
         try {
@@ -86,9 +89,6 @@ public class XmppPrivateChatProducer extends DefaultProducer {
                 LOG.debug("Sending XMPP message to {} from {} : {}", new Object[]{participant,
endpoint.getUser(), message.getBody()});
             }
             chat.sendMessage(message);
-        } catch (XMPPException xmppe) {
-            throw new RuntimeExchangeException("Could not send XMPP message: to " + participant
+ " from " + endpoint.getUser() + " : " + message
-                    + " to: " + XmppEndpoint.getConnectionMessage(connection), exchange,
xmppe);
         } catch (Exception e) {
             throw new RuntimeExchangeException("Could not send XMPP message to " + participant
+ " from " + endpoint.getUser() + " : " + message
                     + " to: " + XmppEndpoint.getConnectionMessage(connection), exchange,
e);
@@ -117,7 +117,7 @@ public class XmppPrivateChatProducer extends DefaultProducer {
         return chat;
     }
     
-    private synchronized void reconnect() throws XMPPException {
+    private synchronized void reconnect() throws XMPPException, SmackException, IOException
{
         if (!connection.isConnected()) {
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Reconnecting to: {}", XmppEndpoint.getConnectionMessage(connection));
@@ -131,11 +131,11 @@ public class XmppPrivateChatProducer extends DefaultProducer {
         if (connection == null) {
             try {
                 connection = endpoint.createConnection();
-            } catch (XMPPException e) {
+            } catch (SmackException e) {
                 if (endpoint.isTestConnectionOnStartup()) {
                     throw new RuntimeException("Could not establish connection to XMPP server:
 " + endpoint.getConnectionDescription(), e);
                 } else {
-                    LOG.warn("Could not connect to XMPP server. {}  Producer will attempt
lazy connection when needed.", XmppEndpoint.getXmppExceptionLogMessage(e));
+                    LOG.warn("Could not connect to XMPP server. {}  Producer will attempt
lazy connection when needed.", e.getMessage());
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/camel/blob/b909dec5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cbe9662..378d589 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -409,8 +409,8 @@
     <!-- use slf4j-api 1.6.x to be easy compatible with older Camel releases -->
     <slf4j-api-version>1.6.6</slf4j-api-version>
     <slf4j-version>1.7.10</slf4j-version>
-    <smack-bundle-version>3.2.1_1</smack-bundle-version>
-    <smack-version>3.2.1</smack-version>
+    <smack-bundle-version>4.0.6</smack-bundle-version>
+    <smack-version>4.0.6</smack-version>
     <snakeyaml-version>1.14</snakeyaml-version>
     <snappy-version>1.1.0.1</snappy-version>
     <snmp4j-version>2.3.0_1</snmp4j-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/b909dec5/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 8c6ebfe..7ebc790 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1355,7 +1355,9 @@
     <feature version='${project.version}'>camel-spring</feature>
     <bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.smack/${smack-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-core/${smack-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-tcp/${smack-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-extensions/${smack-bundle-version}</bundle>
     <feature version='${spring-version-range-karaf}'>spring-jms</feature>
     <feature version='${spring-version-range-karaf}'>spring-web</feature>
     <feature version='${spring-version-range-karaf}'>spring-oxm</feature>
@@ -1542,7 +1544,9 @@
   </feature>
   <feature name='camel-xmpp' version='${project.version}' resolver='(obr)' start-level='50'>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.smack/${smack-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-core/${smack-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-tcp/${smack-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-extensions/${smack-bundle-version}</bundle>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-xmpp/${project.version}</bundle>
   </feature>


Mime
View raw message