diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/chrome.manifest b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/chrome.manifest
deleted file mode 100644
index 3d5c5dbf324367c50eac5981cecf821500f35909..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/chrome.manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-content	foxwiki	core/src/main/resources/content/
-overlay	chrome://browser/content/browser.xul	chrome://foxwiki/content/browser.xul
-
-locale	foxwiki	en-UK	core/src/main/resources/locale/en-UK/
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/install.rdf b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/install.rdf
deleted file mode 100644
index f48c22bb24d67489b469676cdb226a35423c150f..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
-         xmlns:NC="http://home.netscape.com/NC-rdf#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="rdf:#$.UPax2"
-                   em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-                   em:minVersion="1.5"
-                   em:maxVersion="3.0.*"/>
-  <RDF:Description RDF:about="urn:mozilla:install-manifest"
-                   em:id="{afa707e0-05b7-473f-a0f7-d29271ab8cbf}"
-                   em:name="FoXWiki"
-                   em:version="N/A"
-                   em:creator="Robin Fernandes"
-                   em:description="Adds XWiki action links to the context menu."
-                   em:homepageURL="http://soal.xwiki.com/xwiki/bin/view/Code/FoXWiki"
-		   em:iconURL="chrome://foxwiki/content/images/foxwiki.png"
-		   em:optionsURL="chrome://foxwiki/content/preferences.xul">
-    <em:contributor>Nickolay Ponomarev</em:contributor>
-    <em:contributor>Asiri Rathnayake</em:contributor>
-    <em:targetApplication RDF:resource="rdf:#$.UPax2"/>
-  </RDF:Description>
-</RDF:RDF>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/pom.xml
deleted file mode 100644
index 7b788fbe4e7c1179cb06da0ce291b52f0d266bc3..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.xwiki.platform</groupId>
-    <artifactId>xwiki-platform-tools</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-platform-tool-foxwiki</artifactId>
-  <packaging>pom</packaging>
-  <name>XWiki Platform - Tools - FoXWiki - Parent POM</name>
-  <description>FoXWiki, a Firefox extension for XWiki.</description>
-  <modules>
-    <module>xwiki-platform-tool-foxwiki-core</module>
-    <module>xwiki-platform-tool-foxwiki-distribution</module>
-  </modules>
-</project>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/readme.txt b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/readme.txt
deleted file mode 100644
index ca9318a03e92336a73846f17ebcbc004e76a1824..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-* To build, execute 'mvn clean install' inside this directory (you need to have maven installed).
-* Once built, copy distribution/target/foxwiki-distribution-version.xpi into ~/.mozilla/firefox/<your_profile>/extensions/ and restart firefox.
-* For development, modify {afa707e0-05b7-473f-a0f7-d29271ab8cbf} file to point into your development (source) directory and copy it into ~/.mozilla/firefox/<your-profile>/extensions/.
-* Refer to http://kb.mozillazine.org/Getting_started_with_extension_development for information on firefox extensions development.
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/pom.xml
deleted file mode 100644
index bcae3d8b002ef19522403fa071b6e535fdaf1ee4..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.xwiki.platform</groupId>
-    <artifactId>xwiki-platform-tool-foxwiki</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-platform-tool-foxwiki-core</artifactId>
-  <packaging>jar</packaging>
-  <name>XWiki Platform - Tools - FoXWiki - Core</name>
-  <description>The actual "code" files of the extension</description>
-</project>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.js b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.js
deleted file mode 100644
index f07b4c0530cd5b7419203341623b4340deb654ac..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.js
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-
----( FoXWiki by Robin Fernandes )---
-More info: http://soal.xwiki.com/xwiki/bin/view/Code/FoXWiki
-
-This work is licensed under the Creative Commons Attribution 2.5 License. 
-This means you are free to use any of this code for any purpose as long as
-you give credit to Robin Fernandes. View a copy of the license here:
-http://creativecommons.org/licenses/by/2.5/
-
-*/
-
-FoXWiki = new FoXWikiClass();
-
-window.addEventListener("load", function(e) { FoXWiki.onLoad(e); }, false); 
-
-document.addEventListener("FoXWikiDomEvent", function(e) { FoXWiki.onFoXWikiDomEvent(e); }, false, true);
-
-function FoXWikiClass() {
-	// Interface
-	this.onLoad = onLoad;
-	this.contextPopupShowing = contextPopupShowing;
-	this.onXWikiAction = onXWikiAction;
-	this.onFoXWikiDomEvent = onFoXWikiDomEvent;
-
-	//URL transforms
-	this.EditContent= new XWikiActionSetterClass("edit");
-	this.EditForm 	= new XWikiActionSetterClass("inline");
-	this.ViewPage 	= new XWikiActionSetterClass("view");
-	this.DeletePage = new XWikiActionSetterClass("delete");
-	this.EditObjects= new XWikiTemplateSetterClass("editobject");
-	this.EditRights = new XWikiTemplateSetterClass("editrights");
-	this.ViewCode 	= new XWikiTemplateSetterClass("code");
-
-	// Implementation:
-	var XWikiBase	= "xwiki/bin"; 		// TODO: make this customisable
-	var XWikiView	= XWikiBase + "/view"; 	//if the URL contains this string, show menu.
-	
-	//Initialisation
-	function onLoad(event) {
-		var menu = document.getElementById("contentAreaContextMenu");
-		menu.addEventListener("popupshowing", this.contextPopupShowing, false);	
-		this.initialized = true;
-	}
-
-	//Called when context-menu is about to be shown, thanks to listener added 
-	//in onLoad. Allows us to manipulate content of menu before it is displayed.
-	function contextPopupShowing(event) {
-		// Hide entire foxwiki menu if not inside an xwiki site.
-		var isXWikiLink = gContextMenu.linkURL.indexOf(XWikiBase) > -1;
-		gContextMenu.showItem("foxwiki-context-menu", isXWikiLink);
-		gContextMenu.showItem("foxwiki-main-menuseparator", isXWikiLink);
-		// Action links.
-		var isXWikiViewLink = gContextMenu.linkURL.indexOf(XWikiView) > -1;
-		gContextMenu.showItem("separator-01", isXWikiViewLink);
-		gContextMenu.showItem("edit-content-item", isXWikiViewLink);
-		gContextMenu.showItem("edit-form-item", isXWikiViewLink);
-		gContextMenu.showItem("edit-objects-item", isXWikiViewLink);
-		gContextMenu.showItem("edit-rights-item", isXWikiViewLink);
-		gContextMenu.showItem("separator-02", isXWikiViewLink);
-		gContextMenu.showItem("view-code-item", isXWikiViewLink);
-		gContextMenu.showItem("view-page-item", isXWikiViewLink);
-		gContextMenu.showItem("separator-03", isXWikiViewLink);
-		gContextMenu.showItem("delete-page-item", isXWikiViewLink);
-		// WebDAV Links.
-		var isXWikiWebDAVLink = false;
-		if( getDavUrl(gContextMenu.linkURL) != "" ) {
-			isXWikiWebDAVLink = true;
-		}		
-		gContextMenu.showItem("edit-webdav-item", isXWikiWebDAVLink);
-	}
-
-	//Called from menu, takes a URL transform as an argument
-	function onXWikiAction(e, urlTransform) {
-		window._content.location = urlTransform.morphUrl(gContextMenu.linkURL);
-	}
-
-	// URL transform types
-	function XWikiActionSetterClass(inAction)  {
-		//public
-		this.morphUrl=morphUrl;	
-		//private
-		var action = inAction;
-		function morphUrl(inUrl) {
-			//TODO: use XWikiBase and XWikiID variables.
-			return inUrl.replace(/xwiki\/bin\/view/g, "xwiki/bin/"+action);
-		}
-	}
-
-	function XWikiTemplateSetterClass(inTemplate)  {
-		//public
-		this.morphUrl=morphUrl;	
-		//private			
-		var template = inTemplate;
-		function morphUrl(inUrl) {
-			return inUrl + "?xpage=" + template;
-		}			
-	}
-
-	function onFoXWikiDomEvent(evnt) {
-		var davURL = evnt.target.getAttribute("davURL");
-		launchLocalEditor(davURL);
-		evnt.target.setAttribute("foxwiki", "true");
-	}
-
-};
-
-/**
- * Preference manager.
- */
-prefManager = Components.classes["@mozilla.org/preferences-service;1"]
-		.getService(Components.interfaces.nsIPrefBranch);
-
-/**
- * Called whe the user clicks the 'Edit WebDAV' menuitem
- */
-function editWebdav() {
-	launchLocalEditor(getDavUrl(gContextMenu.linkURL));
-}
-
-/*
- * Launches the application associated with 'ext' with the given url as it's first argument.
- */
-function launchLocalEditor(webdavUrl) {
-	var dot = webdavUrl.lastIndexOf(".");
-	var ext = webdavUrl.substr(dot + 1);
-	var associations = prefManager.getCharPref("extensions.foxwiki.associations").split(",");
-	var launchAppPath = "";
-	for( var i = 0; i < associations.length; i++ ) {
-		var parts = associations[i].split("=");
-		if( parts[0] == ext ) {
-			launchAppPath = parts[1];
-			break;
-		}
-	}
-	if( launchAppPath != "" ) {
-		// Launch the local application (with dummy args for the moment)
-		// create an nsILocalFile for the executable
-		var file = Components.classes["@mozilla.org/file/local;1"]
-			.createInstance(Components.interfaces.nsILocalFile);
-		try {
-			file.initWithPath(launchAppPath);
-		} catch (err) {
-			alert("Unable to initialize the executable with path [" + launchAppPath + "]");
-			return;
-		}
-		// create an nsIProcess
-		var process = Components.classes["@mozilla.org/process/util;1"]
-			.createInstance(Components.interfaces.nsIProcess);
-		try {
-			process.init(file);
-		} catch (err) {
-			alert("Error while initializing the nsIProcess : " + err);
-			return;
-		}
-		// Run the process.
-		// If first param is true, calling thread will be blocked until
-		// called process terminates.
-		// Second and third params are used to pass command-line arguments
-		// to the process.
-		var args = (webdavUrl == "") ? [] : [webdavUrl];
-		try {
-			process.run(false, args, args.length);
-		} catch (err) {
-			alert("Error while executing the nsIProcess : " + err);
-			return;
-		}
-		return;
-	}
-	alert("No application is associated for extension [" + ext + "], please adjust your foxwiki preferences.");
-}
-
-/*
- * We might be able to avoid using this function if we can invoke a function on the page to do the conversion.
- */
-function getDavUrl(httpUrl) {
-	var xwiki_attachment_signature = "/xwiki/bin/download/";
-	var xwiki_webdav_signature = "/xwiki/webdav/spaces/";
-	var davUrl = "";
-	if( -1 != httpUrl.indexOf(xwiki_attachment_signature) ) {
-		var parts = httpUrl.split(xwiki_attachment_signature);
-		var elements = parts[1].split("/");
-		if( elements.length == 3 ) {
-			davUrl = parts[0] + xwiki_webdav_signature + elements[0] + "/" + elements[0] + "." + elements[1] + "/" + elements[2];
-		}
-	}
-	return davUrl;
-}
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.xul b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.xul
deleted file mode 100644
index eedcc87a060e82a136ca1501f305b50097e9e97b..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.xul
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay SYSTEM "chrome://foxwiki/locale/foxwiki.dtd">
-<overlay id="foxwiki-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <script src="browser.js"/>
-    <popup id="contentAreaContextMenu">
-        <menu id="foxwiki-context-menu" label="&XWiki;" insertbefore="context-openlink" accesskey="X">
-		<menupopup id="foxwiki-main-popup-menu">
-			
-	                <menuitem id="edit-webdav-item" label="Edit Webdav" accesskey="W"
-						oncommand="editWebdav();"/>
-
-	                <menuitem id="edit-content-item" label="&EditContent;" accesskey="E"
-        			oncommand="FoXWiki.onXWikiAction(event, FoXWiki.EditContent);"/>
-
-	                <menuitem id="edit-form-item" label="&EditForm;" accesskey="F"
-        			oncommand="FoXWiki.onXWikiAction(event, FoXWiki.EditForm);"/>
-
-	                <menuitem id="edit-objects-item" label="&EditObjects;" accesskey="O"
-        		        oncommand="FoXWiki.onXWikiAction(event, FoXWiki.EditObjects);"/>
-
-	                <menuitem id="edit-rights-item" label="&EditRights;" accesskey="R"
-        		        oncommand="FoXWiki.onXWikiAction(event, FoXWiki.EditRights);"/>
-
-	                <menuseparator id="separator-02"/>
-
-        		<menuitem id="view-code-item" label="&ViewCode;" accesskey="C"
-		                oncommand="FoXWiki.onXWikiAction(event, FoXWiki.ViewCode);"/>
-
-                	<menuitem id="view-page-item" label="&ViewPage;" accesskey="V"
-		                oncommand="FoXWiki.onXWikiAction(event, FoXWiki.ViewPage);"/>
-
-	                <menuseparator id="separator-03"/>
-
-        	        <menuitem id="delete-page-item" label="&DeletePage;" accesskey="D"
-                		oncommand="FoXWiki.onXWikiAction(event, FoXWiki.DeletePage);"/>
-
-		</menupopup>
-        </menu>
-	<menuseparator id="foxwiki-main-menuseparator" insertbefore="context-openlink" />
-    </popup>
-</overlay>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/foxwiki.png b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/foxwiki.png
deleted file mode 100644
index 5e92e9e64b948f697ddb1d448cdb5ac2aff80b8d..0000000000000000000000000000000000000000
Binary files a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/foxwiki.png and /dev/null differ
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/general.png b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/general.png
deleted file mode 100644
index 6e52db7cfd482e228dae640a7717ea1dcaf523e8..0000000000000000000000000000000000000000
Binary files a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/general.png and /dev/null differ
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/webdav.png b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/webdav.png
deleted file mode 100644
index 0d753eb62c05fb787e45414194838ac88ee7916b..0000000000000000000000000000000000000000
Binary files a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/webdav.png and /dev/null differ
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/preferences.js b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/preferences.js
deleted file mode 100644
index 21b289deaa7763e1173a24d270893fb62939cede..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/preferences.js
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Gain access to the Prefences service.
- */
-var prefManager = Components.classes["@mozilla.org/preferences-service;1"]
-                            .getService(Components.interfaces.nsIPrefBranch);
-
-
-/*
- * Called when WebDAV preferences screen is loaded.
- */
-function populateAssociationsList() {
-	var prefs = prefManager.getCharPref("extensions.foxwiki.associations");
-	if( prefs == "" ) {
-		return;
-	}
-	var associations = prefs.split(",");
-	var associationsList = document.getElementById("associationsList");
-	for( var i = 0; i < associations.length; i++ ) {
-		var parts = associations[i].split("=");
-	
-		var treeItem = document.createElement("treeitem");
-		var treeRow = document.createElement("treerow");
-		treeItem.appendChild(treeRow);
-
-		var ext = document.createElement("treecell");
-		ext.setAttribute("label", parts[0]);
-		treeRow.appendChild(ext);
-
-		var appPath = document.createElement("treecell");
-		appPath.setAttribute("label", parts[1]);
-		treeRow.appendChild(appPath);
-
-		associationsList.appendChild(treeItem);	
-	}
-}
-
-/**
- * Called when the associations table (tree) is changed.
- */
-function saveAssociationsList() {
-	var associationsList = document.getElementById("associationsList").childNodes;
-	var prefs = "";
-	for( var i = 0; i < associationsList.length; i++ ) {
-		var columns = associationsList[i].childNodes[0].childNodes;
-		var pref = columns[0].getAttribute("label") + "="
-                      + columns[1].getAttribute("label");
-		if( prefs == "" ) {
-			prefs = pref;
-		} else {
-			prefs += "," + pref;
-		}
-	}
-	return prefs;
-}
-
-/**
- * Called when the user clicks the 'Add' Button.
- */
-function addAssociation() {
-	var extensionsInput = document.getElementById("fileExtensionsInputField").value.replace(/^\s+|\s+$/g, '') ;
-	var appPathInput = document.getElementById("applicationPathInputField").value.replace(/^\s+|\s+$/g, '') ;
-	var associationsList = document.getElementById("associationsList");
-	// TODO : We might want to validate these strings a little bit more thoroughly.
-	if( extensionsInput == "" || appPathInput == "" ) {
-		alert("A required field is either missing or is invalid.");
-		return;
-	}
-	var extensions = extensionsInput.split(",");
-	for( var i = 0; i < extensions.length; i++ ) {
-		var extension = extensions[i].replace(/^\s+|\s+$/g, '');
-		if( extension == "" ) {
-			continue;
-		}
-		var treeItem = document.createElement("treeitem");
-		var treeRow = document.createElement("treerow");
-		treeItem.appendChild(treeRow);
-
-		var ext = document.createElement("treecell");
-		ext.setAttribute("label", extension);
-		treeRow.appendChild(ext);
-
-		var appPath = document.createElement("treecell");
-		appPath.setAttribute("label", appPathInput);
-		treeRow.appendChild(appPath);
-
-		associationsList.appendChild(treeItem);	
-	}
-	document.getElementById("fileExtensionsInputField").value = "";
-	document.getElementById("applicationPathInputField").value = "";
-	var associationsTree = document.getElementById("associationsTree");
-      	document.getElementById("webdavpreferences").userChangedValue(associationsTree);
-}
-
-/**
- * Called when the user clicks the 'Delete' Button.
- */
-function deleteAssociation() {
-	var associationsTree = document.getElementById("associationsTree");
-	var index = associationsTree.currentIndex;
-	if(index != -1) {
-		var associationsList = document.getElementById("associationsList");
-		var toRemove = associationsList.childNodes.item(index);
-		associationsList.removeChild(toRemove);
-	      	document.getElementById("webdavpreferences").userChangedValue(associationsTree);
-	}
-}
-
-/**
- * Called when the user clicks the 'Edit' Button.
- */
-function editAssociation() {
-	var associationsTree = document.getElementById("associationsTree");
-	var index = associationsTree.currentIndex;
-	if(index != -1) {
-		var associationsList = document.getElementById("associationsList");
-		var toEdit = associationsList.childNodes[index];
-		var vals = toEdit.childNodes[0].childNodes;
-		document.getElementById("fileExtensionsInputField").value = vals[0].getAttribute("label");
-		document.getElementById("applicationPathInputField").value = vals[1].getAttribute("label");
-		associationsList.removeChild(toEdit);
-	}	
-}
-
-/**
- * Called when the user clicks the 'Brows' Button.
- */
-function browsApplications() {
-	const nsIFilePicker = Components.interfaces.nsIFilePicker;
-	var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-	fp.init(window, "Brows Local Applications", nsIFilePicker.modeOpen);
-	fp.appendFilters(nsIFilePicker.filterAll | nsIFilePicker.filterApps);
-	var rv = fp.show();
-	if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) {
-		document.getElementById("applicationPathInputField").value = fp.file.path;
-	}
-}
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/preferences.xul b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/preferences.xul
deleted file mode 100644
index a2384782032cc14794e8d17fbf9a8838927e25c8..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/preferences.xul
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<prefwindow id="foxwikipreferences" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" title="FoXWiki Preferences" style=" TBD ">
-
-	<script src="preferences.js"/>
-
-	<!-- General Preferences (If There are any) -->
-	<prefpane id="generalpreferences" label="General" image="chrome://foxwiki/content/images/general.png">
-		<groupbox flex="1">
-			<caption label="General Preferences"/>
-		</groupbox>
-	</prefpane>
-
-	<!-- WebDAV Preferences -->
-	<prefpane id="webdavpreferences" label="WebDAV" onpaneload="populateAssociationsList()" image="chrome://foxwiki/content/images/webdav.png">
-		<preferences>
-			<preference id="associations" name="extensions.foxwiki.associations" type="string"/>
-		</preferences>
-		<groupbox flex="1">
-			<caption label="Prefered Applications"/>
-			<label value="" />
-			<vbox flex="1">
-				<hbox align="center">
-					<label value="File Extensions :" width="105"/>
-					<textbox id="fileExtensionsInputField" width="200"/>
-					<label value="(ex :- doc, xls, ppt)"/>
-				</hbox>
-				<hbox align="center">
-					<label value="Application Path :" width="105"/>
-					<textbox id="applicationPathInputField" width="200"/>
-					<button id="browsButton" label="Brows" oncommand="browsApplications()"/>
-					<button id="addButton" label="Add" oncommand="addAssociation()"/>
-				</hbox>
-				<label value="" />
-				<tree 	id="associationsTree" 
-					seltype="single" 
-					hidecolumnpicker="true"
-					preference-editable="true"
-					preference="associations"
-					onsynctopreference="return saveAssociationsList()"
-					height="100"
-					flex="1">
-					<treecols>
-						<treecol id="extColumn" label="Ext"/>
-						<treecol id="pathColumn" label="Application Path" flex="1"/>
-					</treecols>
-					<treechildren id="associationsList">
-					</treechildren>
-				</tree>
-				<label value="" />
-				<hbox align="right">
-					<button id="editButton" label="Edit" oncommand="editAssociation()"/>
-					<button id="deleteButton" label="Delete" oncommand="deleteAssociation()"/>
-				</hbox>
-			</vbox>
-		</groupbox>
-	</prefpane>
-
-</prefwindow>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/locale/en-UK/foxwiki.dtd b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/locale/en-UK/foxwiki.dtd
deleted file mode 100644
index e2a3fdec41e4e07903cfa535d4d866d09eaaccea..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/locale/en-UK/foxwiki.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!ENTITY XWiki "XWiki">
-<!ENTITY EditContent "Edit Content">
-<!ENTITY EditForm "Edit Form">
-<!ENTITY EditObjects "Edit Objects">
-<!ENTITY EditRights "Edit Rights">
-<!ENTITY ViewPage "View Page">
-<!ENTITY ViewCode "View Code">
-<!ENTITY DeletePage "Delete Page">
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/pom.xml
deleted file mode 100644
index dc0f452f29833ff1cf9de0efa5f69f8c3c2cdeb8..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/pom.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.xwiki.platform</groupId>
-    <artifactId>xwiki-platform-tool-foxwiki</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-platform-tool-foxwiki-distribution</artifactId>
-  <packaging>pom</packaging>
-  <name>XWiki Platform - Tools - FoXWiki - Distribution</name>
-  <description>The packaging of the extension</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-tool-foxwiki-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <appendAssemblyId>false</appendAssemblyId>
-          <!-- Don't attach the zip to the project since we don't want to install/deploy it. It's only temporary and
-               it's renamed to an XPI file by the AntRun plugin below. -->
-          <attach>false</attach>
-          <descriptors>
-            <descriptor>src/assemble/distribution.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <configuration>
-              <target>
-                <move file="${project.build.directory}/${project.artifactId}-${project.version}.zip" tofile="${project.build.directory}/${project.artifactId}-${project.version}.xpi"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/${project.artifactId}-${project.version}.xpi</file>
-                  <type>xpi</type>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/assemble/distribution.xml b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/assemble/distribution.xml
deleted file mode 100644
index 1479df8ce83be909d467607d2c59f3ed490c690c..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/assemble/distribution.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
- *
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
--->
-
-<assembly>
-  <id>distribution</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <files>
-    <file>
-      <source>src/main/resources/chrome.manifest</source>
-      <outputDirectory>/</outputDirectory>
-      <destName>chrome.manifest</destName>
-      <filtered>true</filtered>
-    </file>
-    <file>
-      <source>src/main/resources/install.rdf</source>
-      <outputDirectory>/</outputDirectory>
-      <destName>install.rdf</destName>
-      <filtered>true</filtered>
-    </file>
-  </files>
-  <fileSets>
-    <fileSet>
-      <directory>src/main/resources/defaults</directory>
-      <outputDirectory>/defaults</outputDirectory>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <!-- Uncomment when we move to version 2.2 beta 3 of the Assembly plugin since it's not supported in 2.2 beta 1 (and not needed) -->
-      <!--useProjectArtifact>false</useProjectArtifact-->
-      <outputDirectory>/chrome</outputDirectory>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/chrome.manifest b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/chrome.manifest
deleted file mode 100644
index 47011955ce4cdf2796adf971d65b1b5525245dc4..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/chrome.manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-content	foxwiki	jar:chrome/foxwiki-core-${pom.version}.jar!/content/
-overlay	chrome://browser/content/browser.xul	chrome://foxwiki/content/browser.xul
-
-locale	foxwiki	en-UK	jar:chrome/foxwiki-core-${pom.version}.jar!/locale/en-UK/
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/defaults/preferences/foxwiki.js b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/defaults/preferences/foxwiki.js
deleted file mode 100644
index 47cd83d8b90ae39fa296855a1721f6e7851adb47..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/defaults/preferences/foxwiki.js
+++ /dev/null
@@ -1 +0,0 @@
-pref("extensions.foxwiki.associations", "");
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/install.rdf b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/install.rdf
deleted file mode 100644
index 26cdc57ad5a391bf8d28f8764aff21020b9db29e..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
-         xmlns:NC="http://home.netscape.com/NC-rdf#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="rdf:#$.UPax2"
-                   em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-                   em:minVersion="1.5"
-                   em:maxVersion="3.0.*"/>
-  <RDF:Description RDF:about="urn:mozilla:install-manifest"
-                   em:id="{afa707e0-05b7-473f-a0f7-d29271ab8cbf}"
-                   em:name="FoXWiki"
-                   em:version="${pom.version}"
-                   em:creator="Robin Fernandes"
-                   em:description="Adds XWiki action links to the context menu."
-                   em:homepageURL="http://soal.xwiki.com/xwiki/bin/view/Code/FoXWiki"
-		   em:iconURL="chrome://foxwiki/content/images/foxwiki.png"
-		   em:optionsURL="chrome://foxwiki/content/preferences.xul">
-    <em:contributor>Nickolay Ponomarev</em:contributor>
-    <em:contributor>Asiri Rathnayake</em:contributor>
-    <em:targetApplication RDF:resource="rdf:#$.UPax2"/>
-  </RDF:Description>
-</RDF:RDF>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/{afa707e0-05b7-473f-a0f7-d29271ab8cbf} b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/{afa707e0-05b7-473f-a0f7-d29271ab8cbf}
deleted file mode 100644
index 17c19feef2a8c947fbf73966af1322f742c2eeb8..0000000000000000000000000000000000000000
--- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/{afa707e0-05b7-473f-a0f7-d29271ab8cbf}
+++ /dev/null
@@ -1 +0,0 @@
-/home/asiri/projects/xwiki-dev/xwiki-sandbox/foxwiki