From 82dbfece17f59bcf71ccf1278c87498d44cb3f6c Mon Sep 17 00:00:00 2001
From: Dele Olajide <dele@4ng.net>
Date: Sun, 17 Mar 2024 21:16:16 +0000
Subject: [PATCH] fix websockets issue

---
 build.cmd                                     |   8 +-
 changelog.html                                |  10 +-
 plugin.xml                                    |   7 +-
 pom.xml                                       |  80 ++-
 src/java/org/ifsoft/download/Servlet.java     |  15 +-
 src/java/org/ifsoft/meet/Email.java           |  77 --
 src/java/org/ifsoft/meet/Friend.java          |  98 ---
 src/java/org/ifsoft/meet/MeetController.java  | 410 -----------
 src/java/org/ifsoft/meet/MeetService.java     | 638 -----------------
 src/java/org/ifsoft/meet/PublicKey.java       |  28 -
 src/java/org/ifsoft/mta/MtaManager.java       |   2 +-
 src/java/org/ifsoft/sso/Password.java         |  12 +-
 src/java/org/ifsoft/sso/SmartIdCard.java      |  14 +-
 src/java/org/ifsoft/sso/SmartIdCardCert.java  |  12 +-
 .../org/ifsoft/sso/WellKnownHostMeta.java     |  10 +-
 .../ifsoft/websockets/LiveStreamSocket.java   |   7 +-
 .../ifsoft/websockets/ProxyConnection.java    |  12 +-
 .../org/ifsoft/websockets/ProxyWebSocket.java |   7 +-
 .../openfire/plugin/ofmeet/OfMeetPlugin.java  | 179 +++--
 .../openfire/plugin/rest/AuthFilter.java      | 110 ---
 .../openfire/plugin/rest/CORSFilter.java      |  26 -
 .../rest/controller/GroupController.java      | 155 ----
 .../controller/JustMarriedController.java     | 259 -------
 .../rest/controller/MUCRoomController.java    | 673 ------------------
 .../rest/controller/MessageController.java    |  44 --
 .../rest/controller/MsgArchiveController.java |  71 --
 .../rest/controller/SessionController.java    | 217 ------
 .../rest/controller/StatisticsController.java |  34 -
 .../controller/UserServiceController.java     | 652 -----------------
 .../UserServiceLegacyController.java          | 376 ----------
 .../plugin/rest/service/AskService.java       | 434 -----------
 .../plugin/rest/service/BookmarkService.java  | 148 ----
 .../plugin/rest/service/ChatService.java      | 515 --------------
 .../plugin/rest/service/GroupService.java     |  61 --
 .../plugin/rest/service/JerseyWrapper.java    | 110 ---
 .../rest/service/MUCRoomAdminsService.java    |  51 --
 .../rest/service/MUCRoomMembersService.java   |  51 --
 .../rest/service/MUCRoomOutcastsService.java  |  51 --
 .../rest/service/MUCRoomOwnersService.java    |  51 --
 .../plugin/rest/service/MUCRoomService.java   |  95 ---
 .../plugin/rest/service/MessageService.java   |  28 -
 .../rest/service/MsgArchiveService.java       |  32 -
 .../plugin/rest/service/RestAPIService.java   |  89 ---
 .../plugin/rest/service/SessionService.java   |  60 --
 .../plugin/rest/service/SipService.java       |  82 ---
 .../rest/service/StatisticsService.java       |  29 -
 .../plugin/rest/service/UserGroupService.java |  62 --
 .../rest/service/UserLockoutService.java      |  36 -
 .../rest/service/UserRosterService.java       |  92 ---
 .../plugin/rest/service/UserService.java      |  64 --
 .../plugin/rest/utils/MUCRoomUtils.java       | 133 ----
 .../openfire/plugin/rest/utils/UserUtils.java | 132 ----
 .../openfire/plugins/pade/PadePlugin.java     | 102 +--
 53 files changed, 228 insertions(+), 6523 deletions(-)
 delete mode 100644 src/java/org/ifsoft/meet/Email.java
 delete mode 100644 src/java/org/ifsoft/meet/Friend.java
 delete mode 100644 src/java/org/ifsoft/meet/MeetController.java
 delete mode 100644 src/java/org/ifsoft/meet/MeetService.java
 delete mode 100644 src/java/org/ifsoft/meet/PublicKey.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/AuthFilter.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/CORSFilter.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/controller/GroupController.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/controller/JustMarriedController.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/controller/MUCRoomController.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/controller/MessageController.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/controller/MsgArchiveController.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/controller/SessionController.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/controller/StatisticsController.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/controller/UserServiceController.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/controller/UserServiceLegacyController.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/AskService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/BookmarkService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/ChatService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/GroupService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/JerseyWrapper.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomAdminsService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomMembersService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomOutcastsService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomOwnersService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/MessageService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/MsgArchiveService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/RestAPIService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/SessionService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/SipService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/StatisticsService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/UserGroupService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/UserLockoutService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/UserRosterService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/service/UserService.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/utils/MUCRoomUtils.java
 delete mode 100644 src/java/org/jivesoftware/openfire/plugin/rest/utils/UserUtils.java

diff --git a/build.cmd b/build.cmd
index 1573bee7..425b0b98 100644
--- a/build.cmd
+++ b/build.cmd
@@ -2,10 +2,10 @@ call mvn clean package -Dmaven.test.skip=true
 
 cd target
 rename pade-openfire-plugin-assembly.jar pade.jar
-rd "D:\Openfire\openfire_4_7_5\plugins\pade" /q /s
-del "D:\Openfire\openfire_4_7_5\plugins\pade.jar" 
-del /q "D:\Openfire\openfire_4_7_5\logs\*.*"
-copy pade.jar D:\Openfire\openfire_4_7_5\plugins\pade.jar
+rd "D:\Openfire\openfire_4_8_0\plugins\pade" /q /s
+del "D:\Openfire\openfire_4_8_0\plugins\pade.jar" 
+del /q "D:\Openfire\openfire_4_8_0\logs\*.*"
+copy pade.jar D:\Openfire\openfire_4_8_0\plugins\pade.jar
 
 rd "D:\Projects\openfire-cluster\node1\plugins\pade" /q /s
 del "D:\Projects\openfire-cluster\node1\plugins\pade.jar" 
diff --git a/changelog.html b/changelog.html
index 2bcf25bb..ee321978 100644
--- a/changelog.html
+++ b/changelog.html
@@ -44,12 +44,12 @@ <h1>
 Pade Changelog
 </h1>
 
-<p><b>1.8.0</b> -- <i>March 31, 2024</i></p> 
+<p><b>1.8.0</b> -- <i>March 31, 2024</i></p>
  <ul>
-	<li></li>
- </ul> 
- 
-<p><b>1.7.9</b> -- <i>March 16, 2024</i></p> 
+	<li>Marking that this version (and implicitly, future versions) are now compatible with Openfire 4.8.0+</li>
+ </ul>
+
+<p><b>1.7.9</b> -- <i>December 31, 2023</i></p> 
  <ul>
 	<li>Update to latest Pade client code</li>
      <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/pull/465">Issue #465 - fix firefox's unsupported codec error</a></li>	
diff --git a/plugin.xml b/plugin.xml
index 3a83a069..923a557b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,10 +5,9 @@
     <description>${project.description}</description>
     <author>Ignite Realtime</author>
     <version>${project.version}</version>
-    <date>16/03/2024</date>
-	<priorToServerVersion>4.8.0</priorToServerVersion>		
-    <minServerVersion>4.7.0</minServerVersion>
-    <minJavaVersion>1.8</minJavaVersion>   
+    <date>31/03/2024</date>	
+    <minServerVersion>4.8.0</minServerVersion>
+    <minJavaVersion>1.11</minJavaVersion>   
     <adminconsole>
         <tab id="tab-ofmeet" name="${plugin.title}" url="ofmeet-summary.jsp" description="${plugin.description}">
             <sidebar id="siderbar-ofmeet"             name="${plugin.jitsi.title}">
diff --git a/pom.xml b/pom.xml
index 032423d4..c6d4fdd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.7.0</version>
+        <version>4.8.1</version>
     </parent>
     
     <groupId>org.igniterealtime.openfire</groupId>
@@ -104,10 +104,17 @@
     </build>
 
     <dependencies>   
+        <dependency>
+            <groupId>org.igniterealtime.openfire</groupId>
+            <artifactId>xmppserver</artifactId>
+            <version>${openfire.version}</version>
+            <scope>provided</scope>
+        </dependency>	
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcmail-jdk15on</artifactId>
             <version>${bouncycastle.version}</version>
+            <scope>provided</scope>				
         </dependency>	
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -136,32 +143,7 @@
             <groupId>javax.sip</groupId>
             <artifactId>jain-sip-ri</artifactId>
             <version>1.3.0-91</version>			
-        </dependency>		
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>1.19.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-            <version>1.19.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-            <version>1.19.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-servlet</artifactId>
-            <version>1.19.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-            <version>1.19.4</version>
-        </dependency>
+        </dependency>			
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
@@ -260,7 +242,7 @@
         <dependency>
             <groupId>org.bitbucket.b_c</groupId>
             <artifactId>jose4j</artifactId>
-            <version>0.9.4</version>
+            <version>0.9.3</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/fluent-hc -->
@@ -284,14 +266,6 @@
             <artifactId>picocontainer</artifactId>
             <version>1.2</version>
         </dependency>
-
-       
-        <!-- https://mvnrepository.com/artifact/org.eclipse.jetty.fcgi/fcgi-server -->
-        <dependency>
-            <groupId>org.eclipse.jetty.fcgi</groupId>
-            <artifactId>fcgi-server</artifactId>
-            <version>9.4.12.v20180830</version>
-        </dependency>
         
         <!-- https://mvnrepository.com/artifact/com.j256.two-factor-auth/two-factor-auth -->
         <dependency>
@@ -403,13 +377,40 @@
             <version>3.2.1.Final</version>
         </dependency> 
 		
-		<!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-util -->
+		<dependency>
+			<groupId>org.eclipse.jetty.websocket</groupId>
+			<artifactId>websocket-jetty-client</artifactId>
+			<version>${jetty.version}</version>
+		</dependency>	
+
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>9.4.35.v20201120</version>
+			<artifactId>jetty-io</artifactId>
+			<version>${jetty.version}</version>
+            <scope>provided</scope>			
 		</dependency>
 
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-http</artifactId>
+			<version>${jetty.version}</version>
+            <scope>provided</scope>			
+		</dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-jetty-server</artifactId>
+            <version>${jetty.version}</version>
+            <scope>provided</scope>				
+        </dependency>		
+
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>${jetty.version}</version>
+            <scope>provided</scope>			
+		</dependency>		
+
 		<dependency>
 			<groupId>com.yubico</groupId>
 			<artifactId>webauthn-server-core</artifactId>
@@ -429,6 +430,7 @@
             <artifactId>web-push</artifactId>
             <version>5.1.1</version>
         </dependency>
+		
     </dependencies>
 	
     <repositories>
diff --git a/src/java/org/ifsoft/download/Servlet.java b/src/java/org/ifsoft/download/Servlet.java
index e15b4172..9600eee8 100644
--- a/src/java/org/ifsoft/download/Servlet.java
+++ b/src/java/org/ifsoft/download/Servlet.java
@@ -62,14 +62,13 @@ private void writeHeader(String urlString, HttpServletResponse response)
                 response.setHeader("Content-Type", "text/html");
 
             response.setHeader("Connection", "close");
-
-            HttpBindManager boshManager = HttpBindManager.getInstance();
-
-            response.setHeader("Access-Control-Allow-Origin", boshManager.getCORSAllowOrigin());
-            response.setHeader("Access-Control-Allow-Headers", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS_DEFAULT + ", Authorization");
-            response.setHeader("Access-Control-Allow-Credentials", "true");
-            response.setHeader("Access-Control-Allow-Methods", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS_DEFAULT);
-
+			
+			HttpBindManager boshManager = HttpBindManager.getInstance();
+			response.setHeader("Access-Control-Allow-Methods", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS.getValue()));
+			response.setHeader("Access-Control-Allow-Headers", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS.getValue() + ", Authorization"));
+			response.setHeader("Access-Control-Max-Age", String.valueOf(HttpBindManager.HTTP_BIND_CORS_MAX_AGE.getValue().toSeconds()));
+			response.setHeader("Access-Control-Allow-Origin", String.valueOf(HttpBindManager.HTTP_BIND_ALLOWED_ORIGINS.getDefaultValue()));
+			response.setHeader("Access-Control-Allow-Credentials", "true");			
         }
         catch(Exception e)
         {
diff --git a/src/java/org/ifsoft/meet/Email.java b/src/java/org/ifsoft/meet/Email.java
deleted file mode 100644
index 5a63a718..00000000
--- a/src/java/org/ifsoft/meet/Email.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.ifsoft.meet;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-
-@XmlRootElement(name = "email")
-public class Email {
-
-    private String textBody;
-    private String htmlBody;
-    private String toName;
-    private String fromName;
-    private String to;
-    private String from;
-    private String subject;
-
-    public Email()
-    {
-    }
-
-    @XmlElement public String getTextBody() {
-        return textBody;
-    }
-
-    public void setTextBody(String textBody) {
-        this.textBody = textBody;
-    }
-
-    @XmlElement public String getHtmlBody() {
-        return htmlBody;
-    }
-
-    public void setHtmlBody(String htmlBody) {
-        this.htmlBody = htmlBody;
-    }
-
-    @XmlElement public String getToName() {
-        return toName;
-    }
-
-    public void setToName(String toName) {
-        this.toName = toName;
-    }
-
-    @XmlElement public String getFromName() {
-        return fromName;
-    }
-
-    public void setFromName(String fromName) {
-        this.fromName = fromName;
-    }
-
-    @XmlElement public String getTo() {
-        return to;
-    }
-
-    public void setTo(String to) {
-        this.to = to;
-    }
-
-    @XmlElement public String getFrom() {
-        return from;
-    }
-
-    public void setFrom(String from) {
-        this.from = from;
-    }
-
-    @XmlElement public String getSubject() {
-        return subject;
-    }
-
-    public void setSubject(String subject) {
-        this.subject = subject;
-    }
-}
diff --git a/src/java/org/ifsoft/meet/Friend.java b/src/java/org/ifsoft/meet/Friend.java
deleted file mode 100644
index ed80288d..00000000
--- a/src/java/org/ifsoft/meet/Friend.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.ifsoft.meet;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The Class Friend.
- */
-@XmlRootElement(name = "friend")
-@XmlType(propOrder = { "jid", "nickname", "groups"})
-public class Friend {
-
-    /** The jid. */
-    private String jid;
-
-    /** The nickname. */
-    private String nickname;
-
-    /** The groups. */
-    private String groups;
-
-    /**
-     * Instantiates a new roster item entity.
-     */
-    public Friend() {
-
-    }
-
-    public Friend(String jid, String nickname, String groups) {
-        this.jid = jid;
-        this.nickname = nickname;
-        this.groups = groups;
-    }
-
-    /**
-     * Gets the jid.
-     *
-     * @return the jid
-     */
-    @XmlElement
-    public String getJid() {
-        return jid;
-    }
-
-    /**
-     * Sets the jid.
-     *
-     * @param jid
-     *            the new jid
-     */
-    public void setJid(String jid) {
-        this.jid = jid;
-    }
-
-    /**
-     * Gets the nickname.
-     *
-     * @return the nickname
-     */
-    @XmlElement
-    public String getNickname() {
-        return nickname;
-    }
-
-    /**
-     * Sets the nickname.
-     *
-     * @param nickname
-     *            the new nickname
-     */
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
-    /**
-     * Gets the groups.
-     *
-     * @return the groups
-     */
-    @XmlElement
-    public String getGroups() {
-        return groups;
-    }
-
-    /**
-     * Sets the groups.
-     *
-     * @param groups
-     *            the new groups
-     */
-    public void setGroups(String groups) {
-        this.groups = groups;
-    }
-}
diff --git a/src/java/org/ifsoft/meet/MeetController.java b/src/java/org/ifsoft/meet/MeetController.java
deleted file mode 100644
index fdad965f..00000000
--- a/src/java/org/ifsoft/meet/MeetController.java
+++ /dev/null
@@ -1,410 +0,0 @@
-package org.ifsoft.meet;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
-import java.security.*;
-
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.SessionManager;
-import org.jivesoftware.util.*;
-import org.jivesoftware.openfire.group.*;
-import org.jivesoftware.openfire.user.*;
-import org.jivesoftware.openfire.session.*;
-import org.jivesoftware.openfire.muc.*;
-
-import org.xmpp.packet.*;
-import org.jivesoftware.openfire.plugin.rawpropertyeditor.RawPropertyEditor;
-import org.jivesoftware.openfire.plugin.rest.dao.PropertyDAO;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import net.sf.json.*;
-import org.xmpp.packet.*;
-import org.dom4j.Element;
-import com.google.common.io.BaseEncoding;
-import com.google.gson.Gson;
-import org.apache.http.HttpResponse;
-import nl.martijndwars.webpush.*;
-
-import org.bouncycastle.jce.ECNamedCurveTable;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.igniterealtime.openfire.plugins.pushnotification.WebPushInterceptor;
-
-/**
- * The Class MeetController.
- */
-public class MeetController {
-
-    private static final Logger Log = LoggerFactory.getLogger(MeetController.class);
-    public static final MeetController INSTANCE = new MeetController();
-
-    /**
-     * Gets the instance.
-     *
-     * @return the instance
-     */
-    public static MeetController getInstance() {
-        return INSTANCE;
-    }
-
-    //-------------------------------------------------------
-    //
-    //  Web Push
-    //
-    //-------------------------------------------------------
-
-    /**
-     * push a payload to all subscribed web push resources of a group
-     *
-     */
-    public boolean groupWebPush(String groupName, String payload)
-    {
-        boolean ok = false;
-
-        String publicKey = JiveGlobals.getProperty("vapid.public.key", null);
-        String privateKey = JiveGlobals.getProperty("vapid.private.key", null);
-        String domain = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
-
-        try {
-            Group group = GroupManager.getInstance().getGroup(groupName);
-
-            if (group != null && publicKey != null && privateKey != null)
-            {
-                PushService pushService = new PushService()
-                    .setPublicKey(publicKey)
-                    .setPrivateKey(privateKey)
-                    .setSubject("mailto:admin@" + domain);
-
-                Log.debug("groupWebPush keys \n"  + publicKey + "\n" + privateKey);
-
-                for (String key : group.getProperties().keySet())
-                {
-                    if (key.startsWith("webpush.subscribe."))
-                    {
-                        try {
-                            Subscription subscription = new Gson().fromJson(group.getProperties().get(key), Subscription.class);
-                            Notification notification = new Notification(subscription, payload);
-                            HttpResponse response = pushService.send(notification);
-                            int statusCode = response.getStatusLine().getStatusCode();
-
-                            ok =  ok && (200 == statusCode) || (201 == statusCode);
-
-                            Log.debug("groupWebPush delivered "  + statusCode + "\n" + response);
-
-                        } catch (Exception e) {
-                            Log.error("groupWebPush failed "  + "\n" + payload, e);
-                        }
-                    }
-                }
-
-            }
-        } catch (Exception e1) {
-            Log.error("groupWebPush failed "  + "\n" + payload, e1);
-        }
-
-        return ok;
-    }
-
-    /**
-     * push a payload to all subscribed web push resources of a user
-     *
-     */
-    public boolean postWebPush(String username, String payload)
-    {
-        Log.debug("postWebPush "  + username + "\n" + payload);
-
-        User user = RawPropertyEditor.getInstance().getAndCheckUser(username);
-        if (user == null) return false;
-        boolean ok = true;
-
-        String publicKey = user.getProperties().get("vapid.public.key");
-        String privateKey = user.getProperties().get("vapid.private.key");
-
-        if (publicKey == null) publicKey = JiveGlobals.getProperty("vapid.public.key", null);
-        if (privateKey == null) privateKey = JiveGlobals.getProperty("vapid.private.key", null);
-
-        try {
-            if (publicKey != null && privateKey != null)
-            {
-                PushService pushService = new PushService()
-                    .setPublicKey(publicKey)
-                    .setPrivateKey(privateKey)
-                    .setSubject("mailto:admin@" + XMPPServer.getInstance().getServerInfo().getXMPPDomain());
-
-                Log.debug("postWebPush keys \n"  + publicKey + "\n" + privateKey);
-
-                for (String key : user.getProperties().keySet())
-                {
-                    if (key.startsWith("webpush.subscribe."))
-                    {
-                        try {
-                            Subscription subscription = new Gson().fromJson(user.getProperties().get(key), Subscription.class);
-                            Notification notification = new Notification(subscription, payload);
-                            HttpResponse response = pushService.send(notification);
-                            int statusCode = response.getStatusLine().getStatusCode();
-
-                            ok = ok && (200 == statusCode) || (201 == statusCode);
-
-                            Log.debug("postWebPush delivered "  + statusCode + "\n" + response);
-
-
-                        } catch (Exception e) {
-                            Log.error("postWebPush failed "  + username + "\n" + payload, e);
-                        }
-                    }
-                }
-
-            }
-        } catch (Exception e1) {
-            Log.error("postWebPush failed "  + username + "\n" + payload, e1);
-        }
-
-        return ok;
-    }
-	
-    public boolean sendWebPush(String json)
-    {
-        Log.debug("sendWebPush\n" + json);
-        boolean ok = false;
-
-        try {	
-			JSONObject data = new JSONObject(json);
-			String payload = data.getString("payload");			
-			String publicKey = data.getString("publicKey");
-			String privateKey = data.getString("privateKey");
-			JSONObject subscriptionJson = data.getJSONObject("subscription");		
-			
-			PushService pushService = new PushService()
-				.setPublicKey(publicKey)
-				.setPrivateKey(privateKey)
-				.setSubject("mailto:admin@" + XMPPServer.getInstance().getServerInfo().getXMPPDomain());
-
-			Subscription subscription = new Gson().fromJson(subscriptionJson.toString(), Subscription.class);
-			Notification notification = new Notification(subscription, payload);
-			HttpResponse response = pushService.send(notification);
-			int statusCode = response.getStatusLine().getStatusCode();
-
-			ok = (200 == statusCode) || (201 == statusCode);
-
-			Log.debug("sendWebPush delivered "  + statusCode + "\n" + response);
-
-        } catch (Exception e1) {
-            Log.error("sendWebPush failed\n" + json, e1);
-        }
-
-        return ok;
-    }	
-
-    /**
-     * store web push subscription as a user property
-     *
-     */
-    public boolean putWebPushSubscription(String username, String resource, String subscription)
-    {
-        Log.debug("putWebPushSubscription "  + username + " " + resource + "\n" + subscription);
-
-        User user = RawPropertyEditor.getInstance().getAndCheckUser(username);
-        if (user == null) return false;
-
-        user.getProperties().put("webpush.subscribe." + resource, subscription);
-        return true;
-    }
-
-    /**
-     * generate a new public/private key pair for VAPID and store in system properties
-     * and user properties
-     */
-    public String getWebPushPublicKey(String username)
-    {
-        Log.debug("getWebPushPublicKey " + username);
-
-        String ofPublicKey = null;
-        String ofPrivateKey = null;
-
-        User user = RawPropertyEditor.getInstance().getAndCheckUser(username);
-        if (user == null) return null;
-
-        ofPublicKey = user.getProperties().get("vapid.public.key");
-        ofPrivateKey = user.getProperties().get("vapid.private.key");
-
-        if (ofPublicKey == null || ofPrivateKey == null)
-        {
-            try {
-                KeyPair keyPair = generateKeyPair();
-
-                // taken from https://gist.github.com/halysongoncalves/e5bac1cf31b6331ba6b29b2a7c29fa5f
-                final ECPublicKey ecPublicKey = (ECPublicKey) keyPair.getPublic();
-                final ECPrivateKey ecPrivateKey = (ECPrivateKey) keyPair.getPrivate();
-                final byte[] publicKey = ecPublicKey.getQ().getEncoded(true);
-                final byte[] privateKey = ecPrivateKey.getD().toByteArray();
-
-                ofPublicKey = BaseEncoding.base64Url().encode(publicKey);
-                ofPrivateKey = BaseEncoding.base64Url().encode(privateKey);
-
-                user.getProperties().put("vapid.public.key", ofPublicKey);
-                JiveGlobals.setProperty("vapid.public.key", ofPublicKey);
-
-                user.getProperties().put("vapid.private.key", ofPrivateKey);
-                JiveGlobals.setProperty("vapid.private.key", ofPrivateKey);
-
-            } catch (Exception e) {
-                Log.error("getWebPushPublicKey", e);
-            }
-
-        } else {
-            user.getProperties().put("vapid.public.key", ofPublicKey);
-            user.getProperties().put("vapid.private.key", ofPrivateKey);
-        }
-
-        return ofPublicKey;
-    }
-
-    /**
-     * Generate an EC keypair on the prime256v1 curve.
-     *
-     * @return
-     * @throws InvalidAlgorithmParameterException
-     * @throws NoSuchProviderException
-     * @throws NoSuchAlgorithmException
-     */
-    private KeyPair generateKeyPair() throws InvalidAlgorithmParameterException, NoSuchProviderException, NoSuchAlgorithmException {
-        ECNamedCurveParameterSpec parameterSpec = ECNamedCurveTable.getParameterSpec("prime256v1");
-
-        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("ECDH", "BC");
-        keyPairGenerator.initialize(parameterSpec);
-
-        return keyPairGenerator.generateKeyPair();
-    }
-
-    //-------------------------------------------------------
-    //
-    //  Message
-    //
-    //-------------------------------------------------------
-
-    public boolean postMessage(String username, String payload)
-    {
-        Log.debug("postMessage "  + username + "\n" + payload);
-
-        User user = RawPropertyEditor.getInstance().getAndCheckUser(username);
-        if (user == null) return false;
-        boolean ok = false;
-
-        try {
-            JSONObject json = new JSONObject(payload);
-
-            if ("chat".equals(json.getString("msgType"))) {
-                ok = postChatMessage(user, json);
-            } else {
-                ok = postGroupChatMessage(user, json);
-            }
-
-        } catch (Exception e1) {
-            Log.error("postMessage failed "  + username + "\n" + payload, e1);
-        }
-
-        return ok;
-    }
-
-    private boolean postChatMessage(User user, JSONObject json)
-    {
-        Log.debug("postChatMessage "  + user + "\n" + json);
-
-        try {
-            final String domain = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
-            final String username = user.getUsername();
-
-            JID jid1 = new JID(username + "@" + domain);
-            JID jid2 = new JID(json.getString("msgFrom"));
-
-            Message message = new Message();
-            message.setFrom(jid1);
-            message.setTo(jid2);
-            message.setType(Message.Type.chat);
-            message.setBody(">" + json.getString("msgBody") + "\n\n" + json.getString("reply"));
-            XMPPServer.getInstance().getRoutingTable().routePacket(jid2, message, true);
-
-            WebPushInterceptor.notifications.remove(username); // reset notification indicator
-			return true;
-			
-        } catch (Exception e) {
-            Log.error("postChatMessage", e);
-			return false;			
-        }
-    }
-
-    private boolean postGroupChatMessage(User user, JSONObject json)
-    {
-        Log.debug("postGroupChatMessage "  + user + "\n" + json);
-
-        try {
-            String domain = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
-            JID jid1 = new JID(user.getUsername() + "@" + domain);
-            JID jid2 = new JID(json.getString("msgFrom"));
-            String muc = jid2.getDomain();
-            muc = muc.substring(0, muc.indexOf("."));
-
-            MultiUserChatService mucService = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(muc);
-            MUCRoom room = mucService.getChatRoom(jid2.getNode());
-
-            Message message = new Message();
-            message.setFrom(jid2 + "/" + user.getName());
-            //message.setTo(jid2);
-            message.setType(Message.Type.groupchat);
-            message.setBody("> " + json.getString("msgNick") + " : " + json.getString("msgBody") + "\n\n" + json.getString("reply"));
-            room.send(message, room.getRole());
-			return true;
-
-        } catch (Exception e) {
-            Log.error("postGroupChatMessage", e);
-			return false;
-        }
-    }
-
-
-    //-------------------------------------------------------
-    //
-    //  Jitsi Meet
-    //
-    //-------------------------------------------------------
-
-    public boolean inviteToJvb(String username, String jid)
-    {
-        if (SessionManager.getInstance().getSessions(username).size() > 0)
-        {
-            String room = username + "-" + System.currentTimeMillis();
-            String domain = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
-            String mucDomain = JiveGlobals.getProperty( "ofmeet.main.muc", "conference" + "." + domain);
-
-            try {
-                JID jid1 = new JID(username + "@" + domain);
-                JID jid2 = new JID(jid);
-
-                String confJid = room + "@" + mucDomain;
-
-                Message message1 = new Message();
-                message1.setFrom(jid1);
-                message1.setTo(jid2);
-                Element x1 = message1.addChildElement("x", "jabber:x:conference").addAttribute("jid", confJid);
-                x1.addElement("invite").addAttribute("from", jid1.toString());
-                XMPPServer.getInstance().getRoutingTable().routePacket(jid2, message1, true);
-
-                Message message2 = new Message();
-                message2.setFrom(jid2);
-                message2.setTo(jid1);
-                Element x2 = message2.addChildElement("x", "jabber:x:conference").addAttribute("jid", confJid).addAttribute("autoaccept", "true");
-                x2.addElement("invite").addAttribute("from", jid2.toString());
-                XMPPServer.getInstance().getRoutingTable().routePacket(jid1, message2, true);
-
-                return true;
-
-            } catch (Exception e) {
-                Log.error("inviteToJvb", e);
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/java/org/ifsoft/meet/MeetService.java b/src/java/org/ifsoft/meet/MeetService.java
deleted file mode 100644
index aa2bc1c8..00000000
--- a/src/java/org/ifsoft/meet/MeetService.java
+++ /dev/null
@@ -1,638 +0,0 @@
-package org.ifsoft.meet;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.text.SimpleDateFormat;
-
-import javax.mail.*;
-import javax.mail.internet.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Context;
-
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.roster.*;
-import org.jivesoftware.openfire.user.*;
-import org.jivesoftware.openfire.plugin.rest.controller.UserServiceController;
-import org.jivesoftware.openfire.plugin.rest.entity.UserEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.UserEntity;
-
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-import org.jivesoftware.util.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.jivesoftware.openfire.plugin.rest.BasicAuth;
-import org.xmpp.packet.JID;
-import net.sf.json.*;
-import org.igniterealtime.openfire.plugins.pushnotification.WebPushInterceptor;
-import uk.ifsoft.openfire.plugins.pade.PadePlugin;
-
-
-@Path("restapi/v1/meet")
-public class MeetService {
-
-    private static final Logger Log = LoggerFactory.getLogger(MeetService.class);
-    private static final String domain = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
-    private MeetController meetController;
-
-    @Context
-    private HttpServletRequest httpRequest;
-
-    @PostConstruct
-    public void init()
-    {
-        meetController = MeetController.getInstance();
-    }
-
-    //-------------------------------------------------------
-    //
-    //  Web Push
-    //
-    //-------------------------------------------------------
-
-    @GET
-    @Path("/webpush")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public UserEntities getPushSubscribers()  throws ServiceException
-    {
-        UserEntities userEntities = UserServiceController.getInstance().getUserEntitiesByProperty("webpush.subscribe.%", null);
-        Map<String, UserEntity> users = new HashMap<String, UserEntity>();
-
-        for (UserEntity user : userEntities.getUsers()) {
-            user.setProperties(null);
-            users.put(user.getUsername(), user);
-        }
-
-        return new UserEntities(users.values());
-    }
-	
-    @GET
-    @Path("/webpush/{username}")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public PublicKey getWebPushPublicKey(@PathParam("username") String username) throws ServiceException {
-        Log.debug("getWebPushPublicKey " + username);
-
-        String publicKey = JiveGlobals.getProperty("vapid.public.key", null);
-
-        if (publicKey == null)
-        {
-            publicKey = meetController.getWebPushPublicKey(username);
-        }
-
-        if (publicKey == null)
-            throw new ServiceException("Exception", "public key not found", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION,  Response.Status.NOT_FOUND);
-
-        return new PublicKey(publicKey);
-    }
-
-    @PUT
-    @Path("/webpush/{username}/{resource}")
-    public Response putWebPushSubscription(@PathParam("username") String username, @PathParam("resource") String resource, String subscription) throws ServiceException {
-        Log.debug("putWebPushSubscription " + username + " " + resource + "\n" + subscription);
-
-        try {
-            if (meetController.putWebPushSubscription(username, resource, subscription))
-            {
-                return Response.status(Response.Status.OK).build();
-            }
-
-        } catch (Exception e) {
-            Log.error("putWebPushSubscription", e);
-        }
-        return Response.status(Response.Status.BAD_REQUEST).build();
-    }
-
-    @POST
-    @Path("/webpush/{username}")
-    public Response postWebPush(@PathParam("username") String username, String notification) throws ServiceException {
-        Log.debug("postWebPush " + username + "\n" + notification);
-
-        try {
-            if (meetController.postWebPush(username, notification))
-            {
-                return Response.status(Response.Status.OK).build();
-            }
-
-        } catch (Exception e) {
-            Log.error("postWebPush", e);
-        }
-        return Response.status(Response.Status.BAD_REQUEST).build();
-    }
-
-    @POST
-    @Path("/webpushsend")
-    public Response sendWebPush(String data) throws ServiceException {
-        Log.debug("sendWebPush \n" + data);
-
-        try {
-            if (meetController.sendWebPush(data))
-            {
-                return Response.status(Response.Status.OK).build();
-            }
-
-        } catch (Exception e) {
-            Log.error("sendWebPush", e);
-        }
-        return Response.status(Response.Status.BAD_REQUEST).build();
-    }
-	
-    //-------------------------------------------------------
-    //
-    //  Message
-    //
-    //-------------------------------------------------------
-
-    @POST
-    @Path("/message")
-    public Response postMessage(String notification) throws ServiceException {
-        String username = getEndUser();
-        Log.debug("message " + username + "\n" + notification);
-
-        try {
-            if (meetController.postMessage(username, notification))
-            {
-                return Response.status(Response.Status.OK).build();
-            }
-
-        } catch (Exception e) {
-            Log.error("postMessage", e);
-        }
-        return Response.status(Response.Status.BAD_REQUEST).build();
-    }
-
-    //-------------------------------------------------------
-    //
-    //  Jitsi Meet
-    //
-    //-------------------------------------------------------
-
-    @POST
-    @Path("/invite/{username}/{jid}")
-    public Response inviteToJvb(@PathParam("username") String username, @PathParam("jid") String jid) throws ServiceException
-    {
-        try {
-
-            if (meetController.inviteToJvb(username, jid))
-            {
-                return Response.status(Response.Status.OK).build();
-            }
-
-        } catch (Exception e) {
-            Log.error("inviteToJvb", e);
-        }
-        return Response.status(Response.Status.BAD_REQUEST).build();
-    }
-
-    //-------------------------------------------------------
-    //
-    //  Web Authentication
-    //
-    //-------------------------------------------------------
-
-    @POST
-    @Path("/webauthn/register/start/{username}")
-    public String webauthnRegisterStart(@PathParam("username") String username, String name) throws ServiceException
-    {
-        Log.debug("webauthnRegisterStart " + username + " " + name);
-		String json = "{}";
-			
-        try {
-			json = PadePlugin.self.startRegisterWebAuthn(username, name);			
-
-        } catch (Exception e) {
-            Log.error("webauthnRegisterStart", e);
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-        
-		return json;
-    }	
-	
-    @POST
-    @Path("/webauthn/register/finish/{username}")
-    public Response webauthnRegisterFinish(@PathParam("username") String username, String json) throws ServiceException
-    {
-        Log.debug("webauthnRegisterFinish " + username + "\n" + json);
-			
-        try {
-			if (PadePlugin.self.finishRegisterWebAuthn(json, username) != null)
-			{
-				return Response.status(Response.Status.OK).build();
-			}			
-
-        } catch (Exception e) {
-            Log.error("webauthnRegisterFinish", e);
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-        
-        return Response.status(Response.Status.BAD_REQUEST).build();
-    }	
-	
-    @POST
-    @Path("/webauthn/authenticate/start/{username}")
-    public String webauthnAuthenticateStart(@PathParam("username") String username) throws ServiceException
-    {
-        Log.debug("webauthnAuthenticateStart " + username);
-		String json = "{}";
-			
-        try {
-			json = PadePlugin.self.startAuthentication(username);			
-
-        } catch (Exception e) {
-            Log.error("webauthnAuthenticateStart", e);
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-        
-		return json;
-    }	
-	
-    @POST
-    @Path("/webauthn/authenticate/finish/{username}")
-    public Response webauthnAuthenticateFinish(@PathParam("username") String username, String json) throws ServiceException
-    {
-        Log.debug("webauthnAuthenticateFinish " + username + "\n" + json);
-			
-        try {
-			if (PadePlugin.self.finishAuthentication(json, username))
-			{
-				return Response.status(Response.Status.OK).build();
-			}			
-
-        } catch (Exception e) {
-            Log.error("webauthnAuthenticateFinish", e);
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-        
-        return Response.status(Response.Status.BAD_REQUEST).build();
-    }	
-	
-    //-------------------------------------------------------
-    //
-    //  Custom Profile update/delete. Use chat/users to fetch
-    //
-    //-------------------------------------------------------
-
-    @GET
-    @Path("/profile/{criteria}")
-    public String getUserProfiles(@PathParam("criteria") String criteria) throws ServiceException
-    {
-        try {
-            UserManager userManager = UserManager.getInstance();
-            Set<String> searchFields = userManager.getSearchFields();
-            Set<User> users = new HashSet<User>();
-
-            Collection<User> foundUsers = new ArrayList<User>();
-
-            for (String searchField : searchFields)
-            {
-                foundUsers.addAll(userManager.findUsers(new HashSet<String>(Arrays.asList(searchField)), criteria));
-            }
-
-            JSONArray profiles = new JSONArray();
-            int i=0;
-
-            for (User user : foundUsers)
-            {
-                if (user != null)
-                {
-                    JSONObject profileProperties = new JSONObject();
-
-                    profileProperties.put("username", user.getUsername());
-                    profileProperties.put("name", user.getName());
-                    profileProperties.put("email", user.getEmail());
-                    profileProperties.put("jid", user.getUsername() + "@" + domain);
-
-                    for (String key : user.getProperties().keySet())
-                    {
-                        Log.debug("getUserProperty " + key + " " + user.getProperties().get(key));
-
-                        if (!key.startsWith("ofchat.blast."))
-                        {
-                            profileProperties.put(key, user.getProperties().get(key));
-                        }
-                    }
-
-                    profiles.put(i++, profileProperties);
-                }
-            }
-
-            return profiles.toString();
-
-        } catch (Exception e) {
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-
-    @POST
-    @Path("/profile")
-    public Response setUserProperties(String properties) throws ServiceException
-    {
-        Log.debug("setUserProperties " + properties);
-        try {
-
-            String username = getEndUser();
-            User user = XMPPServer.getInstance().getUserManager().getUser(username);
-
-            JSONArray profileProperties = new JSONArray(properties);
-
-            for (int i = 0; i < profileProperties.length(); i++)
-            {
-                JSONObject property = profileProperties.getJSONObject(i);
-
-                Log.debug("setUserProperty " + username + " " + property.getString("name") + " " + property.getString("value"));
-
-                if (property.getString("name") != null && property.getString("value") != null)
-                {
-                    user.getProperties().put(property.getString("name"), property.getString("value"));
-                }
-            }
-
-        } catch (Exception e) {
-            Log.error("setUserProperty", e);
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-        return Response.status(Response.Status.OK).build();
-    }
-
-    @DELETE
-    @Path("/profile/{propertyName}")
-    public Response deleteUserProperty(@PathParam("propertyName") String propertyName) throws ServiceException
-    {
-        try {
-            User user = XMPPServer.getInstance().getUserManager().getUser(getEndUser());
-            user.getProperties().remove(propertyName);
-
-        } catch (Exception e) {
-            Log.error("deleteUserProperty", e);
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-        return Response.status(Response.Status.OK).build();
-    }
-
-    //-------------------------------------------------------
-    //
-    //  Contacts/Friends
-    //
-    //-------------------------------------------------------
-
-    @POST
-    @Path("/friend")
-    public Response createFriend(Friend friend) throws ServiceException
-    {
-        try {
-            String username = getEndUser();
-            String response = createFriendship(username, friend.getJid(), friend.getNickname(), friend.getGroups());
-
-            if (response == null)
-            {
-                return Response.status(Response.Status.OK).build();
-            }
-
-        } catch (Exception e) {
-            Log.error("createFriend", e);
-        }
-        return Response.status(Response.Status.BAD_REQUEST).build();
-    }
-
-    private String createFriendship(String username, String contactJid, String contactName, String groupList)
-    {
-        Log.debug("createFriendship " + username + " " + contactJid + " " + contactName + " " + groupList);
-
-        String response = null;
-
-        try {
-            org.jivesoftware.openfire.roster.Roster roster = XMPPServer.getInstance().getRosterManager().getRoster(username);
-
-            if (roster != null)
-            {
-                ArrayList<String> groups = new ArrayList<String>();
-
-                if (groupList != null && !"".equals(groupList))
-                {
-                    String tokens[] = groupList.split(",");
-
-                    for (int i=0; i<tokens.length; i++)
-                    {
-                       groups.add(tokens[i]);
-                    }
-                }
-
-                JID toUserJid = new JID(contactJid);
-                RosterItem gwitem = null;
-
-                if (roster.isRosterItem(toUserJid) == false)
-                {
-                    Log.debug("create friendship " + username + " " + toUserJid + " " + contactName);
-                    gwitem = roster.createRosterItem(toUserJid, true, true);
-
-                } else {
-                    Log.debug("update friendship " + username + " " + toUserJid + " " + contactName);
-                    gwitem = roster.getRosterItem(toUserJid);
-                }
-
-                if (gwitem != null)
-                {
-                    gwitem.setSubStatus(RosterItem.SUB_BOTH);
-                    gwitem.setAskStatus(RosterItem.ASK_NONE);
-                    gwitem.setNickname(contactName);
-                    gwitem.setGroups((List<String>) groups);
-
-                    roster.updateRosterItem(gwitem);
-                    roster.broadcast(gwitem, true);
-
-                }
-            }
-        } catch (Exception e) {
-            //Log.error("createFriendship", e);
-            response = e.toString();
-        }
-        return response;
-    }
-
-    private String getEndUser() throws ServiceException
-    {
-        String token = httpRequest.getHeader("authorization");
-
-        Log.debug("getEndUser " + token);
-
-        if (token != null)
-        {
-            if (WebPushInterceptor.tokens.containsKey(token))
-            {
-                return WebPushInterceptor.tokens.remove(token);    // claim token
-
-            } else {
-                String[] usernameAndPassword = BasicAuth.decode(token);
-
-                if (usernameAndPassword != null && usernameAndPassword.length == 2)
-                {
-                    return usernameAndPassword[0];
-                }
-            }
-        }
-
-        throw new ServiceException("Access denied", "Exception", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-    }
-
-    //-------------------------------------------------------
-    //
-    //  SMS
-    //
-    //-------------------------------------------------------
-
-    @POST
-    @Path("/sms/{source}/{destination}")
-    public Response sendSms(@PathParam("source") String source, @PathParam("destination") String destination, String body) throws ServiceException
-    {
-        try {
-
-
-        } catch (Exception e) {
-            Log.error("sendSms", e);
-        }
-        return Response.status(Response.Status.BAD_REQUEST).build();
-    }
-
-    //-------------------------------------------------------
-    //
-    //  EMAIL
-    //
-    //-------------------------------------------------------
-
-    @POST
-    @Path("/email")
-    public Response sendEmail(Email email) throws ServiceException
-    {
-        try {
-            String response = sendEmailMessage(email.getToName(), email.getTo(), email.getFromName(), email.getFrom(), email.getSubject(), email.getTextBody(), email.getHtmlBody());
-
-            if (response == null)
-            {
-                return Response.status(Response.Status.OK).build();
-            }
-
-        } catch (Exception e) {
-            Log.error("sendEmail", e);
-        }
-        return Response.status(Response.Status.BAD_REQUEST).build();
-    }
-
-    public static String sendEmailMessage(String toName, String toEmail, String fromName, String fromEmail, String subject, String textBody, String htmlBody)
-    {
-        Log.debug("sendEmailMessage " + toName + " " + toEmail + " " + fromName + " " + fromEmail + " " + subject + "\n" + textBody);
-
-        String response = null;
-
-        // Check for errors in the given fields:
-        if (toEmail == null || fromEmail == null || subject == null || (textBody == null && htmlBody == null))
-        {
-            response = "Error sending email: Invalid fields: "
-                    + ((toEmail == null) ? "toEmail " : "")
-                    + ((fromEmail == null) ? "fromEmail " : "")
-                    + ((subject == null) ? "subject " : "")
-                    + ((textBody == null && htmlBody == null) ? "textBody or htmlBody " : "");
-            Log.error("sendMessage " + response);
-        }
-        else {
-            try {
-                String encoding = MimeUtility.mimeCharset("UTF-8");
-                MimeMessage message = EmailService.getInstance().createMimeMessage();
-                Address to;
-                Address from;
-
-                if (toName != null) {
-                    to = new InternetAddress(toEmail, toName, encoding);
-                }
-                else {
-                    to = new InternetAddress(toEmail, "", encoding);
-                }
-
-                if (fromName != null) {
-                    from = new InternetAddress(fromEmail, fromName, encoding);
-                }
-                else {
-                    from = new InternetAddress(fromEmail, "", encoding);
-                }
-
-                // Set the date of the message to be the current date
-                SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z",
-                        java.util.Locale.US);
-                format.setTimeZone(JiveGlobals.getTimeZone());
-                message.setHeader("Date", format.format(new Date()));
-                message.setHeader("Content-Transfer-Encoding", "8bit");
-                message.setRecipient(Message.RecipientType.TO, to);
-                message.setFrom(from);
-                message.setReplyTo(new javax.mail.Address[]{from});
-                message.setSubject(StringUtils.replace(subject, "\n", ""), encoding);
-
-                if (textBody != null && htmlBody != null)
-                {
-                    MimeMultipart content = new MimeMultipart("alternative");
-                    // Plain-text
-                    MimeBodyPart text = new MimeBodyPart();
-                    text.setText(textBody, encoding);
-                    text.setDisposition(Part.INLINE);
-                    content.addBodyPart(text);
-                    // HTML
-                    MimeBodyPart html = new MimeBodyPart();
-                    html.setContent(htmlBody, "text/html; charset=UTF-8");
-                    html.setDisposition(Part.INLINE);
-                   html.setHeader("Content-Transfer-Encoding", "8bit");
-                    content.addBodyPart(html);
-                    // Add multipart to message.
-                    message.setContent(content);
-                    message.setDisposition(Part.INLINE);
-                    EmailService.getInstance().sendMessage(message);
-                }
-                else
-
-                if (textBody != null) {
-                    MimeBodyPart bPart = new MimeBodyPart();
-                    bPart.setText(textBody, encoding);
-                    bPart.setDisposition(Part.INLINE);
-                   bPart.setHeader("Content-Transfer-Encoding", "8bit");
-                    MimeMultipart mPart = new MimeMultipart();
-                    mPart.addBodyPart(bPart);
-                    message.setContent(mPart);
-                    message.setDisposition(Part.INLINE);
-                    // Add the message to the send list
-                    EmailService.getInstance().sendMessage(message);
-                }
-                else
-
-                if (htmlBody != null) {
-                    MimeBodyPart bPart = new MimeBodyPart();
-                    bPart.setContent(htmlBody, "text/html; charset=UTF-8");
-                    bPart.setDisposition(Part.INLINE);
-                    bPart.setHeader("Content-Transfer-Encoding", "8bit");
-                    MimeMultipart mPart = new MimeMultipart();
-                    mPart.addBodyPart(bPart);
-                    message.setContent(mPart);
-                    message.setDisposition(Part.INLINE);
-                    // Add the message to the send list
-                    EmailService.getInstance().sendMessage(message);
-                }
-            }
-            catch (Exception e) {
-                Log.error(e.getMessage(), e);
-                response = e.toString();
-            }
-        }
-        return response;
-    }
-}
diff --git a/src/java/org/ifsoft/meet/PublicKey.java b/src/java/org/ifsoft/meet/PublicKey.java
deleted file mode 100644
index 469c5a92..00000000
--- a/src/java/org/ifsoft/meet/PublicKey.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.ifsoft.meet;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "vapid")
-public class PublicKey {
-
-    private String publicKey;
-
-    public PublicKey() {
-    }
-
-    public PublicKey(String publicKey)
-    {
-        this.publicKey = publicKey;
-    }
-
-
-    @XmlElement
-    public String getPublicKey() {
-        return publicKey;
-    }
-
-    public void setPublicKey(String publicKey) {
-        this.publicKey = publicKey;
-    }
-}
\ No newline at end of file
diff --git a/src/java/org/ifsoft/mta/MtaManager.java b/src/java/org/ifsoft/mta/MtaManager.java
index 59827ddc..3e6f3fc4 100644
--- a/src/java/org/ifsoft/mta/MtaManager.java
+++ b/src/java/org/ifsoft/mta/MtaManager.java
@@ -171,7 +171,7 @@ private Connector createSSLConnector( final Server mtaServer ) {
             httpsConfig.setSendDateHeader(false);
             httpsConfig.addCustomizer(new SecureRequestCustomizer());
 
-            final SslContextFactory sslContextFactory = new SslContextFactory();
+            final SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
             sslContextFactory.addExcludeProtocols("SSLv3");
             sslContextFactory.setEndpointIdentificationAlgorithm(null);
             sslContextFactory.setTrustStorePath(c2sTrustStoreLocation);
diff --git a/src/java/org/ifsoft/sso/Password.java b/src/java/org/ifsoft/sso/Password.java
index 2dc68868..0126c672 100644
--- a/src/java/org/ifsoft/sso/Password.java
+++ b/src/java/org/ifsoft/sso/Password.java
@@ -190,12 +190,12 @@ private void writeHeader(HttpServletResponse response)
         response.setHeader("Pragma", "no-cache");
         response.setHeader("Content-Type", "application/javascript");
         response.setHeader("Connection", "close");
-
-        HttpBindManager boshManager = HttpBindManager.getInstance();
-
-        response.setHeader("Access-Control-Allow-Origin", boshManager.getCORSAllowOrigin());
-        response.setHeader("Access-Control-Allow-Headers", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS_DEFAULT + ", Authorization");
+		
+		HttpBindManager boshManager = HttpBindManager.getInstance();
+		response.setHeader("Access-Control-Allow-Methods", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS.getValue()));
+		response.setHeader("Access-Control-Allow-Headers", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS.getValue() + ", Authorization"));
+		response.setHeader("Access-Control-Max-Age", String.valueOf(HttpBindManager.HTTP_BIND_CORS_MAX_AGE.getValue().toSeconds()));
+		response.setHeader("Access-Control-Allow-Origin", String.valueOf(HttpBindManager.HTTP_BIND_ALLOWED_ORIGINS.getDefaultValue()));
         response.setHeader("Access-Control-Allow-Credentials", "true");
-        response.setHeader("Access-Control-Allow-Methods", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS_DEFAULT);
     }
 }
diff --git a/src/java/org/ifsoft/sso/SmartIdCard.java b/src/java/org/ifsoft/sso/SmartIdCard.java
index a56e6fed..d833c665 100644
--- a/src/java/org/ifsoft/sso/SmartIdCard.java
+++ b/src/java/org/ifsoft/sso/SmartIdCard.java
@@ -165,13 +165,13 @@ private void writeHeader(HttpServletResponse response)
         response.setHeader("Pragma", "no-cache");
         response.setHeader("Content-Type", "application/javascript");
         response.setHeader("Connection", "close");
-
-        HttpBindManager boshManager = HttpBindManager.getInstance();
-
-        response.setHeader("Access-Control-Allow-Origin", boshManager.getCORSAllowOrigin());
-        response.setHeader("Access-Control-Allow-Headers", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS_DEFAULT + ", Authorization");
-        response.setHeader("Access-Control-Allow-Credentials", "true");
-        response.setHeader("Access-Control-Allow-Methods", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS_DEFAULT);
+		
+		HttpBindManager boshManager = HttpBindManager.getInstance();
+		response.setHeader("Access-Control-Allow-Methods", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS.getValue()));
+		response.setHeader("Access-Control-Allow-Headers", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS.getValue() + ", Authorization"));
+		response.setHeader("Access-Control-Max-Age", String.valueOf(HttpBindManager.HTTP_BIND_CORS_MAX_AGE.getValue().toSeconds()));
+		response.setHeader("Access-Control-Allow-Origin", String.valueOf(HttpBindManager.HTTP_BIND_ALLOWED_ORIGINS.getDefaultValue()));
+        response.setHeader("Access-Control-Allow-Credentials", "true");		
     }
 
     public String get(String url) throws ClientProtocolException, IOException
diff --git a/src/java/org/ifsoft/sso/SmartIdCardCert.java b/src/java/org/ifsoft/sso/SmartIdCardCert.java
index 639c7bd0..c6295a4c 100644
--- a/src/java/org/ifsoft/sso/SmartIdCardCert.java
+++ b/src/java/org/ifsoft/sso/SmartIdCardCert.java
@@ -162,12 +162,12 @@ private void writeHeader(HttpServletResponse response)
         response.setHeader("Content-Type", "application/javascript");
         response.setHeader("Connection", "close");
 
-        HttpBindManager boshManager = HttpBindManager.getInstance();
-
-        response.setHeader("Access-Control-Allow-Origin", boshManager.getCORSAllowOrigin());
-        response.setHeader("Access-Control-Allow-Headers", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS_DEFAULT + ", Authorization");
-        response.setHeader("Access-Control-Allow-Credentials", "true");
-        response.setHeader("Access-Control-Allow-Methods", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS_DEFAULT);
+		HttpBindManager boshManager = HttpBindManager.getInstance();
+		response.setHeader("Access-Control-Allow-Methods", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS.getValue()));
+		response.setHeader("Access-Control-Allow-Headers", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS.getValue() + ", Authorization"));
+		response.setHeader("Access-Control-Max-Age", String.valueOf(HttpBindManager.HTTP_BIND_CORS_MAX_AGE.getValue().toSeconds()));
+		response.setHeader("Access-Control-Allow-Origin", String.valueOf(HttpBindManager.HTTP_BIND_ALLOWED_ORIGINS.getDefaultValue()));
+        response.setHeader("Access-Control-Allow-Credentials", "true");	
     }
 
 }
diff --git a/src/java/org/ifsoft/sso/WellKnownHostMeta.java b/src/java/org/ifsoft/sso/WellKnownHostMeta.java
index 2eea8dab..b402becb 100644
--- a/src/java/org/ifsoft/sso/WellKnownHostMeta.java
+++ b/src/java/org/ifsoft/sso/WellKnownHostMeta.java
@@ -50,11 +50,11 @@ private void writeHeader(HttpServletResponse response)
         response.setHeader("Content-Type", "application/javascript");
         response.setHeader("Connection", "close");
 
-        HttpBindManager boshManager = HttpBindManager.getInstance();
-
-        response.setHeader("Access-Control-Allow-Origin", boshManager.getCORSAllowOrigin());
-        response.setHeader("Access-Control-Allow-Headers", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS_DEFAULT + ", Authorization");
+		HttpBindManager boshManager = HttpBindManager.getInstance();
+		response.setHeader("Access-Control-Allow-Methods", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS.getValue()));
+		response.setHeader("Access-Control-Allow-Headers", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS.getValue() + ", Authorization"));
+		response.setHeader("Access-Control-Max-Age", String.valueOf(HttpBindManager.HTTP_BIND_CORS_MAX_AGE.getValue().toSeconds()));
+		response.setHeader("Access-Control-Allow-Origin", String.valueOf(HttpBindManager.HTTP_BIND_ALLOWED_ORIGINS.getDefaultValue()));
         response.setHeader("Access-Control-Allow-Credentials", "true");
-        response.setHeader("Access-Control-Allow-Methods", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS_DEFAULT);
     }
 }
diff --git a/src/java/org/ifsoft/websockets/LiveStreamSocket.java b/src/java/org/ifsoft/websockets/LiveStreamSocket.java
index 9cecad60..d637981e 100644
--- a/src/java/org/ifsoft/websockets/LiveStreamSocket.java
+++ b/src/java/org/ifsoft/websockets/LiveStreamSocket.java
@@ -15,11 +15,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
-import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
-import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
 import org.eclipse.jetty.websocket.api.annotations.*;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.RemoteEndpoint;
@@ -94,7 +89,7 @@ public boolean isOpen() {
 					
 			final String ffmpeg = path + File.separator + ffmpegName;	
 			final String url = liveStreamUrl + "/" + metadata.getString("key");
-			final String cmdLine = ffmpeg + " -i - -vcodec libx264 -f flv " + url;
+			final String cmdLine = ffmpeg + " -i - -vcodec copy -f flv " + url;
 			ffmpegThread = Spawn.startProcess(cmdLine, new File(path), this);
             
 			securityAuditManager.logEvent("pade", "meeting - " + metadata.getString("room") + " live stream by " + metadata.getString("user"), url);
diff --git a/src/java/org/ifsoft/websockets/ProxyConnection.java b/src/java/org/ifsoft/websockets/ProxyConnection.java
index 89031c6b..f5e4af62 100644
--- a/src/java/org/ifsoft/websockets/ProxyConnection.java
+++ b/src/java/org/ifsoft/websockets/ProxyConnection.java
@@ -12,13 +12,12 @@
 import java.security.cert.X509Certificate;
 import java.util.*;
 import java.util.concurrent.*;
+import java.time.Duration;
 import javax.net.*;
 import javax.net.ssl.*;
 import javax.security.auth.callback.*;
 
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
@@ -53,7 +52,6 @@ public ProxyConnection(URI uri, List<String> subprotocol, int connectTimeout)
     {
         Log.debug("ProxyConnection " + uri + " " + subprotocol);
 
-        final SslContextFactory clientSslContextFactory = SslContextFactoryProvider.getClientSslContextFactory();
         if("wss".equals(uri.getScheme()))
         {
             Log.debug("ProxyConnection - SSL");
@@ -62,7 +60,7 @@ public ProxyConnection(URI uri, List<String> subprotocol, int connectTimeout)
         }
         else isSecure = false;
 
-        httpClient = new HttpClient(new HttpClientTransportOverHTTP(1),clientSslContextFactory);
+        httpClient = new HttpClient();
         final QueuedThreadPool queuedThreadPool = QueuedThreadPoolProvider.getQueuedThreadPool("ProxyConnection-HttpClient");
         httpClient.setExecutor(queuedThreadPool);
         httpClient.setConnectTimeout(connectTimeout);
@@ -71,10 +69,10 @@ public ProxyConnection(URI uri, List<String> subprotocol, int connectTimeout)
         {
 			httpClient.start();
 			wsClient = new WebSocketClient(httpClient);
+			wsClient.setIdleTimeout(Duration.ofMinutes(5));			
             wsClient.start();
 			
-            final ClientUpgradeRequest request = new ClientUpgradeRequest();
-			request.setRequestURI​(uri);
+            final ClientUpgradeRequest request = new ClientUpgradeRequest(uri);
             if (subprotocol != null) request.setSubProtocols(subprotocol);
 			
 			proxySocket = new ProxySocket(this);			
@@ -245,7 +243,7 @@ public void deliver(String text)
             {
                 try {
                     Log.debug("ProxySocket deliver: \n" + text);
-                    session.getRemote().sendStringByFuture(text);
+                    session.getRemote().sendString(text);
                     lastMessage = null;
                 } catch (Exception e) {
                     Log.error("ProxySocket deliver", e);
diff --git a/src/java/org/ifsoft/websockets/ProxyWebSocket.java b/src/java/org/ifsoft/websockets/ProxyWebSocket.java
index 0d3b2605..3ea632ce 100644
--- a/src/java/org/ifsoft/websockets/ProxyWebSocket.java
+++ b/src/java/org/ifsoft/websockets/ProxyWebSocket.java
@@ -15,11 +15,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
-import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
-import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
 import org.eclipse.jetty.websocket.api.annotations.*;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.RemoteEndpoint;
@@ -95,7 +90,7 @@ public void deliver(String message)
         {
             try {
                 Log.debug(" : Delivered : \n" + message );
-                wsSession.getRemote().sendStringByFuture(message);
+                wsSession.getRemote().sendString(message);
             } catch (Exception e) {
                 Log.error("ProxyWebSocket deliver " + e);
                 Log.warn("Could not deliver : \n" + message );
diff --git a/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetPlugin.java b/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetPlugin.java
index a3035588..bc19f02e 100644
--- a/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetPlugin.java
+++ b/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetPlugin.java
@@ -26,9 +26,14 @@
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.servlets.*;
 import org.eclipse.jetty.servlet.*;
+import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.servlet.*;
 import org.eclipse.jetty.websocket.server.*;
-import org.eclipse.jetty.websocket.server.pathmap.ServletPathSpec;
+import org.eclipse.jetty.websocket.server.config.*;
+
+import org.eclipse.jetty.util.security.*;
+import org.eclipse.jetty.security.*;
+import org.eclipse.jetty.security.authentication.*;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -58,15 +63,22 @@
 import org.jivesoftware.openfire.session.ClientSession;
 import org.jivesoftware.openfire.session.Session;
 import org.jivesoftware.openfire.security.SecurityAuditManager;
+import org.jivesoftware.openfire.plugin.rest.OpenfireLoginService;
+
 import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.StringUtils;
 import org.jivesoftware.util.PropertyEventDispatcher;
 import org.jivesoftware.util.PropertyEventListener;
 import org.jivesoftware.util.cache.Cache;
 import org.jivesoftware.util.cache.CacheFactory;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.jitsi.util.OSUtils;
+import waffle.servlet.NegotiateSecurityFilter;
+import waffle.servlet.WaffleInfoServlet;
+
 import org.xmpp.component.ComponentManager;
 import org.xmpp.component.ComponentManagerFactory;
 import org.xmpp.packet.IQ;
@@ -80,6 +92,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.Security;
+import javax.servlet.DispatcherType;
 import java.io.*;
 import java.net.*;
 import java.util.*;
@@ -99,7 +112,6 @@
 import org.jboss.netty.channel.ExceptionEvent;
 import org.json.JSONObject;
 import org.json.JSONArray;
-import org.jitsi.util.OSUtils;
 import de.mxro.process.*;
 import javax.xml.bind.DatatypeConverter;
 import org.voicebridge.Application;
@@ -129,6 +141,10 @@ public class OfMeetPlugin implements Plugin, SessionEventListener, ClusterEventL
 
     private OfMeetIQHandler ofmeetIQHandler;
     private WebAppContext publicWebApp;
+    private WebAppContext contextPublic;
+    private WebAppContext contextPrivate;
+    private WebAppContext contextWinSSO;
+    private WebAppContext contextWellKnown;	
     private ServletContextHandler jvbWsContext = null;
     private ServletContextHandler streamWsContext = null;	
     private BookmarkInterceptor bookmarkInterceptor;
@@ -396,40 +412,89 @@ public void destroyPlugin()
     }
 
     protected void loadPublicWebApp() throws Exception
-    {
-        Log.info( "Initializing public web application for /colibri-ws web socket" );
-
-        jvbWsContext = new ServletContextHandler(null, "/colibri-ws", ServletContextHandler.SESSIONS);
-
-        try {
-            WebSocketUpgradeFilter wsfilter = WebSocketUpgradeFilter.configureContext(jvbWsContext);
-            wsfilter.getFactory().getPolicy().setIdleTimeout(60 * 60 * 1000);
-            wsfilter.getFactory().getPolicy().setMaxTextMessageSize(64000000);
-            wsfilter.addMapping(new ServletPathSpec("/*"), new JvbSocketCreator());					
+    {			
+        jvbWsContext = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        jvbWsContext.setContextPath("/colibri-ws");
 
-        } catch (Exception e) {
-            Log.error("loadPublicWebApp", e);
-        }
-
-        HttpBindManager.getInstance().addJettyHandler(jvbWsContext);	
-
-        publicWebApp = new WebAppContext(null, pluginDirectory.getPath() + "/classes/jitsi-meet",  new OFMeetConfig().getWebappContextPath());
-        publicWebApp.setClassLoader(this.getClass().getClassLoader());
-
-        final List<ContainerInitializer> initializers4 = new ArrayList<>();
-        initializers4.add(new ContainerInitializer(new JettyJasperInitializer(), null));
-        publicWebApp.setAttribute("org.eclipse.jetty.containerInitializers", initializers4);
-        publicWebApp.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
-
-        HttpBindManager.getInstance().addJettyHandler( publicWebApp );
+        JettyWebSocketServletContainerInitializer.configure(jvbWsContext, (servletContext, wsContainer) ->
+        {
+            wsContainer.setMaxTextMessageSize(65535);
+            wsContainer.addMapping("/*", new JvbSocketCreator());
+        });	
 
-        Log.debug( "Initialized public web application", publicWebApp.toString() );
+		HttpBindManager.getInstance().addJettyHandler( jvbWsContext );	
+        Log.info( "Initialized public web socket for /colibri-ws web socket" );
+		
+		publicWebApp = new WebAppContext(pluginDirectory.getPath() + "/classes/jitsi-meet",  new OFMeetConfig().getWebappContextPath());
+		publicWebApp.setClassLoader(this.getClass().getClassLoader());
+		final List<ContainerInitializer> initializers4 = new ArrayList<>();
+		initializers4.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+		publicWebApp.setAttribute("org.eclipse.jetty.containerInitializers", initializers4);
+		publicWebApp.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
+		HttpBindManager.getInstance().addJettyHandler( publicWebApp );	
+		
+		contextPublic = new WebAppContext(pluginDirectory.getPath() + "/classes/docs", "/pade");
+		contextPublic.setClassLoader(this.getClass().getClassLoader());
+		contextPublic.getMimeTypes().addMimeMapping("wasm", "application/wasm");
+		final List<ContainerInitializer> initializersCRM = new ArrayList<>();
+		initializersCRM.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+		contextPublic.setAttribute("org.eclipse.jetty.containerInitializers", initializersCRM);
+		contextPublic.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
+		contextPublic.setWelcomeFiles(new String[]{"index.html"});
+		HttpBindManager.getInstance().addJettyHandler(contextPublic);		
+							
+		contextWellKnown = new WebAppContext(pluginDirectory.getPath() + "/classes/well-known", "/.well-known");
+		contextWellKnown.setClassLoader(this.getClass().getClassLoader());
+		final List<ContainerInitializer> initializersWellKnown = new ArrayList<>();
+		initializersWellKnown.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+		contextWellKnown.setAttribute("org.eclipse.jetty.containerInitializers", initializersWellKnown);
+		contextWellKnown.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
+		contextWellKnown.setWelcomeFiles(new String[]{"index.jsp"});
+		HttpBindManager.getInstance().addJettyHandler(contextWellKnown);
+		
+		contextPrivate = new WebAppContext(pluginDirectory.getPath() + "/classes/private", "/dashboard");
+		contextPrivate.setClassLoader(this.getClass().getClassLoader());
+		contextPrivate.getMimeTypes().addMimeMapping("wasm", "application/wasm");
+		SecurityHandler securityHandler = basicAuth("ofmeet");
+		contextPrivate.setSecurityHandler(securityHandler);
+		final List<ContainerInitializer> initializersDashboard = new ArrayList<>();
+		initializersDashboard.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+		contextPrivate.setAttribute("org.eclipse.jetty.containerInitializers", initializersDashboard);
+		contextPrivate.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
+		contextPrivate.setWelcomeFiles(new String[]{"index.jsp"});
+		HttpBindManager.getInstance().addJettyHandler(contextPrivate);
+		
+		contextWinSSO = new WebAppContext(pluginDirectory.getPath() + "/classes/win-sso", "/sso");
+		contextWinSSO.setClassLoader(this.getClass().getClassLoader());
+		final List<ContainerInitializer> initializers7 = new ArrayList<>();
+		initializers7.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+		contextWinSSO.setAttribute("org.eclipse.jetty.containerInitializers", initializers7);
+		contextWinSSO.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
+		contextWinSSO.setWelcomeFiles(new String[]{"index.jsp"});
+		
+		if (OSUtils.IS_WINDOWS && contextWinSSO != null)
+		{
+			NegotiateSecurityFilter securityFilter = new NegotiateSecurityFilter();
+			FilterHolder filterHolder = new FilterHolder();
+			filterHolder.setFilter(securityFilter);
+			EnumSet<DispatcherType> enums = EnumSet.of(DispatcherType.REQUEST);
+			enums.add(DispatcherType.REQUEST);
+
+			contextWinSSO.addFilter(filterHolder, "/*", enums);
+			contextWinSSO.addServlet(new ServletHolder(new WaffleInfoServlet()), "/waffle");
+			
+			contextWinSSO.addServlet(new ServletHolder(new org.ifsoft.sso.Password()), "/password");
+			HttpBindManager.getInstance().addJettyHandler(contextWinSSO);			
+		}	
+	
+		Log.debug( "Initialized public web application", publicWebApp.toString() );
+				
     }
 
 	
-    public static class JvbSocketCreator implements WebSocketCreator
+    public static class JvbSocketCreator implements JettyWebSocketCreator
     {
-        @Override public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp)
+        @Override public Object createWebSocket(JettyServerUpgradeRequest req, JettyServerUpgradeResponse resp)
         {
 			String ipaddr = JiveGlobals.getProperty( "ofmeet.videobridge.rest.host", OfMeetPlugin.self.getIpAddress());	
             String jvbPort = JiveGlobals.getProperty( "ofmeet.websockets.plainport", "8180");
@@ -480,7 +545,14 @@ public void unloadPublicWebApp() throws Exception
                 {
                     HttpBindManager.getInstance().removeJettyHandler(streamWsContext);
                     streamWsContext.destroy();
-                }				
+                }	
+
+				HttpBindManager.getInstance().removeJettyHandler(contextPublic);
+				HttpBindManager.getInstance().removeJettyHandler(contextPrivate);
+
+				if (contextWellKnown != null) HttpBindManager.getInstance().removeJettyHandler(contextWellKnown);
+				if (contextWinSSO != null) HttpBindManager.getInstance().removeJettyHandler(contextWinSSO);
+				
             }
             finally
             {
@@ -736,6 +808,27 @@ private String getStringFromFile(String filePath)
         return contentBuilder.toString();
     }
 
+    private static final SecurityHandler basicAuth(String realm) {
+
+        OpenfireLoginService l = new OpenfireLoginService(realm);
+        Constraint constraint = new Constraint();
+        constraint.setName(Constraint.__BASIC_AUTH);
+        constraint.setRoles(new String[]{"ofmeet", "webapp-owner", "webapp-contributor", "warfile-admin"});
+        constraint.setAuthenticate(true);
+
+        ConstraintMapping cm = new ConstraintMapping();
+        cm.setConstraint(constraint);
+        cm.setPathSpec("/*");
+
+        ConstraintSecurityHandler csh = new ConstraintSecurityHandler();
+        csh.setAuthenticator(new BasicAuthenticator());
+        csh.setRealmName(realm);
+        csh.addConstraintMapping(cm);
+        csh.setLoginService(l);
+
+        return csh;
+    }
+	
     //-------------------------------------------------------
     //
     //      ffmpeg live streaming
@@ -822,19 +915,15 @@ private void setupFFMPEG(File pluginDirectory)
 	
 	private void startFFMPEG(String path)
 	{	
-        streamWsContext = new ServletContextHandler(null, "/livestream-ws", ServletContextHandler.SESSIONS);		
+        streamWsContext = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        streamWsContext.setContextPath("/livestream-ws");
+		HttpBindManager.getInstance().addJettyHandler( streamWsContext );			
 
-        try {			
-            WebSocketUpgradeFilter wsfilter2 = WebSocketUpgradeFilter.configureContext(streamWsContext);
-            wsfilter2.getFactory().getPolicy().setIdleTimeout(60 * 60 * 1000);
-            wsfilter2.getFactory().getPolicy().setMaxTextMessageSize(64000000);
-            wsfilter2.getFactory().getPolicy().setMaxBinaryMessageSize(64000000);			
-			
-            wsfilter2.addMapping(new ServletPathSpec("/*"), new StreamSocketCreator());						
-
-        } catch (Exception e) {
-            Log.error("loadPublicWebApp", e);
-        }			
+        JettyWebSocketServletContainerInitializer.configure(streamWsContext, (servletContext, wsContainer) ->
+        {
+            wsContainer.setMaxTextMessageSize(65535);
+            wsContainer.addMapping("/*", new StreamSocketCreator());
+        });	
 
         try {
 			String ffmpegName = null;
@@ -867,9 +956,9 @@ private void extractFile(ZipInputStream zipIn, String filePath) throws IOExcepti
         bos.close();
     }	
 	
-    public static class StreamSocketCreator implements WebSocketCreator
+    public static class StreamSocketCreator implements JettyWebSocketCreator
     {
-        @Override public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp)
+        @Override public Object createWebSocket(JettyServerUpgradeRequest req, JettyServerUpgradeResponse resp)
         {
 			String streamKey = null;
 			
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/AuthFilter.java b/src/java/org/jivesoftware/openfire/plugin/rest/AuthFilter.java
deleted file mode 100644
index 5606c0fc..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/AuthFilter.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response.Status;
-
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.user.*;
-import org.jivesoftware.openfire.admin.AdminManager;
-import org.jivesoftware.openfire.auth.AuthFactory;
-import org.jivesoftware.openfire.auth.ConnectionException;
-import org.jivesoftware.openfire.auth.InternalUnauthenticatedException;
-import org.jivesoftware.openfire.auth.UnauthorizedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.jivesoftware.util.*;
-
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-
-import org.igniterealtime.openfire.plugins.pushnotification.WebPushInterceptor;
-import org.ifsoft.sso.Password;
-
-/**
- * The Class AuthFilter.
- */
-public class AuthFilter implements ContainerRequestFilter {
-
-    private static Logger LOG = LoggerFactory.getLogger(AuthFilter.class);
-    @Context private HttpServletRequest httpRequest;
-
-    @Override public ContainerRequest filter(ContainerRequest containerRequest) throws WebApplicationException
-    {
-        // Let the preflight request through the authentication
-        if ("OPTIONS".equals(containerRequest.getMethod())) {
-            return containerRequest;
-        }
-		
-        // Let web authn through
-        if (containerRequest.getPath().contains("/meet/webauthn")) {
-            return containerRequest;
-        }	
-
-        // Let web push through
-        if (containerRequest.getPath().contains("/webpushsend") && "POST".equals(containerRequest.getMethod())) {
-            return containerRequest;
-        }		
-
-        // Get the authentification passed in HTTP headers parameters
-        String auth = containerRequest.getHeaderValue("authorization");
-
-        if (auth == null) {
-            throw new WebApplicationException(Status.UNAUTHORIZED);
-        }
-
-        // let replies through
-
-        if (WebPushInterceptor.tokens.containsKey(auth))
-        {
-            return containerRequest;
-        }
-
-        String[] usernameAndPassword = BasicAuth.decode(auth);
-
-        // If username or password fail
-        if (usernameAndPassword == null || usernameAndPassword.length != 2) {
-            throw new WebApplicationException(Status.UNAUTHORIZED);
-        }
-
-/*
-        boolean userAdmin = AdminManager.getInstance().isUserAdmin(usernameAndPassword[0], true);
-
-        if (!userAdmin) {
-            throw new WebApplicationException(Status.UNAUTHORIZED);
-        }
-*/
-        try {
-			boolean ofmeetWebAuthnEnabled = JiveGlobals.getBooleanProperty( "ofmeet.webauthn.enabled", false );	
-
-			if (ofmeetWebAuthnEnabled)
-			{
-				User user = XMPPServer.getInstance().getUserManager().getUser(usernameAndPassword[0]);
-				
-                if (user.getProperties().containsKey("webauthn-key-" + usernameAndPassword[1]))
-                {
-					return containerRequest;
-                }				
-			}
-			else
-				
-			if (Password.passwords.containsKey(usernameAndPassword[0]))
-			{
-				String passkey = Password.passwords.get(usernameAndPassword[0]).trim();	
-
-				if (passkey.equals(usernameAndPassword[1]))
-				{
-					return containerRequest;
-				}				
-			}				
-				
-            AuthFactory.authenticate(usernameAndPassword[0], usernameAndPassword[1]);
-        } catch (Exception e) {
-            LOG.error("Wrong HTTP Basic Auth authorization", e);
-        }
-
-        return containerRequest;
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/CORSFilter.java b/src/java/org/jivesoftware/openfire/plugin/rest/CORSFilter.java
deleted file mode 100644
index 9c7a70c5..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/CORSFilter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest;
-
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerResponse;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
-
-/**
- * The Class CORSFilter.
- */
-public class CORSFilter implements ContainerResponseFilter {
-
-    /* (non-Javadoc)
-     * @see com.sun.jersey.spi.container.ContainerResponseFilter#filter(com.sun.jersey.spi.container.ContainerRequest, com.sun.jersey.spi.container.ContainerResponse)
-     */
-    @Override
-    public ContainerResponse filter(ContainerRequest request, ContainerResponse response) {
-        response.getHttpHeaders().add("Access-Control-Allow-Origin", "*");
-        response.getHttpHeaders().add("Access-Control-Allow-Headers",
-                "origin, content-type, accept, authorization");
-        response.getHttpHeaders().add("Access-Control-Allow-Credentials", "true");
-        response.getHttpHeaders().add("Access-Control-Allow-Methods",
-                "GET, POST, PUT, DELETE, OPTIONS, HEAD");
-
-        return response;
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/controller/GroupController.java b/src/java/org/jivesoftware/openfire/plugin/rest/controller/GroupController.java
deleted file mode 100644
index f71b0bfa..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/controller/GroupController.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.controller;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.group.Group;
-import org.jivesoftware.openfire.group.GroupAlreadyExistsException;
-import org.jivesoftware.openfire.group.GroupManager;
-import org.jivesoftware.openfire.group.GroupNotFoundException;
-import org.jivesoftware.openfire.plugin.rest.entity.GroupEntity;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.utils.MUCRoomUtils;
-
-/**
- * The Class GroupController.
- */
-public class GroupController {
-	/** The Constant INSTANCE. */
-	public static final GroupController INSTANCE = new GroupController();
-
-	/**
-	 * Gets the single instance of GroupController.
-	 *
-	 * @return single instance of GroupController
-	 */
-	public static GroupController getInstance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Gets the groups.
-	 *
-	 * @return the groups
-	 * @throws ServiceException
-	 *             the service exception
-	 */
-	public List<GroupEntity> getGroups() throws ServiceException {
-		Collection<Group> groups = GroupManager.getInstance().getGroups();
-		List<GroupEntity> groupEntities = new ArrayList<GroupEntity>();
-		for (Group group : groups) {
-			GroupEntity groupEntity = new GroupEntity(group.getName(), group.getDescription());
-			groupEntities.add(groupEntity);
-		}
-
-		return groupEntities;
-	}
-
-	/**
-	 * Gets the group.
-	 *
-	 * @param groupName
-	 *            the group name
-	 * @return the group
-	 * @throws ServiceException
-	 *             the service exception
-	 */
-	public GroupEntity getGroup(String groupName) throws ServiceException {
-		Group group;
-		try {
-			group = GroupManager.getInstance().getGroup(groupName);
-		} catch (GroupNotFoundException e) {
-			throw new ServiceException("Could not find group", groupName, ExceptionType.GROUP_NOT_FOUND,
-					Response.Status.NOT_FOUND, e);
-		}
-
-		GroupEntity groupEntity = new GroupEntity(group.getName(), group.getDescription());
-		groupEntity.setAdmins(MUCRoomUtils.convertJIDsToStringList(group.getAdmins()));
-		groupEntity.setMembers(MUCRoomUtils.convertJIDsToStringList(group.getMembers()));
-
-		return groupEntity;
-	}
-
-	/**
-	 * Creates the group.
-	 *
-	 * @param groupEntity
-	 *            the group entity
-	 * @return the group
-	 * @throws ServiceException
-	 *             the service exception
-	 */
-	public Group createGroup(GroupEntity groupEntity) throws ServiceException {
-		Group group;
-		if (groupEntity != null && !groupEntity.getName().isEmpty()) {
-			try {
-				group = GroupManager.getInstance().createGroup(groupEntity.getName());
-				group.setDescription(groupEntity.getDescription());
-
-				group.getProperties().put("sharedRoster.showInRoster", "onlyGroup");
-				group.getProperties().put("sharedRoster.displayName", groupEntity.getName());
-				group.getProperties().put("sharedRoster.groupList", "");
-			} catch (GroupAlreadyExistsException e) {
-				throw new ServiceException("Could not create a group", groupEntity.getName(),
-						ExceptionType.GROUP_ALREADY_EXISTS, Response.Status.CONFLICT, e);
-			}
-		} else {
-			throw new ServiceException("Could not create new group", "groups",
-					ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-		}
-		return group;
-	}
-
-	/**
-	 * Update group.
-	 *
-	 * @param groupName the group name
-	 * @param groupEntity the group entity
-	 * @return the group
-	 * @throws ServiceException the service exception
-	 */
-	public Group updateGroup(String groupName, GroupEntity groupEntity) throws ServiceException {
-		Group group;
-		if (groupEntity != null && !groupEntity.getName().isEmpty()) {
-			if (groupName.equals(groupEntity.getName())) {
-				try {
-					group = GroupManager.getInstance().getGroup(groupName);
-					group.setDescription(groupEntity.getDescription());
-				} catch (GroupNotFoundException e) {
-					throw new ServiceException("Could not find group", groupName, ExceptionType.GROUP_NOT_FOUND,
-							Response.Status.NOT_FOUND, e);
-				}
-			} else {
-				throw new ServiceException(
-						"Could not update the group. The group name is different to the payload group name.", groupName + " != " + groupEntity.getName(),
-						ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-			}
-		} else {
-			throw new ServiceException("Could not update new group", "groups",
-					ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-		}
-		return group;
-	}
-
-	/**
-	 * Delete group.
-	 *
-	 * @param groupName
-	 *            the group name
-	 * @throws ServiceException
-	 *             the service exception
-	 */
-	public void deleteGroup(String groupName) throws ServiceException {
-		try {
-			Group group = GroupManager.getInstance().getGroup(groupName);
-			GroupManager.getInstance().deleteGroup(group);
-		} catch (GroupNotFoundException e) {
-			throw new ServiceException("Could not find group", groupName, ExceptionType.GROUP_NOT_FOUND,
-					Response.Status.NOT_FOUND, e);
-		}
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/controller/JustMarriedController.java b/src/java/org/jivesoftware/openfire/plugin/rest/controller/JustMarriedController.java
deleted file mode 100644
index 2b4e7c2c..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/controller/JustMarriedController.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.controller;
-
-import java.util.List;
-
-import javax.ws.rs.core.Response;
-
-import org.dom4j.Element;
-import org.jivesoftware.openfire.SessionManager;
-import org.jivesoftware.openfire.SharedGroupException;
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.auth.AuthFactory;
-import org.jivesoftware.openfire.group.Group;
-import org.jivesoftware.openfire.group.GroupManager;
-import org.jivesoftware.openfire.lockout.LockOutManager;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.roster.Roster;
-import org.jivesoftware.openfire.roster.RosterItem;
-import org.jivesoftware.openfire.session.ClientSession;
-import org.jivesoftware.openfire.user.User;
-import org.jivesoftware.openfire.user.UserAlreadyExistsException;
-import org.jivesoftware.openfire.user.UserManager;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-import org.jivesoftware.openfire.vcard.VCardManager;
-import org.xmpp.packet.StreamError;
-
-/**
- * The Class JustMarriedController.
- */
-public class JustMarriedController {
-
-	/**
-	 * Change name.
-	 *
-	 * @param currentUserName
-	 *            the current user name
-	 * @param newUserName
-	 *            the new user name
-	 * @param deleteOldUser
-	 *            the delete old user
-	 * @param newEmail
-	 *            the new email
-	 * @param newRealName
-	 *            the new real name
-	 * @return true, if successful
-	 * @throws ServiceException
-	 *             the service exception
-	 */
-	public static boolean changeName(String currentUserName, String newUserName, boolean deleteOldUser,
-			String newEmail, String newRealName) throws ServiceException {
-		UserManager userManager = UserManager.getInstance();
-
-		try {
-			User currentUser = userManager.getUser(currentUserName);
-			// Old user found, create new one
-			String password = AuthFactory.getPassword(currentUserName);
-			String newName = (newRealName == null || newRealName.length() == 0) ? currentUser.getName() : newRealName;
-			String newMail = (newEmail == null || newEmail.length() == 0) ? currentUser.getEmail() : newEmail;
-			User newUser = userManager.createUser(newUserName, password, currentUser.getName(), newMail);
-			newUser.setName(newName);
-			newUser.setNameVisible(currentUser.isNameVisible());
-			newUser.setEmailVisible(currentUser.isEmailVisible());
-			newUser.setCreationDate(currentUser.getCreationDate());
-
-			copyRoster(currentUser, newUser, currentUserName);
-			copyProperties(currentUser, newUser);
-			copyToGroups(currentUserName, newUserName);
-			copyVCard(currentUserName, newUserName);
-			if (deleteOldUser) {
-				deleteUser(currentUser);
-			}
-
-		} catch (UserNotFoundException e) {
-			throw new ServiceException("Could not find user", currentUserName, ExceptionType.USER_NOT_FOUND_EXCEPTION,
-					Response.Status.NOT_FOUND, e);
-		} catch (UserAlreadyExistsException e) {
-			throw new ServiceException("Could not create new user", newUserName,
-					ExceptionType.USER_ALREADY_EXISTS_EXCEPTION, Response.Status.CONFLICT, e);
-		}
-		return true;
-
-	}
-
-	/**
-	 * Copy v card.
-	 *
-	 * @param currentUserName
-	 *            the current user name
-	 * @param newUserName
-	 *            the new user name
-	 * @throws ServiceException
-	 *             the service exception
-	 */
-	private static void copyVCard(String currentUserName, String newUserName) throws ServiceException {
-		VCardManager vcardManager = VCardManager.getInstance();
-		Element vcard = vcardManager.getVCard(currentUserName);
-
-		if (vcard != null) {
-			try {
-				vcardManager.setVCard(newUserName, vcard);
-			} catch (Exception e) {
-				throw new ServiceException("Could not copy vcard to new user", newUserName,
-						ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST, e);
-			}
-		}
-	}
-
-	/**
-	 * Copy to groups.
-	 *
-	 * @param currentUser
-	 *            the current user
-	 * @param newUser
-	 *            the new user
-	 */
-	private static void copyToGroups(String currentUser, String newUser) {
-		GroupManager groupManager = GroupManager.getInstance();
-		for (Group group : groupManager.getGroups()) {
-			if (group.isUser(currentUser)) {
-				group.getMembers().add(XMPPServer.getInstance().createJID(newUser, null));
-			}
-		}
-
-	}
-
-	/**
-	 * Delete user.
-	 *
-	 * @param oldUser
-	 *            the old user
-	 */
-	private static void deleteUser(User oldUser) {
-		UserManager.getInstance().deleteUser(oldUser);
-		LockOutManager.getInstance().enableAccount(oldUser.getUsername());
-		final StreamError error = new StreamError(StreamError.Condition.not_authorized);
-		for (ClientSession sess : SessionManager.getInstance().getSessions(oldUser.getUsername())) {
-			sess.deliverRawText(error.toXML());
-			sess.close();
-		}
-	}
-
-	/**
-	 * Copy properties.
-	 *
-	 * @param currentUser
-	 *            the current user
-	 * @param newUser
-	 *            the new user
-	 */
-	private static void copyProperties(User currentUser, User newUser) {
-		newUser.getProperties().putAll( currentUser.getProperties() );
-	}
-
-	/**
-	 * Copy roster.
-	 *
-	 * @param currentUser
-	 *            the current user
-	 * @param newUser
-	 *            the new user
-	 * @param currentUserName
-	 *            the current user name
-	 * @throws ServiceException
-	 *             the service exception
-	 */
-	private static void copyRoster(User currentUser, User newUser, String currentUserName) throws ServiceException {
-		Roster newRoster = newUser.getRoster();
-		Roster currentRoster = currentUser.getRoster();
-		for (RosterItem item : currentRoster.getRosterItems()) {
-			try {
-				List<String> groups = item.getGroups();
-
-				RosterItem justCreated = newRoster.createRosterItem(item.getJid(), item.getNickname(), groups, true,
-						true);
-				justCreated.setAskStatus(item.getAskStatus());
-				justCreated.setRecvStatus(item.getRecvStatus());
-				justCreated.setSubStatus(item.getSubStatus());
-
-				for (Group gr : item.getSharedGroups()) {
-					justCreated.addSharedGroup(gr);
-				}
-
-				for (Group gr : item.getInvisibleSharedGroups()) {
-					justCreated.addInvisibleSharedGroup(gr);
-				}
-				newRoster.updateRosterItem(justCreated);
-				addNewUserToOthersRoster(newUser, item, currentUserName);
-
-			} catch (UserAlreadyExistsException e) {
-				throw new ServiceException("Could not create roster item for user ", newUser.getUsername(),
-						ExceptionType.USER_ALREADY_EXISTS_EXCEPTION, Response.Status.CONFLICT, e);
-			} catch (SharedGroupException e) {
-				throw new ServiceException("Could not create roster item, because it is a contact from a shared group",
-						newUser.getUsername(), ExceptionType.USER_ALREADY_EXISTS_EXCEPTION,
-						Response.Status.BAD_REQUEST, e);
-			} catch (UserNotFoundException e) {
-				throw new ServiceException("Could not update roster item for user " + newUser.getUsername()
-						+ " because it was not properly created.", newUser.getUsername(),
-						ExceptionType.USER_NOT_FOUND_EXCEPTION, Response.Status.NOT_FOUND, e);
-			}
-		}
-
-	}
-
-	/**
-	 * Adds the new user to others roster.
-	 *
-	 * @param newUser
-	 *            the new user
-	 * @param otherItem
-	 *            the other item
-	 * @param currentUser
-	 *            the current user
-	 * @throws ServiceException
-	 *             the service exception
-	 */
-	private static void addNewUserToOthersRoster(User newUser, RosterItem otherItem, String currentUser)
-			throws ServiceException {
-		otherItem.getJid();
-		UserManager userManager = UserManager.getInstance();
-
-		// Is this user registered with our OF server?
-		String username = otherItem.getJid().getNode();
-		if (username != null && username.length() > 0 && userManager.isRegisteredUser(otherItem.getJid(), false)
-				&& XMPPServer.getInstance().isLocal(XMPPServer.getInstance().createJID(currentUser, null))) {
-			try {
-				User otherUser = userManager.getUser(username);
-				Roster otherRoster = otherUser.getRoster();
-				RosterItem oldUserOnOthersRoster = otherRoster.getRosterItem(XMPPServer.getInstance().createJID(
-						currentUser, null));
-
-				try {
-					if (!oldUserOnOthersRoster.isOnlyShared()) {
-
-						RosterItem justCreated = otherRoster.createRosterItem(
-								XMPPServer.getInstance().createJID(newUser.getUsername(), null),
-								oldUserOnOthersRoster.getNickname(), oldUserOnOthersRoster.getGroups(), true, true);
-						justCreated.setAskStatus(oldUserOnOthersRoster.getAskStatus());
-						justCreated.setRecvStatus(oldUserOnOthersRoster.getRecvStatus());
-						justCreated.setSubStatus(oldUserOnOthersRoster.getSubStatus());
-						otherRoster.updateRosterItem(justCreated);
-					}
-				} catch (UserAlreadyExistsException e) {
-					throw new ServiceException("Could not create roster item for user ", newUser.getUsername(),
-							ExceptionType.USER_ALREADY_EXISTS_EXCEPTION, Response.Status.CONFLICT, e);
-				} catch (SharedGroupException e) {
-					throw new ServiceException(
-							"Could not create roster item, because it is a contact from a shared group",
-							newUser.getUsername(), ExceptionType.USER_ALREADY_EXISTS_EXCEPTION,
-							Response.Status.BAD_REQUEST, e);
-				}
-			} catch (UserNotFoundException e) {
-				throw new ServiceException("Could not create roster item for user " + newUser.getUsername()
-						+ "  because it is a contact from a shared group.", newUser.getUsername(),
-						ExceptionType.USER_NOT_FOUND_EXCEPTION, Response.Status.NOT_FOUND, e);
-			}
-		}
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/controller/MUCRoomController.java b/src/java/org/jivesoftware/openfire/plugin/rest/controller/MUCRoomController.java
deleted file mode 100644
index a5360469..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/controller/MUCRoomController.java
+++ /dev/null
@@ -1,673 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.controller;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Iterator;
-
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.cluster.ClusterManager;
-import org.jivesoftware.openfire.container.PluginManager;
-import org.jivesoftware.openfire.group.ConcurrentGroupList;
-import org.jivesoftware.openfire.group.Group;
-import org.jivesoftware.openfire.muc.ConflictException;
-import org.jivesoftware.openfire.muc.ForbiddenException;
-import org.jivesoftware.openfire.muc.MUCRole;
-import org.jivesoftware.openfire.muc.MUCRoom;
-import org.jivesoftware.openfire.muc.NotAllowedException;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCChannelType;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCRoomEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCRoomEntity;
-import org.jivesoftware.openfire.plugin.rest.entity.OccupantEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.OccupantEntity;
-import org.jivesoftware.openfire.plugin.rest.entity.ParticipantEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.ParticipantEntity;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCRoomMessageEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCRoomMessageEntity;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.utils.MUCRoomUtils;
-import org.jivesoftware.openfire.plugin.rest.utils.UserUtils;
-import org.jivesoftware.util.AlreadyExistsException;
-import org.jivesoftware.util.cache.CacheFactory;
-import org.xmpp.packet.JID;
-import org.xmpp.packet.Presence;
-
-import org.xmpp.packet.Message;
-import org.jivesoftware.openfire.muc.MultiUserChatService;
-import org.jivesoftware.openfire.muc.MUCRoomHistory;
-import org.dom4j.Element;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The Class MUCRoomController.
- */
-public class MUCRoomController {
-    private static Logger Log = LoggerFactory.getLogger(MUCRoomController.class);
-
-    /** The Constant INSTANCE. */
-    public static final MUCRoomController INSTANCE = new MUCRoomController();
-
-    /**
-     * Gets the single instance of MUCRoomController.
-     *
-     * @return single instance of MUCRoomController
-     */
-    public static MUCRoomController getInstance() {
-        return INSTANCE;
-    }
-
-    /**
-     * Gets the chat rooms.
-     *
-     * @param serviceName
-     *            the service name
-     * @param channelType
-     *            the channel type
-     * @param roomSearch
-     *            the room search
-     * @return the chat rooms
-     */
-    public MUCRoomEntities getChatRooms(String serviceName, String channelType, String roomSearch, boolean expand) {
-        Log.debug("getChatRooms");
-        List<MUCRoom> rooms = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(serviceName)
-                .getActiveChatRooms();
-
-        List<MUCRoomEntity> mucRoomEntities = new ArrayList<MUCRoomEntity>();
-
-        for (MUCRoom chatRoom : rooms) {
-            if (roomSearch != null) {
-                if (!chatRoom.getName().contains(roomSearch)) {
-                    continue;
-                }
-            }
-
-            if (channelType.equals(MUCChannelType.ALL)) {
-                mucRoomEntities.add(convertToMUCRoomEntity(chatRoom, expand));
-            } else if (channelType.equals(MUCChannelType.PUBLIC) && chatRoom.isPublicRoom()) {
-                mucRoomEntities.add(convertToMUCRoomEntity(chatRoom, expand));
-            }
-        }
-
-        return new MUCRoomEntities(mucRoomEntities);
-    }
-
-    /**
-     * Gets the chat room.
-     *
-     * @param roomName
-     *            the room name
-     * @param serviceName
-     *            the service name
-     * @return the chat room
-     * @throws ServiceException
-     *             the service exception
-     */
-    public MUCRoomEntity getChatRoom(String roomName, String serviceName, boolean expand) throws ServiceException {
-        Log.debug("getChatRoom, "+roomName);
-        MUCRoom chatRoom = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(serviceName)
-                .getChatRoom(roomName);
-
-        if (chatRoom == null) {
-            throw new ServiceException("Could not find the chat room", roomName, ExceptionType.ROOM_NOT_FOUND, Response.Status.NOT_FOUND);
-        }
-
-        MUCRoomEntity mucRoomEntity = convertToMUCRoomEntity(chatRoom, expand);
-        return mucRoomEntity;
-    }
-
-    /**
-     * Delete chat room.
-     *
-     * @param roomName
-     *            the room name
-     * @param serviceName
-     *            the service name
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void deleteChatRoom(String roomName, String serviceName) throws ServiceException {
-        Log.debug("deleteChatRoom, "+roomName);
-        MUCRoom chatRoom = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(serviceName)
-                .getChatRoom(roomName.toLowerCase());
-
-        if (chatRoom != null) {
-            chatRoom.destroyRoom(null, null);
-            if (ClusterManager.isClusteringStarted()) {
-                //CacheFactory.doClusterTask(new RoomRemovedEvent((LocalMUCRoom) chatRoom));
-            }
-        } else {
-            throw new ServiceException("Could not remove the channel", roomName, ExceptionType.ROOM_NOT_FOUND, Response.Status.NOT_FOUND);
-        }
-    }
-
-    /**
-     * Creates the chat room.
-     *
-     * @param serviceName
-     *            the service name
-     * @param mucRoomEntity
-     *            the MUC room entity
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void createChatRoom(String serviceName, MUCRoomEntity mucRoomEntity) throws ServiceException {
-        Log.debug("createChatRoom, "+mucRoomEntity.getRoomName());
-        try {
-            createRoom(mucRoomEntity, serviceName);
-        } catch (NotAllowedException e) {
-            throw new ServiceException("Could not create the channel", mucRoomEntity.getRoomName(),
-                    ExceptionType.NOT_ALLOWED, Response.Status.FORBIDDEN, e);
-        } catch (ForbiddenException e) {
-            throw new ServiceException("Could not create the channel", mucRoomEntity.getRoomName(),
-                    ExceptionType.NOT_ALLOWED, Response.Status.FORBIDDEN, e);
-        } catch (ConflictException e) {
-            throw new ServiceException("Could not create the channel", mucRoomEntity.getRoomName(),
-                    ExceptionType.NOT_ALLOWED, Response.Status.CONFLICT, e);
-        } catch (AlreadyExistsException e) {
-            throw new ServiceException("Could not create the channel", mucRoomEntity.getRoomName(),
-                    ExceptionType.ALREADY_EXISTS, Response.Status.CONFLICT, e);
-        }
-    }
-
-    /**
-     * Update chat room.
-     *
-     * @param roomName
-     *            the room name
-     * @param serviceName
-     *            the service name
-     * @param mucRoomEntity
-     *            the MUC room entity
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void updateChatRoom(String roomName, String serviceName, MUCRoomEntity mucRoomEntity)
-            throws ServiceException {
-        Log.debug("updateChatRoom, "+mucRoomEntity.getRoomName());
-        try {
-            // If the room name is different throw exception
-            if (!roomName.equals(mucRoomEntity.getRoomName())) {
-                throw new ServiceException(
-                        "Could not update the channel. The room name is different to the entity room name.", roomName,
-                        ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-            }
-            createRoom(mucRoomEntity, serviceName);
-        } catch (NotAllowedException e) {
-            throw new ServiceException("Could not update the channel", roomName, ExceptionType.NOT_ALLOWED, Response.Status.FORBIDDEN, e);
-        } catch (ForbiddenException e) {
-            throw new ServiceException("Could not update the channel", roomName, ExceptionType.NOT_ALLOWED, Response.Status.FORBIDDEN, e);
-        } catch (ConflictException e) {
-            throw new ServiceException("Could not update the channel", roomName, ExceptionType.NOT_ALLOWED, Response.Status.CONFLICT, e);
-        } catch (AlreadyExistsException e) {
-            throw new ServiceException("Could not update the channel", mucRoomEntity.getRoomName(),
-                    ExceptionType.ALREADY_EXISTS, Response.Status.CONFLICT, e);
-        }
-    }
-
-    /**
-     * Creates the room.
-     *
-     * @param mucRoomEntity
-     *            the MUC room entity
-     * @param serviceName
-     *            the service name
-     * @throws NotAllowedException
-     *             the not allowed exception
-     * @throws ForbiddenException
-     *             the forbidden exception
-     * @throws ConflictException
-     *             the conflict exception
-     * @throws AlreadyExistsException
-     */
-    private void createRoom(MUCRoomEntity mucRoomEntity, String serviceName) throws NotAllowedException,
-            ForbiddenException, ConflictException, AlreadyExistsException {
-        Log.debug("createRoom entry, "+mucRoomEntity.getRoomName());
-        // Set owner
-        JID owner = XMPPServer.getInstance().createJID("admin", null);
-        if (mucRoomEntity.getOwners() != null && mucRoomEntity.getOwners().size() > 0) {
-            owner = new JID(mucRoomEntity.getOwners().get(0));
-        } else {
-            List<String> owners = new ArrayList<String>();
-            owners.add(owner.toBareJID());
-            mucRoomEntity.setOwners(owners);
-        }
-
-        //  Check if chat service is available, if not create a new one
-        boolean serviceRegistered = XMPPServer.getInstance().getMultiUserChatManager().isServiceRegistered(serviceName);
-        if(!serviceRegistered) {
-            XMPPServer.getInstance().getMultiUserChatManager().createMultiUserChatService(serviceName, serviceName, false);
-        }
-
-        MUCRoom room = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(serviceName)
-                .getChatRoom(mucRoomEntity.getRoomName().toLowerCase(), owner);
-
-        // Set values
-        room.setNaturalLanguageName(mucRoomEntity.getNaturalName());
-        room.setSubject(mucRoomEntity.getSubject());
-        room.setDescription(mucRoomEntity.getDescription());
-        room.setPassword(mucRoomEntity.getPassword());
-        room.setPersistent(mucRoomEntity.isPersistent());
-        room.setPublicRoom(mucRoomEntity.isPublicRoom());
-        room.setRegistrationEnabled(mucRoomEntity.isRegistrationEnabled());
-        room.setCanAnyoneDiscoverJID(mucRoomEntity.isCanAnyoneDiscoverJID());
-        room.setCanOccupantsChangeSubject(mucRoomEntity.isCanOccupantsChangeSubject());
-        room.setCanOccupantsInvite(mucRoomEntity.isCanOccupantsInvite());
-        room.setChangeNickname(mucRoomEntity.isCanChangeNickname());
-        room.setModificationDate(mucRoomEntity.getModificationDate());
-        room.setLogEnabled(mucRoomEntity.isLogEnabled());
-        room.setLoginRestrictedToNickname(mucRoomEntity.isLoginRestrictedToNickname());
-        room.setMaxUsers(mucRoomEntity.getMaxUsers());
-        room.setMembersOnly(mucRoomEntity.isMembersOnly());
-        room.setModerated(mucRoomEntity.isModerated());
-
-        // Set broadcast presence roles
-        if (mucRoomEntity.getBroadcastPresenceRoles() != null) {
-            room.setRolesToBroadcastPresence(MUCRoomUtils.convertStringsToRoles(mucRoomEntity.getBroadcastPresenceRoles()));			
-        } else {
-            room.setRolesToBroadcastPresence(new ArrayList<>());
-        }
-        // Set all roles
-        setRoles(room, mucRoomEntity);
-
-        // Set creation date
-        if (mucRoomEntity.getCreationDate() != null) {
-            room.setCreationDate(mucRoomEntity.getCreationDate());
-        } else {
-            room.setCreationDate(new Date());
-        }
-
-        // Set modification date
-        if (mucRoomEntity.getModificationDate() != null) {
-            room.setModificationDate(mucRoomEntity.getModificationDate());
-        } else {
-            room.setModificationDate(new Date());
-        }
-
-        // Unlock the room, because the default configuration lock the room.
-        room.unlock(room.getRole());
-
-        // Fire RoomUpdateEvent if cluster is started
-        if (ClusterManager.isClusteringStarted()) {
-          //CacheFactory.doClusterTask(new RoomAvailableEvent((LocalMUCRoom) room));
-          //CacheFactory.doClusterTask(new RoomUpdatedEvent((LocalMUCRoom) room));
-        }
-
-        // Save the room to the DB if the room should be persistant
-        if (room.isPersistent()) {
-            room.saveToDB();
-        }
-    }
-
-    /**
-     * Gets the room participants.
-     *
-     * @param roomName
-     *            the room name
-     * @param serviceName
-     *            the service name
-     * @return the room participants
-     */
-    public ParticipantEntities getRoomParticipants(String roomName, String serviceName) {
-        Log.debug("ParticipantEntities, "+roomName);
-        ParticipantEntities participantEntities = new ParticipantEntities();
-        List<ParticipantEntity> participants = new ArrayList<ParticipantEntity>();
-
-        Collection<MUCRole> serverParticipants = XMPPServer.getInstance().getMultiUserChatManager()
-                .getMultiUserChatService(serviceName).getChatRoom(roomName).getParticipants();
-
-        for (MUCRole role : serverParticipants) {
-            ParticipantEntity participantEntity = new ParticipantEntity();
-            participantEntity.setJid(role.getRoleAddress().toFullJID());
-            participantEntity.setRole(role.getRole().name());
-            participantEntity.setAffiliation(role.getAffiliation().name());
-
-            participants.add(participantEntity);
-        }
-
-        participantEntities.setParticipants(participants);
-        return participantEntities;
-    }
-
-    /**
-     * Gets the room occupants.
-     *
-     * @param roomName
-     *            the room name
-     * @param serviceName
-     *            the service name
-     * @return the room occupants
-     */
-    public OccupantEntities getRoomOccupants(String roomName, String serviceName) {
-        Log.debug("getRoomOccupants, "+roomName);
-        OccupantEntities occupantEntities = new OccupantEntities();
-        List<OccupantEntity> occupants = new ArrayList<OccupantEntity>();
-
-        Collection<MUCRole> serverOccupants = XMPPServer.getInstance().getMultiUserChatManager()
-                .getMultiUserChatService(serviceName).getChatRoom(roomName).getOccupants();
-
-        for (MUCRole role : serverOccupants) {
-            OccupantEntity occupantEntity = new OccupantEntity();
-            occupantEntity.setJid(role.getRoleAddress().toFullJID());
-            occupantEntity.setRole(role.getRole().name());
-            occupantEntity.setUserAddress(role.getUserAddress().toFullJID());
-            occupantEntity.setAffiliation(role.getAffiliation().name());
-
-            occupants.add(occupantEntity);
-        }
-
-        occupantEntities.setOccupants(occupants);
-        return occupantEntities;
-    }
-
-    /**
-     * Gets the room chat history.
-     *
-     * @param roomName
-     *            the room name
-     * @param serviceName
-     *            the service name
-     * @return the room chat history
-     */
-    public MUCRoomMessageEntities getRoomHistory(String roomName, String serviceName) throws ServiceException {
-        Log.debug("getRoomHistory, "+roomName);
-        MUCRoomMessageEntities mucRoomMessageEntities = new MUCRoomMessageEntities();
-        List<MUCRoomMessageEntity> listMessages = new ArrayList<>();
-
-        MultiUserChatService mucS =XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(serviceName);
-        MUCRoom chatRoom = mucS.getChatRoom(roomName);
-        if (chatRoom == null) {
-            throw new ServiceException("Could not find the chat room", roomName, ExceptionType.ROOM_NOT_FOUND, Response.Status.NOT_FOUND);
-        }
-
-        MUCRoomHistory mucRH = chatRoom.getRoomHistory();
-        Iterator<Message> messageHistory = mucRH.getMessageHistory();
-
-        while (messageHistory.hasNext()) {
-            Message message = messageHistory.next();
-
-            MUCRoomMessageEntity mucMsgEntity = new MUCRoomMessageEntity();
-
-            if (message.getTo()!=null && message.getTo().toString().length()!=0)
-                mucMsgEntity.setTo(message.getTo().toString());
-
-            if (message.getFrom()!=null && message.getFrom().toString().length()!=0)
-                mucMsgEntity.setFrom(message.getFrom().toFullJID());
-
-            if (message.getType()!=null && message.getType().toString().length()!=0)
-                mucMsgEntity.setType(message.getType().name());
-
-            if (message.getBody()!=null && message.getBody().length()!=0)
-                mucMsgEntity.setBody(message.getBody());
-
-            Element delay = message.getChildElement("delay","urn:xmpp:delay");
-
-            if (delay!=null) {
-                mucMsgEntity.setDelayStamp(delay.attributeValue("stamp"));
-                String delayFrom = delay.attributeValue("from");
-
-                if (delayFrom!=null)
-                    mucMsgEntity.setDelayFrom(delayFrom);
-            }
-            listMessages.add(mucMsgEntity);
-        }
-        mucRoomMessageEntities.setMessages(listMessages);
-        return mucRoomMessageEntities;
-    }
-
-
-    /**
-     * Convert to MUC room entity.
-     *
-     * @param room
-     *            the room
-     * @return the MUC room entity
-     */
-    public MUCRoomEntity convertToMUCRoomEntity(MUCRoom room, boolean expand) {
-        MUCRoomEntity mucRoomEntity = new MUCRoomEntity(room.getNaturalLanguageName(), room.getName(),
-                room.getDescription());
-
-        mucRoomEntity.setSubject(room.getSubject());
-        mucRoomEntity.setCanAnyoneDiscoverJID(room.canAnyoneDiscoverJID());
-        mucRoomEntity.setCanChangeNickname(room.canChangeNickname());
-        mucRoomEntity.setCanOccupantsChangeSubject(room.canOccupantsChangeSubject());
-        mucRoomEntity.setCanOccupantsInvite(room.canOccupantsInvite());
-
-        mucRoomEntity.setPublicRoom(room.isPublicRoom());
-        mucRoomEntity.setPassword(room.getPassword());
-        mucRoomEntity.setPersistent(room.isPersistent());
-        mucRoomEntity.setRegistrationEnabled(room.isRegistrationEnabled());
-        mucRoomEntity.setLogEnabled(room.isLogEnabled());
-        mucRoomEntity.setLoginRestrictedToNickname(room.isLoginRestrictedToNickname());
-        mucRoomEntity.setMaxUsers(room.getMaxUsers());
-        mucRoomEntity.setMembersOnly(room.isMembersOnly());
-        mucRoomEntity.setModerated(room.isModerated());
-
-        ConcurrentGroupList<JID> owners = new ConcurrentGroupList<JID>(room.getOwners());
-        ConcurrentGroupList<JID> admins = new ConcurrentGroupList<JID>(room.getAdmins());
-        ConcurrentGroupList<JID> members = new ConcurrentGroupList<JID>(room.getMembers());
-        ConcurrentGroupList<JID> outcasts = new ConcurrentGroupList<JID>(room.getOutcasts());
-
-        if (expand) {
-            for(Group ownerGroup : owners.getGroups()) {
-                owners.addAllAbsent(ownerGroup.getAll());
-            }
-            for(Group adminGroup : admins.getGroups()) {
-                admins.addAllAbsent(adminGroup.getAll());
-            }
-            for(Group memberGroup : members.getGroups()) {
-                members.addAllAbsent(memberGroup.getAll());
-            }
-            for(Group outcastGroup : outcasts.getGroups()) {
-                outcasts.addAllAbsent(outcastGroup.getAll());
-            }
-        }
-
-        mucRoomEntity.setOwners(MUCRoomUtils.convertJIDsToStringList(owners));
-        mucRoomEntity.setAdmins(MUCRoomUtils.convertJIDsToStringList(admins));
-        mucRoomEntity.setMembers(MUCRoomUtils.convertJIDsToStringList(members));
-        mucRoomEntity.setOutcasts(MUCRoomUtils.convertJIDsToStringList(outcasts));
-
-        mucRoomEntity.setOwnerGroups(MUCRoomUtils.convertGroupsToStringList(owners.getGroups()));
-        mucRoomEntity.setAdminGroups(MUCRoomUtils.convertGroupsToStringList(admins.getGroups()));
-        mucRoomEntity.setMemberGroups(MUCRoomUtils.convertGroupsToStringList(members.getGroups()));
-        mucRoomEntity.setOutcastGroups(MUCRoomUtils.convertGroupsToStringList(outcasts.getGroups()));
-		mucRoomEntity.setBroadcastPresenceRoles(MUCRoomUtils.convertRolesToStringList(room.getRolesToBroadcastPresence()));		
-
-        mucRoomEntity.setCreationDate(room.getCreationDate());
-        mucRoomEntity.setModificationDate(room.getModificationDate());
-
-        return mucRoomEntity;
-    }
-
-    /**
-     * Reset roles.
-     *
-     * @param room
-     *            the room
-     * @param mucRoomEntity
-     *            the muc room entity
-     * @throws ForbiddenException
-     *             the forbidden exception
-     * @throws NotAllowedException
-     *             the not allowed exception
-     * @throws ConflictException
-     *             the conflict exception
-     */
-    private void setRoles(MUCRoom room, MUCRoomEntity mucRoomEntity) throws ForbiddenException, NotAllowedException,
-            ConflictException {
-        List<JID> roles = new ArrayList<JID>();
-        Collection<JID> owners = new ArrayList<JID>();
-        Collection<JID> existingOwners = new ArrayList<JID>();
-
-        List<JID> mucRoomEntityOwners = MUCRoomUtils.convertStringsToJIDs(mucRoomEntity.getOwners());
-        owners.addAll(room.getOwners());
-
-        // Find same owners
-        for (JID jid : owners) {
-            if (mucRoomEntityOwners.contains(jid)) {
-                existingOwners.add(jid);
-            }
-        }
-
-        // Don't delete the same owners
-        owners.removeAll(existingOwners);
-        room.addOwners(MUCRoomUtils.convertStringsToJIDs(mucRoomEntity.getOwners()), room.getRole());
-
-        // Collect all roles to reset
-        roles.addAll(owners);
-        roles.addAll(room.getAdmins());
-        roles.addAll(room.getMembers());
-        roles.addAll(room.getOutcasts());
-
-        for (JID jid : roles) {
-            room.addNone(jid, room.getRole());
-        }
-
-        room.addOwners(MUCRoomUtils.convertStringsToJIDs(mucRoomEntity.getOwners()), room.getRole());
-        if (mucRoomEntity.getAdmins() != null) {
-            room.addAdmins(MUCRoomUtils.convertStringsToJIDs(mucRoomEntity.getAdmins()), room.getRole());
-        }
-        if (mucRoomEntity.getMembers() != null) {
-            for (String memberJid : mucRoomEntity.getMembers()) {
-                room.addMember(new JID(memberJid), null, room.getRole());
-            }
-        }
-        if (mucRoomEntity.getOutcasts() != null) {
-            for (String outcastJid : mucRoomEntity.getOutcasts()) {
-                room.addOutcast(new JID(outcastJid), null, room.getRole());
-            }
-        }
-    }
-
-    /**
-     * Adds the admin.
-     *
-     * @param serviceName
-     *            the service name
-     * @param roomName
-     *            the room name
-     * @param jid
-     *            the jid
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void addAdmin(String serviceName, String roomName, String jid) throws ServiceException {
-        MUCRoom room = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(serviceName)
-                .getChatRoom(roomName.toLowerCase());
-        try {
-            room.addAdmin(UserUtils.checkAndGetJID(jid), room.getRole());
-        } catch (ForbiddenException e) {
-            throw new ServiceException("Could not add admin", jid, ExceptionType.NOT_ALLOWED, Response.Status.FORBIDDEN, e);
-        } catch (ConflictException e) {
-            throw new ServiceException("Could not add admin", jid, ExceptionType.NOT_ALLOWED, Response.Status.CONFLICT, e);
-        }
-    }
-
-    /**
-     * Adds the owner.
-     *
-     * @param serviceName
-     *            the service name
-     * @param roomName
-     *            the room name
-     * @param jid
-     *            the jid
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void addOwner(String serviceName, String roomName, String jid) throws ServiceException {
-        MUCRoom room = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(serviceName)
-                .getChatRoom(roomName.toLowerCase());
-        try {
-            room.addOwner(UserUtils.checkAndGetJID(jid), room.getRole());
-        } catch (ForbiddenException e) {
-            throw new ServiceException("Could not add owner", jid, ExceptionType.NOT_ALLOWED, Response.Status.FORBIDDEN, e);
-        }
-    }
-
-    /**
-     * Adds the member.
-     *
-     * @param serviceName
-     *            the service name
-     * @param roomName
-     *            the room name
-     * @param jid
-     *            the jid
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void addMember(String serviceName, String roomName, String jid) throws ServiceException {
-        MUCRoom room = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(serviceName)
-                .getChatRoom(roomName.toLowerCase());
-        try {
-            room.addMember(UserUtils.checkAndGetJID(jid), null, room.getRole());
-        } catch (ForbiddenException e) {
-            throw new ServiceException("Could not add member", jid, ExceptionType.NOT_ALLOWED, Response.Status.FORBIDDEN, e);
-        } catch (ConflictException e) {
-            throw new ServiceException("Could not add member", jid, ExceptionType.NOT_ALLOWED, Response.Status.FORBIDDEN, e);
-        }
-    }
-
-    /**
-     * Adds the outcast.
-     *
-     * @param serviceName
-     *            the service name
-     * @param roomName
-     *            the room name
-     * @param jid
-     *            the jid
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void addOutcast(String serviceName, String roomName, String jid) throws ServiceException {
-        MUCRoom room = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(serviceName)
-                .getChatRoom(roomName.toLowerCase());
-        try {
-            room.addOutcast(UserUtils.checkAndGetJID(jid), null, room.getRole());
-        } catch (NotAllowedException e) {
-            throw new ServiceException("Could not add outcast", jid, ExceptionType.NOT_ALLOWED, Response.Status.FORBIDDEN, e);
-        } catch (ForbiddenException e) {
-            throw new ServiceException("Could not add outcast", jid, ExceptionType.NOT_ALLOWED, Response.Status.FORBIDDEN, e);
-        } catch (ConflictException e) {
-            throw new ServiceException("Could not add outcast", jid, ExceptionType.NOT_ALLOWED, Response.Status.CONFLICT, e);
-        }
-    }
-
-    /**
-     * Delete affiliation.
-     *
-     * @param serviceName
-     *            the service name
-     * @param roomName
-     *            the room name
-     * @param jid
-     *            the jid
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void deleteAffiliation(String serviceName, String roomName, String jid) throws ServiceException {
-        MUCRoom room = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(serviceName)
-                .getChatRoom(roomName.toLowerCase());
-        try {
-              JID userJid = UserUtils.checkAndGetJID(jid);
-
-              // Send a presence to other room members
-              List<Presence> addNonePresence = room.addNone(userJid, room.getRole());
-              for (Presence presence : addNonePresence) {
-                room.send(presence, room.getRole());
-              }
-        } catch (ForbiddenException e) {
-            throw new ServiceException("Could not delete affiliation", jid, ExceptionType.NOT_ALLOWED, Response.Status.FORBIDDEN, e);
-        } catch (ConflictException e) {
-            throw new ServiceException("Could not delete affiliation", jid, ExceptionType.NOT_ALLOWED, Response.Status.CONFLICT, e);
-        }
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/controller/MessageController.java b/src/java/org/jivesoftware/openfire/plugin/rest/controller/MessageController.java
deleted file mode 100644
index c282428f..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/controller/MessageController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.controller;
-
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.SessionManager;
-import org.jivesoftware.openfire.plugin.rest.entity.MessageEntity;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-
-/**
- * The Class MessageController.
- */
-public class MessageController {
-	/** The Constant INSTANCE. */
-	public static final MessageController INSTANCE = new MessageController();
-
-	/**
-	 * Gets the single instance of MessageController.
-	 *
-	 * @return single instance of MessageController
-	 */
-	public static MessageController getInstance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Send broadcast message.
-	 *
-	 * @param messageEntity
-	 *            the message entity
-	 * @throws ServiceException
-	 *             the service exception
-	 */
-	public void sendBroadcastMessage(MessageEntity messageEntity) throws ServiceException {
-		if (messageEntity.getBody() != null && !messageEntity.getBody().isEmpty()) {
-			SessionManager.getInstance().sendServerMessage(null, messageEntity.getBody());
-		} else {
-			throw new ServiceException("Message content/body is null or empty", "",
-					ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION,
-					Response.Status.BAD_REQUEST);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/controller/MsgArchiveController.java b/src/java/org/jivesoftware/openfire/plugin/rest/controller/MsgArchiveController.java
deleted file mode 100644
index dc9e06ab..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/controller/MsgArchiveController.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.controller;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.jivesoftware.database.DbConnectionManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.xmpp.packet.JID;
-
-/**
- * The Class MsgArchiveController.
- */
-public class MsgArchiveController {
-
-    /** The Constant LOG. */
-    private static final Logger LOG = LoggerFactory.getLogger(MsgArchiveController.class);
-
-	/** The Constant INSTANCE. */
-	public static final MsgArchiveController INSTANCE = new MsgArchiveController();
-
-    /** The Constant USER_MESSAGE_COUNT. */
-    private static final String USER_MESSAGE_COUNT = "select COUNT(1) from ofMessageArchive a " +
-            "join ofPresence p on (a.sentDate > p.offlineDate) " +
-            "WHERE a.toJID = ? AND p.username = ?";
-
-	/**
-	 * Gets the single instance of MsgArchiveController.
-	 *
-	 * @return single instance of MsgArchiveController
-	 */
-	public static MsgArchiveController getInstance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * The Constructor.
-	 */
-	private MsgArchiveController() {
-	}
-
-    /**
-     * Returns the total number of messages that haven't been delivered to the user.
-     *
-     * @param jid the jid
-     * @return the total number of user unread messages.
-     */
-    public int getUnReadMessagesCount(JID jid) {
-        int messageCount = 0;
-        Connection con = null;
-        PreparedStatement pstmt = null;
-        ResultSet rs = null;
-        try {
-            con = DbConnectionManager.getConnection();
-            pstmt = con.prepareStatement(USER_MESSAGE_COUNT);
-            pstmt.setString(1, jid.toBareJID());
-            pstmt.setString(2, jid.getNode());
-            rs = pstmt.executeQuery();
-            if (rs.next()) {
-                messageCount = rs.getInt(1);
-            }
-        } catch (SQLException sqle) {
-            LOG.error(sqle.getMessage(), sqle);
-        } finally {
-            DbConnectionManager.closeConnection(rs, pstmt, con);
-        }
-        return messageCount;
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/controller/SessionController.java b/src/java/org/jivesoftware/openfire/plugin/rest/controller/SessionController.java
deleted file mode 100644
index 777e7827..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/controller/SessionController.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.controller;
-
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.SessionManager;
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.plugin.rest.entity.SessionEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.SessionEntity;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.session.ClientSession;
-import org.jivesoftware.openfire.session.LocalClientSession;
-import org.jivesoftware.openfire.session.Session;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.xmpp.packet.Message;
-import org.xmpp.packet.Presence;
-import org.xmpp.packet.StreamError;
-
-import org.dom4j.*;
-
-/**
- * The Class SessionController.
- */
-public class SessionController {
-    /** The Constant INSTANCE. */
-    public static final SessionController INSTANCE = new SessionController();
-
-    /** The log. */
-    private static Logger LOG = LoggerFactory.getLogger(SessionController.class);
-
-    /**
-     * Gets the single instance of SessionController.
-     *
-     * @return single instance of SessionController
-     */
-    public static SessionController getInstance() {
-        return INSTANCE;
-    }
-
-    /**
-     * Gets the user sessions.
-     *
-     * @param username the username
-     * @return the user sessions
-     * @throws ServiceException the service exception
-     */
-    public SessionEntities getUserSessions(String username) throws ServiceException {
-        Collection<ClientSession> clientSessions = SessionManager.getInstance().getSessions(username);
-        SessionEntities sessionEntities = convertToSessionEntities(clientSessions);
-        return sessionEntities;
-    }
-
-    /**
-     * Gets the all sessions.
-     *
-     * @return the all sessions
-     * @throws ServiceException the service exception
-     */
-    public SessionEntities getAllSessions() throws ServiceException {
-        Collection<ClientSession> clientSessions = SessionManager.getInstance().getSessions();
-        SessionEntities sessionEntities = convertToSessionEntities(clientSessions);
-        return sessionEntities;
-    }
-
-    /**
-     * Notify the user sessions.
-     *
-     * @param username the username
-     * @throws ServiceException the service exception
-     */
-    public void notifySession(String username, String payload) throws ServiceException {
-        Collection<ClientSession> clientSessions = SessionManager.getInstance().getSessions(username);
-
-        for (ClientSession session : clientSessions)
-        {
-            routeMessage(session, payload);
-        }
-    }
-
-    /**
-     * Notify all sessions.
-     *
-     * @throws ServiceException the service exception
-     */
-    public void notifySessions(String payload) throws ServiceException {
-        Collection<ClientSession> clientSessions = SessionManager.getInstance().getSessions();
-
-        for (ClientSession session : clientSessions)
-        {
-            routeMessage(session, payload);
-        }
-    }
-
-    private void routeMessage(ClientSession session, String payload)
-    {
-        Message message = new Message();
-        message.setFrom("admin@" + XMPPServer.getInstance().getServerInfo().getXMPPDomain());
-        message.setTo(session.getAddress());
-        message.setType(Message.Type.headline);
-
-        Element properties = message.addChildElement("properties", "http://www.jivesoftware.com/xmlns/xmpp/properties");
-        Element property = properties.addElement("property");
-        property.addElement("name").setText("data");
-
-        Element value = property.addElement("value");
-        value.addAttribute("type", "string");
-        value.setText(payload);
-
-        XMPPServer.getInstance().getMessageRouter().route(message);
-    }
-
-
-    /**
-     * Removes the user sessions.
-     *
-     * @param username the username
-     * @throws ServiceException the service exception
-     */
-    public void removeUserSessions(String username) throws ServiceException {
-        final StreamError error = new StreamError(StreamError.Condition.not_authorized);
-        for (ClientSession session : SessionManager.getInstance().getSessions(username)) {
-            session.deliverRawText(error.toXML());
-            session.close();
-        }
-    }
-
-    /**
-     * Convert to session entities.
-     *
-     * @param clientSessions the client sessions
-     * @return the session entities
-     * @throws ServiceException the service exception
-     */
-    private SessionEntities convertToSessionEntities(Collection<ClientSession> clientSessions) throws ServiceException {
-        List<SessionEntity> sessions = new ArrayList<SessionEntity>();
-        SessionEntities sessionEntities = new SessionEntities(sessions);
-
-        for (ClientSession clientSession : clientSessions) {
-            SessionEntity session = new SessionEntity();
-            session.setSessionId(clientSession.getAddress().toString());
-
-            if (!clientSession.isAnonymousUser()) {
-                try {
-                    session.setUsername(clientSession.getUsername());
-                } catch (UserNotFoundException e) {
-                    throw new ServiceException("Could not get user", "", ExceptionType.USER_NOT_FOUND_EXCEPTION,
-                            Response.Status.NOT_FOUND, e);
-                }
-            } else {
-                session.setUsername("Anonymous");
-            }
-
-            session.setRessource(clientSession.getAddress().getResource());
-
-            if (clientSession instanceof LocalClientSession) {
-                  session.setNode("Local");
-            } else {
-                session.setNode("Remote");
-            }
-
-            String status = "";
-            if (clientSession.getStatus() == Session.STATUS_CLOSED) {
-                status = "Closed";
-            } else if (clientSession.getStatus() == Session.STATUS_CONNECTED) {
-                status = "Connected";
-            } else if (clientSession.getStatus() == Session.STATUS_AUTHENTICATED) {
-                status = "Authenticated";
-            } else {
-                status = "Unkown";
-            }
-            session.setSessionStatus(status);
-
-            if (clientSession.getPresence() != null) {
-                session.setPresenceMessage(clientSession.getPresence().getStatus());
-
-                Presence.Show show = clientSession.getPresence().getShow();
-                if(show == Presence.Show.away) {
-                    session.setPresenceStatus("Away");
-                } else if(show == Presence.Show.chat) {
-                    session.setPresenceStatus("Available to Chat");
-                } else if(show == Presence.Show.dnd) {
-                    session.setPresenceStatus("Do Not Disturb");
-                } else if(show == Presence.Show.xa) {
-                    session.setPresenceStatus("Extended Away");
-                } else if(show == null) {
-                    session.setPresenceStatus("Online");
-                } else {
-                    session.setPresenceStatus("Unknown/Not Recognized");
-                }
-                session.setPriority(clientSession.getPresence().getPriority());
-            }
-
-            try {
-                session.setHostAddress(clientSession.getHostAddress());
-                session.setHostName(clientSession.getHostName());
-            } catch (UnknownHostException e) {
-                LOG.error("UnknownHostException", e);
-            }
-
-            session.setCreationDate(clientSession.getCreationDate());
-            session.setLastActionDate(clientSession.getLastActiveDate());
-            session.setSecure(clientSession.isSecure());
-
-            sessions.add(session);
-        }
-        return sessionEntities;
-    }
-}
\ No newline at end of file
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/controller/StatisticsController.java b/src/java/org/jivesoftware/openfire/plugin/rest/controller/StatisticsController.java
deleted file mode 100644
index 0c3774f3..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/controller/StatisticsController.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.controller;
-
-import org.jivesoftware.openfire.SessionManager;
-import org.jivesoftware.openfire.plugin.rest.entity.SessionsCount;
-
-/**
- * The Class StatisticsController.
- */
-public class StatisticsController {
-	
-	/** The Constant INSTANCE. */
-	public static final StatisticsController INSTANCE = new StatisticsController();
-
-	/**
-	 * Gets the instance.
-	 *
-	 * @return the instance
-	 */
-	public static StatisticsController getInstance() {
-		return INSTANCE;
-	}
-	
-	/**
-	 * Gets the concurent sessions.
-	 *
-	 * @return the concurent sessions
-	 */
-	public SessionsCount getConcurentSessions() {
-		int userSessionsCountLocal = SessionManager.getInstance().getUserSessionsCount(true);
-		int userSessionsCountCluster = SessionManager.getInstance().getUserSessionsCount(false);
-		
-		return new SessionsCount(userSessionsCountLocal, userSessionsCountCluster);
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/controller/UserServiceController.java b/src/java/org/jivesoftware/openfire/plugin/rest/controller/UserServiceController.java
deleted file mode 100644
index 66a74821..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/controller/UserServiceController.java
+++ /dev/null
@@ -1,652 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.controller;
-
-import java.util.*;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.SessionManager;
-import org.jivesoftware.openfire.SharedGroupException;
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.group.Group;
-import org.jivesoftware.openfire.group.GroupManager;
-import org.jivesoftware.openfire.group.GroupNotFoundException;
-import org.jivesoftware.openfire.lockout.LockOutManager;
-import org.jivesoftware.openfire.plugin.rest.dao.PropertyDAO;
-import org.jivesoftware.openfire.plugin.rest.entity.GroupEntity;
-import org.jivesoftware.openfire.plugin.rest.entity.RosterEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.RosterItemEntity;
-import org.jivesoftware.openfire.plugin.rest.entity.UserEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.UserEntity;
-import org.jivesoftware.openfire.plugin.rest.entity.UserGroupsEntity;
-import org.jivesoftware.openfire.plugin.rest.entity.UserProperty;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.utils.UserUtils;
-import org.jivesoftware.openfire.roster.Roster;
-import org.jivesoftware.openfire.roster.RosterItem;
-import org.jivesoftware.openfire.roster.RosterManager;
-import org.jivesoftware.openfire.session.ClientSession;
-import org.jivesoftware.openfire.user.User;
-import org.jivesoftware.openfire.user.UserAlreadyExistsException;
-import org.jivesoftware.openfire.user.UserManager;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-import org.jivesoftware.database.DbConnectionManager;
-import org.xmpp.packet.JID;
-import org.xmpp.packet.StreamError;
-
-/**
- * The Class UserServiceController.
- */
-public class UserServiceController {
-    /** The Constant INSTANCE. */
-    public static final UserServiceController INSTANCE = new UserServiceController();
-
-    /** The user manager. */
-    private UserManager userManager;
-
-    /** The roster manager. */
-    private RosterManager rosterManager;
-
-    /** The server. */
-    private XMPPServer server;
-
-    /** The lock out manager. */
-    private LockOutManager lockOutManager;
-
-    /**
-     * Gets the single instance of UserServiceController.
-     *
-     * @return single instance of UserServiceController
-     */
-    public static UserServiceController getInstance() {
-        return INSTANCE;
-    }
-
-    /**
-     * Instantiates a new user service controller.
-     */
-    private UserServiceController() {
-        server = XMPPServer.getInstance();
-        userManager = server.getUserManager();
-        rosterManager = server.getRosterManager();
-        lockOutManager = server.getLockOutManager();
-    }
-
-    /**
-     * Creates the user.
-     *
-     * @param userEntity
-     *            the user entity
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void createUser(UserEntity userEntity) throws ServiceException {
-        if (userEntity != null && !userEntity.getUsername().isEmpty()) {
-            if (userEntity.getPassword() == null) {
-                throw new ServiceException("Could not create new user, because password is null",
-                        userEntity.getUsername(), "PasswordIsNull", Response.Status.BAD_REQUEST);
-            }
-            try {
-                userManager.createUser(userEntity.getUsername(), userEntity.getPassword(), userEntity.getName(),
-                        userEntity.getEmail());
-            } catch (UserAlreadyExistsException e) {
-                throw new ServiceException("Could not create new user", userEntity.getUsername(),
-                        ExceptionType.USER_ALREADY_EXISTS_EXCEPTION, Response.Status.CONFLICT);
-            }
-            addProperties(userEntity.getUsername(), userEntity.getProperties());
-        } else {
-            throw new ServiceException("Could not create new user",
-                    "users", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-
-    /**
-     * Update user.
-     *
-     * @param username
-     *            the username
-     * @param userEntity
-     *            the user entity
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void updateUser(String username, UserEntity userEntity) throws ServiceException {
-        if (userEntity != null && !username.isEmpty()) {
-            // Payload contains another username than provided over path
-            // parameter
-            if (userEntity.getUsername() != null) {
-                if (!userEntity.getUsername().equals(username)) {
-                    JustMarriedController.changeName(username, userEntity.getUsername(), true, userEntity.getEmail(),
-                            userEntity.getName());
-                    addProperties(userEntity.getUsername(), userEntity.getProperties());
-                    return;
-                }
-            }
-            User user = getAndCheckUser(username);
-            if (userEntity.getPassword() != null) {
-                user.setPassword(userEntity.getPassword());
-            }
-            if (userEntity.getName() != null) {
-                user.setName(userEntity.getName());
-            }
-            if (userEntity.getEmail() != null) {
-                user.setEmail(userEntity.getEmail());
-            }
-
-            addProperties(username, userEntity.getProperties());
-        }
-    }
-
-    /**
-     * Delete user.
-     *
-     * @param username
-     *            the username
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void deleteUser(String username) throws ServiceException {
-        User user = getAndCheckUser(username);
-        userManager.deleteUser(user);
-
-        rosterManager.deleteRoster(server.createJID(username, null));
-    }
-
-    /**
-     * Gets the user entities.
-     *
-     * @param userSearch
-     *            the user search
-     * @param propertyValue
-     * @param propertyKey
-     * @return the user entities
-     * @throws ServiceException
-     */
-    public UserEntities getUserEntities(String userSearch, String propertyKey, String propertyValue)
-            throws ServiceException {
-        if (propertyKey != null) {
-            return getUserEntitiesByProperty(propertyKey, propertyValue);
-        }
-        UserEntities userEntities = new UserEntities();
-        userEntities.setUsers(UserUtils.convertUsersToUserEntities(userManager.getUsers(), userSearch));
-        return userEntities;
-    }
-
-    /**
-     * Gets the user entities by advanved search
-     *
-     * @param userSearch
-     *            the user search
-     * @param propertyValue
-     * @param propertyKey
-     * @return the user entities
-     * @throws ServiceException
-     */
-    public UserEntities getUsersBySearch(String criteria) throws ServiceException
-    {
-        UserManager userManager = UserManager.getInstance();
-        Set<String> searchFields = userManager.getSearchFields();
-        Set<User> users = new HashSet<User>();
-
-        Collection<User> foundUsers = new ArrayList<User>();
-        List<UserEntity> userEntities = new ArrayList<UserEntity>();
-
-        for (String searchField : searchFields)
-        {
-            foundUsers.addAll(userManager.findUsers(new HashSet<String>(Arrays.asList(searchField)), criteria));
-        }
-
-        foundUsers.addAll(getUsersByProperty(criteria));
-
-        for (User user : foundUsers)
-        {
-            if (user != null) {
-                users.add(user);
-            }
-        }
-
-        for (User user : users)
-        {
-            userEntities.add(UserUtils.convertUserToUserEntity(user));
-        }
-        return  new UserEntities(userEntities);
-    }
-
-    /**
-     * Gets the user objects by property key or value.
-     *
-     * @param propertyName
-     *            the property name
-     * @param propertyValue
-     *            the property value (can be null)
-     * @return the username by property
-     */
-    public List<User> getUsersByProperty(String search) throws ServiceException
-    {
-        List<User> users = new ArrayList<User>();
-        Connection con = null;
-        PreparedStatement pstmt = null;
-        ResultSet rs = null;
-
-        try {
-            con = DbConnectionManager.getConnection();
-
-            pstmt = con.prepareStatement("SELECT username FROM ofUserProp WHERE name=?");
-            pstmt.setString(1, search);
-
-            rs = pstmt.executeQuery();
-
-            while (rs.next())
-            {
-                users.add(getUser(rs.getString(1)));
-            }
-
-            pstmt = con.prepareStatement("SELECT username FROM ofUserProp WHERE propValue=?");
-            pstmt.setString(1, search);
-
-            rs = pstmt.executeQuery();
-
-            while (rs.next())
-            {
-                users.add(getUser(rs.getString(1)));
-            }
-
-
-        } catch (Exception e) {
-            throw new ServiceException("Could not get user properties", search, e.toString(), Response.Status.BAD_REQUEST);
-
-        } finally {
-            DbConnectionManager.closeConnection(rs, pstmt, con);
-        }
-        return users;
-    }
-
-    /**
-     * Returns the the requested user or <tt>null</tt> if there are any
-     * problems that don't throw an error.
-     *
-     * @param username the username of the local user to retrieve.
-     * @return the requested user.
-     * @throws UserNotFoundException if the requested user
-     *         does not exist in the local server.
-     */
-    public User getUser(String username) throws UserNotFoundException
-    {
-        JID targetJID = server.createJID(username, null);
-        // Check that the sender is not requesting information of a remote server entity
-        if (targetJID.getNode() == null) {
-            // Sender is requesting presence information of an anonymous user
-            throw new UserNotFoundException("Username is null");
-        }
-        return userManager.getUser(targetJID.getNode());
-    }
-    /**
-     * Gets the user entity.
-     *
-     * @param username
-     *            the username
-     * @return the user entity
-     * @throws ServiceException
-     *             the service exception
-     */
-    public UserEntity getUserEntity(String username) throws ServiceException {
-        return UserUtils.convertUserToUserEntity(getAndCheckUser(username));
-    }
-
-    /**
-     * Enable user.
-     *
-     * @param username
-     *            the username
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void enableUser(String username) throws ServiceException {
-        getAndCheckUser(username);
-        lockOutManager.enableAccount(username);
-    }
-
-    /**
-     * Disable user.
-     *
-     * @param username
-     *            the username
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void disableUser(String username) throws ServiceException {
-        getAndCheckUser(username);
-        lockOutManager.disableAccount(username, null, null);
-
-        if (lockOutManager.isAccountDisabled(username)) {
-            final StreamError error = new StreamError(StreamError.Condition.not_authorized);
-            for (ClientSession sess : SessionManager.getInstance().getSessions(username)) {
-                sess.deliverRawText(error.toXML());
-                sess.close();
-            }
-        }
-    }
-
-    /**
-     * Gets the roster entities.
-     *
-     * @param username
-     *            the username
-     * @return the roster entities
-     * @throws ServiceException
-     *             the service exception
-     */
-    public RosterEntities getRosterEntities(String username) throws ServiceException {
-        Roster roster = getUserRoster(username);
-
-        List<RosterItemEntity> rosterEntities = new ArrayList<RosterItemEntity>();
-        for (RosterItem rosterItem : roster.getRosterItems()) {
-            RosterItemEntity rosterItemEntity = new RosterItemEntity(rosterItem.getJid().toBareJID(), rosterItem.getNickname(), rosterItem.getSubStatus().getValue());
-            rosterItemEntity.setGroups(rosterItem.getGroups());
-
-            rosterEntities.add(rosterItemEntity);
-        }
-
-        return new RosterEntities(rosterEntities);
-    }
-
-    /**
-     * Adds the roster item.
-     *
-     * @param username
-     *            the username
-     * @param rosterItemEntity
-     *            the roster item entity
-     * @throws ServiceException
-     *             the service exception
-     * @throws UserAlreadyExistsException
-     *             the user already exists exception
-     * @throws SharedGroupException
-     *             the shared group exception
-     * @throws UserNotFoundException
-     *             the user not found exception
-     */
-    public void addRosterItem(String username, RosterItemEntity rosterItemEntity) throws ServiceException,
-            UserAlreadyExistsException, SharedGroupException, UserNotFoundException {
-        Roster roster = getUserRoster(username);
-        if (rosterItemEntity.getJid() == null) {
-            throw new ServiceException("JID is null", "JID", "IllegalArgumentException", Response.Status.BAD_REQUEST);
-        }
-        JID jid = new JID(rosterItemEntity.getJid());
-
-        try {
-            roster.getRosterItem(jid);
-            throw new UserAlreadyExistsException(jid.toBareJID());
-        } catch (UserNotFoundException e) {
-            // Roster item does not exist. Try to add it.
-        }
-
-        if (roster != null) {
-            RosterItem rosterItem = roster.createRosterItem(jid, rosterItemEntity.getNickname(),
-                    rosterItemEntity.getGroups(), false, true);
-            UserUtils.checkSubType(rosterItemEntity.getSubscriptionType());
-            rosterItem.setSubStatus(RosterItem.SubType.getTypeFromInt(rosterItemEntity.getSubscriptionType()));
-            roster.updateRosterItem(rosterItem);
-        }
-    }
-
-    /**
-     * Update roster item.
-     *
-     * @param username
-     *            the username
-     * @param rosterJid
-     *            the roster jid
-     * @param rosterItemEntity
-     *            the roster item entity
-     * @throws ServiceException
-     *             the service exception
-     * @throws UserNotFoundException
-     *             the user not found exception
-     * @throws UserAlreadyExistsException
-     *             the user already exists exception
-     * @throws SharedGroupException
-     *             the shared group exception
-     */
-    public void updateRosterItem(String username, String rosterJid, RosterItemEntity rosterItemEntity)
-            throws ServiceException, UserNotFoundException, UserAlreadyExistsException, SharedGroupException {
-        getAndCheckUser(username);
-
-        Roster roster = getUserRoster(username);
-        JID jid = new JID(rosterJid);
-        RosterItem rosterItem = roster.getRosterItem(jid);
-
-        if (rosterItemEntity.getNickname() != null) {
-            rosterItem.setNickname(rosterItemEntity.getNickname());
-        }
-        if (rosterItemEntity.getGroups() != null) {
-            rosterItem.setGroups(rosterItemEntity.getGroups());
-        }
-        UserUtils.checkSubType(rosterItemEntity.getSubscriptionType());
-
-        rosterItem.setSubStatus(RosterItem.SubType.getTypeFromInt(rosterItemEntity.getSubscriptionType()));
-        roster.updateRosterItem(rosterItem);
-    }
-
-    /**
-     * Delete roster item.
-     *
-     * @param username
-     *            the username
-     * @param rosterJid
-     *            the roster jid
-     * @throws SharedGroupException
-     *             the shared group exception
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void deleteRosterItem(String username, String rosterJid) throws SharedGroupException, ServiceException {
-        getAndCheckUser(username);
-        Roster roster = getUserRoster(username);
-        JID jid = new JID(rosterJid);
-
-        if (roster.deleteRosterItem(jid, true) == null) {
-            throw new ServiceException("Roster Item could not deleted", jid.toBareJID(), "RosterItemNotFound",
-                    Response.Status.NOT_FOUND);
-        }
-    }
-
-    /**
-     * Gets the user groups.
-     *
-     * @param username
-     *            the username
-     * @return the user groups
-     * @throws ServiceException
-     *             the service exception
-     */
-    public List<String> getUserGroups(String username) throws ServiceException {
-        User user = getAndCheckUser(username);
-        Collection<Group> groups = GroupManager.getInstance().getGroups(user);
-        List<String> groupNames = new ArrayList<String>();
-        for (Group group : groups) {
-            groupNames.add(group.getName());
-        }
-
-        return groupNames;
-    }
-
-    /**
-     * Adds the user to group.
-     *
-     * @param username
-     *            the username
-     * @param userGroupsEntity
-     *            the user groups entity
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void addUserToGroups(String username, UserGroupsEntity userGroupsEntity) throws ServiceException {
-        if (userGroupsEntity != null) {
-            Collection<Group> groups = new ArrayList<Group>();
-
-            for (String groupName : userGroupsEntity.getGroupNames()) {
-                Group group = null;
-                try {
-                    group = GroupManager.getInstance().getGroup(groupName);
-                } catch (GroupNotFoundException e) {
-                    // Create this group
-                    group = GroupController.getInstance().createGroup(new GroupEntity(groupName, ""));
-                }
-                groups.add(group);
-            }
-            for (Group group : groups) {
-                group.getMembers().add(server.createJID(username, null));
-            }
-        }
-    }
-
-    /**
-     * Adds the user to group.
-     *
-     * @param username the username
-     * @param groupName the group name
-     * @throws ServiceException the service exception
-     */
-    public void addUserToGroup(String username, String groupName) throws ServiceException {
-        Group group = null;
-        try {
-            group = GroupManager.getInstance().getGroup(groupName);
-        } catch (GroupNotFoundException e) {
-            // Create this group
-            group = GroupController.getInstance().createGroup(new GroupEntity(groupName, ""));
-        }
-
-        group.getMembers().add(server.createJID(username, null));
-    }
-
-    /**
-     * Delete user from groups.
-     *
-     * @param username
-     *            the username
-     * @param userGroupsEntity
-     *            the user groups entity
-     * @throws ServiceException
-     *             the service exception
-     */
-    public void deleteUserFromGroups(String username, UserGroupsEntity userGroupsEntity) throws ServiceException {
-        if (userGroupsEntity != null) {
-            for (String groupName : userGroupsEntity.getGroupNames()) {
-                Group group = null;
-                try {
-                    group = GroupManager.getInstance().getGroup(groupName);
-                } catch (GroupNotFoundException e) {
-                    throw new ServiceException("Could not find group", groupName, ExceptionType.GROUP_NOT_FOUND,
-                            Response.Status.NOT_FOUND, e);
-                }
-                group.getMembers().remove(server.createJID(username, null));
-            }
-        }
-    }
-
-    /**
-     * Delete user from group.
-     *
-     * @param username the username
-     * @param groupName the group name
-     * @throws ServiceException the service exception
-     */
-    public void deleteUserFromGroup(String username, String groupName) throws ServiceException {
-        Group group = null;
-        try {
-            group = GroupManager.getInstance().getGroup(groupName);
-        } catch (GroupNotFoundException e) {
-            throw new ServiceException("Could not find group", groupName, ExceptionType.GROUP_NOT_FOUND,
-                    Response.Status.NOT_FOUND, e);
-        }
-        group.getMembers().remove(server.createJID(username, null));
-    }
-
-    /**
-     * Gets the user entities by property key and or value.
-     *
-     * @param propertyKey
-     *            the property key
-     * @param propertyValue
-     *            the property value (can be null)
-     * @return the user entities by property
-     * @throws ServiceException
-     *             the service exception
-     */
-    public UserEntities getUserEntitiesByProperty(String propertyKey, String propertyValue) throws ServiceException {
-        List<String> usernames = PropertyDAO.getUsernameByProperty(propertyKey, propertyValue);
-        List<UserEntity> users = new ArrayList<UserEntity>();
-        UserEntities userEntities = new UserEntities();
-
-        for (String username : usernames) {
-            users.add(getUserEntity(username));
-        }
-
-        userEntities.setUsers(users);
-        return userEntities;
-    }
-
-    /**
-     * Adds the properties.
-     *
-     * @param userEntity
-     *            the user entity
-     * @throws ServiceException
-     *             the service exception
-     */
-    private void addProperties(String username, List<UserProperty> properties) throws ServiceException {
-        User user = getAndCheckUser(username);
-        user.getProperties().clear();
-        if (properties != null) {
-            for (UserProperty property : properties) {
-                user.getProperties().put(property.getKey(), property.getValue());
-            }
-        }
-    }
-
-    /**
-     * Gets the and check user.
-     *
-     * @param username
-     *            the username
-     * @return the and check user
-     * @throws ServiceException
-     *             the service exception
-     */
-    private User getAndCheckUser(String username) throws ServiceException {
-        JID targetJID = server.createJID(username, null);
-        if (targetJID.getNode() == null) {
-            throw new ServiceException("Could not get user", username, ExceptionType.USER_NOT_FOUND_EXCEPTION,
-                    Response.Status.NOT_FOUND);
-        }
-
-        try {
-            return userManager.getUser(targetJID.getNode());
-        } catch (UserNotFoundException e) {
-            throw new ServiceException("Could not get user", username, ExceptionType.USER_NOT_FOUND_EXCEPTION,
-                    Response.Status.NOT_FOUND, e);
-        }
-    }
-
-    /**
-     * Gets the user roster.
-     *
-     * @param username
-     *            the username
-     * @return the user roster
-     * @throws ServiceException
-     *             the service exception
-     */
-    private Roster getUserRoster(String username) throws ServiceException {
-        try {
-            return rosterManager.getRoster(username);
-        } catch (UserNotFoundException e) {
-            throw new ServiceException("Could not get user roster", username, ExceptionType.USER_NOT_FOUND_EXCEPTION,
-                    Response.Status.NOT_FOUND, e);
-        }
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/controller/UserServiceLegacyController.java b/src/java/org/jivesoftware/openfire/plugin/rest/controller/UserServiceLegacyController.java
deleted file mode 100644
index a8b0932e..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/controller/UserServiceLegacyController.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jivesoftware.openfire.plugin.rest.controller;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.jivesoftware.openfire.SharedGroupException;
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.group.Group;
-import org.jivesoftware.openfire.group.GroupAlreadyExistsException;
-import org.jivesoftware.openfire.group.GroupManager;
-import org.jivesoftware.openfire.group.GroupNotFoundException;
-import org.jivesoftware.openfire.lockout.LockOutManager;
-import org.jivesoftware.openfire.roster.Roster;
-import org.jivesoftware.openfire.roster.RosterItem;
-import org.jivesoftware.openfire.roster.RosterManager;
-import org.jivesoftware.openfire.user.User;
-import org.jivesoftware.openfire.user.UserAlreadyExistsException;
-import org.jivesoftware.openfire.user.UserManager;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-import org.xmpp.packet.JID;
-
-/**
- * Plugin that allows the administration of users via HTTP requests.
- *
- * @author Justin Hunt
- */
-public class UserServiceLegacyController {
-	
-	/** The Constant INSTANCE. */
-	public static final UserServiceLegacyController INSTANCE = new UserServiceLegacyController();
-	
-	/** The user manager. */
-	private UserManager userManager;
-	
-	/** The roster manager. */
-	private RosterManager rosterManager;
-	
-	/** The server. */
-	private XMPPServer server;
-
-	/**
-	 * Gets the single instance of UserServiceLegacyController.
-	 *
-	 * @return single instance of UserServiceLegacyController
-	 */
-	public static UserServiceLegacyController getInstance() {
-		return INSTANCE;
-	}
-	
-	/**
-	 * Instantiates a new user service legacy controller.
-	 */
-	private UserServiceLegacyController() {
-		server = XMPPServer.getInstance();
-		userManager = server.getUserManager();
-		rosterManager = server.getRosterManager();
-	}
-
-	/**
-	 * Creates the user.
-	 *
-	 * @param username the username
-	 * @param password the password
-	 * @param name the name
-	 * @param email the email
-	 * @param groupNames the group names
-	 * @throws UserAlreadyExistsException the user already exists exception
-	 * @throws GroupAlreadyExistsException the group already exists exception
-	 * @throws UserNotFoundException the user not found exception
-	 * @throws GroupNotFoundException the group not found exception
-	 */
-	public void createUser(String username, String password, String name, String email, String groupNames)
-			throws UserAlreadyExistsException, GroupAlreadyExistsException, UserNotFoundException,
-			GroupNotFoundException {
-		userManager.createUser(username, password, name, email);
-		userManager.getUser(username);
-
-		if (groupNames != null) {
-			Collection<Group> groups = new ArrayList<Group>();
-			StringTokenizer tkn = new StringTokenizer(groupNames, ",");
-
-			while (tkn.hasMoreTokens()) {
-				String groupName = tkn.nextToken();
-				Group group = null;
-
-				try {
-					group = GroupManager.getInstance().getGroup(groupName);
-				} catch (GroupNotFoundException e) {
-					// Create this group ;
-					group = GroupManager.getInstance().createGroup(groupName);
-					group.getProperties().put("sharedRoster.showInRoster", "onlyGroup");
-					group.getProperties().put("sharedRoster.displayName", groupName);
-					group.getProperties().put("sharedRoster.groupList", "");
-				}
-				groups.add(group);
-			}
-			for (Group group : groups) {
-				group.getMembers().add(server.createJID(username, null));
-			}
-		}
-	}
-
-	/**
-	 * Delete user.
-	 *
-	 * @param username the username
-	 * @throws UserNotFoundException the user not found exception
-	 * @throws SharedGroupException the shared group exception
-	 */
-	public void deleteUser(String username) throws UserNotFoundException, SharedGroupException {
-		User user = getUser(username);
-		userManager.deleteUser(user);
-
-		rosterManager.deleteRoster(server.createJID(username, null));
-	}
-
-	/**
-	 * Lock Out on a given username.
-	 *
-	 * @param username            the username of the local user to disable.
-	 * @throws UserNotFoundException             if the requested user does not exist in the local server.
-	 */
-	public void disableUser(String username) throws UserNotFoundException {
-		getUser(username);
-		LockOutManager.getInstance().disableAccount(username, null, null);
-	}
-
-	/**
-	 * Remove the lockout on a given username.
-	 *
-	 * @param username            the username of the local user to enable.
-	 * @throws UserNotFoundException             if the requested user does not exist in the local server.
-	 */
-	public void enableUser(String username) throws UserNotFoundException {
-		getUser(username);
-		LockOutManager.getInstance().enableAccount(username);
-	}
-
-	/**
-	 * Update user.
-	 *
-	 * @param username the username
-	 * @param password the password
-	 * @param name the name
-	 * @param email the email
-	 * @param groupNames the group names
-	 * @throws UserNotFoundException the user not found exception
-	 * @throws GroupAlreadyExistsException the group already exists exception
-	 */
-	public void updateUser(String username, String password, String name, String email, String groupNames)
-			throws UserNotFoundException, GroupAlreadyExistsException {
-		User user = getUser(username);
-		if (password != null)
-			user.setPassword(password);
-		if (name != null)
-			user.setName(name);
-		if (email != null)
-			user.setEmail(email);
-
-		if (groupNames != null) {
-			Collection<Group> newGroups = new ArrayList<Group>();
-			StringTokenizer tkn = new StringTokenizer(groupNames, ",");
-
-			while (tkn.hasMoreTokens()) {
-				String groupName = tkn.nextToken();
-				Group group = null;
-
-				try {
-					group = GroupManager.getInstance().getGroup(groupName);
-				} catch (GroupNotFoundException e) {
-					// Create this group ;
-					group = GroupManager.getInstance().createGroup(groupName);
-					group.getProperties().put("sharedRoster.showInRoster", "onlyGroup");
-					group.getProperties().put("sharedRoster.displayName", groupName);
-					group.getProperties().put("sharedRoster.groupList", "");
-				}
-
-				newGroups.add(group);
-			}
-
-			Collection<Group> existingGroups = GroupManager.getInstance().getGroups(user);
-			// Get the list of groups to add to the user
-			Collection<Group> groupsToAdd = new ArrayList<Group>(newGroups);
-			groupsToAdd.removeAll(existingGroups);
-			// Get the list of groups to remove from the user
-			Collection<Group> groupsToDelete = new ArrayList<Group>(existingGroups);
-			groupsToDelete.removeAll(newGroups);
-
-			// Add the user to the new groups
-			for (Group group : groupsToAdd) {
-				group.getMembers().add(server.createJID(username, null));
-			}
-			// Remove the user from the old groups
-			for (Group group : groupsToDelete) {
-				group.getMembers().remove(server.createJID(username, null));
-			}
-		}
-	}
-
-	/**
-	 * Add new roster item for specified user.
-	 *
-	 * @param username            the username of the local user to add roster item to.
-	 * @param itemJID            the JID of the roster item to be added.
-	 * @param itemName            the nickname of the roster item.
-	 * @param subscription            the type of subscription of the roster item. Possible values
-	 *            are: -1(remove), 0(none), 1(to), 2(from), 3(both).
-	 * @param groupNames            the name of a group to place contact into.
-	 * @throws UserNotFoundException             if the user does not exist in the local server.
-	 * @throws UserAlreadyExistsException             if roster item with the same JID already exists.
-	 * @throws SharedGroupException             if roster item cannot be added to a shared group.
-	 */
-	public void addRosterItem(String username, String itemJID, String itemName, String subscription, String groupNames)
-			throws UserNotFoundException, UserAlreadyExistsException, SharedGroupException {
-		getUser(username);
-		Roster r = rosterManager.getRoster(username);
-		JID j = new JID(itemJID);
-
-		try {
-			r.getRosterItem(j);
-			throw new UserAlreadyExistsException(j.toBareJID());
-		} catch (UserNotFoundException e) {
-			// Roster item does not exist. Try to add it.
-		}
-
-		if (r != null) {
-			List<String> groups = new ArrayList<String>();
-			if (groupNames != null) {
-				StringTokenizer tkn = new StringTokenizer(groupNames, ",");
-				while (tkn.hasMoreTokens()) {
-					groups.add(tkn.nextToken());
-				}
-			}
-			RosterItem ri = r.createRosterItem(j, itemName, groups, false, true);
-			if (subscription == null) {
-				subscription = "0";
-			}
-			ri.setSubStatus(RosterItem.SubType.getTypeFromInt(Integer.parseInt(subscription)));
-			r.updateRosterItem(ri);
-		}
-	}
-
-	/**
-	 * Update roster item for specified user.
-	 *
-	 * @param username            the username of the local user to update roster item for.
-	 * @param itemJID            the JID of the roster item to be updated.
-	 * @param itemName            the nickname of the roster item.
-	 * @param subscription            the type of subscription of the roster item. Possible values
-	 *            are: -1(remove), 0(none), 1(to), 2(from), 3(both).
-	 * @param groupNames            the name of a group.
-	 * @throws UserNotFoundException             if the user does not exist in the local server or roster item
-	 *             does not exist.
-	 * @throws SharedGroupException             if roster item cannot be added to a shared group.
-	 */
-	public void updateRosterItem(String username, String itemJID, String itemName, String subscription,
-			String groupNames) throws UserNotFoundException, SharedGroupException {
-		getUser(username);
-		Roster r = rosterManager.getRoster(username);
-		JID j = new JID(itemJID);
-
-		RosterItem ri = r.getRosterItem(j);
-
-		List<String> groups = new ArrayList<String>();
-		if (groupNames != null) {
-			StringTokenizer tkn = new StringTokenizer(groupNames, ",");
-			while (tkn.hasMoreTokens()) {
-				groups.add(tkn.nextToken());
-			}
-		}
-
-		ri.setGroups(groups);
-		ri.setNickname(itemName);
-
-		if (subscription == null) {
-			subscription = "0";
-		}
-		ri.setSubStatus(RosterItem.SubType.getTypeFromInt(Integer.parseInt(subscription)));
-		r.updateRosterItem(ri);
-	}
-
-	/**
-	 * Delete roster item for specified user. No error returns if nothing to
-	 * delete.
-	 *
-	 * @param username
-	 *            the username of the local user to add roster item to.
-	 * @param itemJID
-	 *            the JID of the roster item to be deleted.
-	 * @throws UserNotFoundException
-	 *             if the user does not exist in the local server.
-	 * @throws SharedGroupException
-	 *             if roster item cannot be deleted from a shared group.
-	 */
-	public void deleteRosterItem(String username, String itemJID) throws UserNotFoundException, SharedGroupException {
-		getUser(username);
-		Roster r = rosterManager.getRoster(username);
-		JID j = new JID(itemJID);
-
-		// No roster item is found. Uncomment the following line to throw
-		// UserNotFoundException.
-		// r.getRosterItem(j);
-
-		r.deleteRosterItem(j, true);
-	}
-
-	/**
-	 * Returns the the requested user or <tt>null</tt> if there are any problems
-	 * that don't throw an error.
-	 *
-	 * @param username
-	 *            the username of the local user to retrieve.
-	 * @return the requested user.
-	 * @throws UserNotFoundException
-	 *             if the requested user does not exist in the local server.
-	 */
-	private User getUser(String username) throws UserNotFoundException {
-		JID targetJID = server.createJID(username, null);
-		// Check that the sender is not requesting information of a remote
-		// server entity
-		if (targetJID.getNode() == null) {
-			// Sender is requesting presence information of an anonymous user
-			throw new UserNotFoundException("Username is null");
-		}
-		return userManager.getUser(targetJID.getNode());
-	}
-
-	/**
-	 * Returns all group names or an empty collection.
-	 *
-	 * @return the all groups
-	 */
-	public Collection<String> getAllGroups() {
-		Collection<Group> groups = GroupManager.getInstance().getGroups();
-		Collection<String> groupNames = new ArrayList<String>();
-		for (Group group : groups) {
-			groupNames.add(group.getName());
-		}
-		return groupNames;
-	}
-
-	/**
-	 * Returns all group names or an empty collection for specific user.
-	 *
-	 * @param username the username
-	 * @return the user groups
-	 * @throws UserNotFoundException the user not found exception
-	 */
-	public Collection<String> getUserGroups(String username) throws UserNotFoundException {
-		User user = getUser(username);
-		Collection<Group> groups = GroupManager.getInstance().getGroups(user);
-		Collection<String> groupNames = new ArrayList<String>();
-		for (Group group : groups) {
-			groupNames.add(group.getName());
-		}
-		return groupNames;
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/AskService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/AskService.java
deleted file mode 100644
index c816cb92..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/AskService.java
+++ /dev/null
@@ -1,434 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.xml.bind.DatatypeConverter;
-
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-import org.jivesoftware.openfire.plugin.rest.entity.WorkgroupEntity;
-import org.jivesoftware.openfire.plugin.rest.*;
-import org.jivesoftware.openfire.auth.AuthFactory;
-import org.jivesoftware.openfire.*;
-
-import org.jivesoftware.util.*;
-import org.jivesoftware.util.cache.Cache;
-import org.jivesoftware.util.cache.CacheFactory;
-import org.jivesoftware.openfire.user.*;
-import org.jivesoftware.database.DbConnectionManager;
-
-import org.broadbear.link.preview.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.xmpp.packet.*;
-import org.dom4j.Element;
-
-import net.sf.json.*;
-import com.j256.twofactorauth.TimeBasedOneTimePasswordUtil;
-
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpState;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
-import org.apache.commons.httpclient.params.HttpClientParams;
-import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
-
-
-@Path("restapi/v1/ask")
-public class AskService {
-
-    private static final Logger Log = LoggerFactory.getLogger(AskService.class);
-    private static final String TEXT_PLAIN = "text/plain";
-    private static final String APPLICATION_JSON = "application/json";
-    private static final Header HEADER_ACCEPT_APPLICATION_JSON = new Header("Accept", APPLICATION_JSON);
-    private static final Header HEADER_CONTENT_TYPE_APPLICATION_JSON = new Header("Content-Type", APPLICATION_JSON);
-    private static final Header HEADER_ACCEPT_CHARSET_UTF8 = new Header("Accept-Charset", "UTF-8");
-    private static final MessageRouter MESSAGE_ROUTER = XMPPServer.getInstance().getMessageRouter();
-    private static final String DOMAIN = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
-    private static final String SERVER = XMPPServer.getInstance().getServerInfo().getHostname();
-    private static final Cache<String, String> cachedIrmaRequests;
-
-    static {
-       cachedIrmaRequests = CacheFactory.createLocalCache("IRMA Verifications");
-    }
-    private HttpClient client;
-
-    @PostConstruct
-    public void init()
-    {
-        MultiThreadedHttpConnectionManager threadedConnectionManager = new MultiThreadedHttpConnectionManager();
-        client = new HttpClient(threadedConnectionManager);
-        //HttpClientParams hcParams = client.getParams();
-        //hcParams.setAuthenticationPreemptive(true);
-    }
-
-    //-------------------------------------------------------
-    //
-    //  preview link (url)
-    //
-    //-------------------------------------------------------
-
-    @GET
-    @Path("/previewlink/{quality}/{url}")
-    public String previewLink(@PathParam("quality") String quality, @PathParam("url") String url) throws ServiceException
-    {
-        Log.debug("previewLink " + url + " " + quality);
-
-        try {
-            JSONObject jsonObject = new JSONObject();
-            SourceContent sourceContent = TextCrawler.scrape(new String(DatatypeConverter.parseBase64Binary(url)), Integer.parseInt(quality));
-
-            if (sourceContent == null)
-            {
-                throw new ServiceException("Exception", "bad url", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-            }
-
-            if (sourceContent.getImages() != null)      jsonObject.put("image", sourceContent.getImages().get(0));
-            if (sourceContent.getDescription() != null) jsonObject.put("descriptionShort", sourceContent.getDescription());
-            if (sourceContent.getTitle()!=null)         jsonObject.put("title", sourceContent.getTitle());
-
-            return jsonObject.toString();
-
-        } catch (Exception e) {
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-
-    //-------------------------------------------------------
-    //
-    //  uport
-    //
-    //-------------------------------------------------------
-
-    @GET
-    @Path("/uport/{appId}/{clientId}")
-    public String getSigner(@PathParam("appId") String appId, @PathParam("clientId") String clientId) throws ServiceException
-    {
-        Log.debug("getSigner uport.clientid." + appId + "." + clientId);
-
-        try {
-            String signer = JiveGlobals.getProperty("uport.clientid." + appId + "." + clientId);
-
-            Log.debug("gotSigner " + signer);
-
-            if (signer == null || signer.equals(""))
-            {
-                throw new ServiceException("Exception", "client Id not found", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-            }
-
-            return signer;
-
-        } catch (Exception e) {
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-
-    @POST
-    @Path("/uport/register")
-    public String uportRegister(String json) throws ServiceException
-    {
-        Log.debug("uportRegister\n" + json);
-
-        JSONObject response = new JSONObject();
-
-        Connection con = null;
-        PreparedStatement pstmt = null;
-        ResultSet rs = null;
-        UserManager userManager = UserManager.getInstance();
-
-        try {
-            JSONObject uportCreds = new JSONObject(json);
-
-            if (uportCreds.has("address") && uportCreds.has("name") && uportCreds.has("publicKey"))
-            {
-                String email = uportCreds.has("email") ? uportCreds.getString("email") : null;
-                String password = StringUtils.randomString(32);
-                String finalUsername = null;
-                User user = null;
-
-                con = DbConnectionManager.getConnection();
-                pstmt = con.prepareStatement("SELECT username FROM ofUserProp WHERE propValue=?");
-                pstmt.setString(1, uportCreds.getString("address"));
-
-                rs = pstmt.executeQuery();
-
-                if (!rs.next())
-                {
-                    String[] parts = uportCreds.getString("name").split(" ");
-                    String username = parts[0].toLowerCase().trim();
-
-                    if (parts.length > 1)
-                    {
-                        username = username + "." + parts[1].toLowerCase().trim();
-                    }
-                    boolean ok = false;
-                    finalUsername = username;
-                    int count = 0;
-
-                    while (!ok)
-                    {
-                        try {
-                            userManager.getUser(finalUsername);
-                            finalUsername = username + "-" + String.valueOf(++count);
-
-                        } catch (UserNotFoundException e) {
-                            ok = true;
-                        }
-                    }
-
-                    user = userManager.createUser(finalUsername, password, uportCreds.getString("name"),  email);
-
-                    user.getProperties().put("etherlynk.address", uportCreds.getString("address"));
-                    user.getProperties().put("etherlynk.account", uportCreds.getString("account"));
-                    user.getProperties().put("etherlynk.public.key", uportCreds.getString("publicKey"));
-
-                } else {
-                    finalUsername = rs.getString(1);
-                    user = userManager.getUser(finalUsername);
-
-                    if (uportCreds.has("password"))
-                    {
-                        AuthFactory.authenticate(finalUsername, uportCreds.getString("password"));
-
-                        user.setPassword(password);
-                        user.setName(uportCreds.getString("name"));
-                        if (email != null) user.setEmail(email);
-                    }
-                }
-
-                if (uportCreds.has("avatar")) user.getProperties().put("etherlynk.avatar", uportCreds.getJSONObject("avatar").getString("uri"));
-                if (uportCreds.has("country")) user.getProperties().put("etherlynk.country", uportCreds.getString("country"));
-                if (uportCreds.has("phone")) user.getProperties().put("etherlynk.phone", uportCreds.getString("phone"));
-
-                response.put("username", finalUsername);
-                response.put("password", password);
-
-            } else {
-                Log.error("bad request\n" + uportCreds);
-                throw new ServiceException("Exception", "bad request", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-            }
-
-        } catch (Exception e) {
-            Log.error("uportRegister execption", e);
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        } finally {
-            DbConnectionManager.closeConnection(rs, pstmt, con);
-        }
-
-        return response.toString();
-    }
-
-    //-------------------------------------------------------
-    //
-    //  IRMA
-    //
-    //-------------------------------------------------------
-
-    @POST
-    @Path("/irma/reveal/{jid}")
-    public String irmaReveal(@PathParam("jid") String jid, String irmaRequest) throws ServiceException
-    {
-        Log.debug("irmaReveal " + jid + " " + irmaRequest + "\n" + cachedIrmaRequests.values() + "\n" + cachedIrmaRequests.keySet());
-
-        String response = "\"ERROR\"";
-
-        if (cachedIrmaRequests.containsKey(jid))
-        {
-           Log.debug("irmaReveal cached " + jid);
-           response = cachedIrmaRequests.get(jid);
-           int tries = 0;
-
-           while (response.contains("PENDING") && tries < 20)
-           {
-                Log.debug("irmaReveal pending " + tries);
-                try {
-                    Thread.sleep(3000);
-
-                } catch (Exception e) {
-                    Log.error("irmaReveal thread sleep execption", e);
-                }
-
-                response = cachedIrmaRequests.get(jid);
-                tries++;
-           }
-
-           if (tries >= 10 || response.contains("ERROR")) cachedIrmaRequests.remove(jid);
-        }
-        else {
-            cachedIrmaRequests.put(jid, "\"PENDING\"");
-
-            String revealUrl = JiveGlobals.getProperty("irma.external.url", "http://" + SERVER + ":" + JiveGlobals.getProperty("httpbind.port.plain", "7070")) +  "/session";
-            PostMethod post = null;
-            GetMethod get = null;
-
-            Log.debug("irmaReveal get session " + revealUrl);
-
-            try {
-                post = new PostMethod(revealUrl);
-                post.addRequestHeader(HEADER_ACCEPT_APPLICATION_JSON);
-                post.addRequestHeader(HEADER_CONTENT_TYPE_APPLICATION_JSON);
-                post.addRequestHeader(HEADER_ACCEPT_CHARSET_UTF8);
-
-                if (irmaRequest != null)
-                {
-                    post.setRequestEntity(new StringRequestEntity(irmaRequest, TEXT_PLAIN, "UTF-8"));
-                    int httpCode = client.executeMethod(post);
-
-                    if (httpCode < 300)
-                    {
-                        String payload = getStringFromResponse(post);
-                        JSONObject json = new JSONObject(payload);
-
-                        if (json.has("sessionPtr") && json.has("token"))
-                        {
-                            routeMessage(jid, payload, "reveal");
-
-                            String sessionId = json.getString("token");
-                            String checkUrl = revealUrl + "/" + sessionId + "/status";
-
-                            Log.debug("irmaReveal session id " + sessionId);
-
-                            while (httpCode < 300 && !response.contains("DONE") && !response.contains("TIMEOUT") && !response.contains("CANCELLED"))
-                            {
-                                Thread.sleep(3000);
-
-                                get = new GetMethod(checkUrl + "?" + System.currentTimeMillis());
-                                get.addRequestHeader(HEADER_ACCEPT_APPLICATION_JSON);
-                                get.addRequestHeader(HEADER_CONTENT_TYPE_APPLICATION_JSON);
-                                get.addRequestHeader(HEADER_ACCEPT_CHARSET_UTF8);
-
-                                httpCode = client.executeMethod(get);
-
-                                response = "\"ERROR\"";
-                                if (httpCode < 300) response = getStringFromResponse(get);
-
-                                Log.debug("irmaReveal status " + response + " " + httpCode);
-                                routeMessage(jid, response, "status");
-                            }
-
-                            if (response.contains("DONE"))
-                            {
-                                Log.debug("irmaReveal done " + sessionId);
-
-                                String resultUrl = revealUrl + "/" + sessionId + "/result";
-                                get = new GetMethod(resultUrl);
-                                httpCode = client.executeMethod(get);
-
-                                if (httpCode < 300)
-                                {
-                                    response = getStringFromResponse(get);
-                                    cachedIrmaRequests.put(jid, response);
-
-                                    Log.debug("irmaReveal payload \n" + response);
-                                }
-                                routeMessage(jid, response, "done");
-                            }
-                            else {
-                                Log.debug("irmaReveal error " + response + " " + httpCode);
-                                routeMessage(jid, response, "error");
-                            }
-                        }
-                        else {
-                            Log.debug("irmaReveal error " + response + " " + httpCode);
-                            routeMessage(jid, response, "error");
-                        }
-                    }
-                    else {
-                        Log.error("irmaReveal http error response " + httpCode);
-                        throw new ServiceException("Exception", "http error " + httpCode, ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-                    }
-                } else {
-                    Log.error("irmaReveal missing payload");
-                    throw new ServiceException("Exception", "missing payload", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-                }
-
-            } catch (Exception e) {
-                Log.error("irmaReveal execption", e);
-                throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-            } finally {
-                if (post != null) post.releaseConnection();
-                if (get != null) get.releaseConnection();
-            }
-        }
-        return response;
-    }
-
-    private String getStringFromResponse(HttpMethod method) throws IOException {
-        StringBuilder responseContent;
-        BufferedReader reader;
-        responseContent = new StringBuilder();
-        reader = null;
-
-        try {
-            reader = new BufferedReader(new InputStreamReader(method.getResponseBodyAsStream()));
-            String line;
-
-            while ((line = reader.readLine()) != null)
-                responseContent.append(line).append(System.getProperty("line.separator"));
-        } catch (Exception e) {
-            Log.warn("Error while extracting response body from response");
-
-            if (reader != null)
-                try {
-                    reader.close();
-                } catch (IOException _ex) {
-                }
-            return null;
-        }
-
-        if (reader != null)
-            try {
-                reader.close();
-            } catch (IOException _ex) {
-            }
-
-        return responseContent.toString();
-    }
-
-    private JSONObject sanitizeJson(String response) throws JSONException {
-        return new JSONObject(response.replaceAll("^[^{]", ""));
-    }
-
-    private void routeMessage(String jid, String payload, String action)
-    {
-        Log.debug("routeMessage " + jid + " " + action + "\n" + payload);
-
-        Message message = new Message();
-        message.setFrom(DOMAIN);
-        message.setTo(jid);
-
-        Element irma = message.addChildElement("irma", "http://igniterealtime.org/xmlns/xmpp/irma");
-        irma.addAttribute("action", action);
-        irma.setText(payload);
-
-        MESSAGE_ROUTER.route(message);
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/BookmarkService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/BookmarkService.java
deleted file mode 100644
index 38b1aada..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/BookmarkService.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.jivesoftware.util.NotFoundException;
-
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-
-import org.jivesoftware.openfire.plugin.spark.Bookmark;
-import org.jivesoftware.openfire.plugin.spark.Bookmarks;
-import org.jivesoftware.openfire.plugin.spark.BookmarkManager;
-
-@Path("restapi/v1/bookmarks")
-public class BookmarkService {
-
-    private static final Logger Log = LoggerFactory.getLogger(BookmarkService.class);
-
-
-    @PostConstruct
-    public void init()
-    {
-
-    }
-
-    @POST
-    public Bookmark createBookmark(Bookmark newBookmark) throws ServiceException
-    {
-        Log.debug("createBookmark " + newBookmark);
-
-        try {
-            return new Bookmark(newBookmark.getType(), newBookmark.getName(), newBookmark.getValue(), newBookmark.getUsers(), newBookmark.getGroups());
-
-        } catch (Exception e) {
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-
-    @GET
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public Bookmarks getBookmarks() throws ServiceException
-    {
-        Log.debug("getBookmarks ");
-        try {
-            return new Bookmarks(BookmarkManager.getBookmarks());
-
-        } catch (Exception e) {
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-
-    @GET
-    @Path("/{bookmarkID}")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public Bookmark getBookmark(@PathParam("bookmarkID") String bookmarkID) throws ServiceException
-    {
-        Log.debug("getBookmark " + bookmarkID);
-
-        try {
-            return new Bookmark(Long.parseLong(bookmarkID));
-
-        } catch (Exception e) {
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-
-    @DELETE
-    @Path("/{bookmarkID}")
-    public Response deleteBookmark(@PathParam("bookmarkID") String bookmarkID) throws ServiceException
-    {
-        Log.debug("deleteBookmark " + bookmarkID);
-
-        try {
-            BookmarkManager.deleteBookmark(Long.parseLong(bookmarkID));
-
-        } catch (Exception e) {
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-
-        return Response.status(Response.Status.OK).build();
-    }
-
-    @PUT
-    @Path("/{bookmarkID}")
-    public Bookmark updateBookmark(@PathParam("bookmarkID") String bookmarkID, Bookmark newBookmark) throws ServiceException
-    {
-        Log.debug("updateBookmark " + bookmarkID + " " + newBookmark.getType() + " " + newBookmark.getName() + " " + newBookmark.getValue() + " " + newBookmark.getUsers() + " " + newBookmark.getGroups() + " " + newBookmark.getProperties());
-
-        try {
-            Bookmark bookmark = BookmarkManager.getBookmark(Long.parseLong(bookmarkID));
-            bookmark.setType(newBookmark.getType());
-            bookmark.setName(newBookmark.getName());
-            bookmark.setValue(newBookmark.getValue());
-            bookmark.setUsers(newBookmark.getUsers());
-            bookmark.setGroups(newBookmark.getGroups());
-            return bookmark;
-
-        } catch (Exception e) {
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-
-    @PUT
-    @Path("/{bookmarkID}/property")
-    public Bookmark updateBookmarkProperty(@PathParam("bookmarkID") String bookmarkID, @QueryParam("name") String name, @QueryParam("value") String value) throws ServiceException
-    {
-        Log.debug("updateBookmarkProperty " + bookmarkID + " " + name + " " + value);
-
-        try {
-            Bookmark bookmark = BookmarkManager.getBookmark(Long.parseLong(bookmarkID));
-            bookmark.setProperty(name, value);
-            return bookmark;
-
-        } catch (Exception e) {
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-
-    @DELETE
-    @Path("/{bookmarkID}/property")
-    public Bookmark deleteBookmarkProperty(@PathParam("bookmarkID") String bookmarkID, @QueryParam("name") String name) throws ServiceException
-    {
-        Log.debug("deleteBookmarkProperty " + bookmarkID + " " + name);
-
-        try {
-            Bookmark bookmark = BookmarkManager.getBookmark(Long.parseLong(bookmarkID));
-            bookmark.deleteProperty(name);
-            return bookmark;
-
-        } catch (Exception e) {
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/ChatService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/ChatService.java
deleted file mode 100644
index 89e11734..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/ChatService.java
+++ /dev/null
@@ -1,515 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.net.*;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.time.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.StreamingOutput;
-
-import java.security.Principal;
-
-import javax.xml.bind.*;
-import org.codehaus.jackson.map.*;
-import org.codehaus.jackson.xc.*;
-
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.user.User;
-import org.jivesoftware.openfire.admin.AdminManager;
-import org.jivesoftware.util.*;
-
-import org.jivesoftware.openfire.plugin.rest.controller.UserServiceController;
-import org.jivesoftware.openfire.plugin.rest.controller.MUCRoomController;
-
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-
-import org.jivesoftware.openfire.plugin.rest.*;
-import org.jivesoftware.openfire.plugin.rest.BasicAuth;
-import org.jivesoftware.openfire.plugin.rest.entity.RosterEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.RosterItemEntity;
-import org.jivesoftware.openfire.plugin.rest.entity.UserEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCChannelType;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCRoomEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCRoomEntity;
-import org.jivesoftware.openfire.plugin.rest.entity.OccupantEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.ParticipantEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.WorkgroupEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.AssistQueues;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCRoomMessageEntities;
-
-import org.jivesoftware.openfire.user.*;
-import org.jivesoftware.openfire.SharedGroupException;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-
-import org.jivesoftware.openfire.auth.*;
-import org.jivesoftware.openfire.sip.sipaccount.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.xmpp.packet.*;
-import org.jivesoftware.openfire.archive.*;
-
-import com.j256.twofactorauth.TimeBasedOneTimePasswordUtil;
-import de.mxro.process.*;
-
-import org.ifsoft.sso.Password;
-import org.jitsi.util.OSUtils;
-import org.jivesoftware.openfire.archive.ConversationPDFServlet;
-
-@Path("restapi/v1/chat")
-public class ChatService {
-
-    private static final Logger Log = LoggerFactory.getLogger(ChatService.class);
-    private XMPPServer server;
-    private UserServiceController userService;
-
-    @Context
-    private HttpServletRequest httpRequest;
-
-    @PostConstruct
-    public void init()
-    {
-        server = XMPPServer.getInstance();
-        userService = UserServiceController.getInstance();
-    }
-
-    //-------------------------------------------------------
-    //
-    //  certificate/enroll
-    //
-    //-------------------------------------------------------
-
-    @GET
-    @Path("/certificate")
-    @Produces(MediaType.TEXT_PLAIN)
-    public Response getCertificate() throws ServiceException
-    {
-        String c2sTrustStoreLocation = JiveGlobals.getHomeDirectory() + File.separator + "resources" + File.separator + "security" + File.separator;
-        String base64String = httpRequest.getHeader("authorization");
-        String certsLocation = JiveGlobals.getHomeDirectory() + File.separator + "certificates";
-        String openSslPath = JiveGlobals.getProperty("ofchat.openssl.path", null);
-
-        Log.debug("getCertificate " + base64String);
-
-        if (base64String != null)
-        {
-            String[] usernameAndPassword = BasicAuth.decode(base64String);
-
-            if (usernameAndPassword != null && usernameAndPassword.length == 2)
-            {
-                try {
-                    // /usr/bin/openssl
-                    String aliasHome = checkCertificatesFolder(usernameAndPassword[0]);
-                    String pfxFile = aliasHome + File.separator + usernameAndPassword[0] + ".pfx";
-
-                    if (!(new File(pfxFile)).exists())
-                    {
-                        if (openSslPath == null)
-                        {
-                            throw new ServiceException("Exception", "OpenSSL not configured", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-                        }
-
-                        String jid = usernameAndPassword[0] + "@" + server.getServerInfo().getXMPPDomain();
-
-                        if (aliasHome != null)
-                        {
-                            String command1 = openSslPath + " req -new -newkey rsa:4096 -days 365 -nodes -x509 -keyout " + usernameAndPassword[0] + ".key -out " + usernameAndPassword[0] + ".crt -config " + usernameAndPassword[0] + ".cnf -extensions v3_extensions -subj \"/CN=" + jid + "\"";
-                            String out1 = Spawn.runCommand(command1, new File(aliasHome));
-                            Log.debug(command1 + "\n" + out1);
-
-                            String command2 = openSslPath + " pkcs12 -export -inkey " + usernameAndPassword[0] + ".key -in " + usernameAndPassword[0] + ".crt -out " + usernameAndPassword[0] + ".pfx -passout pass:" + usernameAndPassword[1] + " -passin pass:" + usernameAndPassword[1];
-                            String out2 = Spawn.runCommand(command2, new File(aliasHome));
-                            Log.debug(command2 + "\n" + out2);
-                        }
-                    }
-
-                    if (!(new File(pfxFile)).exists())
-                    {
-                        throw new ServiceException("Exception", "certificate creation failed", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-                    }
-
-                    return Response.ok(new FileInputStream(pfxFile)).type("application/x-pkcs12").build();
-
-                } catch (Exception e) {
-                    throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-                }
-            }
-        }
-
-        throw new ServiceException("Exception", "Access denied", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-    }
-
-    @GET
-    @Path("/enroll")
-    public String getTotpQrCode() throws ServiceException
-    {
-        String base64String = httpRequest.getHeader("authorization");
-        Log.debug("addTotp " + base64String);
-
-        if (base64String != null)
-        {
-            String[] usernameAndPassword = BasicAuth.decode(base64String);
-
-            if (usernameAndPassword != null && usernameAndPassword.length == 2)
-            {
-                try {
-                    User user = userService.getUser(usernameAndPassword[0]);
-                    String base32Secret = user.getProperties().get("ofchat.totp.secret");
-
-                    if (base32Secret == null)
-                    {
-                        base32Secret = TimeBasedOneTimePasswordUtil.generateBase32Secret();
-                        user.getProperties().put("ofchat.totp.secret", base32Secret);
-                    }
-                    return TimeBasedOneTimePasswordUtil.qrImageUrl(usernameAndPassword[0] + "@" + server.getServerInfo().getXMPPDomain(), base32Secret);
-
-                } catch (Exception e) {
-                    throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-                }
-            }
-        }
-        throw new ServiceException("Exception", "Access denied", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-    }
-
-
-    @DELETE
-    @Path("/enroll")
-    @Produces(MediaType.TEXT_PLAIN)
-    public Response deleteTotpQr() throws ServiceException
-    {
-        String base64String = httpRequest.getHeader("authorization");
-        Log.debug("deleteTotpQr " + base64String);
-
-        if (base64String != null)
-        {
-            String[] usernameAndPassword = BasicAuth.decode(base64String);
-
-            if (usernameAndPassword != null && usernameAndPassword.length == 2)
-            {
-                try {
-                    User user = userService.getUser(usernameAndPassword[0]);
-                    String base32Secret = user.getProperties().get("ofchat.totp.secret");
-
-                    if (base32Secret != null)
-                    {
-                        user.getProperties().remove("ofchat.totp.secret");
-                    }
-                    return Response.status(Response.Status.OK).build();
-
-                } catch (Exception e) {
-                    throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-                }
-            }
-        }
-
-        throw new ServiceException("Exception", "Access denied", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-    }
-
-    @GET
-    @Path("/{username}/pdf")
-    @Produces(MediaType.APPLICATION_OCTET_STREAM)
-    public Response getConversationsPdf(@PathParam("username") String username, @QueryParam("keywords") String keywords, @QueryParam("to") String to, @QueryParam("start") String start, @QueryParam("end") String end, @QueryParam("room") String room, @DefaultValue("conference") @QueryParam("service") String service, String password) throws ServiceException
-    {
-        StreamingOutput output = new StreamingOutput()
-        {
-            @Override public void write(OutputStream out)
-            {
-                ConversationPDFServlet.doSearch(out, username, keywords, to, start, end, room, service);
-            }
-        };
-        return Response.ok(output).build();
-    }
-
-    @GET
-    @Path("/{username}/messages")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public Conversations getConversations(@PathParam("username") String username, @QueryParam("keywords") String keywords, @QueryParam("to") String to, @QueryParam("start") String start, @QueryParam("end") String end, @QueryParam("room") String room, @DefaultValue("conference") @QueryParam("service") String service, String password) throws ServiceException
-    {
-        Log.debug("getConversations " + username + " " + keywords + " " + " " + to  + " " + start + " " + end + " " + room + " " + service);
-
-        try {
-            // can be done out of band
-            // authentication required. secret, admin user or authenicated user
-
-            String token = httpRequest.getHeader("authorization");
-
-            if (token != null)
-            {
-                String[] usernameAndPassword = BasicAuth.decode(token.substring(6));
-                usernameAndPassword = BasicAuth.decode(token);
-
-                if (usernameAndPassword == null || usernameAndPassword.length != 2 || !usernameAndPassword[0].equals(username))
-                {
-                    throw new ServiceException("Exception", "not authorized", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-                }
-
-            } else {
-                authenticate( username, password );
-            }
-
-            ArchiveSearch search = new ArchiveSearch();
-            JID participant1JID = makeJid(username);
-            JID participant2JID = null;
-
-            if (to != null) participant2JID = makeJid(to);
-
-            if (participant2JID != null) {
-                search.setParticipants(participant1JID, participant2JID);
-            } else  {
-                search.setParticipants(participant1JID);
-            }
-
-            if (start != null)
-            {
-                Date startDate = null;
-
-                try {
-                    if (start.contains("T"))
-                    {
-                        startDate = Date.from(Instant.parse(start));
-                    }
-                    else {
-                        DateFormat formatter = new SimpleDateFormat("MM/dd/yy");
-                        startDate = formatter.parse(start);
-                    }
-                    startDate = new Date(startDate.getTime() - JiveConstants.MINUTE * 5);
-                    search.setDateRangeMin(startDate);
-                }
-                catch (Exception e) {
-                    Log.error("ConversationPDFServlet", e);
-                }
-            }
-
-            if (end != null)
-            {
-                Date endDate = null;
-
-                try {
-                    if (end.contains("T"))
-                    {
-                        endDate = Date.from(Instant.parse(end));
-                    }
-                    else {
-                        DateFormat formatter = new SimpleDateFormat("MM/dd/yy");
-                        endDate = formatter.parse(end);
-                    }
-                    endDate = new Date(endDate.getTime() + JiveConstants.DAY - 1);
-                    search.setDateRangeMax(endDate);
-                }
-                catch (Exception e) {
-                    Log.error("ConversationPDFServlet", e);
-                }
-            }
-
-            if (keywords != null) search.setQueryString(keywords);
-
-            if (service == null) service = "conference";
-
-            if (room != null)
-            {
-                search.setRoom(new JID(room + "@" + service + "." + server.getServerInfo().getXMPPDomain()));
-            }
-
-            search.setSortOrder(ArchiveSearch.SortOrder.ascending);
-
-            Collection<Conversation> conversations = new ArchiveSearcher().search(search);
-            Collection<Conversation> list = new ArrayList<Conversation>();
-
-            for (Conversation conversation : conversations)
-            {
-                list.add(conversation);
-            }
-
-            return new Conversations(list);
-
-        } catch (Exception e) {
-            Log.error("getConversations", e);
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-    //-------------------------------------------------------
-    //
-    //  Search for users. CRUD user profile (properties)
-    //
-    //-------------------------------------------------------
-
-    @GET
-    @Path("/users")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public UserEntities getUser(@QueryParam("search") String search) throws ServiceException
-    {
-        return userService.getUsersBySearch(search);
-    }
-
-    //-------------------------------------------------------
-    //
-    //  get, join, leave, post message chat rooms
-    //
-    //-------------------------------------------------------
-
-    @GET
-    @Path("/rooms")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public MUCRoomEntities getMUCRooms(@DefaultValue("conference") @QueryParam("servicename") String serviceName, @DefaultValue(MUCChannelType.PUBLIC) @QueryParam("type") String channelType, @QueryParam("search") String roomSearch, @DefaultValue("false") @QueryParam("expandGroups") Boolean expand)
-    {
-        return MUCRoomController.getInstance().getChatRooms(serviceName, channelType, roomSearch, expand);
-    }
-
-    @GET
-    @Path("/rooms/{roomName}")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public MUCRoomEntity getMUCRoomJSON2(@PathParam("roomName") String roomName, @DefaultValue("conference") @QueryParam("servicename") String serviceName, @DefaultValue("false") @QueryParam("expandGroups") Boolean expand) throws ServiceException
-    {
-        return MUCRoomController.getInstance().getChatRoom(roomName, serviceName, expand);
-    }
-
-    @GET
-    @Path("/rooms/{roomName}/participants")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public ParticipantEntities getMUCRoomParticipants(@PathParam("roomName") String roomName, @DefaultValue("conference") @QueryParam("servicename") String serviceName)
-    {
-        return MUCRoomController.getInstance().getRoomParticipants(roomName, serviceName);
-    }
-
-    @GET
-    @Path("/rooms/{roomName}/occupants")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public OccupantEntities getMUCRoomOccupants(@PathParam("roomName") String roomName, @DefaultValue("conference") @QueryParam("servicename") String serviceName)
-    {
-        return MUCRoomController.getInstance().getRoomOccupants(roomName, serviceName);
-    }
-
-    @GET
-    @Path("/rooms/{roomName}/chathistory")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public MUCRoomMessageEntities getMUCRoomHistory(@PathParam("roomName") String roomName, @DefaultValue("conference") @QueryParam("servicename") String serviceName) throws ServiceException
-    {
-        return MUCRoomController.getInstance().getRoomHistory(roomName, serviceName);
-    }
-
-    //-------------------------------------------------------
-    //
-    //  Utitlities
-    //
-    //-------------------------------------------------------
-
-    private JID makeJid(String participant1)
-    {
-        JID participant1JID = null;
-
-        try {
-            int position = participant1.lastIndexOf("@");
-
-            if (position > -1) {
-                String node = participant1.substring(0, position);
-                participant1JID = new JID(JID.escapeNode(node) + participant1.substring(position));
-            } else {
-                participant1JID = new JID(JID.escapeNode(participant1), server.getServerInfo().getXMPPDomain(), null);
-            }
-        } catch (Exception e) {
-            Log.error("makeJid", e);
-        }
-        return participant1JID;
-    }
-
-    private Object jsonToObject(String json, Class objectClass)
-    {
-        Object object = null;
-
-        try {
-            ObjectMapper mapper = new ObjectMapper();
-            AnnotationIntrospector introspector = new JaxbAnnotationIntrospector();
-            mapper.setAnnotationIntrospector(introspector);
-            object = mapper.readValue(json, objectClass);
-
-        } catch (Exception e) {
-            Log.error("jsonToObject", e);
-        }
-
-        Log.debug("jsonToObject\n" + json + "\nObject= " + object);
-        return object;
-    }
-
-    private String objectToJson(Object object)
-    {
-        String json = null;
-
-        try {
-            ObjectMapper mapper = new ObjectMapper();
-            AnnotationIntrospector introspector = new JaxbAnnotationIntrospector();
-            mapper.setAnnotationIntrospector(introspector);
-            json = mapper.writeValueAsString(object);
-
-        } catch (Exception e) {
-            Log.error("objectToJson", e);
-        }
-
-        Log.debug("objectToJson\n" + json + "\nObject= " + object);
-        return json;
-    }
-
-    private String checkCertificatesFolder(String alias)
-    {
-        String jid = alias + "@" + server.getServerInfo().getXMPPDomain();
-        String certificatesHome = JiveGlobals.getHomeDirectory() + File.separator + "certificates";
-        String aliasHome = certificatesHome + File.separator + alias;
-
-        try
-        {
-            File certificatesFolderPath = new File(certificatesHome);
-            if (!certificatesFolderPath.exists()) certificatesFolderPath.mkdirs();
-
-            File aliasFolderPath = new File(aliasHome);
-            if (!aliasFolderPath.exists()) aliasFolderPath.mkdirs();
-
-            List<String> lines = Arrays.asList("[req]", "x509_extensions = v3_extensions", "req_extensions = v3_extensions", "distinguished_name = distinguished_name", "[v3_extensions]", "extendedKeyUsage = clientAuth", "keyUsage = digitalSignature,keyEncipherment", "basicConstraints = CA:FALSE", "subjectAltName = @subject_alternative_name", "[subject_alternative_name]", "otherName.0 = 1.3.6.1.5.5.7.8.5;UTF8:" + jid, "[distinguished_name]", "commonName = " + jid);
-            java.nio.file.Path file = java.nio.file.Paths.get(aliasHome + File.separator + alias + ".cnf");
-
-
-            Files.write(file, lines, Charset.forName("UTF-8"));
-
-            return aliasHome;
-        }
-        catch (Exception e)
-        {
-            Log.error("checkCertificatesFolder", e);
-        }
-        return null;
-    }
-
-    private void authenticate(String username, String password) throws Exception
-    {
-        Log.debug("authenticate " + username + " " + Password.passwords.get(username));
-
-        if (Password.passwords.containsKey(username))     // SSO
-        {
-            String passkey = Password.passwords.get(username).trim();
-
-            if (password.trim().equals(passkey) == false)
-            {
-                throw new ServiceException("Exception", "not authorized", ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-            }
-            return;
-        }
-        else AuthFactory.authenticate( username, password );
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/GroupService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/GroupService.java
deleted file mode 100644
index 3eef41e1..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/GroupService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.plugin.rest.controller.GroupController;
-import org.jivesoftware.openfire.plugin.rest.entity.GroupEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.GroupEntity;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-
-@Path("restapi/v1/groups")
-public class GroupService {
-
-	private GroupController groupController;
-
-	@PostConstruct
-	public void init() {
-		groupController = GroupController.getInstance();
-	}
-
-	@GET
-	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-	public GroupEntities getGroups() throws ServiceException {
-		return new GroupEntities(groupController.getGroups());
-	}
-
-	@POST
-	public Response createGroup(GroupEntity groupEntity) throws ServiceException {
-		groupController.createGroup(groupEntity);
-		return Response.status(Response.Status.CREATED).build();
-	}
-	
-	@GET
-	@Path("/{groupName}")
-	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-	public GroupEntity getGroup(@PathParam("groupName") String groupName) throws ServiceException {
-		return groupController.getGroup(groupName);
-	}
-	
-	@PUT
-	@Path("/{groupName}")
-	public Response updateGroup(@PathParam("groupName") String groupName, GroupEntity groupEntity) throws ServiceException {
-		groupController.updateGroup(groupName, groupEntity);
-		return Response.status(Response.Status.OK).build();
-	}
-
-	@DELETE
-	@Path("/{groupName}")
-	public Response deleteGroup(@PathParam("groupName") String groupName) throws ServiceException {
-		groupController.deleteGroup(groupName);
-		return Response.status(Response.Status.OK).build();
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/JerseyWrapper.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/JerseyWrapper.java
deleted file mode 100644
index e05acbc6..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/JerseyWrapper.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-
-import org.jivesoftware.openfire.plugin.rest.exceptions.RESTExceptionMapper;
-import org.jivesoftware.util.JiveGlobals;
-
-import com.sun.jersey.api.core.PackagesResourceConfig;
-import com.sun.jersey.spi.container.servlet.ServletContainer;
-
-import org.ifsoft.meet.MeetService;
-
-
-public class JerseyWrapper extends ServletContainer
-{
-    private static final String AUTHFILTER = "org.jivesoftware.openfire.plugin.rest.AuthFilter";
-    private static final String CORSFILTER = "org.jivesoftware.openfire.plugin.rest.CORSFilter";
-    private static final String CONTAINER_REQUEST_FILTERS = "com.sun.jersey.spi.container.ContainerRequestFilters";
-    private static final String CONTAINER_RESPONSE_FILTERS = "com.sun.jersey.spi.container.ContainerResponseFilters";
-    private static final String GZIP_FILTER = "com.sun.jersey.api.container.filter.GZIPContentEncodingFilter";
-    private static final String RESOURCE_CONFIG_CLASS_KEY = "com.sun.jersey.config.property.resourceConfigClass";
-    private static final String RESOURCE_CONFIG_CLASS = "com.sun.jersey.api.core.PackagesResourceConfig";
-    private static final String SCAN_PACKAGE_DEFAULT = JerseyWrapper.class.getPackage().getName();
-    private static final long serialVersionUID = 1L;
-    private static Map<String, Object> config;
-    private static PackagesResourceConfig prc;
-    private final static Logger JERSEY_LOGGER = Logger.getLogger("com.sun.jersey");
-
-    private static String loadingStatusMessage = null;
-
-    static
-    {
-        JERSEY_LOGGER.setLevel(Level.SEVERE);
-        config = new HashMap<String, Object>();
-        config.put(RESOURCE_CONFIG_CLASS_KEY, RESOURCE_CONFIG_CLASS);
-        config.put("com.sun.jersey.api.json.POJOMappingFeature", true);
-
-        prc = new PackagesResourceConfig(SCAN_PACKAGE_DEFAULT);
-        prc.setPropertiesAndFeatures(config);
-        prc.getProperties().put(CONTAINER_RESPONSE_FILTERS, CORSFILTER);
-        //prc.getProperties().put(CONTAINER_RESPONSE_FILTERS, GZIP_FILTER);
-        loadAuthenticationFilter();
-
-        prc.getClasses().add(RestAPIService.class);
-
-        prc.getClasses().add(MUCRoomService.class);
-        prc.getClasses().add(MUCRoomOwnersService.class);
-        prc.getClasses().add(MUCRoomAdminsService.class);
-        prc.getClasses().add(MUCRoomMembersService.class);
-        prc.getClasses().add(MUCRoomOutcastsService.class);
-
-        prc.getClasses().add(UserService.class);
-        prc.getClasses().add(UserRosterService.class);
-        prc.getClasses().add(UserGroupService.class);
-        prc.getClasses().add(UserLockoutService.class);
-
-        prc.getClasses().add(GroupService.class);
-        prc.getClasses().add(SessionService.class);
-        prc.getClasses().add(MsgArchiveService.class);
-        prc.getClasses().add(StatisticsService.class);
-        prc.getClasses().add(MessageService.class);
-        prc.getClasses().add(SipService.class);
-        prc.getClasses().add(BookmarkService.class);
-        prc.getClasses().add(ChatService.class);
-        prc.getClasses().add(MeetService.class);
-        prc.getClasses().add(AskService.class);
-
-        prc.getClasses().add(RESTExceptionMapper.class);
-    }
-
-    public static String loadAuthenticationFilter()
-    {
-        //prc.getProperties().put(CONTAINER_REQUEST_FILTERS, GZIP_FILTER);
-        prc.getProperties().put(CONTAINER_REQUEST_FILTERS, AUTHFILTER);
-        return loadingStatusMessage;
-    }
-
-
-    public JerseyWrapper()
-    {
-        super(prc);
-    }
-
-
-    @Override
-    public void init(ServletConfig servletConfig) throws ServletException
-    {
-        loadAuthenticationFilter();
-        super.init(servletConfig);
-    }
-
-    @Override
-    public void destroy()
-    {
-        super.destroy();
-    }
-
-
-    public static String getLoadingStatusMessage()
-    {
-        return loadingStatusMessage;
-    }
-
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomAdminsService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomAdminsService.java
deleted file mode 100644
index d1fb612d..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomAdminsService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.controller.MUCRoomController;
-
-@Path("restapi/v1/chatrooms/{roomName}/admins")
-public class MUCRoomAdminsService {
-
-	@POST
-	@Path("/{jid}")
-	public Response addMUCRoomAdmin(@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("jid") String jid, @PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().addAdmin(serviceName, roomName, jid);
-		return Response.status(Status.CREATED).build();
-	}
-
-	@POST
-	@Path("/group/{groupname}")
-	public Response addMUCRoomAdminGroup(@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("groupname") String groupname, @PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().addAdmin(serviceName, roomName, groupname);
-		return Response.status(Status.CREATED).build();
-	}
-
-	@DELETE
-	@Path("/{jid}")
-	public Response deleteMUCRoomAdmin(@PathParam("jid") String jid,
-			@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().deleteAffiliation(serviceName, roomName, jid);
-		return Response.status(Status.OK).build();
-	}
-
-	@DELETE
-	@Path("/group/{groupname}")
-	public Response deleteMUCRoomAdminGroup(@PathParam("groupname") String groupname,
-			@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().deleteAffiliation(serviceName, roomName, groupname);
-		return Response.status(Status.OK).build();
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomMembersService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomMembersService.java
deleted file mode 100644
index c57b6ef0..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomMembersService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.controller.MUCRoomController;
-
-@Path("restapi/v1/chatrooms/{roomName}/members")
-public class MUCRoomMembersService {
-
-	@POST
-	@Path("/{jid}")
-	public Response addMUCRoomMember(@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("jid") String jid, @PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().addMember(serviceName, roomName, jid);
-		return Response.status(Status.CREATED).build();
-	}
-
-	@POST
-	@Path("/group/{groupname}")
-	public Response addMUCRoomMemberGroup(@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("groupname") String groupname, @PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().addMember(serviceName, roomName, groupname);
-		return Response.status(Status.CREATED).build();
-	}
-
-	@DELETE
-	@Path("/{jid}")
-	public Response deleteMUCRoomMember(@PathParam("jid") String jid,
-			@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().deleteAffiliation(serviceName, roomName, jid);
-		return Response.status(Status.OK).build();
-	}
-
-	@DELETE
-	@Path("/group/{groupname}")
-	public Response deleteMUCRoomMemberGroup(@PathParam("groupname") String groupname,
-			@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().deleteAffiliation(serviceName, roomName, groupname);
-		return Response.status(Status.OK).build();
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomOutcastsService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomOutcastsService.java
deleted file mode 100644
index 59813d95..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomOutcastsService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.controller.MUCRoomController;
-
-@Path("restapi/v1/chatrooms/{roomName}/outcasts")
-public class MUCRoomOutcastsService {
-
-	@POST
-	@Path("/{jid}")
-	public Response addMUCRoomOutcast(@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("jid") String jid, @PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().addOutcast(serviceName, roomName, jid);
-		return Response.status(Status.CREATED).build();
-	}
-
-	@POST
-	@Path("/group/{groupname}")
-	public Response addMUCRoomOutcastGroup(@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("groupname") String groupname, @PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().addOutcast(serviceName, roomName, groupname);
-		return Response.status(Status.CREATED).build();
-	}
-
-	@DELETE
-	@Path("/{jid}")
-	public Response deleteMUCRoomOutcast(@PathParam("jid") String jid,
-			@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().deleteAffiliation(serviceName, roomName, jid);
-		return Response.status(Status.OK).build();
-	}
-
-	@DELETE
-	@Path("/group/{groupname}")
-	public Response deleteMUCRoomOutcastGroup(@PathParam("groupname") String groupname,
-			@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().deleteAffiliation(serviceName, roomName, groupname);
-		return Response.status(Status.OK).build();
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomOwnersService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomOwnersService.java
deleted file mode 100644
index 7bd9c888..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomOwnersService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.controller.MUCRoomController;
-
-@Path("restapi/v1/chatrooms/{roomName}/owners")
-public class MUCRoomOwnersService {
-
-	@POST
-	@Path("/{jid}")
-	public Response addMUCRoomOwner(@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("jid") String jid, @PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().addOwner(serviceName, roomName, jid);
-		return Response.status(Status.CREATED).build();
-	}
-
-	@POST
-	@Path("/group/{groupname}")
-	public Response addMUCRoomOwnerGroup(@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("groupname") String groupname, @PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().addOwner(serviceName, roomName, groupname);
-		return Response.status(Status.CREATED).build();
-	}
-
-	@DELETE
-	@Path("/{jid}")
-	public Response deleteMUCRoomOwner(@PathParam("jid") String jid,
-			@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().deleteAffiliation(serviceName, roomName, jid);
-		return Response.status(Status.OK).build();
-	}
-
-	@DELETE
-	@Path("/group/{groupname}")
-	public Response deleteMUCRoomOwnerGroup(@PathParam("groupname") String groupname,
-			@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-			@PathParam("roomName") String roomName) throws ServiceException {
-		MUCRoomController.getInstance().deleteAffiliation(serviceName, roomName, groupname);
-		return Response.status(Status.OK).build();
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomService.java
deleted file mode 100644
index d4b8a93c..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-import org.jivesoftware.openfire.plugin.rest.entity.MUCChannelType;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCRoomEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCRoomEntity;
-import org.jivesoftware.openfire.plugin.rest.entity.OccupantEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.ParticipantEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.MUCRoomMessageEntities;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.controller.MUCRoomController;
-
-@Path("restapi/v1/chatrooms")
-public class MUCRoomService {
-
-    @GET
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public MUCRoomEntities getMUCRooms(@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-            @DefaultValue(MUCChannelType.PUBLIC) @QueryParam("type") String channelType,
-            @QueryParam("search") String roomSearch,
-            @DefaultValue("false") @QueryParam("expandGroups") Boolean expand) {
-        return MUCRoomController.getInstance().getChatRooms(serviceName, channelType, roomSearch, expand);
-    }
-
-    @GET
-    @Path("/{roomName}")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public MUCRoomEntity getMUCRoomJSON2(@PathParam("roomName") String roomName,
-            @DefaultValue("conference") @QueryParam("servicename") String serviceName,
-            @DefaultValue("false") @QueryParam("expandGroups") Boolean expand) throws ServiceException {
-        return MUCRoomController.getInstance().getChatRoom(roomName, serviceName, expand);
-    }
-
-
-    @DELETE
-    @Path("/{roomName}")
-    public Response deleteMUCRoom(@PathParam("roomName") String roomName,
-            @DefaultValue("conference") @QueryParam("servicename") String serviceName) throws ServiceException {
-        MUCRoomController.getInstance().deleteChatRoom(roomName, serviceName);
-        return Response.status(Status.OK).build();
-    }
-
-    @POST
-    public Response createMUCRoom(@DefaultValue("conference") @QueryParam("servicename") String serviceName,
-            MUCRoomEntity mucRoomEntity) throws ServiceException {
-        MUCRoomController.getInstance().createChatRoom(serviceName, mucRoomEntity);
-        return Response.status(Status.CREATED).build();
-    }
-
-    @PUT
-    @Path("/{roomName}")
-    public Response udpateMUCRoom(@PathParam("roomName") String roomName,
-            @DefaultValue("conference") @QueryParam("servicename") String serviceName, MUCRoomEntity mucRoomEntity)
-            throws ServiceException {
-        MUCRoomController.getInstance().updateChatRoom(roomName, serviceName, mucRoomEntity);
-        return Response.status(Status.OK).build();
-    }
-
-    @GET
-    @Path("/{roomName}/participants")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public ParticipantEntities getMUCRoomParticipants(@PathParam("roomName") String roomName,
-            @DefaultValue("conference") @QueryParam("servicename") String serviceName) {
-        return MUCRoomController.getInstance().getRoomParticipants(roomName, serviceName);
-    }
-
-    @GET
-    @Path("/{roomName}/occupants")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public OccupantEntities getMUCRoomOccupants(@PathParam("roomName") String roomName,
-            @DefaultValue("conference") @QueryParam("servicename") String serviceName) {
-        return MUCRoomController.getInstance().getRoomOccupants(roomName, serviceName);
-    }
-
-    @GET
-    @Path("/{roomName}/chathistory")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public MUCRoomMessageEntities getMUCRoomHistory(@PathParam("roomName") String roomName,
-                                                    @DefaultValue("conference") @QueryParam("servicename") String serviceName) throws ServiceException {
-        return MUCRoomController.getInstance().getRoomHistory(roomName, serviceName);
-    }
-
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/MessageService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/MessageService.java
deleted file mode 100644
index 7a66f2ce..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/MessageService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.plugin.rest.controller.MessageController;
-import org.jivesoftware.openfire.plugin.rest.entity.MessageEntity;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-
-@Path("restapi/v1/messages")
-public class MessageService {
-
-	private MessageController messageController;
-
-	@PostConstruct
-	public void init() {
-		messageController = MessageController.getInstance();
-	}
-
-	@POST
-	@Path("/users")
-	public Response sendBroadcastMessage(MessageEntity messageEntity) throws ServiceException {
-		messageController.sendBroadcastMessage(messageEntity);
-		return Response.status(Response.Status.CREATED).build();
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/MsgArchiveService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/MsgArchiveService.java
deleted file mode 100644
index 3b068f41..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/MsgArchiveService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import org.jivesoftware.openfire.plugin.rest.controller.MsgArchiveController;
-import org.jivesoftware.openfire.plugin.rest.entity.MsgArchiveEntity;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.xmpp.packet.JID;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-@Path("restapi/v1/archive/messages/unread/{jid}")
-public class MsgArchiveService {
-
-    private MsgArchiveController archive;
-
-    @PostConstruct
-    public void init() {
-        archive = MsgArchiveController.getInstance();
-    }
-
-    @GET
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public MsgArchiveEntity getUnReadMessagesCount(@PathParam("jid") String jidStr) throws ServiceException {
-        JID jid = new JID(jidStr);
-        int msgCount = archive.getUnReadMessagesCount(jid);
-        return new MsgArchiveEntity(jidStr, msgCount);
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/RestAPIService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/RestAPIService.java
deleted file mode 100644
index 7c76d821..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/RestAPIService.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import java.util.*;
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.plugin.rest.entity.SystemProperties;
-import org.jivesoftware.openfire.plugin.rest.entity.SystemProperty;
-import org.jivesoftware.openfire.plugin.rest.exceptions.*;
-
-import org.jivesoftware.util.*;
-
-@Path("restapi/v1/system/properties")
-public class RestAPIService {
-
-    @PostConstruct
-    public void init() {
-    }
-
-    @GET
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public SystemProperties getSystemProperties() {
-        SystemProperties systemProperties = new SystemProperties();
-        List<SystemProperty> propertiesList = new ArrayList<SystemProperty>();
-
-        for(String propertyKey : JiveGlobals.getPropertyNames()) {
-            String propertyValue = JiveGlobals.getProperty(propertyKey);
-            propertiesList.add(new SystemProperty(propertyKey, propertyValue));
-        }
-        systemProperties.setProperties(propertiesList);
-        return systemProperties;
-    }
-
-    @GET
-    @Path("/{propertyKey}")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public SystemProperty getSystemProperty(@PathParam("propertyKey") String propertyKey) throws ServiceException {
-        String propertyValue = JiveGlobals.getProperty(propertyKey);
-        if(propertyValue != null) {
-        return new SystemProperty(propertyKey, propertyValue);
-        } else {
-            throw new ServiceException("Could not find property", propertyKey, ExceptionType.PROPERTY_NOT_FOUND,
-                    Response.Status.NOT_FOUND);
-        }
-    }
-
-    @POST
-    public Response createSystemProperty(SystemProperty systemProperty) throws ServiceException {
-        JiveGlobals.setProperty(systemProperty.getKey(), systemProperty.getValue());
-        return Response.status(Response.Status.CREATED).build();
-    }
-
-    @PUT
-    @Path("/{propertyKey}")
-    public Response updateUser(@PathParam("propertyKey") String propertyKey, SystemProperty systemProperty) throws ServiceException {
-        if(JiveGlobals.getProperty(propertyKey) != null) {
-            if(systemProperty.getKey().equals(propertyKey)) {
-                JiveGlobals.setProperty(propertyKey, systemProperty.getValue());
-            } else {
-                throw new ServiceException("Path property name and entity property name doesn't match", propertyKey, ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION,
-                        Response.Status.BAD_REQUEST);
-            }
-        } else {
-            throw new ServiceException("Could not find property for update", systemProperty.getKey(), ExceptionType.PROPERTY_NOT_FOUND,
-                    Response.Status.NOT_FOUND);
-        }
-        return Response.status(Response.Status.OK).build();
-    }
-
-    @DELETE
-    @Path("/{propertyKey}")
-    public Response deleteUser(@PathParam("propertyKey") String propertyKey) throws ServiceException {
-        if(JiveGlobals.getProperty(propertyKey) != null) {
-            JiveGlobals.deleteProperty(propertyKey);
-        } else {
-            throw new ServiceException("Could not find property", propertyKey, ExceptionType.PROPERTY_NOT_FOUND,
-                    Response.Status.NOT_FOUND);
-        }
-        return Response.status(Response.Status.OK).build();
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/SessionService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/SessionService.java
deleted file mode 100644
index ef3ec3ff..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/SessionService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.plugin.rest.controller.SessionController;
-import org.jivesoftware.openfire.plugin.rest.entity.SessionEntities;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-
-@Path("restapi/v1/sessions")
-public class SessionService {
-
-    private SessionController sessionController;
-
-    @PostConstruct
-    public void init() {
-        sessionController = SessionController.getInstance();
-    }
-
-    @POST
-    public Response notifySessions(String payload) throws ServiceException {
-        sessionController.notifySessions(payload);
-        return Response.status(Response.Status.OK).build();
-    }
-
-    @GET
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public SessionEntities getAllSessions() throws ServiceException {
-        return sessionController.getAllSessions();
-    }
-
-    @GET
-    @Path("/{username}")
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public SessionEntities getUserSessions(@PathParam("username") String username) throws ServiceException {
-        return sessionController.getUserSessions(username);
-    }
-
-    @POST
-    @Path("/{username}")
-    public Response notifySession(@PathParam("username") String username, String payload) throws ServiceException {
-        sessionController.notifySession(username, payload);
-        return Response.status(Response.Status.OK).build();
-    }
-
-    @DELETE
-    @Path("/{username}")
-    public Response kickSession(@PathParam("username") String username) throws ServiceException {
-        sessionController.removeUserSessions(username);
-        return Response.status(Response.Status.OK).build();
-    }
-
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/SipService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/SipService.java
deleted file mode 100644
index 65afe34e..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/SipService.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-
-import org.jivesoftware.openfire.sip.sipaccount.SipAccount;
-import org.jivesoftware.openfire.sip.sipaccount.SipAccounts;
-import org.jivesoftware.openfire.sip.sipaccount.SipAccountDAO;
-
-@Path("restapi/v1/sipaccounts")
-public class SipService {
-
-    @PostConstruct
-    public void init()
-    {
-
-    }
-
-    @GET
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public SipAccounts getSipAccounts(@DefaultValue("0") @QueryParam("start") String start, @DefaultValue("250") @QueryParam("count") String count) throws ServiceException
-    {
-        try {
-            return new SipAccounts(SipAccountDAO.getUsers(Integer.parseInt(start), Integer.parseInt(count)));
-
-        } catch (Exception e) {
-            throw new ServiceException("Exception", e.getMessage(), ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION, Response.Status.BAD_REQUEST);
-        }
-    }
-
-    @GET
-    @Path("/username/{username}")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public SipAccount getAccountByUser(@PathParam("username") String username) throws ServiceException
-    {
-        return SipAccountDAO.getAccountByUser(username);
-    }
-
-    @GET
-    @Path("/extension/{extension}")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public SipAccount getAccountByExtn(@PathParam("extension") String extension) throws ServiceException
-    {
-        return SipAccountDAO.getAccountByExtn(extension);
-    }
-
-    @POST
-    public Response createSipAccount(SipAccount sipAccount) throws ServiceException
-    {
-        if (SipAccountDAO.getAccountByUser(sipAccount.getUsername()) != null) {
-            SipAccountDAO.update(sipAccount);
-            return Response.status(Response.Status.OK).build();
-        } else {
-            SipAccountDAO.insert(sipAccount);
-            return Response.status(Response.Status.CREATED).build();
-        }
-    }
-
-    @DELETE
-    @Path("/{username}")
-    public Response deleteUser(@PathParam("username") String username) throws ServiceException {
-        SipAccount sipAccount = SipAccountDAO.getAccountByUser(username);
-        SipAccountDAO.remove(sipAccount);
-        return Response.status(Response.Status.OK).build();
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/StatisticsService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/StatisticsService.java
deleted file mode 100644
index ea680d00..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/StatisticsService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.jivesoftware.openfire.plugin.rest.controller.StatisticsController;
-import org.jivesoftware.openfire.plugin.rest.entity.SessionsCount;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-
-@Path("restapi/v1/system/statistics")
-public class StatisticsService {
-
-	private StatisticsController controller;
-
-	@PostConstruct
-	public void init() {
-		controller = StatisticsController.getInstance();
-	}
-
-	@GET
-	@Path("/sessions")
-	@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-	public SessionsCount getCCS() throws ServiceException {
-		return controller.getConcurentSessions();
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/UserGroupService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/UserGroupService.java
deleted file mode 100644
index 891da72f..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/UserGroupService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.plugin.rest.controller.UserServiceController;
-import org.jivesoftware.openfire.plugin.rest.entity.UserGroupsEntity;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-
-@Path("restapi/v1/users/{username}/groups")
-public class UserGroupService {
-
-	private UserServiceController plugin;
-
-	@PostConstruct
-	public void init() {
-		plugin = UserServiceController.getInstance();
-	}
-
-	@GET
-	@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-	public UserGroupsEntity getUserGroups(@PathParam("username") String username) throws ServiceException {
-		return new UserGroupsEntity(plugin.getUserGroups(username));
-	}
-
-	@POST
-	public Response addUserToGroups(@PathParam("username") String username, UserGroupsEntity userGroupsEntity)
-			throws ServiceException {
-		plugin.addUserToGroups(username, userGroupsEntity);
-		return Response.status(Response.Status.CREATED).build();
-	}
-	
-	@POST
-	@Path("/{groupName}")
-	public Response addUserToGroup(@PathParam("username") String username, @PathParam("groupName") String groupName)
-			throws ServiceException {
-		plugin.addUserToGroup(username, groupName);
-		return Response.status(Response.Status.CREATED).build();
-	}
-	
-	@DELETE
-	@Path("/{groupName}")
-	public Response deleteUserFromGroup(@PathParam("username") String username, @PathParam("groupName") String groupName)
-			throws ServiceException {
-		plugin.deleteUserFromGroup(username, groupName);
-		return Response.status(Response.Status.OK).build();
-	}
-
-	@DELETE
-	public Response deleteUserFromGroups(@PathParam("username") String username, UserGroupsEntity userGroupsEntity)
-			throws ServiceException {
-		plugin.deleteUserFromGroups(username, userGroupsEntity);
-		return Response.status(Response.Status.OK).build();
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/UserLockoutService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/UserLockoutService.java
deleted file mode 100644
index 86125d79..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/UserLockoutService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.plugin.rest.controller.UserServiceController;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-
-@Path("restapi/v1/lockouts")
-public class UserLockoutService {
-
-	private UserServiceController plugin;
-
-	@PostConstruct
-	public void init() {
-		plugin = UserServiceController.getInstance();
-	}
-
-	@POST
-	@Path("/{username}")
-	public Response disableUser(@PathParam("username") String username) throws ServiceException {
-		plugin.disableUser(username);
-		return Response.status(Response.Status.CREATED).build();
-	}
-
-	@DELETE
-	@Path("/{username}")
-	public Response enableUser(@PathParam("username") String username) throws ServiceException {
-		plugin.enableUser(username);
-		return Response.status(Response.Status.OK).build();
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/UserRosterService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/UserRosterService.java
deleted file mode 100644
index 69025f7f..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/UserRosterService.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.SharedGroupException;
-import org.jivesoftware.openfire.plugin.rest.controller.UserServiceController;
-import org.jivesoftware.openfire.plugin.rest.entity.RosterEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.RosterItemEntity;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ExceptionType;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-import org.jivesoftware.openfire.user.UserAlreadyExistsException;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-
-@Path("restapi/v1/users/{username}/roster")
-public class UserRosterService {
-
-	private static final String COULD_NOT_UPDATE_THE_ROSTER = "Could not update the roster";
-
-	private static final String COULD_NOT_CREATE_ROSTER_ITEM = "Could not create roster item";
-
-	private UserServiceController plugin;
-
-	@PostConstruct
-	public void init() {
-		plugin = UserServiceController.getInstance();
-	}
-
-	@GET
-	@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-	public RosterEntities getUserRoster(@PathParam("username") String username) throws ServiceException {
-		return plugin.getRosterEntities(username);
-	}
-
-	@POST
-	public Response createRoster(@PathParam("username") String username, RosterItemEntity rosterItemEntity)
-			throws ServiceException {
-		try {
-			plugin.addRosterItem(username, rosterItemEntity);
-		} catch (UserNotFoundException e) {
-			throw new ServiceException(COULD_NOT_CREATE_ROSTER_ITEM, "", ExceptionType.USER_NOT_FOUND_EXCEPTION,
-					Response.Status.NOT_FOUND, e);
-		} catch (UserAlreadyExistsException e) {
-			throw new ServiceException(COULD_NOT_CREATE_ROSTER_ITEM, "", ExceptionType.USER_ALREADY_EXISTS_EXCEPTION,
-					Response.Status.CONFLICT, e);
-		} catch (SharedGroupException e) {
-			throw new ServiceException(COULD_NOT_CREATE_ROSTER_ITEM, "", ExceptionType.SHARED_GROUP_EXCEPTION,
-					Response.Status.BAD_REQUEST, e);
-		}
-		return Response.status(Response.Status.CREATED).build();
-	}
-
-	@DELETE
-	@Path("/{rosterJid}")
-	public Response deleteRoster(@PathParam("username") String username, @PathParam("rosterJid") String rosterJid)
-			throws ServiceException {
-		try {
-			plugin.deleteRosterItem(username, rosterJid);
-		} catch (SharedGroupException e) {
-			throw new ServiceException("Could not delete the roster item", rosterJid,
-					ExceptionType.SHARED_GROUP_EXCEPTION, Response.Status.BAD_REQUEST, e);
-		}
-		return Response.status(Response.Status.OK).build();
-	}
-
-	@PUT
-	@Path("/{rosterJid}")
-	public Response updateRoster(@PathParam("username") String username, @PathParam("rosterJid") String rosterJid,
-			RosterItemEntity rosterItemEntity) throws ServiceException {
-		try {
-			plugin.updateRosterItem(username, rosterJid, rosterItemEntity);
-		} catch (UserNotFoundException e) {
-			throw new ServiceException(COULD_NOT_UPDATE_THE_ROSTER, rosterJid, ExceptionType.USER_NOT_FOUND_EXCEPTION,
-					Response.Status.NOT_FOUND, e);
-		} catch (SharedGroupException e) {
-			throw new ServiceException(COULD_NOT_UPDATE_THE_ROSTER, rosterJid, ExceptionType.SHARED_GROUP_EXCEPTION,
-					Response.Status.BAD_REQUEST, e);
-		} catch (UserAlreadyExistsException e) {
-			throw new ServiceException(COULD_NOT_UPDATE_THE_ROSTER, rosterJid,
-					ExceptionType.USER_ALREADY_EXISTS_EXCEPTION, Response.Status.CONFLICT, e);
-		}
-		return Response.status(Response.Status.OK).build();
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/service/UserService.java b/src/java/org/jivesoftware/openfire/plugin/rest/service/UserService.java
deleted file mode 100644
index 003005c4..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/service/UserService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.service;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.jivesoftware.openfire.plugin.rest.controller.UserServiceController;
-import org.jivesoftware.openfire.plugin.rest.entity.UserEntities;
-import org.jivesoftware.openfire.plugin.rest.entity.UserEntity;
-import org.jivesoftware.openfire.plugin.rest.exceptions.ServiceException;
-
-@Path("restapi/v1/users")
-public class UserService {
-
-	private UserServiceController plugin;
-
-	@PostConstruct
-	public void init() {
-		plugin = UserServiceController.getInstance();
-	}
-
-	@GET
-	@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-	public UserEntities getUsers(@QueryParam("search") String userSearch,
-			@QueryParam("propertyKey") String propertyKey, @QueryParam("propertyValue") String propertyValue)
-			throws ServiceException {
-		return plugin.getUserEntities(userSearch, propertyKey, propertyValue);
-	}
-
-	@POST
-	public Response createUser(UserEntity userEntity) throws ServiceException {
-		plugin.createUser(userEntity);
-		return Response.status(Response.Status.CREATED).build();
-	}
-
-	@GET
-	@Path("/{username}")
-	@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-	public UserEntity getUser(@PathParam("username") String username) throws ServiceException {
-		return plugin.getUserEntity(username);
-	}
-
-	@PUT
-	@Path("/{username}")
-	public Response updateUser(@PathParam("username") String username, UserEntity userEntity) throws ServiceException {
-		plugin.updateUser(username, userEntity);
-		return Response.status(Response.Status.OK).build();
-	}
-
-	@DELETE
-	@Path("/{username}")
-	public Response deleteUser(@PathParam("username") String username) throws ServiceException {
-		plugin.deleteUser(username);
-		return Response.status(Response.Status.OK).build();
-	}
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/utils/MUCRoomUtils.java b/src/java/org/jivesoftware/openfire/plugin/rest/utils/MUCRoomUtils.java
deleted file mode 100644
index 1c59cfbc..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/utils/MUCRoomUtils.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.utils;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.jivesoftware.openfire.group.Group;
-import org.jivesoftware.openfire.muc.MUCRole;
-import org.jivesoftware.openfire.muc.MUCRoom;
-import org.xmpp.packet.JID;
-import org.xmpp.packet.Packet;
-
-/**
- * The Class MUCRoomUtils.
- */
-public class MUCRoomUtils {
-
-    /**
-     * Instantiates a new MUC room utils.
-     */
-    private MUCRoomUtils() {
-        throw new AssertionError();
-    }
-
-    /**
-     * Convert jids to string list.
-     * In case the jid is not bare (=it is a group jid) exclude it
-     *
-     * @param jids
-     *            the jids
-     * @return the array list< string>
-     */
-    public static List<String> convertJIDsToStringList(Collection<JID> jids) {
-        List<String> result = new ArrayList<String>();
-
-        for (JID jid : jids) {
-            if (jid.getResource() == null) result.add(jid.toBareJID());
-        }
-        return result;
-    }
-
-    /**
-     * Convert groups to string list
-     * @param groups
-     * 			the groups
-     * @return the array list of the group names
-     */
-    public static List<String> convertGroupsToStringList(Collection<Group> groups) {
-        List<String> result = new ArrayList<String>();
-        for (Group group : groups) {
-            result.add(group.getName());
-        }
-        return result;
-    }
-
-    /**
-     * Convert strings to jids.
-     *
-     * @param jids
-     *            the jids
-     * @return the list<jid>
-     */
-    public static List<JID> convertStringsToJIDs(List<String> jids) {
-        List<JID> result = new ArrayList<JID>();
-
-        for (String jidString : jids) {
-            result.add(new JID(jidString));
-        }
-        return result;
-    }
-
-    /**
-     * Convert MUCRole.role instances to string list.
-     *
-     * @param roles
-     *            the roles
-     * @return the array list<string>
-     */
-    public static List<String> convertRolesToStringList(Collection<MUCRole.Role> roles) {
-        return roles.stream()
-            .map(MUCRole.Role::toString)
-            .collect(Collectors.toList());
-    }
-
-    /**
-     * Convert string instances to a MUCRole.role list.
-     *
-     * @param roles
-     *            the roles
-     * @return the array list<MUCRole.role>
-     */
-    public static List<MUCRole.Role> convertStringsToRoles(Collection<String> roles) {
-        return roles.stream()
-            .map(MUCRole.Role::valueOf)
-            .collect(Collectors.toList());
-    }
-
-    /**
-     * Wrapper around MUCRoom::send
-     *
-     * Attempts to call the legacy implementation of MUCRoom::send, if an Openfire version < 4.6 is used.
-     */
-    public static void send(MUCRoom room, Packet packet, MUCRole role)
-        throws InvocationTargetException, IllegalAccessException {
-        Method legacySend = legacySendMethod();
-
-        if (legacySend != null) {
-            legacySend.invoke(room, packet); // Openfire < 4.6
-        } else {
-            room.send(packet, role); // Openfire >= 4.6
-        }
-    }
-
-    /**
-     * Attempts to find the legacy MUCRoom::send method signature
-     * depending on the used Openfire version via reflection.
-     *
-     * Openfire versions < 4.6 offer the MUCRoom::send function with one parameters,
-     * while later versions expect two.
-     *
-     * @return the legacy MUCRoom::send method, if present, else null
-     */
-    private static Method legacySendMethod() {
-        try {
-            return MUCRoom.class.getMethod("send", Packet.class);
-        } catch (NoSuchMethodException e) {
-            return null;
-        }
-    }
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/utils/UserUtils.java b/src/java/org/jivesoftware/openfire/plugin/rest/utils/UserUtils.java
deleted file mode 100644
index 290b389a..00000000
--- a/src/java/org/jivesoftware/openfire/plugin/rest/utils/UserUtils.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.jivesoftware.openfire.plugin.rest.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.plugin.rest.entity.UserEntity;
-import org.jivesoftware.openfire.plugin.rest.entity.UserProperty;
-import org.jivesoftware.openfire.user.User;
-import org.jivesoftware.openfire.user.UserAlreadyExistsException;
-import org.jivesoftware.openfire.group.Group;
-import org.jivesoftware.openfire.group.GroupManager;
-import org.jivesoftware.openfire.group.GroupJID;
-import org.jivesoftware.openfire.group.GroupNotFoundException;
-import org.xmpp.packet.JID;
-
-/**
- * The Class UserUtils.
- */
-public class UserUtils {
-
-	/**
-	 * Instantiates a new user utils.
-	 */
-	private UserUtils() {
-		throw new AssertionError();
-	}
-
-	/**
-	 * Convert users to user entities.
-	 *
-	 * @param users            the users
-	 * @param userSearch the user search
-	 * @return the list
-	 */
-	public static List<UserEntity> convertUsersToUserEntities(Collection<User> users, String userSearch) {
-		List<UserEntity> result = new ArrayList<UserEntity>();
-
-		for (User user : users) {
-			if (userSearch != null) {
-				if (!user.getUsername().contains(userSearch)) {
-					continue;
-				}
-			}
-
-			result.add(convertUserToUserEntity(user));
-		}
-		return result;
-	}
-
-	/**
-	 * Convert user to user entity.
-	 *
-	 * @param user
-	 *            the user
-	 * @return the user entity
-	 */
-	public static UserEntity convertUserToUserEntity(User user) {
-		UserEntity userEntity = new UserEntity(user.getUsername(), user.getName(), user.getEmail());
-
-		List<UserProperty> userProperties = new ArrayList<UserProperty>();
-		for (Entry<String, String> property : user.getProperties().entrySet()) {
-			userProperties.add(new UserProperty(property.getKey(), property.getValue()));
-		}
-		userEntity.setProperties(userProperties);
-
-		return userEntity;
-	}
-
-	/**
-	 * Checks if is valid sub type.
-	 *
-	 * @param subType            the sub type
-	 * @return true, if is valid sub type
-	 * @throws UserAlreadyExistsException the user already exists exception
-	 */
-	public static void checkSubType(int subType) throws UserAlreadyExistsException {
-		if (!(subType >= -1 && subType <= 3)) {
-			throw new UserAlreadyExistsException();
-		}
-	}
-	
-	
-	/**
-	 * Check and get jid.
-	 *
-	 * @param jid the jid
-	 * @return the jid
-	 */
-	public static JID checkAndGetJID(String jid) {
-		if(isValidBareJid(jid)) {
-			return new JID(jid);
-		} else if (isValidGroupName(jid)) {
-			GroupJID gjid = new GroupJID(jid);
-			return gjid.asBareJID();
-		} else {
-			return XMPPServer.getInstance().createJID(jid, null);
-		}
-	}
-	
-	/**
-	 * Checks if is valid bare jid.
-	 *
-	 * @param jid the jid
-	 * @return true, if is valid bare jid
-	 */
-	public static boolean isValidBareJid(String jid) {
-		final int index = jid.indexOf('@');
-		if (index == -1) {
-			return false;
-		} else if (jid.indexOf('@', index + 1) != -1) {
-			return false;
-		}
-		return true;
-	}
-	/**
-	 * Checks if this group exists.
-	 *
-	 * @param groupname The groupname as a string
-	 * @return true, if the groupname exists
-	 */
-	public static boolean isValidGroupName(String groupname) {
-		try {
-			Group g = GroupManager.getInstance().getGroup(groupname);
-		} catch(GroupNotFoundException e) {
-			return false;
-		}
-		return true;
-	}
-}
diff --git a/src/java/uk/ifsoft/openfire/plugins/pade/PadePlugin.java b/src/java/uk/ifsoft/openfire/plugins/pade/PadePlugin.java
index 3f0def28..b3967962 100644
--- a/src/java/uk/ifsoft/openfire/plugins/pade/PadePlugin.java
+++ b/src/java/uk/ifsoft/openfire/plugins/pade/PadePlugin.java
@@ -9,7 +9,7 @@
 import org.jivesoftware.openfire.net.SASLAuthentication;
 import org.jivesoftware.openfire.user.User;
 import org.jivesoftware.openfire.user.UserNotFoundException;
-
+import org.jivesoftware.openfire.plugin.rest.sasl.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,9 +30,6 @@
 import org.jivesoftware.openfire.muc.*;
 import org.jivesoftware.openfire.session.*;
 import org.jivesoftware.openfire.group.*;
-import org.jivesoftware.openfire.plugin.rest.sasl.*;
-import org.jivesoftware.openfire.plugin.rest.service.JerseyWrapper;
-import org.jivesoftware.openfire.plugin.rest.OpenfireLoginService;
 import org.jivesoftware.util.*;
 
 import java.security.SecureRandom;
@@ -42,11 +39,7 @@
 import java.nio.file.*;
 import java.nio.file.attribute.FileTime;
 import java.security.Security;
-import javax.servlet.DispatcherType;
 
-import org.jitsi.util.OSUtils;
-import waffle.servlet.NegotiateSecurityFilter;
-import waffle.servlet.WaffleInfoServlet;
 import org.xmpp.packet.*;
 import org.dom4j.Element;
 import org.igniterealtime.openfire.plugins.pushnotification.WebPushInterceptor;
@@ -70,12 +63,6 @@ public class PadePlugin implements Plugin, MUCEventListener
     private static final Logger Log = LoggerFactory.getLogger( PadePlugin.class );
     public static PadePlugin self;
     public static String webRoot;
-
-    private ServletContextHandler contextRest;
-    private WebAppContext contextPublic;
-    private WebAppContext contextPrivate;
-    private WebAppContext contextWinSSO;
-    private WebAppContext contextWellKnown;
     private WebPushInterceptor interceptor;
     private OfMeetPlugin ofMeetPlugin;
 	private RelyingParty relyingParty;
@@ -103,63 +90,6 @@ public void initializePlugin( final PluginManager manager, final File pluginDire
         InterceptorManager.getInstance().addInterceptor( interceptor );
         OfflineMessageStrategy.addListener( interceptor );
 
-        contextRest = new ServletContextHandler(null, "/rest", ServletContextHandler.SESSIONS);
-        contextRest.setClassLoader(this.getClass().getClassLoader());
-        contextRest.addServlet(new ServletHolder(new JerseyWrapper()), "/api/*");
-        HttpBindManager.getInstance().addJettyHandler(contextRest);
-
-        contextWellKnown = new WebAppContext(null, pluginDirectory.getPath() + "/classes/well-known", "/.well-known");
-        contextWellKnown.setClassLoader(this.getClass().getClassLoader());
-        final List<ContainerInitializer> initializersWellKnown = new ArrayList<>();
-        initializersWellKnown.add(new ContainerInitializer(new JettyJasperInitializer(), null));
-        contextWellKnown.setAttribute("org.eclipse.jetty.containerInitializers", initializersWellKnown);
-        contextWellKnown.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
-        contextWellKnown.setWelcomeFiles(new String[]{"index.jsp"});
-        HttpBindManager.getInstance().addJettyHandler(contextWellKnown);
-
-        contextPrivate = new WebAppContext(null, pluginDirectory.getPath() + "/classes/private", "/dashboard");
-        contextPrivate.setClassLoader(this.getClass().getClassLoader());
-        contextPrivate.getMimeTypes().addMimeMapping("wasm", "application/wasm");
-        SecurityHandler securityHandler = basicAuth("ofmeet");
-        contextPrivate.setSecurityHandler(securityHandler);
-        final List<ContainerInitializer> initializersDashboard = new ArrayList<>();
-        initializersDashboard.add(new ContainerInitializer(new JettyJasperInitializer(), null));
-        contextPrivate.setAttribute("org.eclipse.jetty.containerInitializers", initializersDashboard);
-        contextPrivate.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
-        contextPrivate.setWelcomeFiles(new String[]{"index.jsp"});
-        HttpBindManager.getInstance().addJettyHandler(contextPrivate);
-
-        contextPublic = new WebAppContext(null, pluginDirectory.getPath() + "/classes/docs", "/pade");
-        contextPublic.setClassLoader(this.getClass().getClassLoader());
-        contextPublic.getMimeTypes().addMimeMapping("wasm", "application/wasm");
-        final List<ContainerInitializer> initializersCRM = new ArrayList<>();
-        initializersCRM.add(new ContainerInitializer(new JettyJasperInitializer(), null));
-        contextPublic.setAttribute("org.eclipse.jetty.containerInitializers", initializersCRM);
-        contextPublic.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
-        contextPublic.setWelcomeFiles(new String[]{"index.html"});
-        HttpBindManager.getInstance().addJettyHandler(contextPublic);
-
-        contextWinSSO = new WebAppContext(null, pluginDirectory.getPath() + "/classes/win-sso", "/sso");
-        contextWinSSO.setClassLoader(this.getClass().getClassLoader());
-        final List<ContainerInitializer> initializers7 = new ArrayList<>();
-        initializers7.add(new ContainerInitializer(new JettyJasperInitializer(), null));
-        contextWinSSO.setAttribute("org.eclipse.jetty.containerInitializers", initializers7);
-        contextWinSSO.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
-        contextWinSSO.setWelcomeFiles(new String[]{"index.jsp"});
-
-        if (OSUtils.IS_WINDOWS)
-        {
-            NegotiateSecurityFilter securityFilter = new NegotiateSecurityFilter();
-            FilterHolder filterHolder = new FilterHolder();
-            filterHolder.setFilter(securityFilter);
-            EnumSet<DispatcherType> enums = EnumSet.of(DispatcherType.REQUEST);
-            enums.add(DispatcherType.REQUEST);
-
-            contextWinSSO.addFilter(filterHolder, "/*", enums);
-            contextWinSSO.addServlet(new ServletHolder(new WaffleInfoServlet()), "/waffle");
-        }
-        contextWinSSO.addServlet(new ServletHolder(new org.ifsoft.sso.Password()), "/password");
-        HttpBindManager.getInstance().addJettyHandler(contextWinSSO);
 
         try
         {
@@ -196,7 +126,7 @@ public void initializePlugin( final PluginManager manager, final File pluginDire
 			mastodonIQHandler.startHandler();		
 			XMPPServer.getInstance().getIQRouter().addHandler(mastodonIQHandler);	
 			XMPPServer.getInstance().getIQDiscoInfoHandler().addServerFeature("urn:xmpp:sfu:mastodon:0");				
-		}			
+		}	
     }
 	
 	public String startRegisterWebAuthn(String username, String name)
@@ -301,13 +231,6 @@ public void destroyPlugin()
             Security.removeProvider( OfChatSaslProvider.NAME );
         } catch (Exception e) {}
 
-        HttpBindManager.getInstance().removeJettyHandler(contextRest);
-        HttpBindManager.getInstance().removeJettyHandler(contextPublic);
-        HttpBindManager.getInstance().removeJettyHandler(contextPrivate);
-
-        if (contextWellKnown != null) HttpBindManager.getInstance().removeJettyHandler(contextWellKnown);
-        if (contextWinSSO != null) HttpBindManager.getInstance().removeJettyHandler(contextWinSSO);
-
         if ( JiveGlobals.getBooleanProperty( "pade.mucevent.dispatcher.enabled", true))
         {
             MUCEventDispatcher.removeListener(this);
@@ -327,27 +250,6 @@ public OfMeetPlugin getContainer()
         return ofMeetPlugin;
     }
 
-    private static final SecurityHandler basicAuth(String realm) {
-
-        OpenfireLoginService l = new OpenfireLoginService(realm);
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__BASIC_AUTH);
-        constraint.setRoles(new String[]{"ofmeet", "webapp-owner", "webapp-contributor", "warfile-admin"});
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping cm = new ConstraintMapping();
-        cm.setConstraint(constraint);
-        cm.setPathSpec("/*");
-
-        ConstraintSecurityHandler csh = new ConstraintSecurityHandler();
-        csh.setAuthenticator(new BasicAuthenticator());
-        csh.setRealmName(realm);
-        csh.addConstraintMapping(cm);
-        csh.setLoginService(l);
-
-        return csh;
-    }
-
     private void checkRecordingsFolder()
     {
         String resourcesHome = JiveGlobals.getHomeDirectory() + File.separator + "resources" + File.separator + "spank";