Ported changes from Enterprise trunk to work with Openfire trunk.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10412 b35dd754-fafc-0310-a699-88a17e54d16e

src/plugins/clientControl/src/web/client-features.jsp

@@ -9,8 +9,6 @@
     String broadcastEnabledString = JiveGlobals.getProperty("broadcast.enabled", "true");
     String fileTransferString = JiveGlobals.getProperty("transfer.enabled", "true");
 
-    boolean isMucEnabled = XMPPServer.getInstance().getMultiUserChatServer().isServiceEnabled();
-    String musEnabledString = JiveGlobals.getProperty("muc.enabled", "true");
     String vcardEnabledString = JiveGlobals.getProperty("vcard.enabled", "true");
 
 
@@ -18,20 +16,16 @@
     if (submit) {
         broadcastEnabledString = request.getParameter("broadcastEnabled");
         fileTransferString = request.getParameter("transferEnabled");
-        musEnabledString = request.getParameter("mucEnabled");
         vcardEnabledString = request.getParameter("vcardEnabled");
 
         JiveGlobals.setProperty("broadcast.enabled", broadcastEnabledString);
         JiveGlobals.setProperty("transfer.enabled", fileTransferString);
 
-        boolean mucEnabled = Boolean.parseBoolean(musEnabledString);
-        XMPPServer.getInstance().getMultiUserChatServer().enableService(mucEnabled, true);
         JiveGlobals.setProperty("vcard.enabled", vcardEnabledString);
 
     }
     boolean broadcastEnabled = Boolean.parseBoolean(broadcastEnabledString);
     boolean transferEnabled = Boolean.parseBoolean(fileTransferString);
-    boolean mucEnabled = XMPPServer.getInstance().getMultiUserChatServer().isServiceEnabled();
     boolean vcardEnabled = Boolean.parseBoolean(vcardEnabledString);
 
     // Enable File Transfer in the system.
@@ -103,19 +97,6 @@
             </td>
         </tr>
 
-         <tr>
-            <td><b><fmt:message key="client.features.groupchat" /></b><br/><span class="jive-description">
-               <fmt:message key="client.features.groupchat.description" />
-           </span></td>
-            <td width="1%" nowrap>
-                <input type="radio" name="mucEnabled" value="true" <%= mucEnabled ? "checked" : "" %> />
-            </td>
-            <td width="1%" nowrap>
-                <input type="radio" name="mucEnabled" value="false" <%= !mucEnabled ? "checked" : "" %> />
-            </td>
-        </tr>
-
-
     </table>
 
     <br/>

src/plugins/clientControl/src/web/confirm-bookmark-delete.jsp

@@ -4,7 +4,7 @@
 <%@ page import="org.jivesoftware.util.Log" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page import="org.jivesoftware.openfire.muc.MUCRoom" %>
-<%@ page import="org.jivesoftware.openfire.muc.MultiUserChatServer" %>
+<%@ page import="org.jivesoftware.openfire.muc.MultiUserChatService" %>
 <%@ page import="java.util.Collection" %>
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
@@ -170,20 +170,4 @@ else { %>
         return returnStr;
     }
 
-    public String getJidFromRoomName(String roomName) {
-        // Load the MultiUserChatServer
-        XMPPServer xmppServer = XMPPServer.getInstance();
-        MultiUserChatServer mucServer = xmppServer.getMultiUserChatServer();
-        MUCRoom room = null;
-        try {
-            room = mucServer.getChatRoom(roomName);
-        }
-        catch (Exception e) {
-            Log.error(e);
-
-            return null;
-        }
-
-        return "";//Todo. Return actual name. Checking in for file transfer.
-    }
 %>
\ No newline at end of file

src/plugins/clientControl/src/web/create-bookmark.jsp

@@ -4,7 +4,7 @@
 <%@ page import="org.jivesoftware.util.ParamUtils" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page import="org.jivesoftware.openfire.muc.MUCRoom" %>
-<%@ page import="org.jivesoftware.openfire.muc.MultiUserChatServer" %>
+<%@ page import="org.jivesoftware.openfire.muc.MultiUserChatService" %>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.Collection" %>
 <%@ page import="java.util.HashMap" %>
@@ -415,20 +415,4 @@ else { %>
         return returnStr;
     }
 
-    public String getJidFromRoomName(String roomName) {
-        // Load the MultiUserChatServer
-        XMPPServer xmppServer = XMPPServer.getInstance();
-        MultiUserChatServer mucServer = xmppServer.getMultiUserChatServer();
-        MUCRoom room = null;
-        try {
-            room = mucServer.getChatRoom(roomName);
-        }
-        catch (Exception e) {
-            Log.error(e);
-
-            return null;
-        }
-
-        return "";//Todo. Return actual name. Checking in for file transfer.
-    }
 %>

src/test/throttletest/ThrottleTest.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <output url="file://$MODULE_DIR$/../../../work" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/build/lib/smack.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/build/lib/smackx.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntryProperties />
-  </component>
-</module>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <output url="file://$MODULE_DIR$/../../../work" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/smack.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/smackx.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+