PubSub implementation & Sluift refactoring.

Change-Id: I04ff7111b73565c00bff6db183451774a633344f
author: Remko Tronçon <git@el-tramo.be> 2013-08-25 16:39:06 (GMT)
committer: Remko Tronçon <git@el-tramo.be> 2013-08-27 19:47:48 (GMT)
commit: 1bb607f96e79845ce30dd5590b0d53cc394ac150 (patch)
tree: 6156622ddd1b3238aec73536e0dc25b632965a71 /Swiften/Parser
parent: c4431ee90f3f1daac0a12b35bfa3378d5c570eaa (diff)
download: swift-contrib-1bb607f96e79845ce30dd5590b0d53cc394ac150.zip
swift-contrib-1bb607f96e79845ce30dd5590b0d53cc394ac150.tar.bz2
86 files changed, 4231 insertions, 6 deletions
diff --git a/Swiften/Parser/GenericPayloadParserFactory2.h b/Swiften/Parser/GenericPayloadParserFactory2.h
new file mode 100644
index 0000000..f24b64e
--- /dev/null
+++ b/Swiften/Parser/GenericPayloadParserFactory2.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <string>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+
+	/**
+	 * A generic class for PayloadParserFactories that parse a specific payload (given as the template parameter of the class).
+	 */
+	template<typename PARSER_TYPE>
+	class GenericPayloadParserFactory2 : public PayloadParserFactory {
+		public:
+			/**
+			 * Construct a parser factory that can parse the given top-level tag in the given namespace.
+			 */
+			GenericPayloadParserFactory2(const std::string& tag, const std::string& xmlns, PayloadParserFactoryCollection* parsers) : tag_(tag), xmlns_(xmlns), parsers_(parsers) {}
+
+			virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const {
+				return (tag_.empty() ? true : element == tag_) && (xmlns_.empty() ? true : xmlns_ == ns);
+			}
+
+			virtual PayloadParser* createPayloadParser() {
+				return new PARSER_TYPE(parsers_);
+			}
+
+		private:
+			std::string tag_;
+			std::string xmlns_;
+			PayloadParserFactoryCollection* parsers_;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
index 1797e45..3ec5a7a 100644
--- a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
+++ b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -10,6 +10,8 @@
 #include <Swiften/Elements/UnblockPayload.h>
 #include <Swiften/Elements/BlockListPayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
+#include <Swiften/Parser/GenericPayloadParserFactory.h>
+#include <Swiften/Parser/GenericPayloadParserFactory2.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/ErrorParser.h>
 #include <Swiften/Parser/PayloadParsers/ErrorParserFactory.h>
@@ -68,6 +70,11 @@
 #include <Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/WhiteboardParser.h>
 #include <Swiften/Parser/PayloadParsers/IdleParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/UserLocationParser.h>
 
 using namespace boost;
 
@@ -127,9 +134,14 @@ FullPayloadParserFactoryCollection::FullPayloadParserFactoryCollection() {
 	factories_.push_back(boost::make_shared<GenericPayloadParserFactory<JingleFileTransferHashParser> >("checksum"));
 	factories_.push_back(boost::make_shared<GenericPayloadParserFactory<S5BProxyRequestParser> >("query", "http://jabber.org/protocol/bytestreams"));
 	factories_.push_back(boost::make_shared<GenericPayloadParserFactory<WhiteboardParser> >("wb", "http://swift.im/whiteboard"));
+	factories_.push_back(boost::make_shared<GenericPayloadParserFactory<UserLocationParser> >("geoloc", "http://jabber.org/protocol/geoloc"));
 	factories_.push_back(boost::make_shared<DeliveryReceiptParserFactory>());
 	factories_.push_back(boost::make_shared<DeliveryReceiptRequestParserFactory>());
 	factories_.push_back(boost::make_shared<GenericPayloadParserFactory<IdleParser> >("idle", "urn:xmpp:idle:1"));
+	factories_.push_back(boost::make_shared<GenericPayloadParserFactory2<PubSubParser> >("pubsub", "http://jabber.org/protocol/pubsub", this));
+	factories_.push_back(boost::make_shared<GenericPayloadParserFactory2<PubSubOwnerPubSubParser> >("pubsub", "http://jabber.org/protocol/pubsub#owner", this));
+	factories_.push_back(boost::make_shared<GenericPayloadParserFactory2<PubSubEventParser> >("event", "http://jabber.org/protocol/pubsub#event", this));
+	factories_.push_back(boost::make_shared<PubSubErrorParserFactory>());
 
 	foreach(shared_ptr<PayloadParserFactory> factory, factories_) {
 		addFactory(factory.get());
diff --git a/Swiften/Parser/PayloadParsers/PubSubAffiliationParser.cpp b/Swiften/Parser/PayloadParsers/PubSubAffiliationParser.cpp
new file mode 100644
index 0000000..05fa119
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubAffiliationParser.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubAffiliationParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/EnumParser.h>
+
+using namespace Swift;
+
+PubSubAffiliationParser::PubSubAffiliationParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubAffiliationParser::~PubSubAffiliationParser() {
+}
+
+void PubSubAffiliationParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("affiliation")) {
+			if (boost::optional<PubSubAffiliation::Type> value = EnumParser<PubSubAffiliation::Type>()(PubSubAffiliation::None, "none")(PubSubAffiliation::Member, "member")(PubSubAffiliation::Outcast, "outcast")(PubSubAffiliation::Owner, "owner")(PubSubAffiliation::Publisher, "publisher")(PubSubAffiliation::PublishOnly, "publish-only").parse(*attributeValue)) {
+				getPayloadInternal()->setType(*value);
+			}
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubAffiliationParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubAffiliationParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubAffiliationParser.h b/Swiften/Parser/PayloadParsers/PubSubAffiliationParser.h
new file mode 100644
index 0000000..43c619d
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubAffiliationParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubAffiliation.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubAffiliationParser : public GenericPayloadParser<PubSubAffiliation> {
+		public:
+			PubSubAffiliationParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubAffiliationParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.cpp b/Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.cpp
new file mode 100644
index 0000000..b75e339
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubAffiliationParser.h>
+
+using namespace Swift;
+
+PubSubAffiliationsParser::PubSubAffiliationsParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubAffiliationsParser::~PubSubAffiliationsParser() {
+}
+
+void PubSubAffiliationsParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "affiliation" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubAffiliationParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubAffiliationsParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "affiliation" && ns == "http://jabber.org/protocol/pubsub") {
+				getPayloadInternal()->addAffiliation(boost::dynamic_pointer_cast<PubSubAffiliation>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubAffiliationsParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h b/Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h
new file mode 100644
index 0000000..646e7a8
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubAffiliations.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubAffiliationsParser : public GenericPayloadParser<PubSubAffiliations> {
+		public:
+			PubSubAffiliationsParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubAffiliationsParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubConfigureParser.cpp b/Swiften/Parser/PayloadParsers/PubSubConfigureParser.cpp
new file mode 100644
index 0000000..773c1c7
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubConfigureParser.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubConfigureParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/FormParser.h>
+
+using namespace Swift;
+
+PubSubConfigureParser::PubSubConfigureParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubConfigureParser::~PubSubConfigureParser() {
+}
+
+void PubSubConfigureParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	
+
+	if (level == 1) {
+		if (element == "x" && ns == "jabber:x:data") {
+			currentPayloadParser = boost::make_shared<FormParser>();
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubConfigureParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "x" && ns == "jabber:x:data") {
+				getPayloadInternal()->setData(boost::dynamic_pointer_cast<Form>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubConfigureParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubConfigureParser.h b/Swiften/Parser/PayloadParsers/PubSubConfigureParser.h
new file mode 100644
index 0000000..8300140
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubConfigureParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubConfigure.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubConfigureParser : public GenericPayloadParser<PubSubConfigure> {
+		public:
+			PubSubConfigureParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubConfigureParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubCreateParser.cpp b/Swiften/Parser/PayloadParsers/PubSubCreateParser.cpp
new file mode 100644
index 0000000..47f35c9
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubCreateParser.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubCreateParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubCreateParser::PubSubCreateParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubCreateParser::~PubSubCreateParser() {
+}
+
+void PubSubCreateParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubCreateParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubCreateParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubCreateParser.h b/Swiften/Parser/PayloadParsers/PubSubCreateParser.h
new file mode 100644
index 0000000..865b8ec
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubCreateParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubCreate.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubCreateParser : public GenericPayloadParser<PubSubCreate> {
+		public:
+			PubSubCreateParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubCreateParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubDefaultParser.cpp b/Swiften/Parser/PayloadParsers/PubSubDefaultParser.cpp
new file mode 100644
index 0000000..7a370cd
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubDefaultParser.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubDefaultParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/EnumParser.h>
+
+using namespace Swift;
+
+PubSubDefaultParser::PubSubDefaultParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubDefaultParser::~PubSubDefaultParser() {
+}
+
+void PubSubDefaultParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("type")) {
+			if (boost::optional<PubSubDefault::Type> value = EnumParser<PubSubDefault::Type>()(PubSubDefault::None, "none")(PubSubDefault::Collection, "collection")(PubSubDefault::Leaf, "leaf").parse(*attributeValue)) {
+				getPayloadInternal()->setType(*value);
+			}
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubDefaultParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubDefaultParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubDefaultParser.h b/Swiften/Parser/PayloadParsers/PubSubDefaultParser.h
new file mode 100644
index 0000000..7bd8d66
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubDefaultParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubDefault.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubDefaultParser : public GenericPayloadParser<PubSubDefault> {
+		public:
+			PubSubDefaultParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubDefaultParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubErrorParser.cpp b/Swiften/Parser/PayloadParsers/PubSubErrorParser.cpp
new file mode 100644
index 0000000..9752cd2
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubErrorParser.cpp
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#include <Swiften/Parser/PayloadParsers/PubSubErrorParser.h>
+
+using namespace Swift;
+
+PubSubErrorParser::PubSubErrorParser() : level(0) {
+	typeParser
+		(PubSubError::ClosedNode, "closed-node")
+		(PubSubError::ConfigurationRequired, "configuration-required")
+		(PubSubError::InvalidJID, "invalid-jid")
+		(PubSubError::InvalidOptions, "invalid-options")
+		(PubSubError::InvalidPayload, "invalid-payload")
+		(PubSubError::InvalidSubscriptionID, "invalid-subid")
+		(PubSubError::ItemForbidden, "item-forbidden")
+		(PubSubError::ItemRequired, "item-required")
+		(PubSubError::JIDRequired, "jid-required")
+		(PubSubError::MaximumItemsExceeded, "max-items-exceeded")
+		(PubSubError::MaximumNodesExceeded, "max-nodes-exceeded")
+		(PubSubError::NodeIDRequired, "nodeid-required")
+		(PubSubError::NotInRosterGroup, "not-in-roster-group")
+		(PubSubError::NotSubscribed, "not-subscribed")
+		(PubSubError::PayloadTooBig, "payload-too-big")
+		(PubSubError::PayloadRequired, "payload-required")
+		(PubSubError::PendingSubscription, "pending-subscription")
+		(PubSubError::PresenceSubscriptionRequired, "presence-subscription-required")
+		(PubSubError::SubscriptionIDRequired, "subid-required")
+		(PubSubError::TooManySubscriptions, "too-many-subscriptions")
+		(PubSubError::Unsupported, "unsupported")
+		(PubSubError::UnsupportedAccessModel, "unsupported-access-model");
+	unsupportedTypeParser
+		(PubSubError::AccessAuthorize, "access-authorize")
+		(PubSubError::AccessOpen, "access-open")
+		(PubSubError::AccessPresence, "access-presence")
+		(PubSubError::AccessRoster, "access-roster")
+		(PubSubError::AccessWhitelist, "access-whitelist")
+		(PubSubError::AutoCreate, "auto-create")
+		(PubSubError::AutoSubscribe, "auto-subscribe")
+		(PubSubError::Collections, "collections")
+		(PubSubError::ConfigNode, "config-node")
+		(PubSubError::CreateAndConfigure, "create-and-configure")
+		(PubSubError::CreateNodes, "create-nodes")
+		(PubSubError::DeleteItems, "delete-items")
+		(PubSubError::DeleteNodes, "delete-nodes")
+		(PubSubError::FilteredNotifications, "filtered-notifications")
+		(PubSubError::GetPending, "get-pending")
+		(PubSubError::InstantNodes, "instant-nodes")
+		(PubSubError::ItemIDs, "item-ids")
+		(PubSubError::LastPublished, "last-published")
+		(PubSubError::LeasedSubscription, "leased-subscription")
+		(PubSubError::ManageSubscriptions, "manage-subscriptions")
+		(PubSubError::MemberAffiliation, "member-affiliation")
+		(PubSubError::MetaData, "meta-data")
+		(PubSubError::ModifyAffiliations, "modify-affiliations")
+		(PubSubError::MultiCollection, "multi-collection")
+		(PubSubError::MultiSubscribe, "multi-subscribe")
+		(PubSubError::OutcastAffiliation, "outcast-affiliation")
+		(PubSubError::PersistentItems, "persistent-items")
+		(PubSubError::PresenceNotifications, "presence-notifications")
+		(PubSubError::PresenceSubscribe, "presence-subscribe")
+		(PubSubError::Publish, "publish")
+		(PubSubError::PublishOptions, "publish-options")
+		(PubSubError::PublishOnlyAffiliation, "publish-only-affiliation")
+		(PubSubError::PublisherAffiliation, "publisher-affiliation")
+		(PubSubError::PurgeNodes, "purge-nodes")
+		(PubSubError::RetractItems, "retract-items")
+		(PubSubError::RetrieveAffiliations, "retrieve-affiliations")
+		(PubSubError::RetrieveDefault, "retrieve-default")
+		(PubSubError::RetrieveItems, "retrieve-items")
+		(PubSubError::RetrieveSubscriptions, "retrieve-subscriptions")
+		(PubSubError::Subscribe, "subscribe")
+		(PubSubError::SubscriptionOptions, "subscription-options")
+		(PubSubError::SubscriptionNotifications, "subscription-notifications");
+}
+
+PubSubErrorParser::~PubSubErrorParser() {
+}
+
+void PubSubErrorParser::handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) {
+	if (level == 1) {
+		if (boost::optional<PubSubError::Type> type = typeParser.parse(element)) {
+			getPayloadInternal()->setType(*type);
+			if (type == PubSubError::Unsupported) {
+				if (boost::optional<std::string> feature = attributes.getAttributeValue("feature")) {
+					if (boost::optional<PubSubError::UnsupportedFeatureType> unsupportedType = unsupportedTypeParser.parse(*feature)) {
+						getPayloadInternal()->setUnsupportedFeatureType(*unsupportedType);
+					}
+				}
+			}
+		}
+	}
+	++level;
+}
+
+void PubSubErrorParser::handleEndElement(const std::string&, const std::string&) {
+	--level;
+}
+
+void PubSubErrorParser::handleCharacterData(const std::string&) {
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubErrorParser.h b/Swiften/Parser/PayloadParsers/PubSubErrorParser.h
new file mode 100644
index 0000000..eb7dcfe
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubErrorParser.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubError.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+#include <Swiften/Parser/EnumParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubErrorParser : public GenericPayloadParser<PubSubError> {
+		public:
+			PubSubErrorParser();
+			virtual ~PubSubErrorParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			int level;
+			EnumParser<PubSubError::Type> typeParser;
+			EnumParser<PubSubError::UnsupportedFeatureType> unsupportedTypeParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.cpp b/Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.cpp
new file mode 100644
index 0000000..10dfd63
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.cpp
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#include <Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.h>
+
+using namespace Swift;
+
+PubSubErrorParserFactory::~PubSubErrorParserFactory() {
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.h b/Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.h
new file mode 100644
index 0000000..e2386da
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubErrorParser.h>
+
+namespace Swift {
+	class PubSubErrorParserFactory : public PayloadParserFactory {
+		public:
+			PubSubErrorParserFactory() {
+			}
+			~PubSubErrorParserFactory();
+
+			virtual bool canParse(const std::string&, const std::string& ns, const AttributeMap&) const {
+				return ns == "http://jabber.org/protocol/pubsub#errors";
+			}
+
+			virtual PayloadParser* createPayloadParser() {
+				return new PubSubErrorParser();
+			}
+	};
+}
+
+
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.cpp
new file mode 100644
index 0000000..f187be8
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubEventAssociateParser::PubSubEventAssociateParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventAssociateParser::~PubSubEventAssociateParser() {
+}
+
+void PubSubEventAssociateParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventAssociateParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventAssociateParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.h b/Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.h
new file mode 100644
index 0000000..000edf2
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEventAssociate.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventAssociateParser : public GenericPayloadParser<PubSubEventAssociate> {
+		public:
+			PubSubEventAssociateParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventAssociateParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.cpp
new file mode 100644
index 0000000..08b9c65
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.h>
+
+using namespace Swift;
+
+PubSubEventCollectionParser::PubSubEventCollectionParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventCollectionParser::~PubSubEventCollectionParser() {
+}
+
+void PubSubEventCollectionParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "disassociate" && ns == "http://jabber.org/protocol/pubsub#event") {
+			currentPayloadParser = boost::make_shared<PubSubEventDisassociateParser>(parsers);
+		}
+		if (element == "associate" && ns == "http://jabber.org/protocol/pubsub#event") {
+			currentPayloadParser = boost::make_shared<PubSubEventAssociateParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventCollectionParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "disassociate" && ns == "http://jabber.org/protocol/pubsub#event") {
+				getPayloadInternal()->setDisassociate(boost::dynamic_pointer_cast<PubSubEventDisassociate>(currentPayloadParser->getPayload()));
+			}
+			if (element == "associate" && ns == "http://jabber.org/protocol/pubsub#event") {
+				getPayloadInternal()->setAssociate(boost::dynamic_pointer_cast<PubSubEventAssociate>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventCollectionParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.h b/Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.h
new file mode 100644
index 0000000..aad97d2
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEventCollection.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventCollectionParser : public GenericPayloadParser<PubSubEventCollection> {
+		public:
+			PubSubEventCollectionParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventCollectionParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.cpp
new file mode 100644
index 0000000..f905299
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/FormParser.h>
+
+using namespace Swift;
+
+PubSubEventConfigurationParser::PubSubEventConfigurationParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventConfigurationParser::~PubSubEventConfigurationParser() {
+}
+
+void PubSubEventConfigurationParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "x" && ns == "jabber:x:data") {
+			currentPayloadParser = boost::make_shared<FormParser>();
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventConfigurationParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "x" && ns == "jabber:x:data") {
+				getPayloadInternal()->setData(boost::dynamic_pointer_cast<Form>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventConfigurationParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.h b/Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.h
new file mode 100644
index 0000000..7189460
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEventConfiguration.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventConfigurationParser : public GenericPayloadParser<PubSubEventConfiguration> {
+		public:
+			PubSubEventConfigurationParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventConfigurationParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.cpp
new file mode 100644
index 0000000..03c7423
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.h>
+
+using namespace Swift;
+
+PubSubEventDeleteParser::PubSubEventDeleteParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventDeleteParser::~PubSubEventDeleteParser() {
+}
+
+void PubSubEventDeleteParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "redirect" && ns == "http://jabber.org/protocol/pubsub#event") {
+			currentPayloadParser = boost::make_shared<PubSubEventRedirectParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventDeleteParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "redirect" && ns == "http://jabber.org/protocol/pubsub#event") {
+				getPayloadInternal()->setRedirects(boost::dynamic_pointer_cast<PubSubEventRedirect>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventDeleteParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.h b/Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.h
new file mode 100644
index 0000000..36f8e0b
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEventDelete.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventDeleteParser : public GenericPayloadParser<PubSubEventDelete> {
+		public:
+			PubSubEventDeleteParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventDeleteParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.cpp
new file mode 100644
index 0000000..287ac35
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubEventDisassociateParser::PubSubEventDisassociateParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventDisassociateParser::~PubSubEventDisassociateParser() {
+}
+
+void PubSubEventDisassociateParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventDisassociateParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventDisassociateParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.h b/Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.h
new file mode 100644
index 0000000..9015100
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEventDisassociate.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventDisassociateParser : public GenericPayloadParser<PubSubEventDisassociate> {
+		public:
+			PubSubEventDisassociateParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventDisassociateParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventItemParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventItemParser.cpp
new file mode 100644
index 0000000..8903545
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventItemParser.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventItemParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubEventItemParser::PubSubEventItemParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventItemParser::~PubSubEventItemParser() {
+}
+
+void PubSubEventItemParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("publisher")) {
+			getPayloadInternal()->setPublisher(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("id")) {
+			getPayloadInternal()->setID(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (PayloadParserFactory* factory = parsers->getPayloadParserFactory(element, ns, attributes)) {
+			currentPayloadParser.reset(factory->createPayloadParser());
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventItemParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			getPayloadInternal()->addData(currentPayloadParser->getPayload());
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventItemParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventItemParser.h b/Swiften/Parser/PayloadParsers/PubSubEventItemParser.h
new file mode 100644
index 0000000..6c16043
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventItemParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEventItem.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventItemParser : public GenericPayloadParser<PubSubEventItem> {
+		public:
+			PubSubEventItemParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventItemParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.cpp
new file mode 100644
index 0000000..fa155e9
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventItemsParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventItemParser.h>
+
+using namespace Swift;
+
+PubSubEventItemsParser::PubSubEventItemsParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventItemsParser::~PubSubEventItemsParser() {
+}
+
+void PubSubEventItemsParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "item" && ns == "http://jabber.org/protocol/pubsub#event") {
+			currentPayloadParser = boost::make_shared<PubSubEventItemParser>(parsers);
+		}
+		if (element == "retract" && ns == "http://jabber.org/protocol/pubsub#event") {
+			currentPayloadParser = boost::make_shared<PubSubEventRetractParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventItemsParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "item" && ns == "http://jabber.org/protocol/pubsub#event") {
+				getPayloadInternal()->addItem(boost::dynamic_pointer_cast<PubSubEventItem>(currentPayloadParser->getPayload()));
+			}
+			if (element == "retract" && ns == "http://jabber.org/protocol/pubsub#event") {
+				getPayloadInternal()->addRetract(boost::dynamic_pointer_cast<PubSubEventRetract>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventItemsParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.h b/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.h
new file mode 100644
index 0000000..60ecb25
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEventItems.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventItemsParser : public GenericPayloadParser<PubSubEventItems> {
+		public:
+			PubSubEventItemsParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventItemsParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventParser.cpp
new file mode 100644
index 0000000..c4406a9
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventParser.cpp
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventItemsParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.h>
+
+using namespace Swift;
+
+PubSubEventParser::PubSubEventParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventParser::~PubSubEventParser() {
+}
+
+void PubSubEventParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	
+
+	if (level == 1) {
+		if (element == "items" && ns == "http://jabber.org/protocol/pubsub#event") {
+			currentPayloadParser = boost::make_shared<PubSubEventItemsParser>(parsers);
+		}
+		if (element == "collection" && ns == "http://jabber.org/protocol/pubsub#event") {
+			currentPayloadParser = boost::make_shared<PubSubEventCollectionParser>(parsers);
+		}
+		if (element == "purge" && ns == "http://jabber.org/protocol/pubsub#event") {
+			currentPayloadParser = boost::make_shared<PubSubEventPurgeParser>(parsers);
+		}
+		if (element == "configuration" && ns == "http://jabber.org/protocol/pubsub#event") {
+			currentPayloadParser = boost::make_shared<PubSubEventConfigurationParser>(parsers);
+		}
+		if (element == "delete" && ns == "http://jabber.org/protocol/pubsub#event") {
+			currentPayloadParser = boost::make_shared<PubSubEventDeleteParser>(parsers);
+		}
+		if (element == "subscription" && ns == "http://jabber.org/protocol/pubsub#event") {
+			currentPayloadParser = boost::make_shared<PubSubEventSubscriptionParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (currentPayloadParser) {
+				getPayloadInternal()->setPayload(boost::dynamic_pointer_cast<PubSubEventPayload>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventParser.h b/Swiften/Parser/PayloadParsers/PubSubEventParser.h
new file mode 100644
index 0000000..1042e75
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEvent.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventParser : public GenericPayloadParser<PubSubEvent> {
+		public:
+			PubSubEventParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.cpp
new file mode 100644
index 0000000..14d1e96
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubEventPurgeParser::PubSubEventPurgeParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventPurgeParser::~PubSubEventPurgeParser() {
+}
+
+void PubSubEventPurgeParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventPurgeParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventPurgeParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.h b/Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.h
new file mode 100644
index 0000000..740bff3
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEventPurge.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventPurgeParser : public GenericPayloadParser<PubSubEventPurge> {
+		public:
+			PubSubEventPurgeParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventPurgeParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.cpp
new file mode 100644
index 0000000..f053117
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubEventRedirectParser::PubSubEventRedirectParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventRedirectParser::~PubSubEventRedirectParser() {
+}
+
+void PubSubEventRedirectParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("uri")) {
+			getPayloadInternal()->setURI(*attributeValue);
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventRedirectParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventRedirectParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.h b/Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.h
new file mode 100644
index 0000000..33880ed
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEventRedirect.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventRedirectParser : public GenericPayloadParser<PubSubEventRedirect> {
+		public:
+			PubSubEventRedirectParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventRedirectParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventRetractParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventRetractParser.cpp
new file mode 100644
index 0000000..da3dea3
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventRetractParser.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubEventRetractParser::PubSubEventRetractParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventRetractParser::~PubSubEventRetractParser() {
+}
+
+void PubSubEventRetractParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("id")) {
+			getPayloadInternal()->setID(*attributeValue);
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventRetractParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventRetractParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h b/Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h
new file mode 100644
index 0000000..115bb7a
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEventRetract.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventRetractParser : public GenericPayloadParser<PubSubEventRetract> {
+		public:
+			PubSubEventRetractParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventRetractParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.cpp
new file mode 100644
index 0000000..3367202
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Base/DateTime.h>
+#include <Swiften/Parser/EnumParser.h>
+
+using namespace Swift;
+
+PubSubEventSubscriptionParser::PubSubEventSubscriptionParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubEventSubscriptionParser::~PubSubEventSubscriptionParser() {
+}
+
+void PubSubEventSubscriptionParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("jid")) {
+			if (boost::optional<JID> jid = JID::parse(*attributeValue)) {
+				getPayloadInternal()->setJID(*jid);
+			}
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subscription")) {
+			if (boost::optional<PubSubEventSubscription::SubscriptionType> value = EnumParser<PubSubEventSubscription::SubscriptionType>()(PubSubEventSubscription::None, "none")(PubSubEventSubscription::Pending, "pending")(PubSubEventSubscription::Subscribed, "subscribed")(PubSubEventSubscription::Unconfigured, "unconfigured").parse(*attributeValue)) {
+				getPayloadInternal()->setSubscription(*value);
+			}
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subid")) {
+			getPayloadInternal()->setSubscriptionID(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("expiry")) {
+				getPayloadInternal()->setExpiry(stringToDateTime(*attributeValue));
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubEventSubscriptionParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubEventSubscriptionParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.h b/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.h
new file mode 100644
index 0000000..1469920
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubEventSubscription.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubEventSubscriptionParser : public GenericPayloadParser<PubSubEventSubscription> {
+		public:
+			PubSubEventSubscriptionParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubEventSubscriptionParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubItemParser.cpp b/Swiften/Parser/PayloadParsers/PubSubItemParser.cpp
new file mode 100644
index 0000000..2e7d01a
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubItemParser.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubItemParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubItemParser::PubSubItemParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubItemParser::~PubSubItemParser() {
+}
+
+void PubSubItemParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("id")) {
+			getPayloadInternal()->setID(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (PayloadParserFactory* factory = parsers->getPayloadParserFactory(element, ns, attributes)) {
+			currentPayloadParser.reset(factory->createPayloadParser());
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubItemParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			getPayloadInternal()->addData(currentPayloadParser->getPayload());
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubItemParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubItemParser.h b/Swiften/Parser/PayloadParsers/PubSubItemParser.h
new file mode 100644
index 0000000..4f02211
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubItemParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubItem.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubItemParser : public GenericPayloadParser<PubSubItem> {
+		public:
+			PubSubItemParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubItemParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubItemsParser.cpp b/Swiften/Parser/PayloadParsers/PubSubItemsParser.cpp
new file mode 100644
index 0000000..615f05d
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubItemsParser.cpp
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubItemsParser.h>
+
+#include <boost/optional.hpp>
+#include <boost/lexical_cast.hpp>
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubItemParser.h>
+
+using namespace Swift;
+
+PubSubItemsParser::PubSubItemsParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubItemsParser::~PubSubItemsParser() {
+}
+
+void PubSubItemsParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("max_items")) {
+			try {
+				getPayloadInternal()->setMaximumItems(boost::lexical_cast<unsigned int>(*attributeValue));
+			}
+			catch (boost::bad_lexical_cast&) {
+			}
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subid")) {
+			getPayloadInternal()->setSubscriptionID(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "item" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubItemParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubItemsParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "item" && ns == "http://jabber.org/protocol/pubsub") {
+				getPayloadInternal()->addItem(boost::dynamic_pointer_cast<PubSubItem>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubItemsParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubItemsParser.h b/Swiften/Parser/PayloadParsers/PubSubItemsParser.h
new file mode 100644
index 0000000..895863f
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubItemsParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubItems.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubItemsParser : public GenericPayloadParser<PubSubItems> {
+		public:
+			PubSubItemsParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubItemsParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOptionsParser.cpp b/Swiften/Parser/PayloadParsers/PubSubOptionsParser.cpp
new file mode 100644
index 0000000..3bf4998
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOptionsParser.cpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubOptionsParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/FormParser.h>
+
+using namespace Swift;
+
+PubSubOptionsParser::PubSubOptionsParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubOptionsParser::~PubSubOptionsParser() {
+}
+
+void PubSubOptionsParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("jid")) {
+			if (boost::optional<JID> jid = JID::parse(*attributeValue)) {
+				getPayloadInternal()->setJID(*jid);
+			}
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subid")) {
+			getPayloadInternal()->setSubscriptionID(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "x" && ns == "jabber:x:data") {
+			currentPayloadParser = boost::make_shared<FormParser>();
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubOptionsParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "x" && ns == "jabber:x:data") {
+				getPayloadInternal()->setData(boost::dynamic_pointer_cast<Form>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubOptionsParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOptionsParser.h b/Swiften/Parser/PayloadParsers/PubSubOptionsParser.h
new file mode 100644
index 0000000..3c8754b
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOptionsParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubOptions.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubOptionsParser : public GenericPayloadParser<PubSubOptions> {
+		public:
+			PubSubOptionsParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubOptionsParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.cpp b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.cpp
new file mode 100644
index 0000000..a648862
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/EnumParser.h>
+
+using namespace Swift;
+
+PubSubOwnerAffiliationParser::PubSubOwnerAffiliationParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubOwnerAffiliationParser::~PubSubOwnerAffiliationParser() {
+}
+
+void PubSubOwnerAffiliationParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("jid")) {
+			if (boost::optional<JID> jid = JID::parse(*attributeValue)) {
+				getPayloadInternal()->setJID(*jid);
+			}
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("affiliation")) {
+			if (boost::optional<PubSubOwnerAffiliation::Type> value = EnumParser<PubSubOwnerAffiliation::Type>()(PubSubOwnerAffiliation::None, "none")(PubSubOwnerAffiliation::Member, "member")(PubSubOwnerAffiliation::Outcast, "outcast")(PubSubOwnerAffiliation::Owner, "owner")(PubSubOwnerAffiliation::Publisher, "publisher")(PubSubOwnerAffiliation::PublishOnly, "publish-only").parse(*attributeValue)) {
+				getPayloadInternal()->setType(*value);
+			}
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubOwnerAffiliationParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubOwnerAffiliationParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.h
new file mode 100644
index 0000000..ae54b5f
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubOwnerAffiliation.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubOwnerAffiliationParser : public GenericPayloadParser<PubSubOwnerAffiliation> {
+		public:
+			PubSubOwnerAffiliationParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubOwnerAffiliationParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.cpp b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.cpp
new file mode 100644
index 0000000..b824279
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.h>
+
+using namespace Swift;
+
+PubSubOwnerAffiliationsParser::PubSubOwnerAffiliationsParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubOwnerAffiliationsParser::~PubSubOwnerAffiliationsParser() {
+}
+
+void PubSubOwnerAffiliationsParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "affiliation" && ns == "http://jabber.org/protocol/pubsub#owner") {
+			currentPayloadParser = boost::make_shared<PubSubOwnerAffiliationParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubOwnerAffiliationsParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "affiliation" && ns == "http://jabber.org/protocol/pubsub#owner") {
+				getPayloadInternal()->addAffiliation(boost::dynamic_pointer_cast<PubSubOwnerAffiliation>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubOwnerAffiliationsParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.h
new file mode 100644
index 0000000..755d58c
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubOwnerAffiliations.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubOwnerAffiliationsParser : public GenericPayloadParser<PubSubOwnerAffiliations> {
+		public:
+			PubSubOwnerAffiliationsParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubOwnerAffiliationsParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.cpp b/Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.cpp
new file mode 100644
index 0000000..43d262f
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/FormParser.h>
+
+using namespace Swift;
+
+PubSubOwnerConfigureParser::PubSubOwnerConfigureParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubOwnerConfigureParser::~PubSubOwnerConfigureParser() {
+}
+
+void PubSubOwnerConfigureParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "x" && ns == "jabber:x:data") {
+			currentPayloadParser = boost::make_shared<FormParser>();
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubOwnerConfigureParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "x" && ns == "jabber:x:data") {
+				getPayloadInternal()->setData(boost::dynamic_pointer_cast<Form>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubOwnerConfigureParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.h
new file mode 100644
index 0000000..f9a8553
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubOwnerConfigure.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubOwnerConfigureParser : public GenericPayloadParser<PubSubOwnerConfigure> {
+		public:
+			PubSubOwnerConfigureParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubOwnerConfigureParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.cpp b/Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.cpp
new file mode 100644
index 0000000..4c284bf
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/FormParser.h>
+
+using namespace Swift;
+
+PubSubOwnerDefaultParser::PubSubOwnerDefaultParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubOwnerDefaultParser::~PubSubOwnerDefaultParser() {
+}
+
+void PubSubOwnerDefaultParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	
+
+	if (level == 1) {
+		if (element == "x" && ns == "jabber:x:data") {
+			currentPayloadParser = boost::make_shared<FormParser>();
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubOwnerDefaultParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "x" && ns == "jabber:x:data") {
+				getPayloadInternal()->setData(boost::dynamic_pointer_cast<Form>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubOwnerDefaultParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.h
new file mode 100644
index 0000000..5207bc5
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubOwnerDefault.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubOwnerDefaultParser : public GenericPayloadParser<PubSubOwnerDefault> {
+		public:
+			PubSubOwnerDefaultParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubOwnerDefaultParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.cpp b/Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.cpp
new file mode 100644
index 0000000..a2b7a9d
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.h>
+
+using namespace Swift;
+
+PubSubOwnerDeleteParser::PubSubOwnerDeleteParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubOwnerDeleteParser::~PubSubOwnerDeleteParser() {
+}
+
+void PubSubOwnerDeleteParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "redirect" && ns == "http://jabber.org/protocol/pubsub#owner") {
+			currentPayloadParser = boost::make_shared<PubSubOwnerRedirectParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubOwnerDeleteParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "redirect" && ns == "http://jabber.org/protocol/pubsub#owner") {
+				getPayloadInternal()->setRedirect(boost::dynamic_pointer_cast<PubSubOwnerRedirect>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubOwnerDeleteParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.h
new file mode 100644
index 0000000..c171ab8
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubOwnerDelete.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubOwnerDeleteParser : public GenericPayloadParser<PubSubOwnerDelete> {
+		public:
+			PubSubOwnerDeleteParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubOwnerDeleteParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.cpp b/Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.cpp
new file mode 100644
index 0000000..5262997
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.cpp
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.h>
+
+using namespace Swift;
+
+PubSubOwnerPubSubParser::PubSubOwnerPubSubParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubOwnerPubSubParser::~PubSubOwnerPubSubParser() {
+}
+
+void PubSubOwnerPubSubParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	
+
+	if (level == 1) {
+		if (element == "configure" && ns == "http://jabber.org/protocol/pubsub#owner") {
+			currentPayloadParser = boost::make_shared<PubSubOwnerConfigureParser>(parsers);
+		}
+		if (element == "subscriptions" && ns == "http://jabber.org/protocol/pubsub#owner") {
+			currentPayloadParser = boost::make_shared<PubSubOwnerSubscriptionsParser>(parsers);
+		}
+		if (element == "default" && ns == "http://jabber.org/protocol/pubsub#owner") {
+			currentPayloadParser = boost::make_shared<PubSubOwnerDefaultParser>(parsers);
+		}
+		if (element == "purge" && ns == "http://jabber.org/protocol/pubsub#owner") {
+			currentPayloadParser = boost::make_shared<PubSubOwnerPurgeParser>(parsers);
+		}
+		if (element == "affiliations" && ns == "http://jabber.org/protocol/pubsub#owner") {
+			currentPayloadParser = boost::make_shared<PubSubOwnerAffiliationsParser>(parsers);
+		}
+		if (element == "delete" && ns == "http://jabber.org/protocol/pubsub#owner") {
+			currentPayloadParser = boost::make_shared<PubSubOwnerDeleteParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubOwnerPubSubParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (currentPayloadParser) {
+				getPayloadInternal()->setPayload(boost::dynamic_pointer_cast<PubSubOwnerPayload>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubOwnerPubSubParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.h
new file mode 100644
index 0000000..25fee8a
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubOwnerPubSub.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubOwnerPubSubParser : public GenericPayloadParser<PubSubOwnerPubSub> {
+		public:
+			PubSubOwnerPubSubParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubOwnerPubSubParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.cpp b/Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.cpp
new file mode 100644
index 0000000..ebea0a7
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubOwnerPurgeParser::PubSubOwnerPurgeParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubOwnerPurgeParser::~PubSubOwnerPurgeParser() {
+}
+
+void PubSubOwnerPurgeParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubOwnerPurgeParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubOwnerPurgeParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.h
new file mode 100644
index 0000000..0b85d3d
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubOwnerPurge.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubOwnerPurgeParser : public GenericPayloadParser<PubSubOwnerPurge> {
+		public:
+			PubSubOwnerPurgeParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubOwnerPurgeParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.cpp b/Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.cpp
new file mode 100644
index 0000000..bc54e86
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubOwnerRedirectParser::PubSubOwnerRedirectParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubOwnerRedirectParser::~PubSubOwnerRedirectParser() {
+}
+
+void PubSubOwnerRedirectParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("uri")) {
+			getPayloadInternal()->setURI(*attributeValue);
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubOwnerRedirectParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubOwnerRedirectParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.h
new file mode 100644
index 0000000..9a97d74
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubOwnerRedirect.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubOwnerRedirectParser : public GenericPayloadParser<PubSubOwnerRedirect> {
+		public:
+			PubSubOwnerRedirectParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubOwnerRedirectParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.cpp b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.cpp
new file mode 100644
index 0000000..7c91526
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/EnumParser.h>
+
+using namespace Swift;
+
+PubSubOwnerSubscriptionParser::PubSubOwnerSubscriptionParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubOwnerSubscriptionParser::~PubSubOwnerSubscriptionParser() {
+}
+
+void PubSubOwnerSubscriptionParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("jid")) {
+			if (boost::optional<JID> jid = JID::parse(*attributeValue)) {
+				getPayloadInternal()->setJID(*jid);
+			}
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subscription")) {
+			if (boost::optional<PubSubOwnerSubscription::SubscriptionType> value = EnumParser<PubSubOwnerSubscription::SubscriptionType>()(PubSubOwnerSubscription::None, "none")(PubSubOwnerSubscription::Pending, "pending")(PubSubOwnerSubscription::Subscribed, "subscribed")(PubSubOwnerSubscription::Unconfigured, "unconfigured").parse(*attributeValue)) {
+				getPayloadInternal()->setSubscription(*value);
+			}
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubOwnerSubscriptionParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubOwnerSubscriptionParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.h
new file mode 100644
index 0000000..8ef8d5b
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubOwnerSubscription.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubOwnerSubscriptionParser : public GenericPayloadParser<PubSubOwnerSubscription> {
+		public:
+			PubSubOwnerSubscriptionParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubOwnerSubscriptionParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.cpp b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.cpp
new file mode 100644
index 0000000..ebe90d8
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.h>
+
+using namespace Swift;
+
+PubSubOwnerSubscriptionsParser::PubSubOwnerSubscriptionsParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubOwnerSubscriptionsParser::~PubSubOwnerSubscriptionsParser() {
+}
+
+void PubSubOwnerSubscriptionsParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "subscription" && ns == "http://jabber.org/protocol/pubsub#owner") {
+			currentPayloadParser = boost::make_shared<PubSubOwnerSubscriptionParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubOwnerSubscriptionsParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "subscription" && ns == "http://jabber.org/protocol/pubsub#owner") {
+				getPayloadInternal()->addSubscription(boost::dynamic_pointer_cast<PubSubOwnerSubscription>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubOwnerSubscriptionsParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.h
new file mode 100644
index 0000000..a5459a9
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubOwnerSubscriptions.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubOwnerSubscriptionsParser : public GenericPayloadParser<PubSubOwnerSubscriptions> {
+		public:
+			PubSubOwnerSubscriptionsParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubOwnerSubscriptionsParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubParser.cpp b/Swiften/Parser/PayloadParsers/PubSubParser.cpp
new file mode 100644
index 0000000..5b1462b
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubParser.cpp
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubConfigureParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubDefaultParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubCreateParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOptionsParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubPublishParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubOptionsParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubItemsParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubRetractParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.h>
+
+using namespace Swift;
+
+PubSubParser::PubSubParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubParser::~PubSubParser() {
+}
+
+void PubSubParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 1) {
+		if (element == "items" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubItemsParser>(parsers);
+		}
+		if (element == "create" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubCreateParser>(parsers);
+		}
+		if (element == "publish" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubPublishParser>(parsers);
+		}
+		if (element == "affiliations" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubAffiliationsParser>(parsers);
+		}
+		if (element == "retract" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubRetractParser>(parsers);
+		}
+		if (element == "options" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubOptionsParser>(parsers);
+		}
+		if (element == "configure" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubConfigureParser>(parsers);
+		}
+		if (element == "default" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubDefaultParser>(parsers);
+		}
+		if (element == "subscriptions" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubSubscriptionsParser>(parsers);
+		}
+		if (element == "subscribe" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubSubscribeParser>(parsers);
+		}
+		if (element == "unsubscribe" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubUnsubscribeParser>(parsers);
+		}
+		if (element == "subscription" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubSubscriptionParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (currentPayloadParser) {
+				if (element == "options" && ns == "http://jabber.org/protocol/pubsub") {
+					optionsPayload = boost::dynamic_pointer_cast<PubSubOptions>(currentPayloadParser->getPayload());
+				}
+				else if (element == "configure" && ns == "http://jabber.org/protocol/pubsub") {
+					configurePayload = boost::dynamic_pointer_cast<PubSubConfigure>(currentPayloadParser->getPayload());
+				}
+				else {
+					getPayloadInternal()->setPayload(boost::dynamic_pointer_cast<PubSubPayload>(currentPayloadParser->getPayload()));
+				}
+			}
+			currentPayloadParser.reset();
+		}
+
+		if (level == 0) {
+			if (boost::shared_ptr<PubSubCreate> create = boost::dynamic_pointer_cast<PubSubCreate>(getPayloadInternal()->getPayload())) {
+				if (configurePayload) {
+					create->setConfigure(configurePayload);
+				}
+			}
+			if (boost::shared_ptr<PubSubSubscribe> subscribe = boost::dynamic_pointer_cast<PubSubSubscribe>(getPayloadInternal()->getPayload())) {
+				if (optionsPayload) {
+					subscribe->setOptions(optionsPayload);
+				}
+			}
+		}
+	}
+}
+
+void PubSubParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubParser.h b/Swiften/Parser/PayloadParsers/PubSubParser.h
new file mode 100644
index 0000000..0618361
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubParser.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSub.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+	class PubSubOptions;
+	class PubSubConfigure;
+
+	class SWIFTEN_API PubSubParser : public GenericPayloadParser<PubSub> {
+		public:
+			PubSubParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+			boost::shared_ptr<PubSubConfigure> configurePayload;
+			boost::shared_ptr<PubSubOptions> optionsPayload;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubPublishParser.cpp b/Swiften/Parser/PayloadParsers/PubSubPublishParser.cpp
new file mode 100644
index 0000000..ca358c3
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubPublishParser.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubPublishParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubItemParser.h>
+
+using namespace Swift;
+
+PubSubPublishParser::PubSubPublishParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubPublishParser::~PubSubPublishParser() {
+}
+
+void PubSubPublishParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "item" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubItemParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubPublishParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "item" && ns == "http://jabber.org/protocol/pubsub") {
+				getPayloadInternal()->addItem(boost::dynamic_pointer_cast<PubSubItem>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubPublishParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubPublishParser.h b/Swiften/Parser/PayloadParsers/PubSubPublishParser.h
new file mode 100644
index 0000000..3d64e9d
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubPublishParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubPublish.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubPublishParser : public GenericPayloadParser<PubSubPublish> {
+		public:
+			PubSubPublishParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubPublishParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubRetractParser.cpp b/Swiften/Parser/PayloadParsers/PubSubRetractParser.cpp
new file mode 100644
index 0000000..f4a42d0
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubRetractParser.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubRetractParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubItemParser.h>
+
+using namespace Swift;
+
+PubSubRetractParser::PubSubRetractParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubRetractParser::~PubSubRetractParser() {
+}
+
+void PubSubRetractParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("notify")) {
+			getPayloadInternal()->setNotify(*attributeValue == "true" ? true : false);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "item" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubItemParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubRetractParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "item" && ns == "http://jabber.org/protocol/pubsub") {
+				getPayloadInternal()->addItem(boost::dynamic_pointer_cast<PubSubItem>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubRetractParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubRetractParser.h b/Swiften/Parser/PayloadParsers/PubSubRetractParser.h
new file mode 100644
index 0000000..2b5e633
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubRetractParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubRetract.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubRetractParser : public GenericPayloadParser<PubSubRetract> {
+		public:
+			PubSubRetractParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubRetractParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.cpp b/Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.cpp
new file mode 100644
index 0000000..caed681
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubSubscribeOptionsParser::PubSubSubscribeOptionsParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubSubscribeOptionsParser::~PubSubSubscribeOptionsParser() {
+}
+
+void PubSubSubscribeOptionsParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubSubscribeOptionsParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "required") {
+				getPayloadInternal()->setRequired(true);
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubSubscribeOptionsParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.h b/Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.h
new file mode 100644
index 0000000..c9ac1ca
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubSubscribeOptions.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubSubscribeOptionsParser : public GenericPayloadParser<PubSubSubscribeOptions> {
+		public:
+			PubSubSubscribeOptionsParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubSubscribeOptionsParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscribeParser.cpp b/Swiften/Parser/PayloadParsers/PubSubSubscribeParser.cpp
new file mode 100644
index 0000000..093c2c4
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscribeParser.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubSubscribeParser::PubSubSubscribeParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubSubscribeParser::~PubSubSubscribeParser() {
+}
+
+void PubSubSubscribeParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("jid")) {
+			if (boost::optional<JID> jid = JID::parse(*attributeValue)) {
+				getPayloadInternal()->setJID(*jid);
+			}
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubSubscribeParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubSubscribeParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h b/Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h
new file mode 100644
index 0000000..f0ad09d
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubSubscribe.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubSubscribeParser : public GenericPayloadParser<PubSubSubscribe> {
+		public:
+			PubSubSubscribeParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubSubscribeParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.cpp b/Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.cpp
new file mode 100644
index 0000000..be06ec8
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.cpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/EnumParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.h>
+
+using namespace Swift;
+
+PubSubSubscriptionParser::PubSubSubscriptionParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubSubscriptionParser::~PubSubSubscriptionParser() {
+}
+
+void PubSubSubscriptionParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subid")) {
+			getPayloadInternal()->setSubscriptionID(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("jid")) {
+			if (boost::optional<JID> jid = JID::parse(*attributeValue)) {
+				getPayloadInternal()->setJID(*jid);
+			}
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subscription")) {
+			if (boost::optional<PubSubSubscription::SubscriptionType> value = EnumParser<PubSubSubscription::SubscriptionType>()(PubSubSubscription::None, "none")(PubSubSubscription::Pending, "pending")(PubSubSubscription::Subscribed, "subscribed")(PubSubSubscription::Unconfigured, "unconfigured").parse(*attributeValue)) {
+				getPayloadInternal()->setSubscription(*value);
+			}
+		}
+	}
+
+	if (level == 1) {
+		if (element == "subscribe-options" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubSubscribeOptionsParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubSubscriptionParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "subscribe-options" && ns == "http://jabber.org/protocol/pubsub") {
+				getPayloadInternal()->setOptions(boost::dynamic_pointer_cast<PubSubSubscribeOptions>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubSubscriptionParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h b/Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h
new file mode 100644
index 0000000..49290c2
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubSubscription.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubSubscriptionParser : public GenericPayloadParser<PubSubSubscription> {
+		public:
+			PubSubSubscriptionParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubSubscriptionParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.cpp b/Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.cpp
new file mode 100644
index 0000000..3ac3ca0
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h>
+
+using namespace Swift;
+
+PubSubSubscriptionsParser::PubSubSubscriptionsParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubSubscriptionsParser::~PubSubSubscriptionsParser() {
+}
+
+void PubSubSubscriptionsParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+	}
+
+	if (level == 1) {
+		if (element == "subscription" && ns == "http://jabber.org/protocol/pubsub") {
+			currentPayloadParser = boost::make_shared<PubSubSubscriptionParser>(parsers);
+		}
+	}
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubSubscriptionsParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			if (element == "subscription" && ns == "http://jabber.org/protocol/pubsub") {
+				getPayloadInternal()->addSubscription(boost::dynamic_pointer_cast<PubSubSubscription>(currentPayloadParser->getPayload()));
+			}
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubSubscriptionsParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.h b/Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.h
new file mode 100644
index 0000000..b08db93
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubSubscriptions.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubSubscriptionsParser : public GenericPayloadParser<PubSubSubscriptions> {
+		public:
+			PubSubSubscriptionsParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubSubscriptionsParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.cpp b/Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.cpp
new file mode 100644
index 0000000..53b4fae
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma clang diagnostic ignored "-Wunused-private-field"
+
+#include <Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h>
+
+#include <boost/optional.hpp>
+
+
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
+
+using namespace Swift;
+
+PubSubUnsubscribeParser::PubSubUnsubscribeParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+}
+
+PubSubUnsubscribeParser::~PubSubUnsubscribeParser() {
+}
+
+void PubSubUnsubscribeParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (level == 0) {
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+			getPayloadInternal()->setNode(*attributeValue);
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("jid")) {
+			if (boost::optional<JID> jid = JID::parse(*attributeValue)) {
+				getPayloadInternal()->setJID(*jid);
+			}
+		}
+		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subid")) {
+			getPayloadInternal()->setSubscriptionID(*attributeValue);
+		}
+	}
+
+	
+
+	if (level >= 1 && currentPayloadParser) {
+		currentPayloadParser->handleStartElement(element, ns, attributes);
+	}
+	++level;
+}
+
+void PubSubUnsubscribeParser::handleEndElement(const std::string& element, const std::string& ns) {
+	--level;
+	if (currentPayloadParser) {
+		if (level >= 1) {
+			currentPayloadParser->handleEndElement(element, ns);
+		}
+
+		if (level == 1) {
+			
+			currentPayloadParser.reset();
+		}
+	}
+}
+
+void PubSubUnsubscribeParser::handleCharacterData(const std::string& data) {
+	if (level > 1 && currentPayloadParser) {
+		currentPayloadParser->handleCharacterData(data);
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h b/Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h
new file mode 100644
index 0000000..a9e5ed0
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/PubSubUnsubscribe.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+
+namespace Swift {
+	class PayloadParserFactoryCollection;
+	class PayloadParser;
+
+	class SWIFTEN_API PubSubUnsubscribeParser : public GenericPayloadParser<PubSubUnsubscribe> {
+		public:
+			PubSubUnsubscribeParser(PayloadParserFactoryCollection* parsers);
+			virtual ~PubSubUnsubscribeParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			PayloadParserFactoryCollection* parsers;
+			int level;
+			boost::shared_ptr<PayloadParser> currentPayloadParser;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h b/Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h
index 213cd06..b328670 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h
+++ b/Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h
@@ -1,13 +1,11 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
-#include <cppunit/extensions/HelperMacros.h>
-
 #include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h>
 #include <Swiften/Parser/XMLParser.h>
 #include <Swiften/Parser/XMLParserClient.h>
@@ -32,9 +30,9 @@ namespace Swift {
 
 			virtual void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
 				if (level == 0) {
-					CPPUNIT_ASSERT(!payloadParser.get());
+					assert(!payloadParser.get());
 					PayloadParserFactory* payloadParserFactory = factories.getPayloadParserFactory(element, ns, attributes);
-					CPPUNIT_ASSERT(payloadParserFactory);
+					assert(payloadParserFactory);
 					payloadParser.reset(payloadParserFactory->createPayloadParser());
 				}
 				payloadParser->handleStartElement(element, ns, attributes);
diff --git a/Swiften/Parser/PayloadParsers/UserLocationParser.cpp b/Swiften/Parser/PayloadParsers/UserLocationParser.cpp
new file mode 100644
index 0000000..d3aac69
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/UserLocationParser.cpp
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#include <Swiften/Parser/PayloadParsers/UserLocationParser.h>
+
+#include <boost/lexical_cast.hpp>
+
+#include <Swiften/Base/DateTime.h>
+
+using namespace Swift;
+
+UserLocationParser::UserLocationParser() : level(0) {
+}
+
+UserLocationParser::~UserLocationParser() {
+}
+
+void UserLocationParser::handleStartElement(const std::string&, const std::string&, const AttributeMap&) {
+	if (level == 1) {
+		currentText = "";
+	}
+	++level;
+}
+
+void UserLocationParser::handleEndElement(const std::string& element, const std::string&) {
+	--level;
+	if (level == 1) {
+		try {
+			if (element == "accuracy") {
+				getPayloadInternal()->setAccuracy(boost::lexical_cast<float>(currentText));
+			}
+			else if (element == "alt") {
+				getPayloadInternal()->setAltitude(boost::lexical_cast<float>(currentText));
+			}
+			else if (element == "area") {
+				getPayloadInternal()->setArea(currentText);
+			}
+			else if (element == "bearing") {
+				getPayloadInternal()->setBearing(boost::lexical_cast<float>(currentText));
+			}
+			else if (element == "building") {
+				getPayloadInternal()->setBuilding(currentText);
+			}
+			else if (element == "country") {
+				getPayloadInternal()->setCountry(currentText);
+			}
+			else if (element == "countrycode") {
+				getPayloadInternal()->setCountryCode(currentText);
+			}
+			else if (element == "datum") {
+				getPayloadInternal()->setDatum(currentText);
+			}
+			else if (element == "description") {
+				getPayloadInternal()->setDescription(currentText);
+			}
+			else if (element == "error") {
+				getPayloadInternal()->setError(boost::lexical_cast<float>(currentText));
+			}
+			else if (element == "floor") {
+				getPayloadInternal()->setFloor(currentText);
+			}
+			else if (element == "lat") {
+				getPayloadInternal()->setLatitude(boost::lexical_cast<float>(currentText));
+			}
+			else if (element == "locality") {
+				getPayloadInternal()->setLocality(currentText);
+			}
+			else if (element == "lon") {
+				getPayloadInternal()->setLongitude(boost::lexical_cast<float>(currentText));
+			}
+			else if (element == "postalcode") {
+				getPayloadInternal()->setPostalCode(currentText);
+			}
+			else if (element == "region") {
+				getPayloadInternal()->setRegion(currentText);
+			}
+			else if (element == "room") {
+				getPayloadInternal()->setRoom(currentText);
+			}
+			else if (element == "speed") {
+				getPayloadInternal()->setSpeed(boost::lexical_cast<float>(currentText));
+			}
+			else if (element == "street") {
+				getPayloadInternal()->setStreet(currentText);
+			}
+			else if (element == "text") {
+				getPayloadInternal()->setText(currentText);
+			}
+			else if (element == "timestamp") {
+				getPayloadInternal()->setTimestamp(stringToDateTime(currentText));
+			}
+			else if (element == "uri") {
+				getPayloadInternal()->setURI(currentText);
+			}
+		}
+		catch (const boost::bad_lexical_cast&) {
+		}
+	}
+}
+
+void UserLocationParser::handleCharacterData(const std::string& data) {
+	currentText += data;
+}
diff --git a/Swiften/Parser/PayloadParsers/UserLocationParser.h b/Swiften/Parser/PayloadParsers/UserLocationParser.h
new file mode 100644
index 0000000..eb6e668
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/UserLocationParser.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+#include <string>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+#include <Swiften/Elements/UserLocation.h>
+
+namespace Swift {
+	class SWIFTEN_API UserLocationParser : public GenericPayloadParser<UserLocation> {
+		public:
+			UserLocationParser();
+			virtual ~UserLocationParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			int level;
+			std::string currentText;
+	};
+}
diff --git a/Swiften/Parser/SConscript b/Swiften/Parser/SConscript
index 068cbd7..0a6972e 100644
--- a/Swiften/Parser/SConscript
+++ b/Swiften/Parser/SConscript
@@ -73,7 +73,9 @@ sources = [
 		"PayloadParsers/S5BProxyRequestParser.cpp",
 		"PayloadParsers/DeliveryReceiptParser.cpp",
 		"PayloadParsers/DeliveryReceiptRequestParser.cpp",
+		"PayloadParsers/UserLocationParser.cpp",
 		"PayloadParsers/WhiteboardParser.cpp",
+		"PayloadParsers/PubSubErrorParserFactory.cpp",
 		"PlatformXMLParserFactory.cpp",
 		"PresenceParser.cpp",
 		"SerializingParser.cpp",
author	Remko Tronçon <git@el-tramo.be>	2013-08-25 16:39:06 (GMT)
committer	Remko Tronçon <git@el-tramo.be>	2013-08-27 19:47:48 (GMT)
commit	1bb607f96e79845ce30dd5590b0d53cc394ac150 (patch)
tree	6156622ddd1b3238aec73536e0dc25b632965a71 /Swiften/Parser
parent	c4431ee90f3f1daac0a12b35bfa3378d5c570eaa (diff)
download	swift-contrib-1bb607f96e79845ce30dd5590b0d53cc394ac150.zip swift-contrib-1bb607f96e79845ce30dd5590b0d53cc394ac150.tar.bz2