Add StreamFeatureProvider

so that AccountManager and the CapsExtension can be moved to
smack-extensions, where they belong.

smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java

@@ -26,7 +26,6 @@ import org.jivesoftware.smack.PacketInterceptor;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.XMPPConnectionRegistry;
 import org.jivesoftware.smack.XMPPException.XMPPErrorException;
-import org.jivesoftware.smack.packet.CapsExtension;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.PacketExtension;
@@ -39,6 +38,7 @@ import org.jivesoftware.smack.filter.PacketExtensionFilter;
 import org.jivesoftware.smack.util.Cache;
 import org.jivesoftware.smack.util.stringencoder.Base64;
 import org.jivesoftware.smackx.caps.cache.EntityCapsPersistentCache;
+import org.jivesoftware.smackx.caps.packet.CapsExtension;
 import org.jivesoftware.smackx.disco.NodeInformationProvider;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.disco.packet.DiscoverInfo;

smack-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java

@@ -0,0 +1,84 @@
+/**
+ *
+ * Copyright © 2009 Jonas Ådahl, 2011-2014 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.caps.packet;
+
+import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smack.packet.PacketExtension;
+import org.jivesoftware.smack.util.XmlStringBuilder;
+
+/**
+ * A XEP-0115 Entity Capabilities extension.
+ * <p>
+ * Note that this is currently in smack-core as it's a potential stream feature.
+ * TODO: In feature versions of Smack, it should be possible to register
+ * "providers" for stream features too, so that this class can be moved back to
+ * smack-extensions.
+ * </p>
+ */
+public class CapsExtension implements PacketExtension {
+    public static final String NAMESPACE = "http://jabber.org/protocol/caps";
+    public static final String ELEMENT = "c";
+
+    private final String node, ver, hash;
+
+    public CapsExtension(String node, String version, String hash) {
+        this.node = node;
+        this.ver = version;
+        this.hash = hash;
+    }
+
+    public String getElementName() {
+        return ELEMENT;
+    }
+
+    public String getNamespace() {
+        return NAMESPACE;
+    }
+
+    public String getNode() {
+        return node;
+    }
+
+    public String getVer() {
+        return ver;
+    }
+
+    public String getHash() {
+        return hash;
+    }
+
+    /**
+     * <pre>
+     *  <c xmlns='http://jabber.org/protocol/caps'
+     *     hash='sha-1'
+     *     node='http://code.google.com/p/exodus'
+     *     ver='QgayPKawpkPSDYmwT/WM94uAlu0='/>
+     * </pre>
+     *
+     */
+    @Override
+    public XmlStringBuilder toXML() {
+        XmlStringBuilder xml = new XmlStringBuilder(this);
+        xml.attribute("hash", hash).attribute("node", node).attribute("ver", ver);
+        xml.closeEmptyElement();
+        return xml;
+    }
+
+    public static CapsExtension from(Packet stanza) {
+        return stanza.getExtension(ELEMENT, NAMESPACE);
+    }
+}

smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java

@@ -19,14 +19,15 @@ package org.jivesoftware.smackx.caps.provider;
 import java.io.IOException;
 
 import org.jivesoftware.smack.SmackException;
-import org.jivesoftware.smack.packet.CapsExtension;
 import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.provider.PacketExtensionProvider;
+import org.jivesoftware.smack.provider.StreamFeatureProvider;
 import org.jivesoftware.smackx.caps.EntityCapsManager;
+import org.jivesoftware.smackx.caps.packet.CapsExtension;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
-public class CapsExtensionProvider implements PacketExtensionProvider {
+public class CapsExtensionProvider implements PacketExtensionProvider, StreamFeatureProvider {
 
     public PacketExtension parseExtension(XmlPullParser parser) throws XmlPullParserException, IOException,
             SmackException {
@@ -55,4 +56,10 @@ public class CapsExtensionProvider implements PacketExtensionProvider {
             throw new SmackException("Caps elment with missing attributes");
         }
     }
+
+    @Override
+    public PacketExtension parseStreamFeature(XmlPullParser parser) throws XmlPullParserException,
+                    IOException, SmackException {
+        return parseExtension(parser);
+    }
 }