47 files changed, 3208 insertions, 0 deletions
diff --git a/Swiften/Base/String.cpp b/Swiften/Base/String.cpp
index 7ddf614..242b8e5 100644
--- a/Swiften/Base/String.cpp
+++ b/Swiften/Base/String.cpp
@@ -6,6 +6,8 @@
 
 #include <cassert>
 #include <algorithm>
+#include <sstream>
+#include <iomanip>
 
 #include <Swiften/Base/String.h>
 
@@ -95,4 +97,20 @@ std::vector<std::string> String::split(const std::string& s, char c) {
 	return result;
 }
 
+std::string String::convertIntToHexString(int h) {
+	std::stringstream ss;
+	ss << std::setbase(16);
+	ss << h;
+	return ss.str();
+}
+
+int String::convertHexStringToInt(const std::string& s) {
+	std::stringstream ss;
+	int h;
+	ss << std::setbase(16);
+	ss << s;
+	ss >> h;
+	return h;
+}
+
 }
diff --git a/Swiften/Base/String.h b/Swiften/Base/String.h
index 26cc3f4..de181a1 100644
--- a/Swiften/Base/String.h
+++ b/Swiften/Base/String.h
@@ -29,6 +29,9 @@ namespace Swift {
 			inline bool endsWith(const std::string& s, char c) { 
 				return s.size() > 0 && s[s.size()-1] == c; 
 			}
+
+			std::string convertIntToHexString(int h);
+			int convertHexStringToInt(const std::string& s);
 	};
 
 	class SWIFTEN_API makeString {
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 4d3ee04..1a6c64b 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -29,6 +29,7 @@
 #include <Swiften/Jingle/JingleSessionManager.h>
 #include <Swiften/Network/NetworkFactories.h>
 #include <Swiften/FileTransfer/FileTransferManagerImpl.h>
+#include <Swiften/Whiteboard/WhiteboardSessionManager.h>
 #ifndef SWIFT_EXPERIMENTAL_FT
 #include <Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h>
 #endif
@@ -68,9 +69,16 @@ Client::Client(const JID& jid, const SafeString& password, NetworkFactories* net
 	
 	jingleSessionManager = new JingleSessionManager(getIQRouter());
 	fileTransferManager = NULL;
+
+	whiteboardSessionManager = NULL;
+#ifdef SWIFT_EXPERIMENTAL_WB
+	whiteboardSessionManager = new WhiteboardSessionManager(getIQRouter(), getStanzaChannel(), presenceOracle, getEntityCapsProvider());
+#endif
 }
 
 Client::~Client() {
+	delete whiteboardSessionManager;
+
 	delete fileTransferManager;
 	delete jingleSessionManager;
 	
@@ -164,4 +172,8 @@ FileTransferManager* Client::getFileTransferManager() const {
 	return fileTransferManager;
 }
 
+WhiteboardSessionManager* Client::getWhiteboardSessionManager() const {
+	return whiteboardSessionManager;
+}
+
 }
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 9652b16..126572a 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -36,6 +36,7 @@ namespace Swift {
 	class FileTransferManager;
 	class JingleSessionManager;
 	class FileTransferManager;
+	class WhiteboardSessionManager;
 
 	/**
 	 * Provides the core functionality for writing XMPP client software.
@@ -150,6 +151,8 @@ namespace Swift {
 			 * using setCertificateTrustChecker().
 			 */
 			void setAlwaysTrustCertificates();
+
+			WhiteboardSessionManager* getWhiteboardSessionManager() const;
 		
 		public:
 			/**
@@ -185,5 +188,6 @@ namespace Swift {
 			JingleSessionManager* jingleSessionManager;
 			FileTransferManager* fileTransferManager;
 			BlindCertificateTrustChecker* blindCertificateTrustChecker;
+		WhiteboardSessionManager* whiteboardSessionManager;
 	};
 }
diff --git a/Swiften/Elements/DiscoInfo.cpp b/Swiften/Elements/DiscoInfo.cpp
index a4ce079..1683916 100644
--- a/Swiften/Elements/DiscoInfo.cpp
+++ b/Swiften/Elements/DiscoInfo.cpp
@@ -22,6 +22,7 @@ const std::string DiscoInfo::JingleTransportsIBBFeature = std::string("urn:xmpp:
 const std::string DiscoInfo::JingleTransportsS5BFeature = std::string("urn:xmpp:jingle:transports:s5b:1");
 const std::string DiscoInfo::Bytestream = std::string("http://jabber.org/protocol/bytestreams");
 const std::string DiscoInfo::MessageDeliveryReceiptsFeature = std::string("urn:xmpp:receipts");
+const std::string DiscoInfo::WhiteboardFeature = std::string("http://swift.im/whiteboard");
 
 bool DiscoInfo::Identity::operator<(const Identity& other) const {
 	if (category_ == other.category_) {
diff --git a/Swiften/Elements/DiscoInfo.h b/Swiften/Elements/DiscoInfo.h
index 8add815..3334ac8 100644
--- a/Swiften/Elements/DiscoInfo.h
+++ b/Swiften/Elements/DiscoInfo.h
@@ -33,6 +33,7 @@ namespace Swift {
 			static const std::string JingleTransportsS5BFeature;
 			static const std::string Bytestream;
 			static const std::string MessageDeliveryReceiptsFeature;
+			static const std::string WhiteboardFeature;
 
 			class Identity {
 				public:
diff --git a/Swiften/Elements/Whiteboard/WhiteboardColor.cpp b/Swiften/Elements/Whiteboard/WhiteboardColor.cpp
new file mode 100644
index 0000000..f4ff01a
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardColor.cpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Elements/Whiteboard/WhiteboardColor.h>
+#include <Swiften/Base/String.h>
+#include <cstdio>
+#include <iomanip>
+#include <sstream>
+#include <iostream>
+
+namespace Swift {
+	WhiteboardColor::WhiteboardColor() : red_(0), green_(0), blue_(0), alpha_(255) {
+	}
+
+	WhiteboardColor::WhiteboardColor(int red, int green, int blue, int alpha) : red_(red), green_(green), blue_(blue), alpha_(alpha) {
+	}
+
+	WhiteboardColor::WhiteboardColor(const std::string& hex) : alpha_(255) {
+		int value = String::convertHexStringToInt(hex.substr(1));
+		red_ = (value >> 16)&0xFF;
+		green_ = (value >> 8)&0xFF;
+		blue_ = value&0xFF;
+	}
+
+	std::string WhiteboardColor::toHex() const {
+		std::string value = String::convertIntToHexString((red_ << 16) + (green_ << 8) + blue_);
+		while (value.size() < 6) {
+			value.insert(0, "0");
+		}
+		return "#"+value;
+	}
+
+	int WhiteboardColor::getRed() const {
+		return red_;
+	}
+
+	int WhiteboardColor::getGreen() const {
+		return green_;
+	}
+
+	int WhiteboardColor::getBlue() const {
+		return blue_;
+	}
+
+	int WhiteboardColor::getAlpha() const {
+		return alpha_;
+	}
+
+	void WhiteboardColor::setAlpha(int alpha) {
+		alpha_ = alpha;
+	}
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardColor.h b/Swiften/Elements/Whiteboard/WhiteboardColor.h
new file mode 100644
index 0000000..a940338
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardColor.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <string>
+
+namespace Swift {
+	class WhiteboardColor {
+	public:
+		WhiteboardColor();
+		WhiteboardColor(int red, int green, int blue, int alpha = 255);
+		WhiteboardColor(const std::string& hex);
+		std::string toHex() const;
+		int getRed() const;
+		int getGreen() const;
+		int getBlue() const;
+		int getAlpha() const;
+		void setAlpha(int alpha);
+
+	private:
+		int red_, green_, blue_;
+		int alpha_;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h b/Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h
new file mode 100644
index 0000000..091ee30
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardOperation.h>
+
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+
+namespace Swift {
+	class WhiteboardDeleteOperation : public WhiteboardOperation {
+	public:
+		typedef boost::shared_ptr<WhiteboardDeleteOperation> ref;
+	public:
+		~WhiteboardDeleteOperation() {
+		}
+
+		std::string getElementID() const {
+			return elementID_;
+		}
+
+		void setElementID(const std::string& elementID) {
+			elementID_ = elementID;
+		}
+
+	private:
+		std::string elementID_;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardElement.h b/Swiften/Elements/Whiteboard/WhiteboardElement.h
new file mode 100644
index 0000000..df774d9
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardElement.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+#include <Swiften/Elements/Whiteboard/WhiteboardElementVisitor.h>
+
+namespace Swift {
+	class WhiteboardElement {
+	public:
+		typedef boost::shared_ptr<WhiteboardElement> ref;
+
+	public:
+		virtual ~WhiteboardElement() {}
+		virtual void accept(WhiteboardElementVisitor& visitor) = 0;
+
+		const std::string& getID() const {
+			return id_;
+		}
+
+		void setID(const std::string& id) {
+			id_ = id;
+		}
+
+	private:
+		std::string id_;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardElementVisitor.h b/Swiften/Elements/Whiteboard/WhiteboardElementVisitor.h
new file mode 100644
index 0000000..413d6cf
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardElementVisitor.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+namespace Swift {
+	class WhiteboardLineElement;
+	class WhiteboardFreehandPathElement;
+	class WhiteboardRectElement;
+	class WhiteboardPolygonElement;
+	class WhiteboardTextElement;
+	class WhiteboardEllipseElement;
+
+	class WhiteboardElementVisitor {
+	public:
+		virtual ~WhiteboardElementVisitor() {}
+		virtual void visit(WhiteboardLineElement& /*element*/) = 0;
+		virtual void visit(WhiteboardFreehandPathElement& /*element*/) = 0;
+		virtual void visit(WhiteboardRectElement& /*element*/) = 0;
+		virtual void visit(WhiteboardPolygonElement& /*element*/) = 0;
+		virtual void visit(WhiteboardTextElement& /*element*/) = 0;
+		virtual void visit(WhiteboardEllipseElement& /*element*/) = 0;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardEllipseElement.h b/Swiften/Elements/Whiteboard/WhiteboardEllipseElement.h
new file mode 100644
index 0000000..0078479
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardEllipseElement.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardColor.h>
+
+namespace Swift {
+	class WhiteboardEllipseElement : public WhiteboardElement {
+	public:
+		typedef boost::shared_ptr<WhiteboardEllipseElement> ref;
+	public:
+		WhiteboardEllipseElement(int cx, int cy, int rx, int ry) {
+			cx_ = cx;
+			cy_ = cy;
+			rx_ = rx;
+			ry_ = ry;
+		}
+
+		int getCX() const {
+			return cx_;
+		}
+
+		int getCY() const {
+			return cy_;
+		}
+
+		int getRX() const {
+			return rx_;
+		}
+
+		int getRY() const {
+			return ry_;
+		}
+
+		const WhiteboardColor& getPenColor() const {
+			return penColor_;
+		}
+
+		void setPenColor(const WhiteboardColor& color) {
+			penColor_ = color;
+		}
+
+		const WhiteboardColor& getBrushColor() const {
+			return brushColor_;
+		}
+
+		void setBrushColor(const WhiteboardColor& color) {
+			brushColor_ = color;
+		}
+
+		int getPenWidth() const {
+			return penWidth_;
+		}
+
+		void setPenWidth(const int penWidth) {
+			penWidth_ = penWidth;
+		}
+
+		void accept(WhiteboardElementVisitor& visitor) {
+			visitor.visit(*this);
+		}
+
+	private:
+		int cx_, cy_, rx_, ry_;
+		WhiteboardColor penColor_;
+		WhiteboardColor brushColor_;
+		int penWidth_;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardFreehandPathElement.h b/Swiften/Elements/Whiteboard/WhiteboardFreehandPathElement.h
new file mode 100644
index 0000000..bcf3bf9
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardFreehandPathElement.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardColor.h>
+
+#include <vector>
+#include <utility>
+
+namespace Swift {
+	class WhiteboardFreehandPathElement : public WhiteboardElement {
+		typedef std::pair<int, int> Point;
+	public:
+		typedef boost::shared_ptr<WhiteboardFreehandPathElement> ref;
+	public:
+		WhiteboardFreehandPathElement() {
+		}
+
+		void setPoints(const std::vector<Point>& points) {
+			points_ = points;
+		}
+
+		const std::vector<Point>& getPoints() const {
+			return points_;
+		}
+
+		const WhiteboardColor& getColor() const {
+			return color_;
+		}
+
+		void setColor(const WhiteboardColor& color) {
+			color_ = color;
+		}
+
+		int getPenWidth() const {
+			return penWidth_;
+		}
+
+		void setPenWidth(const int penWidth) {
+			penWidth_ = penWidth;
+		}
+
+		void accept(WhiteboardElementVisitor& visitor) {
+			visitor.visit(*this);
+		}
+
+	private:
+		std::vector<Point> points_;
+		WhiteboardColor color_;
+		int penWidth_;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h b/Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h
new file mode 100644
index 0000000..8c20044
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardOperation.h>
+
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+
+namespace Swift {
+	class WhiteboardInsertOperation : public WhiteboardOperation {
+	public:
+		typedef boost::shared_ptr<WhiteboardInsertOperation> ref;
+	public:
+		~WhiteboardInsertOperation() {
+		}
+
+		WhiteboardElement::ref getElement() const {
+			return element_;
+		}
+
+		void setElement(WhiteboardElement::ref element) {
+			element_ = element;
+		}
+
+	private:
+		WhiteboardElement::ref element_;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardLineElement.h b/Swiften/Elements/Whiteboard/WhiteboardLineElement.h
new file mode 100644
index 0000000..3c63afc
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardLineElement.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardColor.h>
+
+namespace Swift {
+	class WhiteboardLineElement : public WhiteboardElement {
+	public:
+		typedef boost::shared_ptr<WhiteboardLineElement> ref;
+	public:
+		WhiteboardLineElement(int x1, int y1, int x2, int y2) {
+			x1_ = x1;
+			y1_ = y1;
+			x2_ = x2;
+			y2_ = y2;
+		}
+
+		int x1() const {
+			return x1_;
+		}
+
+		int y1() const {
+			return y1_;
+		}
+
+		int x2() const {
+			return x2_;
+		}
+
+		int y2() const {
+			return y2_;
+		}
+
+		const WhiteboardColor& getColor() const {
+			return color_;
+		}
+
+		void setColor(const WhiteboardColor& color) {
+			color_ = color;
+		}
+
+		int getPenWidth() const {
+			return penWidth_;
+		}
+
+		void setPenWidth(const int penWidth) {
+			penWidth_ = penWidth;
+		}
+
+		void accept(WhiteboardElementVisitor& visitor) {
+			visitor.visit(*this);
+		}
+
+	private:
+		int x1_, y1_, x2_, y2_;
+		WhiteboardColor color_;
+		int penWidth_;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardOperation.h b/Swiften/Elements/Whiteboard/WhiteboardOperation.h
new file mode 100644
index 0000000..02c6438
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardOperation.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <string>
+
+namespace Swift {
+	class WhiteboardOperation {
+	public:
+		typedef boost::shared_ptr<WhiteboardOperation> ref;
+	public:
+		virtual ~WhiteboardOperation(){};
+
+		std::string getID() const {
+			return id_;
+		}
+
+		void setID(const std::string& id) {
+			id_ = id;
+		}
+
+		std::string getParentID() const {
+			return parentID_;
+		}
+
+		void setParentID(const std::string& parentID) {
+			parentID_ = parentID;
+		}
+
+		int getPos() const {
+			return pos_;
+		}
+
+		void setPos(int pos) {
+			pos_ = pos;
+		}
+
+	private:
+		std::string id_;
+		std::string parentID_;
+		int pos_;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardPolygonElement.h b/Swiften/Elements/Whiteboard/WhiteboardPolygonElement.h
new file mode 100644
index 0000000..679ac01
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardPolygonElement.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardColor.h>
+
+namespace Swift {
+	class WhiteboardPolygonElement : public WhiteboardElement {
+		typedef std::pair<int, int> Point;
+	public:
+		typedef boost::shared_ptr<WhiteboardPolygonElement> ref;
+	public:
+		WhiteboardPolygonElement() {
+		}
+
+		const std::vector<Point>& getPoints() const {
+			return points_;
+		}
+
+		void setPoints(const std::vector<Point>& points) {
+			points_ = points;
+		}
+
+		const WhiteboardColor& getPenColor() const {
+			return penColor_;
+		}
+
+		void setPenColor(const WhiteboardColor& color) {
+			penColor_ = color;
+		}
+
+		const WhiteboardColor& getBrushColor() const {
+			return brushColor_;
+		}
+
+		void setBrushColor(const WhiteboardColor& color) {
+			brushColor_ = color;
+		}
+
+		int getPenWidth() const {
+			return penWidth_;
+		}
+
+		void setPenWidth(const int penWidth) {
+			penWidth_ = penWidth;
+		}
+
+		void accept(WhiteboardElementVisitor& visitor) {
+			visitor.visit(*this);
+		}
+
+	private:
+		std::vector<Point> points_;
+		WhiteboardColor penColor_;
+		WhiteboardColor brushColor_;
+		int penWidth_;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardRectElement.h b/Swiften/Elements/Whiteboard/WhiteboardRectElement.h
new file mode 100644
index 0000000..233b3fa
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardRectElement.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardColor.h>
+
+namespace Swift {
+	class WhiteboardRectElement : public WhiteboardElement {
+	public:
+		typedef boost::shared_ptr<WhiteboardRectElement> ref;
+	public:
+		WhiteboardRectElement(int x, int y, int width, int height) {
+			x_ = x;
+			y_ = y;
+			width_ = width;
+			height_ = height;
+		}
+
+		int getX() const {
+			return x_;
+		}
+
+		int getY() const {
+			return y_;
+		}
+
+		int getWidth() const {
+			return width_;
+		}
+
+		int getHeight() const {
+			return height_;
+		}
+
+		const WhiteboardColor& getPenColor() const {
+			return penColor_;
+		}
+
+		void setPenColor(const WhiteboardColor& color) {
+			penColor_ = color;
+		}
+
+		const WhiteboardColor& getBrushColor() const {
+			return brushColor_;
+		}
+
+		void setBrushColor(const WhiteboardColor& color) {
+			brushColor_ = color;
+		}
+
+		int getPenWidth() const {
+			return penWidth_;
+		}
+
+		void setPenWidth(const int penWidth) {
+			penWidth_ = penWidth;
+		}
+
+		void accept(WhiteboardElementVisitor& visitor) {
+			visitor.visit(*this);
+		}
+
+	private:
+		int x_, y_, width_, height_;
+		WhiteboardColor penColor_;
+		WhiteboardColor brushColor_;
+		int penWidth_;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardTextElement.h b/Swiften/Elements/Whiteboard/WhiteboardTextElement.h
new file mode 100644
index 0000000..7118ac9
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardTextElement.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardColor.h>
+
+namespace Swift {
+	class WhiteboardTextElement : public WhiteboardElement {
+	public:
+		typedef boost::shared_ptr<WhiteboardTextElement> ref;
+	public:
+		WhiteboardTextElement(int x, int y) {
+			x_ = x;
+			y_ = y;
+		}
+
+		void setText(const std::string text) {
+			text_ = text;
+		}
+
+		const std::string& getText() const {
+			return text_;
+		}
+
+		int getX() const {
+			return x_;
+		}
+
+		int getY() const {
+			return y_;
+		}
+
+		const WhiteboardColor& getColor() const {
+			return color_;
+		}
+
+		void setColor(const WhiteboardColor& color) {
+			color_ = color;
+		}
+
+		int getSize() const {
+			return size_;
+		}
+
+		void setSize(const int size) {
+			size_ = size;
+		}
+
+		void accept(WhiteboardElementVisitor& visitor) {
+			visitor.visit(*this);
+		}
+
+	private:
+		int x_, y_;
+		int size_;
+		std::string text_;
+		WhiteboardColor color_;
+	};
+}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h b/Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h
new file mode 100644
index 0000000..a52a341
--- /dev/null
+++ b/Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardOperation.h>
+
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+
+namespace Swift {
+	class WhiteboardUpdateOperation : public WhiteboardOperation {
+	public:
+		typedef boost::shared_ptr<WhiteboardUpdateOperation> ref;
+	public:
+		~WhiteboardUpdateOperation() {
+		}
+
+		WhiteboardElement::ref getElement() const {
+			return element_;
+		}
+
+		void setElement(WhiteboardElement::ref element) {
+			element_ = element;
+		}
+
+		int getNewPos() const {
+			return newPos_;
+		}
+
+		void setNewPos(int newPos) {
+			newPos_ = newPos;
+		}
+
+	private:
+		WhiteboardElement::ref element_;
+		int newPos_;
+	};
+}
diff --git a/Swiften/Elements/WhiteboardPayload.h b/Swiften/Elements/WhiteboardPayload.h
new file mode 100644
index 0000000..ceb2b27
--- /dev/null
+++ b/Swiften/Elements/WhiteboardPayload.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <string>
+
+#include <Swiften/Elements/Payload.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardOperation.h>
+
+namespace Swift {
+	class WhiteboardPayload : public Payload {
+	public:
+		typedef boost::shared_ptr<WhiteboardPayload> ref;
+
+	public:
+		enum Type {UnknownType, Data, SessionRequest, SessionAccept, SessionTerminate};
+
+		WhiteboardPayload(Type type = WhiteboardPayload::Data) : type_(type) {
+		}
+
+		void setData(const std::string &data) {
+			data_ = data;
+		}
+
+		std::string getData() const {
+			return data_;
+		}
+
+		Type getType() const {
+			return type_;
+		}
+
+		void setType(Type type) {
+			type_ = type;
+		}
+
+		WhiteboardElement::ref getElement() const {
+			return element_;
+		}
+
+		void setElement(WhiteboardElement::ref element) {
+			element_ = element;
+		}
+
+		WhiteboardOperation::ref getOperation() const {
+			return operation_;
+		}
+
+		void setOperation(WhiteboardOperation::ref operation) {
+			operation_ = operation;
+		}
+
+	private:
+		std::string data_;
+		Type type_;
+		WhiteboardElement::ref element_;
+		WhiteboardOperation::ref operation_;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
index 217f278..a40e8f6 100644
--- a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
+++ b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
@@ -66,6 +66,7 @@
 #include <Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h>
 #include <Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h>
+#include <Swiften/Parser/PayloadParsers/WhiteboardParser.h>
 
 using namespace boost;
 
@@ -124,6 +125,7 @@ FullPayloadParserFactoryCollection::FullPayloadParserFactoryCollection() {
 	factories_.push_back(boost::make_shared<GenericPayloadParserFactory<JingleFileTransferReceivedParser> >("received", "urn:xmpp:jingle:apps:file-transfer:3"));
 	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<DeliveryReceiptParserFactory>());
 	factories_.push_back(boost::make_shared<DeliveryReceiptRequestParserFactory>());
 
diff --git a/Swiften/Parser/PayloadParsers/WhiteboardParser.cpp b/Swiften/Parser/PayloadParsers/WhiteboardParser.cpp
new file mode 100644
index 0000000..09d8de9
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/WhiteboardParser.cpp
@@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Parser/PayloadParsers/WhiteboardParser.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardLineElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardRectElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardTextElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardPolygonElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardEllipseElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardFreehandPathElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardColor.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h>
+#include <boost/optional.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+#include <boost/lexical_cast.hpp>
+
+namespace Swift {
+	WhiteboardParser::WhiteboardParser() : actualIsText(false), level_(0) {
+	}
+
+	void WhiteboardParser::handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) {
+		if (level_ == 0) {
+			getPayloadInternal()->setType(stringToType(attributes.getAttributeValue("type").get_value_or("")));
+		} else if (level_ == 1) {
+			std::string type = attributes.getAttributeValue("type").get_value_or("");
+			if (type == "insert") {
+				WhiteboardInsertOperation::ref insertOp = boost::make_shared<WhiteboardInsertOperation>();
+				operation = insertOp;
+			} else if (type == "update") {
+				WhiteboardUpdateOperation::ref updateOp = boost::make_shared<WhiteboardUpdateOperation>();
+				std::string move = attributes.getAttributeValue("newpos").get_value_or("0");
+				updateOp->setNewPos(boost::lexical_cast<int>(attributes.getAttributeValue("newpos").get_value_or("0")));
+				operation = updateOp;
+			} else if (type == "delete") {
+				WhiteboardDeleteOperation::ref deleteOp = boost::make_shared<WhiteboardDeleteOperation>();
+				deleteOp->setElementID(attributes.getAttributeValue("elementid").get_value_or(""));
+				operation = deleteOp;
+			}
+			if (operation) {
+				try {
+					operation->setID(attributes.getAttributeValue("id").get_value_or(""));
+					operation->setParentID(attributes.getAttributeValue("parentid").get_value_or(""));
+					operation->setPos(boost::lexical_cast<int>(attributes.getAttributeValue("pos").get_value_or("0")));
+				} catch (boost::bad_lexical_cast&) {
+				}
+			}
+
+		} else if (level_ == 2) {
+			if (element == "line") {
+				int x1 = 0;
+				int y1 = 0;
+				int x2 = 0;
+				int y2 = 0;
+				try {
+					x1 = boost::lexical_cast<int>(attributes.getAttributeValue("x1").get_value_or("0"));
+					y1 = boost::lexical_cast<int>(attributes.getAttributeValue("y1").get_value_or("0"));
+					x2 = boost::lexical_cast<int>(attributes.getAttributeValue("x2").get_value_or("0"));
+					y2 = boost::lexical_cast<int>(attributes.getAttributeValue("y2").get_value_or("0"));
+				} catch (boost::bad_lexical_cast&) {
+				}
+				WhiteboardLineElement::ref whiteboardElement = boost::make_shared<WhiteboardLineElement>(x1, y1, x2, y2);
+
+				WhiteboardColor color(attributes.getAttributeValue("stroke").get_value_or("#000000"));
+				color.setAlpha(opacityToAlpha(attributes.getAttributeValue("opacity").get_value_or("1")));
+				whiteboardElement->setColor(color);
+
+				int penWidth = 1;
+				try {
+					penWidth = boost::lexical_cast<int>(attributes.getAttributeValue("stroke-width").get_value_or("1"));
+				} catch (boost::bad_lexical_cast&) {
+				}
+				whiteboardElement->setPenWidth(penWidth);
+				whiteboardElement->setID(attributes.getAttributeValue("id").get_value_or(""));
+				getPayloadInternal()->setElement(whiteboardElement);
+				wbElement = whiteboardElement;
+			} else if (element == "path") {
+				WhiteboardFreehandPathElement::ref whiteboardElement = boost::make_shared<WhiteboardFreehandPathElement>();
+				std::string pathData = attributes.getAttributeValue("d").get_value_or("");
+				std::vector<std::pair<int, int> > points;
+				if (pathData[0] == 'M') {
+					unsigned int pos = 1;
+					unsigned int npos;
+					int x, y;
+					if (pathData[pos] == ' ') {
+						pos++;
+					}
+					try {
+						npos = pathData.find(' ', pos);
+						x = boost::lexical_cast<int>(pathData.substr(pos, npos-pos));
+						pos = npos+1;
+						npos = pathData.find('L', pos);
+						y = boost::lexical_cast<int>(pathData.substr(pos, npos-pos));
+						pos = npos+1;
+						if (pathData[pos] == ' ') {
+							pos++;
+						}
+						points.push_back(std::pair<int, int>(x, y));
+						while (pos < pathData.size()) {
+							npos = pathData.find(' ', pos);
+							x = boost::lexical_cast<int>(pathData.substr(pos, npos-pos));
+							pos = npos+1;
+							npos = pathData.find(' ', pos);
+							y = boost::lexical_cast<int>(pathData.substr(pos, npos-pos));
+							pos = npos+1;
+							points.push_back(std::pair<int, int>(x, y));
+						}
+					} catch (boost::bad_lexical_cast&) {
+					}
+				}
+				whiteboardElement->setPoints(points);
+
+				int penWidth = 1;
+				try {
+					penWidth = boost::lexical_cast<int>(attributes.getAttributeValue("stroke-width").get_value_or("1"));
+				} catch (boost::bad_lexical_cast&) {
+				}
+				whiteboardElement->setPenWidth(penWidth);
+
+				WhiteboardColor color(attributes.getAttributeValue("stroke").get_value_or("#000000"));
+				color.setAlpha(opacityToAlpha(attributes.getAttributeValue("opacity").get_value_or("1")));
+				whiteboardElement->setColor(color);
+				whiteboardElement->setID(attributes.getAttributeValue("id").get_value_or(""));
+				getPayloadInternal()->setElement(whiteboardElement);
+				wbElement = whiteboardElement;
+			} else if (element == "rect") {
+				int x = 0;
+				int y = 0;
+				int width = 0;
+				int height = 0;
+				try {
+					x = boost::lexical_cast<int>(attributes.getAttributeValue("x").get_value_or("0"));
+					y = boost::lexical_cast<int>(attributes.getAttributeValue("y").get_value_or("0"));
+					width = boost::lexical_cast<int>(attributes.getAttributeValue("width").get_value_or("0"));
+					height = boost::lexical_cast<int>(attributes.getAttributeValue("height").get_value_or("0"));
+				} catch (boost::bad_lexical_cast&) {
+				}
+
+				WhiteboardRectElement::ref whiteboardElement = boost::make_shared<WhiteboardRectElement>(x, y, width, height);
+
+				int penWidth = 1;
+				try {
+					penWidth = boost::lexical_cast<int>(attributes.getAttributeValue("stroke-width").get_value_or("1"));
+				} catch (boost::bad_lexical_cast&) {
+				}
+				whiteboardElement->setPenWidth(penWidth);
+
+				WhiteboardColor penColor(attributes.getAttributeValue("stroke").get_value_or("#000000"));
+				WhiteboardColor brushColor(attributes.getAttributeValue("fill").get_value_or("#000000"));
+				penColor.setAlpha(opacityToAlpha(attributes.getAttributeValue("opacity").get_value_or("1")));
+				brushColor.setAlpha(opacityToAlpha(attributes.getAttributeValue("fill-opacity").get_value_or("1")));
+				whiteboardElement->setPenColor(penColor);
+				whiteboardElement->setBrushColor(brushColor);
+				whiteboardElement->setID(attributes.getAttributeValue("id").get_value_or(""));
+				getPayloadInternal()->setElement(whiteboardElement);
+				wbElement = whiteboardElement;
+			} else if (element == "polygon") {
+				WhiteboardPolygonElement::ref whiteboardElement = boost::make_shared<WhiteboardPolygonElement>();
+
+				std::string pointsData = attributes.getAttributeValue("points").get_value_or("");
+				std::vector<std::pair<int, int> > points;
+				unsigned int pos = 0;
+				unsigned int npos;
+				int x, y;
+				try {
+					while (pos < pointsData.size()) {
+						npos = pointsData.find(',', pos);
+						x = boost::lexical_cast<int>(pointsData.substr(pos, npos-pos));
+						pos = npos+1;
+						npos = pointsData.find(' ', pos);
+						y = boost::lexical_cast<int>(pointsData.substr(pos, npos-pos));
+						pos = npos+1;
+						points.push_back(std::pair<int, int>(x, y));
+					}
+				} catch (boost::bad_lexical_cast&) {
+				}			
+
+				whiteboardElement->setPoints(points);
+
+				int penWidth = 1;
+				try {
+					penWidth = boost::lexical_cast<int>(attributes.getAttributeValue("stroke-width").get_value_or("1"));
+				} catch (boost::bad_lexical_cast&) {
+				}
+				whiteboardElement->setPenWidth(penWidth);
+
+				WhiteboardColor penColor(attributes.getAttributeValue("stroke").get_value_or("#000000"));
+				WhiteboardColor brushColor(attributes.getAttributeValue("fill").get_value_or("#000000"));
+				penColor.setAlpha(opacityToAlpha(attributes.getAttributeValue("opacity").get_value_or("1")));
+				brushColor.setAlpha(opacityToAlpha(attributes.getAttributeValue("fill-opacity").get_value_or("1")));
+				whiteboardElement->setPenColor(penColor);
+				whiteboardElement->setBrushColor(brushColor);
+				whiteboardElement->setID(attributes.getAttributeValue("id").get_value_or(""));
+				getPayloadInternal()->setElement(whiteboardElement);
+				wbElement = whiteboardElement;
+			} else if (element == "text") {
+				int x = 0;
+				int y = 0;
+				try {
+					x = boost::lexical_cast<int>(attributes.getAttributeValue("x").get_value_or("0"));
+					y = boost::lexical_cast<int>(attributes.getAttributeValue("y").get_value_or("0"));
+				} catch (boost::bad_lexical_cast&) {
+				}
+
+				WhiteboardTextElement::ref whiteboardElement = boost::make_shared<WhiteboardTextElement>(x, y);
+
+				actualIsText = true;
+				WhiteboardColor color(attributes.getAttributeValue("fill").get_value_or("#000000"));
+				color.setAlpha(opacityToAlpha(attributes.getAttributeValue("opacity").get_value_or("1")));
+				whiteboardElement->setColor(color);
+
+				int fontSize = 1;
+				try {
+					fontSize = boost::lexical_cast<int>(attributes.getAttributeValue("font-size").get_value_or("12"));
+				} catch (boost::bad_lexical_cast&) {
+				}
+				whiteboardElement->setSize(fontSize);
+				whiteboardElement->setID(attributes.getAttributeValue("id").get_value_or(""));
+				getPayloadInternal()->setElement(whiteboardElement);
+				wbElement = whiteboardElement;
+			} else if (element == "ellipse") {
+				int cx = 0;
+				int cy = 0;
+				int rx = 0;
+				int ry = 0;
+				try {
+					cx = boost::lexical_cast<int>(attributes.getAttributeValue("cx").get_value_or("0"));
+					cy = boost::lexical_cast<int>(attributes.getAttributeValue("cy").get_value_or("0"));
+					rx = boost::lexical_cast<int>(attributes.getAttributeValue("rx").get_value_or("0"));
+					ry = boost::lexical_cast<int>(attributes.getAttributeValue("ry").get_value_or("0"));
+				} catch (boost::bad_lexical_cast&) {
+				}
+
+				WhiteboardEllipseElement::ref whiteboardElement = boost::make_shared<WhiteboardEllipseElement>(cx, cy, rx, ry);
+
+				int penWidth = 1;
+				try {
+					penWidth = boost::lexical_cast<int>(attributes.getAttributeValue("stroke-width").get_value_or("1"));
+				} catch (boost::bad_lexical_cast&) {
+				}
+				whiteboardElement->setPenWidth(penWidth);
+
+				WhiteboardColor penColor(attributes.getAttributeValue("stroke").get_value_or("#000000"));
+				WhiteboardColor brushColor(attributes.getAttributeValue("fill").get_value_or("#000000"));
+				penColor.setAlpha(opacityToAlpha(attributes.getAttributeValue("opacity").get_value_or("1")));
+				brushColor.setAlpha(opacityToAlpha(attributes.getAttributeValue("fill-opacity").get_value_or("1")));
+				whiteboardElement->setPenColor(penColor);
+				whiteboardElement->setBrushColor(brushColor);
+				whiteboardElement->setID(attributes.getAttributeValue("id").get_value_or(""));
+				getPayloadInternal()->setElement(whiteboardElement);
+				wbElement = whiteboardElement;
+			}
+		}
+		++level_;
+	}
+
+	void WhiteboardParser::handleEndElement(const std::string& element, const std::string&) {
+		--level_;
+		if (level_ == 0) {
+			getPayloadInternal()->setData(data_);
+		} else if (level_ == 1) {
+			WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(operation);
+			if (insertOp) {
+				insertOp->setElement(wbElement);
+			}
+
+			WhiteboardUpdateOperation::ref updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(operation);
+			if (updateOp) {
+				updateOp->setElement(wbElement);
+			}
+			getPayloadInternal()->setOperation(operation);
+		} else if (level_ == 2) {
+			if (element == "text") {
+				actualIsText = false;
+			}
+		}
+	}
+
+	void WhiteboardParser::handleCharacterData(const std::string& data) {
+		if (level_ == 3 && actualIsText) {
+			WhiteboardTextElement::ref element = boost::dynamic_pointer_cast<WhiteboardTextElement>(getPayloadInternal()->getElement());
+			element->setText(data);
+		}
+	}
+
+	WhiteboardPayload::Type WhiteboardParser::stringToType(const std::string& type) const {
+		if (type == "data") {
+			return WhiteboardPayload::Data;
+		} else if (type == "session-request") {
+			return WhiteboardPayload::SessionRequest;
+		} else if (type == "session-accept") {
+			return WhiteboardPayload::SessionAccept;
+		} else if (type == "session-terminate") {
+			return WhiteboardPayload::SessionTerminate;
+		} else {
+			return WhiteboardPayload::UnknownType;
+		}
+	}
+
+	int WhiteboardParser::opacityToAlpha(std::string opacity) const {
+		int value = 255;
+		if (opacity.find('.') != std::string::npos) {
+			opacity = opacity.substr(opacity.find('.')+1, 2);
+			try {
+				value = boost::lexical_cast<int>(opacity)*255/100;
+			} catch (boost::bad_lexical_cast&) {
+			}
+		}
+		return value;
+	}
+}
diff --git a/Swiften/Parser/PayloadParsers/WhiteboardParser.h b/Swiften/Parser/PayloadParsers/WhiteboardParser.h
new file mode 100644
index 0000000..0368c7c
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/WhiteboardParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/WhiteboardPayload.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardOperation.h>
+
+namespace Swift {
+	class WhiteboardParser : public Swift::GenericPayloadParser<WhiteboardPayload> {
+	public:
+		WhiteboardParser();
+
+		virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes);
+		virtual void handleEndElement(const std::string& element, const std::string&);
+		virtual void handleCharacterData(const std::string& data);
+
+	private:
+		WhiteboardPayload::Type stringToType(const std::string& type) const;
+		int opacityToAlpha(std::string opacity) const;
+
+	private:
+		bool actualIsText;
+		int level_;
+		std::string data_;
+		WhiteboardElement::ref wbElement;
+		WhiteboardOperation::ref operation;
+	};
+}
diff --git a/Swiften/Parser/SConscript b/Swiften/Parser/SConscript
index e4c2778..64e9eb9 100644
--- a/Swiften/Parser/SConscript
+++ b/Swiften/Parser/SConscript
@@ -72,6 +72,7 @@ sources = [
 		"PayloadParsers/S5BProxyRequestParser.cpp",
 		"PayloadParsers/DeliveryReceiptParser.cpp",
 		"PayloadParsers/DeliveryReceiptRequestParser.cpp",
+		"PayloadParsers/WhiteboardParser.cpp",
 		"PlatformXMLParserFactory.cpp",
 		"PresenceParser.cpp",
 		"SerializingParser.cpp",
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 9996728..bfd1e51 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -189,6 +189,7 @@ if env["SCONS_STAGE"] == "build" :
 			"Serializer/PayloadSerializers/StreamInitiationFileInfoSerializer.cpp",
 			"Serializer/PayloadSerializers/DeliveryReceiptSerializer.cpp",
 			"Serializer/PayloadSerializers/DeliveryReceiptRequestSerializer.cpp",
+			"Serializer/PayloadSerializers/WhiteboardSerializer.cpp",
 			"Serializer/PresenceSerializer.cpp",
 			"Serializer/StanzaSerializer.cpp",
 			"Serializer/StreamErrorSerializer.cpp",
@@ -205,6 +206,15 @@ if env["SCONS_STAGE"] == "build" :
 			"StringCodecs/SHA256.cpp",
 			"StringCodecs/MD5.cpp",
 			"StringCodecs/Hexify.cpp",
+			"Whiteboard/WhiteboardResponder.cpp",
+			"Whiteboard/WhiteboardSession.cpp",
+			"Whiteboard/IncomingWhiteboardSession.cpp",
+			"Whiteboard/OutgoingWhiteboardSession.cpp",
+			"Whiteboard/WhiteboardSessionManager.cpp",
+			"Whiteboard/WhiteboardServer.cpp",
+			"Whiteboard/WhiteboardClient.cpp",
+			"Elements/Whiteboard/WhiteboardColor.cpp",
+			"Whiteboard/WhiteboardTransformer.cpp",
 		]
 
 	SConscript(dirs = [
@@ -400,6 +410,8 @@ if env["SCONS_STAGE"] == "build" :
 			File("TLS/UnitTest/ServerIdentityVerifierTest.cpp"),
 			File("TLS/UnitTest/CertificateTest.cpp"),
 			File("VCards/UnitTest/VCardManagerTest.cpp"),
+			File("Whiteboard/UnitTest/WhiteboardServerTest.cpp"),
+			File("Whiteboard/UnitTest/WhiteboardClientTest.cpp"),
 		])
 	
 	# Generate the Swiften header
diff --git a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
index 93fd70f..b4822cd 100644
--- a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
+++ b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
@@ -50,6 +50,7 @@
 #include <Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/ReplaceSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/LastSerializer.h>
+#include <Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.h>
 
 #include <Swiften/Serializer/PayloadSerializers/StreamInitiationFileInfoSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleContentPayloadSerializer.h>
@@ -108,6 +109,7 @@ FullPayloadSerializerCollection::FullPayloadSerializerCollection() {
 	serializers_.push_back(new SearchPayloadSerializer());
 	serializers_.push_back(new ReplaceSerializer());
 	serializers_.push_back(new LastSerializer());
+	serializers_.push_back(new WhiteboardSerializer());
 	
 	serializers_.push_back(new StreamInitiationFileInfoSerializer());
 	serializers_.push_back(new JingleContentPayloadSerializer());
diff --git a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp
new file mode 100644
index 0000000..148f643
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.h>
+
+#include <boost/smart_ptr/make_shared.hpp>
+#include <boost/lexical_cast.hpp>
+#include <Swiften/Serializer/XML/XMLTextNode.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h>
+
+namespace Swift {
+	void WhiteboardElementSerializingVisitor::visit(WhiteboardLineElement& line) {
+		element = boost::make_shared<XMLElement>("line");
+		try {
+			element->setAttribute("x1", boost::lexical_cast<std::string>(line.x1()));
+			element->setAttribute("y1", boost::lexical_cast<std::string>(line.y1()));
+			element->setAttribute("x2", boost::lexical_cast<std::string>(line.x2()));
+			element->setAttribute("y2", boost::lexical_cast<std::string>(line.y2()));
+			element->setAttribute("id", line.getID());
+			element->setAttribute("stroke", line.getColor().toHex());
+			element->setAttribute("stroke-width", boost::lexical_cast<std::string>(line.getPenWidth()));
+			element->setAttribute("opacity", alphaToOpacity(line.getColor().getAlpha()));
+		} catch (boost::bad_lexical_cast&) {
+		}
+	}
+
+	void WhiteboardElementSerializingVisitor::visit(WhiteboardFreehandPathElement& path) {
+		element = boost::make_shared<XMLElement>("path");
+		element->setAttribute("id", path.getID());
+		element->setAttribute("stroke", path.getColor().toHex());
+		try {
+			element->setAttribute("stroke-width", boost::lexical_cast<std::string>(path.getPenWidth()));
+			element->setAttribute("opacity", alphaToOpacity(path.getColor().getAlpha()));
+			std::string pathData;
+			if (path.getPoints().size() != 0) {
+				std::vector<std::pair<int, int> >::const_iterator it = path.getPoints().begin();
+				pathData = "M"+boost::lexical_cast<std::string>(it->first)+" "+boost::lexical_cast<std::string>(it->second)+"L";
+				for (; it != path.getPoints().end(); ++it) {
+					pathData += boost::lexical_cast<std::string>(it->first)+" "+boost::lexical_cast<std::string>(it->second)+" ";
+				}
+			}
+			element->setAttribute("d", pathData);
+		} catch (boost::bad_lexical_cast&) {
+		}
+	}
+
+	void WhiteboardElementSerializingVisitor::visit(WhiteboardRectElement& rect) {
+		element = boost::make_shared<XMLElement>("rect");
+		try {
+			element->setAttribute("x", boost::lexical_cast<std::string>(rect.getX()));
+			element->setAttribute("y", boost::lexical_cast<std::string>(rect.getY()));
+			element->setAttribute("width", boost::lexical_cast<std::string>(rect.getWidth()));
+			element->setAttribute("height", boost::lexical_cast<std::string>(rect.getHeight()));
+			element->setAttribute("id", rect.getID());
+			element->setAttribute("stroke", rect.getPenColor().toHex());
+			element->setAttribute("fill", rect.getBrushColor().toHex());;
+			element->setAttribute("stroke-width", boost::lexical_cast<std::string>(rect.getPenWidth()));
+			element->setAttribute("opacity", alphaToOpacity(rect.getPenColor().getAlpha()));
+			element->setAttribute("fill-opacity", alphaToOpacity(rect.getBrushColor().getAlpha()));
+		} catch (boost::bad_lexical_cast&) {
+		}
+	}
+
+	void WhiteboardElementSerializingVisitor::visit(WhiteboardPolygonElement& polygon) {
+		element = boost::make_shared<XMLElement>("polygon");
+		try {
+			element->setAttribute("id", polygon.getID());
+			element->setAttribute("stroke", polygon.getPenColor().toHex());
+			element->setAttribute("fill", polygon.getBrushColor().toHex());;
+			element->setAttribute("stroke-width", boost::lexical_cast<std::string>(polygon.getPenWidth()));
+			element->setAttribute("opacity", alphaToOpacity(polygon.getPenColor().getAlpha()));
+			element->setAttribute("fill-opacity", alphaToOpacity(polygon.getBrushColor().getAlpha()));
+			std::string points;
+			std::vector<std::pair<int, int> >::const_iterator it = polygon.getPoints().begin();
+			for (; it != polygon.getPoints().end(); ++it) {
+				points += boost::lexical_cast<std::string>(it->first)+","+boost::lexical_cast<std::string>(it->second)+" ";
+			}
+			element->setAttribute("points", points);
+		} catch (boost::bad_lexical_cast&) {
+		}
+	}
+
+	void WhiteboardElementSerializingVisitor::visit(WhiteboardTextElement& text) {
+		element = boost::make_shared<XMLElement>("text");
+		try {
+			element->setAttribute("x", boost::lexical_cast<std::string>(text.getX()));
+			element->setAttribute("y", boost::lexical_cast<std::string>(text.getY()));
+			element->setAttribute("font-size", boost::lexical_cast<std::string>(text.getSize()));
+			element->setAttribute("id", text.getID());
+			element->setAttribute("fill", text.getColor().toHex());
+			element->setAttribute("opacity", alphaToOpacity(text.getColor().getAlpha()));
+			element->addNode(boost::make_shared<XMLTextNode>(text.getText()));
+		} catch (boost::bad_lexical_cast&) {
+		}
+	}
+
+ 	void WhiteboardElementSerializingVisitor::visit(WhiteboardEllipseElement& ellipse) {
+		element = boost::make_shared<XMLElement>("ellipse");
+		try {
+			element->setAttribute("cx", boost::lexical_cast<std::string>(ellipse.getCX()));
+			element->setAttribute("cy", boost::lexical_cast<std::string>(ellipse.getCY()));
+			element->setAttribute("rx", boost::lexical_cast<std::string>(ellipse.getRX()));
+			element->setAttribute("ry", boost::lexical_cast<std::string>(ellipse.getRY()));
+			element->setAttribute("id", ellipse.getID());
+			element->setAttribute("stroke", ellipse.getPenColor().toHex());
+			element->setAttribute("fill", ellipse.getBrushColor().toHex());;
+			element->setAttribute("stroke-width", boost::lexical_cast<std::string>(ellipse.getPenWidth()));
+			element->setAttribute("opacity", alphaToOpacity(ellipse.getPenColor().getAlpha()));
+			element->setAttribute("fill-opacity", alphaToOpacity(ellipse.getBrushColor().getAlpha()));
+		} catch (boost::bad_lexical_cast&) {
+		}
+	}
+
+	std::string WhiteboardElementSerializingVisitor::intToStr(const int t) const {
+		std::stringstream ss;
+		ss << t;
+		return ss.str();
+	}
+
+	XMLElement::ref WhiteboardElementSerializingVisitor::getResult() const {
+		return element;
+	}
+
+	std::string WhiteboardElementSerializingVisitor::alphaToOpacity(int alpha) const {
+		int opacity = 100*alpha/254;
+		if (opacity == 100) {
+			return "1";
+		} else {
+			return "."+boost::lexical_cast<std::string>(opacity);
+		}
+	}
+
+	std::string WhiteboardSerializer::serializePayload(boost::shared_ptr<WhiteboardPayload> payload) const {
+		XMLElement element("wb", "http://swift.im/whiteboard");
+		if (payload->getType() == WhiteboardPayload::Data) {
+			XMLElement::ref operationNode = boost::make_shared<XMLElement>("operation");
+			WhiteboardElementSerializingVisitor visitor;
+//			payload->getElement()->accept(visitor);
+			WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(payload->getOperation());
+			if (insertOp) {
+				try {
+					operationNode->setAttribute("type", "insert");
+					operationNode->setAttribute("pos", boost::lexical_cast<std::string>(insertOp->getPos()));
+					operationNode->setAttribute("id", insertOp->getID());
+					operationNode->setAttribute("parentid", insertOp->getParentID());
+				} catch (boost::bad_lexical_cast&) {
+				}
+				insertOp->getElement()->accept(visitor);
+				operationNode->addNode(visitor.getResult());
+			}
+			WhiteboardUpdateOperation::ref updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(payload->getOperation());
+			if (updateOp) {
+				try {
+					operationNode->setAttribute("type", "update");
+					operationNode->setAttribute("pos", boost::lexical_cast<std::string>(updateOp->getPos()));
+					operationNode->setAttribute("id", updateOp->getID());
+					operationNode->setAttribute("parentid", updateOp->getParentID());
+					operationNode->setAttribute("newpos", boost::lexical_cast<std::string>(updateOp->getNewPos()));
+				} catch (boost::bad_lexical_cast&) {
+				}
+				updateOp->getElement()->accept(visitor);
+				operationNode->addNode(visitor.getResult());
+
+			}
+
+			WhiteboardDeleteOperation::ref deleteOp = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(payload->getOperation());
+			if (deleteOp) {
+				try {
+					operationNode->setAttribute("type", "delete");
+					operationNode->setAttribute("pos", boost::lexical_cast<std::string>(deleteOp->getPos()));
+					operationNode->setAttribute("id", deleteOp->getID());
+					operationNode->setAttribute("parentid", deleteOp->getParentID());
+					operationNode->setAttribute("elementid", deleteOp->getElementID());
+				} catch (boost::bad_lexical_cast&) {
+				}
+			}
+			element.addNode(operationNode);
+		}
+		element.setAttribute("type", typeToString(payload->getType()));
+		return element.serialize();
+	}
+
+	std::string WhiteboardSerializer::typeToString(WhiteboardPayload::Type type) const {
+		switch (type) {
+			case WhiteboardPayload::Data:
+				return "data";
+			case WhiteboardPayload::SessionRequest:
+				return "session-request";
+			case WhiteboardPayload::SessionAccept:
+				return "session-accept";
+			case WhiteboardPayload::SessionTerminate:
+				return "session-terminate";
+			case WhiteboardPayload::UnknownType:
+				std::cerr << "Serializing unknown action value." << std::endl;
+				return "";
+		}
+		assert(false);
+		return "";
+	}
+}
diff --git a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.h b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.h
new file mode 100644
index 0000000..d51694f
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/WhiteboardPayload.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardLineElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardFreehandPathElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardRectElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardPolygonElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardTextElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardEllipseElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardElementVisitor.h>
+#include <Swiften/Serializer/GenericPayloadSerializer.h>
+#include <Swiften/Serializer/XML/XMLElement.h>
+
+namespace Swift {
+	class WhiteboardElementSerializingVisitor : public WhiteboardElementVisitor {
+	public:
+		void visit(WhiteboardLineElement& line);
+		void visit(WhiteboardFreehandPathElement& path);
+		void visit(WhiteboardRectElement& rect);
+		void visit(WhiteboardPolygonElement& polygon);
+		void visit(WhiteboardTextElement& text);
+		void visit(WhiteboardEllipseElement& ellipse);
+		XMLElement::ref getResult() const;
+
+	private:
+		std::string intToStr(const int t) const;
+		std::string alphaToOpacity(int alpha) const;
+		
+		XMLElement::ref element;
+	};
+
+	class WhiteboardSerializer : public GenericPayloadSerializer<WhiteboardPayload> {
+	public:
+		std::string serializePayload(boost::shared_ptr<WhiteboardPayload> payload) const;
+
+	private:
+		std::string typeToString(WhiteboardPayload::Type type) const;
+	};
+}
diff --git a/Swiften/Whiteboard/IncomingWhiteboardSession.cpp b/Swiften/Whiteboard/IncomingWhiteboardSession.cpp
new file mode 100644
index 0000000..d64a0d2
--- /dev/null
+++ b/Swiften/Whiteboard/IncomingWhiteboardSession.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Whiteboard/IncomingWhiteboardSession.h>
+#include <Swiften/Elements/WhiteboardPayload.h>
+
+#include <boost/smart_ptr/make_shared.hpp>
+#include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h>
+
+namespace Swift {
+	IncomingWhiteboardSession::IncomingWhiteboardSession(const JID& jid, IQRouter* router) : WhiteboardSession(jid, router) {
+	}
+
+	IncomingWhiteboardSession::~IncomingWhiteboardSession() {
+	}
+
+	void IncomingWhiteboardSession::accept() {
+		boost::shared_ptr<WhiteboardPayload> payload = boost::make_shared<WhiteboardPayload>(WhiteboardPayload::SessionAccept);
+		boost::shared_ptr<GenericRequest<WhiteboardPayload> > request = boost::make_shared<GenericRequest<WhiteboardPayload> >(IQ::Set, toJID_, payload, router_);
+		request->send();
+		onRequestAccepted(toJID_);
+	}
+
+	void IncomingWhiteboardSession::handleIncomingOperation(WhiteboardOperation::ref operation) {
+		WhiteboardClient::Result pairResult = client.handleServerOperationReceived(operation);
+		if (pairResult.client) {
+			if (pairResult.client->getPos() != -1) {
+				onOperationReceived(pairResult.client);
+			}
+			lastOpID = pairResult.client->getID();
+		}
+
+		if (pairResult.server) {
+			WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
+			payload->setOperation(pairResult.server);
+			sendPayload(payload);
+		}
+	}
+
+	void IncomingWhiteboardSession::sendOperation(WhiteboardOperation::ref operation) {
+		operation->setID(idGenerator.generateID());
+		operation->setParentID(lastOpID);
+		lastOpID = operation->getID();
+
+		WhiteboardOperation::ref result = client.handleLocalOperationReceived(operation);
+
+		if (result) {
+			WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
+			payload->setOperation(result);
+			sendPayload(payload);
+		}
+	}
+}
diff --git a/Swiften/Whiteboard/IncomingWhiteboardSession.h b/Swiften/Whiteboard/IncomingWhiteboardSession.h
new file mode 100644
index 0000000..beaf267
--- /dev/null
+++ b/Swiften/Whiteboard/IncomingWhiteboardSession.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Whiteboard/WhiteboardSession.h>
+#include <Swiften/Whiteboard/WhiteboardClient.h>
+#include <boost/shared_ptr.hpp>
+
+namespace Swift {
+	class IncomingWhiteboardSession : public WhiteboardSession {
+	public:
+		typedef boost::shared_ptr<IncomingWhiteboardSession> ref;
+
+	public:
+		IncomingWhiteboardSession(const JID& jid, IQRouter* router);
+		~IncomingWhiteboardSession();
+
+		void accept();
+
+	private:
+		void handleIncomingOperation(WhiteboardOperation::ref operation);
+		void sendOperation(WhiteboardOperation::ref operation);
+
+		WhiteboardClient client;
+	};
+}
diff --git a/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp b/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp
new file mode 100644
index 0000000..ad81daa
--- /dev/null
+++ b/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Whiteboard/OutgoingWhiteboardSession.h>
+
+#include <boost/smart_ptr/make_shared.hpp>
+#include <boost/bind.hpp>
+#include <Swiften/Elements/WhiteboardPayload.h>
+
+#include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h>
+
+namespace Swift {
+	OutgoingWhiteboardSession::OutgoingWhiteboardSession(const JID& jid, IQRouter* router) : WhiteboardSession(jid, router) {
+	}
+
+	OutgoingWhiteboardSession::~OutgoingWhiteboardSession() {
+	}
+
+	void OutgoingWhiteboardSession::startSession() {
+		boost::shared_ptr<WhiteboardPayload> payload = boost::make_shared<WhiteboardPayload>(WhiteboardPayload::SessionRequest);
+		boost::shared_ptr<GenericRequest<WhiteboardPayload> > request = boost::make_shared<GenericRequest<WhiteboardPayload> >(IQ::Set, toJID_, payload, router_);
+		request->onResponse.connect(boost::bind(&OutgoingWhiteboardSession::handleRequestResponse, this, _1, _2));
+		request->send();
+	}
+
+	void OutgoingWhiteboardSession::handleRequestResponse(boost::shared_ptr<WhiteboardPayload> /*payload*/, ErrorPayload::ref error) {
+		if (error) {
+			onRequestRejected(toJID_);
+		}
+	}
+
+	void OutgoingWhiteboardSession::handleIncomingOperation(WhiteboardOperation::ref operation) {
+		WhiteboardOperation::ref op = server.handleClientOperationReceived(operation);
+		if (op->getPos() != -1) {
+			onOperationReceived(op);
+		}
+		lastOpID = op->getID();
+
+		WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
+		payload->setOperation(op);
+		sendPayload(payload);
+	}
+
+	void OutgoingWhiteboardSession::sendOperation(WhiteboardOperation::ref operation) {
+		operation->setID(idGenerator.generateID());
+		operation->setParentID(lastOpID);
+		lastOpID = operation->getID();
+
+		server.handleLocalOperationReceived(operation);
+		WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
+		payload->setOperation(operation);
+		sendPayload(payload);
+	}
+}
diff --git a/Swiften/Whiteboard/OutgoingWhiteboardSession.h b/Swiften/Whiteboard/OutgoingWhiteboardSession.h
new file mode 100644
index 0000000..631f7ba
--- /dev/null
+++ b/Swiften/Whiteboard/OutgoingWhiteboardSession.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Whiteboard/WhiteboardSession.h>
+#include <Swiften/Whiteboard/WhiteboardServer.h>
+#include <boost/shared_ptr.hpp>
+#include <Swiften/Queries/GenericRequest.h>
+
+namespace Swift {
+	class OutgoingWhiteboardSession : public WhiteboardSession {
+	public:
+		typedef boost::shared_ptr<OutgoingWhiteboardSession> ref;
+
+	public:
+		OutgoingWhiteboardSession(const JID& jid, IQRouter* router);
+		virtual ~OutgoingWhiteboardSession();
+		void startSession();
+
+	private:
+		void handleRequestResponse(boost::shared_ptr<WhiteboardPayload> /*payload*/, ErrorPayload::ref error);
+		void handleIncomingOperation(WhiteboardOperation::ref operation);
+		void sendOperation(WhiteboardOperation::ref operation);
+
+		WhiteboardServer server;
+	};
+}
diff --git a/Swiften/Whiteboard/UnitTest/WhiteboardClientTest.cpp b/Swiften/Whiteboard/UnitTest/WhiteboardClientTest.cpp
new file mode 100644
index 0000000..7d767d3
--- /dev/null
+++ b/Swiften/Whiteboard/UnitTest/WhiteboardClientTest.cpp
@@ -0,0 +1,676 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include <boost/smart_ptr/make_shared.hpp>
+#include <Swiften/Whiteboard/WhiteboardClient.h>
+#include <Swiften/Whiteboard/Operations/WhiteboardInsertOperation.h>
+#include <Swiften/Whiteboard/Operations/WhiteboardUpdateOperation.h>
+#include <Swiften/Whiteboard/Operations/WhiteboardDeleteOperation.h>
+#include <Swiften/Whiteboard/Elements/WhiteboardEllipseElement.h>
+
+using namespace Swift;
+
+class WhiteboardClientTest : public CppUnit::TestFixture {
+	CPPUNIT_TEST_SUITE(WhiteboardClientTest);
+	CPPUNIT_TEST(testSynchronize_simplestSync);
+	CPPUNIT_TEST(testSynchronize_withoutTranslation);
+	CPPUNIT_TEST(testSynchronize_nonInterrupted);
+	CPPUNIT_TEST(testSynchronize_clientInterruption);
+	CPPUNIT_TEST(testSynchronize_serverInterruption);
+	CPPUNIT_TEST(testSynchronize_nonInterruptedMixOperations);
+	CPPUNIT_TEST(testSynchronize_nonInterruptedMixOperations2);
+	CPPUNIT_TEST_SUITE_END();
+public:
+
+	/*!
+	 *  /\
+	 *  \/
+	 *   \
+	 */
+	void testSynchronize_simplestSync() {
+		WhiteboardClient client;
+		WhiteboardInsertOperation::ref serverOp;
+		serverOp = createInsertOperation("0", "", 0);
+		WhiteboardClient::Result pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(serverOp, boost::dynamic_pointer_cast<WhiteboardInsertOperation>(pairResult.client));
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives first local operation, because it's parented off "0" which exists
+		//in server history and client doesn't wait for any operation ack from server,
+		//so this operation could be send
+		WhiteboardInsertOperation::ref clientOp;
+		clientOp = createInsertOperation("a", "0", 1);
+		WhiteboardEllipseElement::ref aElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(aElement);
+		WhiteboardInsertOperation::ref result;
+		checkOperation(client.handleLocalOperationReceived(clientOp), "a", "0", 1, aElement);
+
+		//Client receives server operation parented off "0", which isn't last client operation
+		//so it have to be transformed against local operations and then transformed value can
+		//be returned to draw
+		serverOp = createInsertOperation("b", "0", 1);
+		WhiteboardEllipseElement::ref bElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverOp->setElement(bElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.client, "b", "a", 2, bElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives confirmation from the server about processed "a" operation, it had to
+		//be transformed against "b" on the server side to receive operation parented off "b".
+		//There aren't any waiting operations to send to server, this operation should return
+		//nothing
+		serverOp = createInsertOperation("a", "b", 1);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives local operation, it doesn't have to be transformed against anything
+		//but operation returned to send to the server should be parented off last server
+		//operation, which is "b"
+		clientOp = createInsertOperation("c", "b", 3);
+		WhiteboardEllipseElement::ref cElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(cElement);
+		checkOperation(client.handleLocalOperationReceived(clientOp), "c", "a", 3, cElement);
+
+		//Client receives confirmation from the server about processed "a" operation, it
+		//should be the same operation as it was sent because server didn't have to
+		//transform it
+		clientOp = createInsertOperation("c", "a", 3);
+		clientOp->setElement(cElement);
+		pairResult = client.handleServerOperationReceived(clientOp);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Results:
+		//Client operations:
+		//ID	pos
+		//0		0
+		//a		1
+		//b		2
+		//c		3
+		//
+		//Server operations:
+		//ID	pos
+		//0		0
+		//b		1
+		//a		1
+		//c		3
+		//
+		//what gives 0abc on both sides
+	}
+
+	/*!
+	 *    /
+	 *   /
+	 *   \
+	 */
+	void testSynchronize_withoutTranslation() {
+		WhiteboardClient client;
+		WhiteboardInsertOperation::ref serverOp;
+		serverOp = createInsertOperation("0", "", 0);
+		WhiteboardClient::Result pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(serverOp, boost::dynamic_pointer_cast<WhiteboardInsertOperation>(pairResult.client));
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives first local operation, because it's parented off "0" which exists
+		//in server history and client doesn't wait for any operation ack from server,
+		//so this operation could be send
+		WhiteboardInsertOperation::ref clientOp = createInsertOperation("c", "0", 1);
+		WhiteboardEllipseElement::ref cElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(cElement);
+		checkOperation(client.handleLocalOperationReceived(clientOp), "c", "0", 1, cElement);
+
+		//Client receives second local operation, client didn't receive ack about previous
+		//operation from the server so it can't be send.
+		clientOp = createInsertOperation("d", "c", 2);
+		WhiteboardEllipseElement::ref dElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(dElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), client.handleLocalOperationReceived(clientOp));
+
+		//Client receives confirmation about processing "c" operation, it should be the
+		//same as sent operation because it wasn't transformed, client could send now
+		//operation "d"
+		clientOp = createInsertOperation("c", "0", 1);
+		clientOp->setElement(cElement);
+		pairResult = client.handleServerOperationReceived(clientOp);
+		checkOperation(pairResult.server, "d", "c", 2, dElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+
+		//Client receives confirmation about processing "d", it should be the same as
+		//sent operation. There aren't any operations in queue to send.
+		clientOp = createInsertOperation("d", "c", 2);
+		clientOp->setElement(dElement);
+		pairResult = client.handleServerOperationReceived(clientOp);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives new operation from server, it's parented off "d" which is at
+		//the end of local history so it doesn't have to be transformed, so operation
+		//to pass to window should be the same
+		serverOp = createInsertOperation("e", "d", 3);
+		WhiteboardEllipseElement::ref eElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverOp->setElement(eElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		WhiteboardInsertOperation::ref result = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(pairResult.client);
+		CPPUNIT_ASSERT_EQUAL(serverOp, boost::dynamic_pointer_cast<WhiteboardInsertOperation>(pairResult.client));
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+
+		//Client operations:
+		//ID	pos
+		//0		0
+		//c		1
+		//d		2
+		//e		3
+		//
+		//Server operations:
+		//ID	pos
+		//0		0
+		//c		1
+		//d		2
+		//e		3
+	}
+
+	/*!
+	 *     /\
+	 *    /  \
+	 *    \  /
+	 *     \/
+	 */
+	void testSynchronize_nonInterrupted() {
+		WhiteboardClient client;
+		WhiteboardInsertOperation::ref serverOp;
+		serverOp = createInsertOperation("0", "", 0);
+		WhiteboardClient::Result pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(serverOp, boost::dynamic_pointer_cast<WhiteboardInsertOperation>(pairResult.client));
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives first local operation, because it's parented off "0" which exists
+		//in server history and client doesn't wait for any operation ack from server,
+		//so this operation could be send
+		WhiteboardInsertOperation::ref clientOp;
+		clientOp = createInsertOperation("a", "0", 1);
+		WhiteboardEllipseElement::ref aElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(aElement);
+		checkOperation(client.handleLocalOperationReceived(clientOp), "a", "0", 1, aElement);
+
+		//Client receives second local operation, client didn't receive ack about previous
+		//operation from the server so it can't be send.
+		clientOp = createInsertOperation("b", "a", 2);
+		WhiteboardEllipseElement::ref bElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(bElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), client.handleLocalOperationReceived(clientOp));
+
+		//Client receives new operation from server, it should be transformed against
+		//"a" and "b" before adding to local operations history because it's parented off "0".
+		//Because client is waiting for ack of "a", there is no operation to send to server
+		serverOp = createInsertOperation("c", "0", 1);
+		WhiteboardEllipseElement::ref cElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverOp->setElement(cElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.client, "c", "b", 3, cElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives new operation from server, it should be transformed against
+		//results of previous transformations, returned operation should be parented off
+		//"c" existing in local history.
+		//Because client is waiting for ack of "a", there is no operation to send to server
+		serverOp = createInsertOperation("d", "c", 2);
+		WhiteboardEllipseElement::ref dElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverOp->setElement(dElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.client, "d", "c", 4, dElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives confirmation about processing "a", it should send next operation
+		//to server which is "b", but it should be version parented of transformed "a"
+		serverOp = createInsertOperation("a", "d", 1);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.server, "b", "a", 2, bElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+
+
+		//Client receives confirmation about processing "b", there aren't any operations
+		//waiting so it should return nothing.
+		serverOp = createInsertOperation("b", "a", 2);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client operations:
+		//ID	pos
+		//0 	0
+		//a 	1
+		//b 	2
+		//c 	3
+		//d 	4
+		//
+		//Server operations:
+		//ID	pos
+		//0 	0
+		//c 	1
+		//d 	2
+		//a 	1
+		//b 	2
+		//
+		//what gives 0abcd on both sides.
+	}
+
+	/*!
+	 *     /\
+	 *    /  \
+	 *    \  /
+	 *    / /
+	 *    \/
+	 */
+	void testSynchronize_clientInterruption() {
+		WhiteboardClient client;
+		WhiteboardInsertOperation::ref serverOp;
+		serverOp = createInsertOperation("0", "", 0);
+		WhiteboardClient::Result pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(serverOp, boost::dynamic_pointer_cast<WhiteboardInsertOperation>(pairResult.client));
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives first local operation, because it's parented off "0" which exists
+		//in server history and client doesn't wait for any operation ack from server,
+		//so this operation could be send
+		WhiteboardInsertOperation::ref clientOp;
+		clientOp = createInsertOperation("a", "0", 1);
+		WhiteboardEllipseElement::ref aElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(aElement);
+		checkOperation(client.handleLocalOperationReceived(clientOp), "a", "0", 1, aElement);
+
+		//Client receives second local operation, client didn't receive ack about previous
+		//operation from the server so it can't be send.
+		clientOp = createInsertOperation("b", "a", 2);
+		WhiteboardEllipseElement::ref bElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(bElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), client.handleLocalOperationReceived(clientOp));
+
+		//Client receives new operation from server, it should be transformed against
+		//"a" and "b" before adding to local operations history because it's parented off "0".
+		//Because client is waiting for ack of "a", there is no operation to send to server
+		serverOp = createInsertOperation("c", "0", 1);
+		WhiteboardEllipseElement::ref cElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverOp->setElement(cElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.client, "c", "b", 3, cElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives new local operation, client is still waiting for ack so, it
+		//should return nothing
+		clientOp = createInsertOperation("e", "a", 4);
+		WhiteboardEllipseElement::ref eElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(eElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), client.handleLocalOperationReceived(clientOp));
+
+		//Client receives new server operation, to add it to local history it should be transformed
+		//against result of previous transformations and operation "e", returned operation should
+		//be parented off "e", which was last local operation
+		serverOp = createInsertOperation("d", "c", 2);
+		WhiteboardEllipseElement::ref dElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverOp->setElement(dElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.client, "d", "e", 5, dElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives confirmation about processing "a", it had to be transformed against
+		//"c" and "d" and it is now parented off "d", returned value should be next operation
+		//which have to be send to server("b" parented off server version of "a").
+		serverOp = createInsertOperation("a", "d", 1);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.server, "b", "a", 2, bElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+
+		//Client receives confirmation about processing "b", it is the same operation as sent because
+		//it didn't have to be transformed, returned value should be next operation
+		//which have to be send to server("e" parented off server version of "b").
+		serverOp = createInsertOperation("b", "a", 2);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.server, "e", "b", 4, eElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+
+		//Client receives confirmation about processing "b", it is the same operation as sent because
+		//it didn't have to be transformed, there aren't any operations to send so this function returns
+		//nothing
+		serverOp = createInsertOperation("e", "b", 4);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Result:
+		//Client operations:
+		//ID	pos
+		//0 	0
+		//a 	1
+		//b 	2
+		//c 	3
+		//e 	4
+		//d 	5
+		//
+		//Server operations:
+		//0 	0
+		//c 	1
+		//d 	2
+		//a 	1
+		//b 	2
+		//e 	4
+		//what gives 0abced on both sides
+	}
+
+	/*!
+	 *    /\
+	 *   / /
+	 *   \ \
+	 *    \/
+	 */
+	void testSynchronize_serverInterruption() {
+		WhiteboardClient client;
+		WhiteboardInsertOperation::ref serverOp;
+		serverOp = createInsertOperation("0", "", 0);
+		WhiteboardClient::Result pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(serverOp, boost::dynamic_pointer_cast<WhiteboardInsertOperation>(pairResult.client));
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives first local operation, because it's parented off "0" which exists
+		//in server history and client doesn't wait for any operation ack from server,
+		//so this operation could be send
+		WhiteboardInsertOperation::ref clientOp;
+		clientOp = createInsertOperation("a", "0", 1);
+		WhiteboardEllipseElement::ref aElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(aElement);
+		checkOperation(client.handleLocalOperationReceived(clientOp), "a", "0", 1, aElement);
+
+		//Client receives second local operation, client didn't receive ack about previous
+		//operation from the server so it can't be send.
+		clientOp = createInsertOperation("b", "a", 2);
+		WhiteboardEllipseElement::ref bElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(bElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), client.handleLocalOperationReceived(clientOp));
+
+		//Client receives new operation from server, it should be transformed against
+		//"a" and "b" before adding to local operations history because it's parented off "0".
+		//Because client is waiting for ack of "a", there is no operation to send to server
+		serverOp = createInsertOperation("c", "0", 1);
+		WhiteboardEllipseElement::ref cElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverOp->setElement(cElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.client, "c", "b", 3, cElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives confirmation about processing "a", it had to be transformed against
+		//"c" and it is now parented off "c", returned value should be next operation
+		//which have to be send to server("b" parented off server version of "a").
+		serverOp = createInsertOperation("a", "c", 1);
+		serverOp->setElement(aElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.server, "b", "a", 2, bElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+
+		//Client receives new server operation, to add it to local history it should be transformed
+		//against result of previous transformation(but only with transformation of "b"), returned
+		//operation should be parented off "c", which was last local operation
+		serverOp = createInsertOperation("d", "a", 3);
+		WhiteboardEllipseElement::ref dElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverOp->setElement(dElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.client, "d", "c", 4, dElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives confirmation about processing "b", it had to be transformed against
+		//"d" because both operations was parented off server version of "a".
+		//there aren't any operations to send so this function returns nothing.
+		serverOp = createInsertOperation("b", "d", 2);
+		serverOp->setElement(bElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client operations:
+		//ID	pos
+		//0 	0
+		//a 	1
+		//b 	2
+		//c 	3
+		//d 	4
+		//
+		//Server operations:
+		//ID	pos
+		//0 	0
+		//c 	1
+		//a 	1
+		//d 	3
+		//b 	2
+		//
+		//what gives 0abcd on both sides
+
+	}
+
+	/*!
+	 *     /\
+	 *    /  \
+	 *    \  /
+	 *     \/
+	 */
+	void testSynchronize_nonInterruptedMixOperations() {
+		WhiteboardClient client;
+		WhiteboardInsertOperation::ref serverOp;
+		serverOp = createInsertOperation("0", "", 0);
+		WhiteboardClient::Result pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(serverOp, boost::dynamic_pointer_cast<WhiteboardInsertOperation>(pairResult.client));
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives first local operation, because it's parented off "0" which exists
+		//in server history and client doesn't wait for any operation ack from server,
+		//so this operation could be send
+		WhiteboardInsertOperation::ref clientOp;
+		clientOp = createInsertOperation("a", "0", 1);
+		WhiteboardEllipseElement::ref aElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setElement(aElement);
+		checkOperation(client.handleLocalOperationReceived(clientOp), "a", "0", 1, aElement);
+
+		//Client receives second local operation, client didn't receive ack about previous
+		//operation from the server so it can't be send.
+		WhiteboardUpdateOperation::ref clientUpdateOp = createUpdateOperation("b", "a", 0);
+		WhiteboardEllipseElement::ref bElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientUpdateOp->setElement(bElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), client.handleLocalOperationReceived(clientUpdateOp));
+
+		//Client receives new operation from server, it should be transformed against
+		//"a" and "b" before adding to local operations history because it's parented off "0".
+		//Because client is waiting for ack of "a", there is no operation to send to server
+		WhiteboardUpdateOperation::ref serverUpdateOp = createUpdateOperation("c", "0", 0);
+		WhiteboardEllipseElement::ref cElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverUpdateOp->setElement(cElement);
+		pairResult = client.handleServerOperationReceived(serverUpdateOp);
+		checkOperation(pairResult.client, "c", "b", 0, cElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives new operation from server, it should be transformed against
+		//results of previous transformations, returned operation should be parented off
+		//"c" existing in local history.
+		//Because client is waiting for ack of "a", there is no operation to send to server
+		serverOp = createInsertOperation("d", "c", 1);
+		WhiteboardEllipseElement::ref dElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverOp->setElement(dElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.client, "d", "c", 2, dElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives confirmation about processing "a", it should send next operation
+		//to server which is "b", but it should be version parented of transformed "a"
+		serverOp = createInsertOperation("a", "d", 1);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.server, "b", "a", 0, cElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+
+
+		//Client receives confirmation about processing "b", there aren't any operations
+		//waiting so it should return nothing.
+		serverUpdateOp = createUpdateOperation("b", "a", 0);
+		pairResult = client.handleServerOperationReceived(serverUpdateOp);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client operations:
+		//ID	pos
+		//0 	0
+		//a 	1
+		//b 	2
+		//c 	3
+		//d 	4
+		//
+		//Server operations:
+		//ID	pos
+		//0 	0
+		//c 	1
+		//d 	2
+		//a 	1
+		//b 	2
+		//
+		//what gives 0abcd on both sides.
+	}
+
+	/*!
+	 *     /\
+	 *    /  \
+	 *    \  /
+	 *     \/
+	 */
+	void testSynchronize_nonInterruptedMixOperations2() {
+		WhiteboardClient client;
+		WhiteboardInsertOperation::ref serverOp;
+		serverOp = createInsertOperation("0", "", 0);
+		WhiteboardClient::Result pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(serverOp, boost::dynamic_pointer_cast<WhiteboardInsertOperation>(pairResult.client));
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		serverOp = createInsertOperation("1", "0", 1);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		CPPUNIT_ASSERT_EQUAL(serverOp, boost::dynamic_pointer_cast<WhiteboardInsertOperation>(pairResult.client));
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+		//Client receives first local operation, because it's parented off "0" which exists
+		//in server history and client doesn't wait for any operation ack from server,
+		//so this operation could be send
+		WhiteboardInsertOperation::ref clientOp;
+		WhiteboardUpdateOperation::ref clientUpdateOp;
+		WhiteboardDeleteOperation::ref clientDeleteOp;
+		clientUpdateOp = createUpdateOperation("a", "1", 0);
+		WhiteboardEllipseElement::ref aElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientUpdateOp->setElement(aElement);
+		checkOperation(client.handleLocalOperationReceived(clientUpdateOp), "a", "1", 0, aElement);
+
+		//Client receives second local operation, client didn't receive ack about previous
+		//operation from the server so it can't be send.
+		clientDeleteOp = createDeleteOperation("b", "a", 1);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), client.handleLocalOperationReceived(clientDeleteOp));
+
+		//Client receives new operation from server, it should be transformed against
+		//"a" and "b" before adding to local operations history because it's parented off "0".
+		//Because client is waiting for ack of "a", there is no operation to send to server
+		serverOp = createInsertOperation("c", "1", 2);
+		WhiteboardEllipseElement::ref cElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverOp->setElement(cElement);
+		pairResult = client.handleServerOperationReceived(serverOp);
+		checkOperation(pairResult.client, "c", "b", 1, cElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives new operation from server, it should be transformed against
+		//results of previous transformations, returned operation should be parented off
+		//"c" existing in local history.
+		//Because client is waiting for ack of "a", there is no operation to send to server
+		WhiteboardUpdateOperation::ref serverUpdateOp = createUpdateOperation("d", "c", 0);
+		WhiteboardEllipseElement::ref dElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		serverUpdateOp->setElement(dElement);
+		pairResult = client.handleServerOperationReceived(serverUpdateOp);
+		checkOperation(pairResult.client, "d", "c", 0, dElement);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client receives confirmation about processing "a", it should send next operation
+		//to server which is "b", but it should be version parented of transformed "a"
+		serverUpdateOp = createUpdateOperation("a", "d", 0);
+		pairResult = client.handleServerOperationReceived(serverUpdateOp);
+		checkOperation(pairResult.server, "b", "a", 1);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+
+
+		//Client receives confirmation about processing "b", there aren't any operations
+		//waiting so it should return nothing.
+		WhiteboardDeleteOperation::ref serverDeleteOp = createDeleteOperation("b", "a", 0);
+		pairResult = client.handleServerOperationReceived(serverDeleteOp);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.client);
+		CPPUNIT_ASSERT_EQUAL(WhiteboardOperation::ref(), pairResult.server);
+
+		//Client operations:
+		//ID	pos
+		//0 	0
+		//a 	1
+		//b 	2
+		//c 	3
+		//d 	4
+		//
+		//Server operations:
+		//ID	pos
+		//0 	0
+		//c 	1
+		//d 	2
+		//a 	1
+		//b 	2
+		//
+		//what gives 0abcd on both sides.
+	}
+
+
+	WhiteboardInsertOperation::ref createInsertOperation(std::string id, std::string parent, int pos) {
+		WhiteboardInsertOperation::ref operation = boost::make_shared<WhiteboardInsertOperation>();
+		operation->setParentID(parent);
+		operation->setID(id);
+		operation->setPos(pos);
+		return operation;
+	}
+
+	WhiteboardUpdateOperation::ref createUpdateOperation(std::string id, std::string parent, int pos) {
+		WhiteboardUpdateOperation::ref operation = boost::make_shared<WhiteboardUpdateOperation>();
+		operation->setParentID(parent);
+		operation->setID(id);
+		operation->setPos(pos);
+		return operation;
+	}
+
+	WhiteboardDeleteOperation::ref createDeleteOperation(std::string id, std::string parent, int pos) {
+		WhiteboardDeleteOperation::ref operation = boost::make_shared<WhiteboardDeleteOperation>();
+		operation->setParentID(parent);
+		operation->setID(id);
+		operation->setPos(pos);
+		return operation;
+	}
+
+	void checkOperation(WhiteboardOperation::ref operation, std::string id, std::string parent, int pos = -1, WhiteboardElement::ref element = WhiteboardElement::ref()) {
+		CPPUNIT_ASSERT_EQUAL(id, operation->getID());
+		CPPUNIT_ASSERT_EQUAL(parent, operation->getParentID());
+		if (pos != -1) {
+			CPPUNIT_ASSERT_EQUAL(pos, operation->getPos());
+		}
+
+		if (element) {
+			WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(operation);
+			if (insertOp) {
+				CPPUNIT_ASSERT_EQUAL(element, insertOp->getElement());
+			}
+
+			WhiteboardUpdateOperation::ref updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(operation);
+			if (updateOp) {
+				CPPUNIT_ASSERT_EQUAL(element, updateOp->getElement());
+			}
+		}
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(WhiteboardClientTest);
diff --git a/Swiften/Whiteboard/UnitTest/WhiteboardServerTest.cpp b/Swiften/Whiteboard/UnitTest/WhiteboardServerTest.cpp
new file mode 100644
index 0000000..563be54
--- /dev/null
+++ b/Swiften/Whiteboard/UnitTest/WhiteboardServerTest.cpp
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include <boost/smart_ptr/make_shared.hpp>
+#include <Swiften/Whiteboard/WhiteboardServer.h>
+#include <Swiften/Whiteboard/Operations/WhiteboardInsertOperation.h>
+#include <Swiften/Whiteboard/Operations/WhiteboardDeleteOperation.h>
+#include <Swiften/Whiteboard/Operations/WhiteboardUpdateOperation.h>
+#include <Swiften/Whiteboard/Elements/WhiteboardEllipseElement.h>
+
+using namespace Swift;
+
+class WhiteboardServerTest : public CppUnit::TestFixture {
+	CPPUNIT_TEST_SUITE(WhiteboardServerTest);
+	CPPUNIT_TEST(testSimpleOp);
+	CPPUNIT_TEST(testSimpleOp1);
+	CPPUNIT_TEST(testSimpleOp2);
+	CPPUNIT_TEST(testFewSimpleOps);
+	CPPUNIT_TEST_SUITE_END();
+public:
+	void testSimpleOp() {
+		WhiteboardServer server;
+		WhiteboardInsertOperation::ref firstOp = boost::make_shared<WhiteboardInsertOperation>();
+		firstOp->setID("0");
+		server.handleLocalOperationReceived(firstOp);
+		WhiteboardInsertOperation::ref serverOp = boost::make_shared<WhiteboardInsertOperation>();
+		serverOp->setID("b");
+		serverOp->setParentID("0");
+		serverOp->setPos(1);
+		server.handleLocalOperationReceived(serverOp);
+		WhiteboardInsertOperation::ref clientOp = boost::make_shared<WhiteboardInsertOperation>();
+		WhiteboardEllipseElement::ref clientElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setID("a");
+		clientOp->setParentID("0");
+		clientOp->setPos(1);
+		clientOp->setElement(clientElement);
+		WhiteboardInsertOperation::ref op = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(server.handleClientOperationReceived(clientOp));
+		CPPUNIT_ASSERT_EQUAL(std::string("b"), op->getParentID());
+		CPPUNIT_ASSERT_EQUAL(std::string("a"), op->getID());
+		CPPUNIT_ASSERT_EQUAL(1, op->getPos());
+		CPPUNIT_ASSERT_EQUAL(clientElement, boost::dynamic_pointer_cast<WhiteboardEllipseElement>(op->getElement()));
+	}
+
+	void testSimpleOp1() {
+		WhiteboardServer server;
+		WhiteboardInsertOperation::ref firstOp = boost::make_shared<WhiteboardInsertOperation>();
+		firstOp->setID("0");
+		server.handleLocalOperationReceived(firstOp);
+		WhiteboardDeleteOperation::ref serverOp = boost::make_shared<WhiteboardDeleteOperation>();
+		serverOp->setID("b");
+		serverOp->setParentID("0");
+		serverOp->setPos(1);
+		server.handleLocalOperationReceived(serverOp);
+		WhiteboardUpdateOperation::ref clientOp = boost::make_shared<WhiteboardUpdateOperation>();
+		WhiteboardEllipseElement::ref clientElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setID("a");
+		clientOp->setParentID("0");
+		clientOp->setPos(1);
+		clientOp->setElement(clientElement);
+		WhiteboardDeleteOperation::ref op = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(server.handleClientOperationReceived(clientOp));
+		CPPUNIT_ASSERT_EQUAL(std::string("b"), op->getParentID());
+		CPPUNIT_ASSERT_EQUAL(std::string("a"), op->getID());
+		CPPUNIT_ASSERT_EQUAL(-1, op->getPos());
+	}
+
+	void testSimpleOp2() {
+		WhiteboardServer server;
+		WhiteboardInsertOperation::ref firstOp = boost::make_shared<WhiteboardInsertOperation>();
+		firstOp->setID("0");
+		server.handleLocalOperationReceived(firstOp);
+		WhiteboardUpdateOperation::ref serverOp = boost::make_shared<WhiteboardUpdateOperation>();
+		serverOp->setID("b");
+		serverOp->setParentID("0");
+		serverOp->setPos(1);
+		server.handleLocalOperationReceived(serverOp);
+		WhiteboardDeleteOperation::ref clientOp = boost::make_shared<WhiteboardDeleteOperation>();
+		clientOp->setID("a");
+		clientOp->setParentID("0");
+		clientOp->setPos(1);
+		WhiteboardDeleteOperation::ref op = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(server.handleClientOperationReceived(clientOp));
+		CPPUNIT_ASSERT_EQUAL(std::string("b"), op->getParentID());
+		CPPUNIT_ASSERT_EQUAL(std::string("a"), op->getID());
+		CPPUNIT_ASSERT_EQUAL(1, op->getPos());
+	}
+
+
+	void testFewSimpleOps() {
+		WhiteboardServer server;
+		WhiteboardInsertOperation::ref firstOp = boost::make_shared<WhiteboardInsertOperation>();
+		firstOp->setID("0");
+		server.handleLocalOperationReceived(firstOp);
+		WhiteboardInsertOperation::ref serverOp = boost::make_shared<WhiteboardInsertOperation>();
+		serverOp->setID("a");
+		serverOp->setParentID("0");
+		serverOp->setPos(1);
+		server.handleLocalOperationReceived(serverOp);
+		serverOp = boost::make_shared<WhiteboardInsertOperation>();
+		serverOp->setID("b");
+		serverOp->setParentID("a");
+		serverOp->setPos(2);
+		server.handleLocalOperationReceived(serverOp);
+		serverOp = boost::make_shared<WhiteboardInsertOperation>();
+		serverOp->setID("c");
+		serverOp->setParentID("b");
+		serverOp->setPos(3);
+		server.handleLocalOperationReceived(serverOp);
+		WhiteboardInsertOperation::ref clientOp = boost::make_shared<WhiteboardInsertOperation>();
+		WhiteboardEllipseElement::ref clientElement = boost::make_shared<WhiteboardEllipseElement>(0,0,0,0);
+		clientOp->setID("d");
+		clientOp->setParentID("0");
+		clientOp->setPos(1);
+		clientOp->setElement(clientElement);
+		WhiteboardInsertOperation::ref op = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(server.handleClientOperationReceived(clientOp));
+		CPPUNIT_ASSERT_EQUAL(std::string("c"), op->getParentID());
+		CPPUNIT_ASSERT_EQUAL(std::string("d"), op->getID());
+		CPPUNIT_ASSERT_EQUAL(1, op->getPos());
+		CPPUNIT_ASSERT_EQUAL(clientElement, boost::dynamic_pointer_cast<WhiteboardEllipseElement>(op->getElement()));
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(WhiteboardServerTest);
diff --git a/Swiften/Whiteboard/WhiteboardClient.cpp b/Swiften/Whiteboard/WhiteboardClient.cpp
new file mode 100644
index 0000000..4dacc90
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardClient.cpp
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Whiteboard/WhiteboardClient.h>
+#include <Swiften/Whiteboard/WhiteboardTransformer.h>
+#include <boost/smart_ptr/make_shared.hpp>
+
+namespace Swift {
+	WhiteboardOperation::ref WhiteboardClient::handleLocalOperationReceived(WhiteboardOperation::ref operation) {
+		localOperations_.push_back(operation);
+
+		WhiteboardOperation::ref op;
+		WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(operation);
+		if (insertOp) {
+			op = boost::make_shared<WhiteboardInsertOperation>(*insertOp);
+		}
+		WhiteboardUpdateOperation::ref updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(operation);
+		if (updateOp) {
+			op = boost::make_shared<WhiteboardUpdateOperation>(*updateOp);
+		}
+		WhiteboardDeleteOperation::ref deleteOp = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(operation);
+		if (deleteOp) {
+			op = boost::make_shared<WhiteboardDeleteOperation>(*deleteOp);
+		}
+
+		if (bridge_.size() > 0) {
+			op->setParentID(bridge_.back()->getID());
+		}
+		bridge_.push_back(op);
+
+		if (lastSentOperationID_.empty())
+		{
+			WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(operation);
+			if (insertOp) {
+				op = boost::make_shared<WhiteboardInsertOperation>(*insertOp);
+			}
+			WhiteboardUpdateOperation::ref updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(operation);
+			if (updateOp) {
+				op = boost::make_shared<WhiteboardUpdateOperation>(*updateOp);
+			}
+			WhiteboardDeleteOperation::ref deleteOp = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(operation);
+			if (deleteOp) {
+				op = boost::make_shared<WhiteboardDeleteOperation>(*deleteOp);
+			}
+
+
+			if (serverOperations_.size() > 0) {
+				op->setParentID(serverOperations_.back()->getID());
+			}
+			lastSentOperationID_ = operation->getID();
+			return op;
+		} else {
+			return WhiteboardOperation::ref();
+		}
+	}
+
+	WhiteboardClient::Result WhiteboardClient::handleServerOperationReceived(WhiteboardOperation::ref operation) {
+		serverOperations_.push_back(operation);
+		Result result;
+//		if (localOperations_.empty()) {// || localOperations_.back()->getID() == operation->getParentID()) {
+		//Situation where client and server are in sync
+		if (localOperations_.size() == serverOperations_.size()-1) {
+			localOperations_.push_back(operation);
+//			clientOp = operation;
+			result.client = operation;
+		} else if (lastSentOperationID_ == operation->getID()) {
+			//Client received confirmation about own operation and it sends next operation to server
+			if (bridge_.size() > 0 && lastSentOperationID_ == bridge_.front()->getID()) {
+				bridge_.erase(bridge_.begin());
+			}
+
+			if (bridge_.size() > 0 && (bridge_.front())->getParentID() == lastSentOperationID_) {
+				lastSentOperationID_ = (bridge_.front())->getID();
+				result.server = bridge_.front();
+			}
+			if (!result.server) {
+				lastSentOperationID_.clear();
+			}
+		} else {
+			std::list<WhiteboardOperation::ref>::iterator it = bridge_.begin();
+			std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> opPair;
+			WhiteboardOperation::ref temp;
+			opPair = WhiteboardTransformer::transform(*it, operation);
+			temp = opPair.first;
+
+			*it = opPair.second;
+			std::string previousID = (*it)->getID();
+			++it;
+			for (; it != bridge_.end(); ++it) {
+				opPair = WhiteboardTransformer::transform(*it, temp);
+				temp = opPair.first;
+				*it = opPair.second;
+				(*it)->setParentID(previousID);
+				previousID = (*it)->getID();
+			}
+
+			temp->setParentID(localOperations_.back()->getID());
+			localOperations_.push_back(temp);
+			result.client = temp;
+		}
+
+		return result;
+	}
+
+	void WhiteboardClient::print() {
+		std::list<WhiteboardOperation::ref>::iterator it;
+		std::cout << "Client" << std::endl;
+		for(it = localOperations_.begin(); it != localOperations_.end(); ++it) {
+			std::cout << (*it)->getID() << " " << (*it)->getPos() << std::endl;
+		}
+
+		std::cout << "Server" << std::endl;
+		for(it = serverOperations_.begin(); it != serverOperations_.end(); ++it) {
+			std::cout << (*it)->getID() << " " << (*it)->getPos() << std::endl;
+		}
+	}
+}
diff --git a/Swiften/Whiteboard/WhiteboardClient.h b/Swiften/Whiteboard/WhiteboardClient.h
new file mode 100644
index 0000000..388f948
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardClient.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardOperation.h>
+#include <list>
+#include <utility>
+
+namespace Swift {
+	class WhiteboardClient {
+	public:
+		struct Result {
+			WhiteboardOperation::ref client;
+			WhiteboardOperation::ref server;
+		};
+		/*!
+		 * @return Operation to send
+		 */   	
+		WhiteboardOperation::ref handleLocalOperationReceived(WhiteboardOperation::ref operation);
+		/*!
+		 * @return pair.first-element to handle locally, pair.second-element to send to server
+		 */
+		Result handleServerOperationReceived(WhiteboardOperation::ref operation);
+		void print();
+
+	private:
+		std::list<WhiteboardOperation::ref> localOperations_;
+		std::list<WhiteboardOperation::ref> serverOperations_;
+		std::list<WhiteboardOperation::ref> bridge_;
+		std::string lastSentOperationID_;
+	};
+}
diff --git a/Swiften/Whiteboard/WhiteboardResponder.cpp b/Swiften/Whiteboard/WhiteboardResponder.cpp
new file mode 100644
index 0000000..f72861f
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardResponder.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Whiteboard/WhiteboardResponder.h>
+
+#include <boost/smart_ptr/make_shared.hpp>
+#include <Swiften/Whiteboard/WhiteboardSessionManager.h>
+#include <Swiften/Whiteboard/IncomingWhiteboardSession.h>
+#include <Swiften/Whiteboard/WhiteboardSession.h>
+#include <Swiften/Queries/IQRouter.h>
+
+namespace Swift {
+	WhiteboardResponder::WhiteboardResponder(WhiteboardSessionManager* sessionManager, IQRouter* router) : SetResponder<WhiteboardPayload>(router), sessionManager_(sessionManager), router_(router) {
+	}
+
+	bool WhiteboardResponder::handleSetRequest(const JID& from, const JID& /*to*/, const std::string& id, boost::shared_ptr<WhiteboardPayload> payload) {
+		if (payload->getType() == WhiteboardPayload::SessionRequest) {
+			if (sessionManager_->getSession(from)) {
+				sendError(from, id, ErrorPayload::Conflict, ErrorPayload::Cancel);
+			} else {
+				sendResponse(from, id, boost::shared_ptr<WhiteboardPayload>());
+				IncomingWhiteboardSession::ref session = boost::make_shared<IncomingWhiteboardSession>(from, router_);
+				sessionManager_->handleIncomingSession(session);
+			}
+		} else {
+			sendResponse(from, id, boost::shared_ptr<WhiteboardPayload>());
+			WhiteboardSession::ref session = sessionManager_->getSession(from);
+			if (session != NULL) {
+				session->handleIncomingAction(payload);
+			}
+		}
+		return true;
+	}
+}
diff --git a/Swiften/Whiteboard/WhiteboardResponder.h b/Swiften/Whiteboard/WhiteboardResponder.h
new file mode 100644
index 0000000..c05be23
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardResponder.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Queries/SetResponder.h>
+#include <Swiften/Elements/WhiteboardPayload.h>
+
+namespace Swift {
+	class IQRouter;
+	class WhiteboardSessionManager;
+
+	class WhiteboardResponder : public SetResponder<WhiteboardPayload> {
+	public:
+		WhiteboardResponder(WhiteboardSessionManager* sessionManager, IQRouter* router);
+		bool handleSetRequest(const JID& from, const JID& /*to*/, const std::string& id, boost::shared_ptr<WhiteboardPayload> payload);
+
+	private:
+		WhiteboardSessionManager* sessionManager_;
+		IQRouter* router_;
+	};
+}
diff --git a/Swiften/Whiteboard/WhiteboardServer.cpp b/Swiften/Whiteboard/WhiteboardServer.cpp
new file mode 100644
index 0000000..384372b
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardServer.cpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Whiteboard/WhiteboardServer.h>
+#include <Swiften/Whiteboard/WhiteboardTransformer.h>
+
+namespace Swift {
+	void WhiteboardServer::handleLocalOperationReceived(WhiteboardOperation::ref operation) {
+		operations_.push_back(operation);
+	}
+
+	WhiteboardOperation::ref WhiteboardServer::handleClientOperationReceived(WhiteboardOperation::ref newOperation) {
+		std::list<WhiteboardOperation::ref>::reverse_iterator it;
+		if (operations_.size() == 0 || newOperation->getParentID() == operations_.back()->getID()) {
+			operations_.push_back(newOperation);
+			return newOperation;
+		}
+		for (it = operations_.rbegin(); it != operations_.rend(); ++it) {
+			WhiteboardOperation::ref operation = *it;
+			while (newOperation->getParentID() == operation->getParentID()) {
+				std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> tResult = WhiteboardTransformer::transform(newOperation, operation);
+
+				if (it == operations_.rbegin()) {
+					operations_.push_back(tResult.second);
+					return tResult.second;
+				} else {
+					newOperation = tResult.second;
+					--it;
+					operation = *it;
+				}
+
+			}
+		}
+		return WhiteboardOperation::ref();
+	}
+
+	void WhiteboardServer::print() {
+		std::list<WhiteboardOperation::ref>::iterator it;
+		std::cout << "Server:" << std::endl;
+		for(it = operations_.begin(); it != operations_.end(); ++it) {
+			std::cout << (*it)->getID() << " " << (*it)->getPos() << std::endl;
+		}
+	}
+
+}
diff --git a/Swiften/Whiteboard/WhiteboardServer.h b/Swiften/Whiteboard/WhiteboardServer.h
new file mode 100644
index 0000000..658254b
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardServer.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h>
+
+#include <list>
+
+namespace Swift {
+	class WhiteboardServer {
+	public:
+		void handleLocalOperationReceived(WhiteboardOperation::ref operation);
+		WhiteboardOperation::ref handleClientOperationReceived(WhiteboardOperation::ref operation);
+		void print();
+
+	private:
+		std::list<WhiteboardOperation::ref> operations_;
+	};
+}
diff --git a/Swiften/Whiteboard/WhiteboardSession.cpp b/Swiften/Whiteboard/WhiteboardSession.cpp
new file mode 100644
index 0000000..cffcf07
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardSession.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Whiteboard/WhiteboardSession.h>
+
+#include <boost/smart_ptr/make_shared.hpp>
+#include <Swiften/Queries/IQRouter.h>
+#include <Swiften/Elements/WhiteboardPayload.h>
+#include <Swiften/Elements/ErrorPayload.h>
+
+#include <iostream>
+
+namespace Swift {
+	WhiteboardSession::WhiteboardSession(const JID& jid, IQRouter* router) : toJID_(jid), router_(router) {
+	}
+
+	WhiteboardSession::~WhiteboardSession() {
+	}
+
+	void WhiteboardSession::handleIncomingAction(boost::shared_ptr<WhiteboardPayload> payload) {
+		switch (payload->getType()) {
+			case WhiteboardPayload::Data:
+				handleIncomingOperation(payload->getOperation());
+				return;
+			case WhiteboardPayload::SessionAccept:
+				onRequestAccepted(toJID_);
+				return;
+			case WhiteboardPayload::SessionTerminate:
+				onSessionTerminated(toJID_);
+				return;
+
+			//handled elsewhere
+			case WhiteboardPayload::SessionRequest:
+
+			case WhiteboardPayload::UnknownType:
+				return;
+		}
+	}
+
+	void WhiteboardSession::sendElement(const WhiteboardElement::ref element) {
+		boost::shared_ptr<WhiteboardPayload> payload = boost::make_shared<WhiteboardPayload>();
+		payload->setElement(element);
+		boost::shared_ptr<GenericRequest<WhiteboardPayload> > request = boost::make_shared<GenericRequest<WhiteboardPayload> >(IQ::Set, toJID_, payload, router_);
+		request->send();
+	}
+
+	void WhiteboardSession::sendPayload(boost::shared_ptr<WhiteboardPayload> payload) {
+		boost::shared_ptr<GenericRequest<WhiteboardPayload> > request = boost::make_shared<GenericRequest<WhiteboardPayload> >(IQ::Set, toJID_, payload, router_);
+		request->send();
+	}
+
+	void WhiteboardSession::cancel() {
+		if (router_->isAvailable()) {
+			boost::shared_ptr<WhiteboardPayload> payload = boost::make_shared<WhiteboardPayload>(WhiteboardPayload::SessionTerminate);
+			boost::shared_ptr<GenericRequest<WhiteboardPayload> > request = boost::make_shared<GenericRequest<WhiteboardPayload> >(IQ::Set, toJID_, payload, router_);
+			request->send();
+		}
+		onSessionTerminated(toJID_);
+	}
+
+	const JID& WhiteboardSession::getTo() const {
+		return toJID_;
+	}
+}
diff --git a/Swiften/Whiteboard/WhiteboardSession.h b/Swiften/Whiteboard/WhiteboardSession.h
new file mode 100644
index 0000000..39fa341
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardSession.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/JID/JID.h>
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Base/IDGenerator.h>
+#include <Swiften/Queries/GenericRequest.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardOperation.h>
+
+namespace Swift {
+	class IQRouter;
+	class ErrorPayload;
+	class WhiteboardPayload;
+
+	class WhiteboardSession {
+	public:
+		typedef boost::shared_ptr<WhiteboardSession> ref;
+
+	public:
+		WhiteboardSession(const JID& jid, IQRouter* router);
+		virtual ~WhiteboardSession();
+		void handleIncomingAction(boost::shared_ptr<WhiteboardPayload> payload);
+		void sendElement(const WhiteboardElement::ref element);
+		virtual void sendOperation(WhiteboardOperation::ref operation) = 0;
+		void cancel();
+		const JID& getTo() const;
+
+	public:
+		boost::signal< void(const WhiteboardElement::ref element)> onElementReceived; 
+		boost::signal< void(const WhiteboardOperation::ref operation)> onOperationReceived;
+		boost::signal< void(const JID& contact)> onSessionTerminated;
+		boost::signal< void(const JID& contact)> onRequestAccepted;
+		boost::signal< void(const JID& contact)> onRequestRejected;
+
+	private:
+		virtual void handleIncomingOperation(WhiteboardOperation::ref operation) = 0;
+
+	protected:
+		void sendPayload(boost::shared_ptr<WhiteboardPayload> payload);
+
+		JID toJID_;
+		IQRouter* router_;
+		std::string lastOpID;
+		IDGenerator idGenerator;
+	};
+}
diff --git a/Swiften/Whiteboard/WhiteboardSessionManager.cpp b/Swiften/Whiteboard/WhiteboardSessionManager.cpp
new file mode 100644
index 0000000..c8e9a6a
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardSessionManager.cpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+
+#include <Swiften/Whiteboard/WhiteboardSessionManager.h>
+
+#include <Swiften/Base/foreach.h>
+#include <boost/smart_ptr/make_shared.hpp>
+#include <boost/bind.hpp>
+#include <Swiften/Queries/IQRouter.h>
+#include <Swiften/Whiteboard/WhiteboardResponder.h>
+#include <Swiften/Presence/PresenceOracle.h>
+#include "Swiften/Disco/EntityCapsProvider.h"
+
+namespace Swift {
+	WhiteboardSessionManager::WhiteboardSessionManager(IQRouter* router, StanzaChannel* stanzaChannel, PresenceOracle* presenceOracle, EntityCapsProvider* capsProvider) : router_(router), stanzaChannel_(stanzaChannel), presenceOracle_(presenceOracle), capsProvider_(capsProvider) {
+		responder = new WhiteboardResponder(this, router);
+		responder->start();
+		stanzaChannel_->onPresenceReceived.connect(boost::bind(&WhiteboardSessionManager::handlePresenceReceived, this, _1));
+		stanzaChannel_->onAvailableChanged.connect(boost::bind(&WhiteboardSessionManager::handleAvailableChanged, this, _1));
+	}
+
+	WhiteboardSessionManager::~WhiteboardSessionManager() {
+		responder->stop();
+		delete responder;
+	}
+
+	WhiteboardSession::ref WhiteboardSessionManager::getSession(const JID& to) {
+		if (sessions_.find(to) == sessions_.end()) {
+			return boost::shared_ptr<WhiteboardSession>();
+		}
+		return sessions_[to];
+	}
+
+	OutgoingWhiteboardSession::ref WhiteboardSessionManager::createOutgoingSession(const JID& to) {
+		JID fullJID = to;
+		if (fullJID.isBare()) {
+			fullJID = getFullJID(fullJID);
+		}
+		OutgoingWhiteboardSession::ref session = boost::make_shared<OutgoingWhiteboardSession>(fullJID, router_);
+		sessions_[fullJID] = session;
+		session->onSessionTerminated.connect(boost::bind(&WhiteboardSessionManager::deleteSessionEntry, this, _1));
+		session->onRequestRejected.connect(boost::bind(&WhiteboardSessionManager::deleteSessionEntry, this, _1));
+		return session;
+	}
+
+	WhiteboardSession::ref WhiteboardSessionManager::requestSession(const JID& to) {
+		WhiteboardSession::ref session = getSession(to);
+		if (!session) {
+			OutgoingWhiteboardSession::ref outgoingSession = createOutgoingSession(to);
+			outgoingSession->startSession();
+			return outgoingSession;
+		} else {
+			return session;
+		}
+	}
+
+	void WhiteboardSessionManager::handleIncomingSession(IncomingWhiteboardSession::ref session) {
+		sessions_[session->getTo()] = session;
+		session->onSessionTerminated.connect(boost::bind(&WhiteboardSessionManager::deleteSessionEntry, this, _1));
+		onSessionRequest(session);
+	}
+
+	JID WhiteboardSessionManager::getFullJID(const JID& bareJID) {
+		JID fullReceipientJID;
+		int priority = INT_MIN;
+	
+		//getAllPresence(bareJID) gives you all presences for the bare JID (i.e. all resources) Remko Tronçon @ 11:11
+		std::vector<Presence::ref> presences = presenceOracle_->getAllPresence(bareJID);
+
+		//iterate over them
+		foreach(Presence::ref pres, presences) {
+			if (pres->getPriority() > priority) {
+				// look up caps from the jid
+				DiscoInfo::ref info = capsProvider_->getCaps(pres->getFrom());
+				if (info && info->hasFeature(DiscoInfo::WhiteboardFeature)) {
+					priority = pres->getPriority();
+					fullReceipientJID = pres->getFrom();
+				}
+			}
+		}
+	
+		return fullReceipientJID;
+	}
+
+	void WhiteboardSessionManager::deleteSessionEntry(const JID& contact) {
+		sessions_.erase(contact);
+	}
+
+	void WhiteboardSessionManager::handlePresenceReceived(Presence::ref presence) {
+		if (!presence->isAvailable()) {
+			WhiteboardSession::ref session = getSession(presence->getFrom());
+			if (session) {
+				session->cancel();
+			}
+		}
+	}
+
+	void WhiteboardSessionManager::handleAvailableChanged(bool available) {
+		if (!available) {
+			std::map<JID, WhiteboardSession::ref> sessionsCopy = sessions_;
+			std::map<JID, WhiteboardSession::ref>::iterator it;
+			for (it = sessionsCopy.begin(); it != sessionsCopy.end(); ++it) {
+				it->second->cancel();
+			}
+		}
+	}
+}
diff --git a/Swiften/Whiteboard/WhiteboardSessionManager.h b/Swiften/Whiteboard/WhiteboardSessionManager.h
new file mode 100644
index 0000000..f696eb8
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardSessionManager.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <map>
+
+#include <Swiften/Queries/IQRouter.h>
+#include <Swiften/JID/JID.h>
+#include <Swiften/Client/StanzaChannel.h>
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Whiteboard/WhiteboardSession.h>
+#include <Swiften/Whiteboard/IncomingWhiteboardSession.h>
+#include <Swiften/Whiteboard/OutgoingWhiteboardSession.h>
+
+namespace Swift {
+	class IQRouter;
+	class WhiteboardResponder;
+	class PresenceOracle;
+	class EntityCapsProvider;
+
+	class WhiteboardSessionManager {
+		friend class WhiteboardResponder;
+	public:
+		WhiteboardSessionManager(IQRouter* router, StanzaChannel* stanzaChannel, PresenceOracle* presenceOracle, EntityCapsProvider* capsProvider);
+		~WhiteboardSessionManager();
+
+		WhiteboardSession::ref getSession(const JID& to);
+		WhiteboardSession::ref requestSession(const JID& to);
+
+	public:
+		boost::signal< void (IncomingWhiteboardSession::ref)> onSessionRequest;
+
+	private:
+		JID getFullJID(const JID& bareJID);
+		OutgoingWhiteboardSession::ref createOutgoingSession(const JID& to);
+		void handleIncomingSession(IncomingWhiteboardSession::ref session);
+		void handlePresenceReceived(Presence::ref presence);
+		void handleAvailableChanged(bool available);
+		void deleteSessionEntry(const JID& contact);
+
+	private:
+		std::map<JID, boost::shared_ptr<WhiteboardSession> > sessions_;
+		IQRouter* router_;
+		StanzaChannel* stanzaChannel_;
+		PresenceOracle* presenceOracle_;
+		EntityCapsProvider* capsProvider_;
+		WhiteboardResponder* responder;
+	};
+}
diff --git a/Swiften/Whiteboard/WhiteboardTransformer.cpp b/Swiften/Whiteboard/WhiteboardTransformer.cpp
new file mode 100644
index 0000000..8b9c927
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardTransformer.cpp
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swiften/Whiteboard/WhiteboardTransformer.h>
+#include <boost/smart_ptr/make_shared.hpp>
+
+namespace Swift {
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardOperation::ref clientOp, WhiteboardOperation::ref serverOp) {
+		WhiteboardInsertOperation::ref clientInsert = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(clientOp);
+		WhiteboardInsertOperation::ref serverInsert = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(serverOp);
+		WhiteboardUpdateOperation::ref clientUpdate = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(clientOp);
+		WhiteboardUpdateOperation::ref serverUpdate = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(serverOp);
+		WhiteboardDeleteOperation::ref clientDelete = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(clientOp);
+		WhiteboardDeleteOperation::ref serverDelete = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(serverOp);
+		if (clientInsert && serverInsert) {
+			return transform(clientInsert, serverInsert);
+		} else if (clientUpdate && serverUpdate) {
+			return transform(clientUpdate, serverUpdate);
+		} else if (clientInsert && serverUpdate) {
+			return transform(clientInsert, serverUpdate);
+		} else if (clientUpdate && serverInsert) {
+			return transform(clientUpdate, serverInsert);
+		} else if (clientDelete && serverDelete) {
+			return transform(clientDelete, serverDelete);
+		} else if (clientInsert && serverDelete) {
+			return transform(clientInsert, serverDelete);
+		} else if (clientDelete && serverInsert) {
+			return transform(clientDelete, serverInsert);
+		} else if (clientUpdate && serverDelete) {
+			return transform(clientUpdate, serverDelete);
+		} else if (clientDelete && serverUpdate) {
+			return transform(clientDelete, serverUpdate);
+		} else {
+			return std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref>();
+		}
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardInsertOperation::ref clientOp, WhiteboardInsertOperation::ref serverOp) {
+		std::pair<WhiteboardInsertOperation::ref, WhiteboardInsertOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardInsertOperation>(*serverOp);
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardInsertOperation>(*clientOp);
+		result.second->setParentID(serverOp->getID());
+		if (clientOp->getPos() <= serverOp->getPos()) {
+			result.first->setPos(result.first->getPos()+1);
+		} else {
+			result.second->setPos(result.second->getPos()+1);
+		}
+		return result;
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardUpdateOperation::ref clientOp, WhiteboardUpdateOperation::ref serverOp) {
+		std::pair<WhiteboardUpdateOperation::ref, WhiteboardUpdateOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardUpdateOperation>(*serverOp);
+		result.first->setParentID(clientOp->getID());
+
+		if (clientOp->getPos() == serverOp->getPos()) {
+			result.second = boost::make_shared<WhiteboardUpdateOperation>(*serverOp);
+			result.second->setID(clientOp->getID());
+			result.second->setParentID(serverOp->getID());
+		} else {
+			result.second = boost::make_shared<WhiteboardUpdateOperation>(*clientOp);
+			result.second->setParentID(serverOp->getID());
+		}
+
+		if (clientOp->getPos() < serverOp->getPos() && clientOp->getNewPos() > serverOp->getPos()) {
+			result.first->setPos(result.first->getPos()-1);
+			if (clientOp->getNewPos() >= serverOp->getNewPos()) {
+				result.first->setNewPos(result.first->getNewPos()-1);
+			}
+		} else if (clientOp->getNewPos() >= serverOp->getNewPos()) {
+			result.first->setNewPos(result.first->getNewPos()-1);
+		}
+
+		if (serverOp->getPos() < clientOp->getPos() && serverOp->getNewPos() > clientOp->getPos()) {
+			result.second->setPos(result.second->getPos()-1);
+			if (serverOp->getNewPos() >= clientOp->getNewPos()) {
+				result.second->setNewPos(result.second->getNewPos()-1);
+			}
+		} else if (serverOp->getNewPos() >= clientOp->getNewPos()) {
+			result.second->setNewPos(result.second->getNewPos()-1);
+		}
+		return result;
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardUpdateOperation::ref clientOp, WhiteboardInsertOperation::ref serverOp) {
+		std::pair<WhiteboardInsertOperation::ref, WhiteboardUpdateOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardInsertOperation>(*serverOp);
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardUpdateOperation>(*clientOp);
+		result.second->setParentID(serverOp->getID());
+		if (serverOp->getPos() <= clientOp->getPos()) {
+			result.second->setPos(result.second->getPos()+1);
+		}
+		return result;
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardInsertOperation::ref clientOp, WhiteboardUpdateOperation::ref serverOp) {
+		std::pair<WhiteboardUpdateOperation::ref, WhiteboardInsertOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardUpdateOperation>(*serverOp);
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardInsertOperation>(*clientOp);
+		result.second->setParentID(serverOp->getID());
+		if (serverOp->getPos() >= clientOp->getPos()) {
+			result.first->setPos(result.first->getPos()+1);
+		}
+		return result;
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardDeleteOperation::ref clientOp, WhiteboardDeleteOperation::ref serverOp) {
+		std::pair<WhiteboardDeleteOperation::ref, WhiteboardDeleteOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardDeleteOperation>(*serverOp);
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardDeleteOperation>(*clientOp);
+		result.second->setParentID(serverOp->getID());
+		if (clientOp->getPos() == -1) {
+			result.second->setPos(-1);
+		}
+		if (serverOp->getPos() == -1) {
+			result.first->setPos(-1);
+		}
+		if (clientOp->getPos() < serverOp->getPos()) {
+			result.first->setPos(result.first->getPos()-1);
+		} else if (clientOp->getPos() > serverOp->getPos()) {
+			result.second->setPos(result.second->getPos()-1);
+		} else {
+			result.first->setPos(-1);
+			result.second->setPos(-1);
+		}
+		return result;
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardInsertOperation::ref clientOp, WhiteboardDeleteOperation::ref serverOp) {
+		std::pair<WhiteboardDeleteOperation::ref, WhiteboardInsertOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardDeleteOperation>(*serverOp);
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardInsertOperation>(*clientOp);
+		result.second->setParentID(serverOp->getID());
+		if (clientOp->getPos() <= serverOp->getPos()) {
+			result.first->setPos(result.first->getPos()+1);
+		} else if (serverOp->getPos() != -1) {
+			result.second->setPos(result.second->getPos()-1);
+		}
+		return result;
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardDeleteOperation::ref clientOp, WhiteboardInsertOperation::ref serverOp) {
+		std::pair<WhiteboardInsertOperation::ref, WhiteboardDeleteOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardInsertOperation>(*serverOp);
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardDeleteOperation>(*clientOp);
+		result.second->setParentID(serverOp->getID());
+		if (serverOp->getPos() <= clientOp->getPos()) {
+			result.second->setPos(result.second->getPos()+1);
+		} else if (clientOp->getPos() != -1) {
+			result.first->setPos(result.first->getPos()-1);
+		}
+		return result;
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardUpdateOperation::ref clientOp, WhiteboardDeleteOperation::ref serverOp) {
+		std::pair<WhiteboardDeleteOperation::ref, WhiteboardOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardDeleteOperation>(*serverOp);
+		result.first->setParentID(clientOp->getID());
+		WhiteboardUpdateOperation::ref updateOp = boost::make_shared<WhiteboardUpdateOperation>(*clientOp);
+		result.second = updateOp;
+		result.second->setParentID(serverOp->getID());
+		if (clientOp->getPos() == serverOp->getPos()) {
+			WhiteboardDeleteOperation::ref deleteOp = boost::make_shared<WhiteboardDeleteOperation>();
+			result.second = deleteOp; 
+			result.second->setPos(-1);
+			result.second->setID(clientOp->getID());
+			result.second->setParentID(serverOp->getID());
+			deleteOp->setElementID(serverOp->getElementID());
+		} else if (clientOp->getPos() > serverOp->getPos() && clientOp->getNewPos() <= serverOp->getPos()) {
+			result.second->setPos(result.second->getPos()-1);
+		} else if (clientOp->getPos() < serverOp->getPos() && clientOp->getNewPos() >= serverOp->getPos()) {
+			updateOp->setNewPos(updateOp->getNewPos()-1);
+		} else if (clientOp->getPos() > serverOp->getPos()) {
+			result.second->setPos(result.second->getPos()-1);
+			updateOp->setNewPos(updateOp->getNewPos()-1);
+		}
+		return result;
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardDeleteOperation::ref clientOp, WhiteboardUpdateOperation::ref serverOp) {
+		std::pair<WhiteboardOperation::ref, WhiteboardDeleteOperation::ref> result;
+		WhiteboardUpdateOperation::ref updateOp = boost::make_shared<WhiteboardUpdateOperation>(*serverOp);
+		result.first = updateOp;
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardDeleteOperation>(*clientOp);
+		result.second->setParentID(serverOp->getID());
+		if (clientOp->getPos() == serverOp->getPos()) {
+			WhiteboardDeleteOperation::ref deleteOp = boost::make_shared<WhiteboardDeleteOperation>();
+			result.first = deleteOp;
+			result.first->setPos(-1);
+			result.first->setID(serverOp->getID());
+			result.first->setParentID(clientOp->getID());
+			deleteOp->setElementID(clientOp->getElementID());
+		} else if (clientOp->getPos() < serverOp->getPos() && clientOp->getPos() >= serverOp->getNewPos()) {
+			result.first->setPos(result.first->getPos()-1);
+		} else if (clientOp->getPos() > serverOp->getPos() && clientOp->getPos() <= serverOp->getNewPos()) {
+			updateOp->setNewPos(updateOp->getNewPos()-1);
+		} else if (clientOp->getPos() < serverOp->getPos()) {
+			result.first->setPos(result.first->getPos()-1);
+			updateOp->setNewPos(updateOp->getNewPos()-1);
+		}
+		return result;
+	}
+}
diff --git a/Swiften/Whiteboard/WhiteboardTransformer.h b/Swiften/Whiteboard/WhiteboardTransformer.h
new file mode 100644
index 0000000..5811f9f
--- /dev/null
+++ b/Swiften/Whiteboard/WhiteboardTransformer.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h>
+#include <utility>
+
+namespace Swift {
+	class WhiteboardTransformer {
+	public:
+		static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardOperation::ref clientOp, WhiteboardOperation::ref serverOp);
+		static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardInsertOperation::ref clientOp, WhiteboardInsertOperation::ref serverOp);
+		static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardUpdateOperation::ref clientOp, WhiteboardUpdateOperation::ref serverOp);
+		static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardUpdateOperation::ref clientOp, WhiteboardInsertOperation::ref serverOp);
+		static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardInsertOperation::ref clientOp, WhiteboardUpdateOperation::ref serverOp);
+		static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardDeleteOperation::ref clientOp, WhiteboardDeleteOperation::ref serverOp);
+		static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardInsertOperation::ref clientOp, WhiteboardDeleteOperation::ref serverOp);
+		static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardDeleteOperation::ref clientOp, WhiteboardInsertOperation::ref serverOp);
+		static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardUpdateOperation::ref clientOp, WhiteboardDeleteOperation::ref serverOp);
+		static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardDeleteOperation::ref clientOp, WhiteboardUpdateOperation::ref serverOp);
+	};
+}