Skip to content

O
Openfire
Commit 803c461b authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato
Browse files
Options

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
parent 6403bfd4
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 85 deletions
src/plugins/clientControl/src/web/client-features.jsp
View file @ 803c461b
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
String broadcastEnabledString = JiveGlobals.getProperty("broadcast.enabled", "true"); String broadcastEnabledString = JiveGlobals.getProperty("broadcast.enabled", "true");
String fileTransferString = JiveGlobals.getProperty("transfer.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"); String vcardEnabledString = JiveGlobals.getProperty("vcard.enabled", "true");
...@@ -18,20 +16,16 @@ ...@@ -18,20 +16,16 @@
if (submit) { if (submit) {
broadcastEnabledString = request.getParameter("broadcastEnabled"); broadcastEnabledString = request.getParameter("broadcastEnabled");
fileTransferString = request.getParameter("transferEnabled"); fileTransferString = request.getParameter("transferEnabled");
musEnabledString = request.getParameter("mucEnabled");
vcardEnabledString = request.getParameter("vcardEnabled"); vcardEnabledString = request.getParameter("vcardEnabled");
JiveGlobals.setProperty("broadcast.enabled", broadcastEnabledString); JiveGlobals.setProperty("broadcast.enabled", broadcastEnabledString);
JiveGlobals.setProperty("transfer.enabled", fileTransferString); JiveGlobals.setProperty("transfer.enabled", fileTransferString);
boolean mucEnabled = Boolean.parseBoolean(musEnabledString);
XMPPServer.getInstance().getMultiUserChatServer().enableService(mucEnabled, true);
JiveGlobals.setProperty("vcard.enabled", vcardEnabledString); JiveGlobals.setProperty("vcard.enabled", vcardEnabledString);
} }
boolean broadcastEnabled = Boolean.parseBoolean(broadcastEnabledString); boolean broadcastEnabled = Boolean.parseBoolean(broadcastEnabledString);
boolean transferEnabled = Boolean.parseBoolean(fileTransferString); boolean transferEnabled = Boolean.parseBoolean(fileTransferString);
boolean mucEnabled = XMPPServer.getInstance().getMultiUserChatServer().isServiceEnabled();
boolean vcardEnabled = Boolean.parseBoolean(vcardEnabledString); boolean vcardEnabled = Boolean.parseBoolean(vcardEnabledString);
// Enable File Transfer in the system. // Enable File Transfer in the system.
...@@ -103,19 +97,6 @@ ...@@ -103,19 +97,6 @@
</td> </td>
</tr> </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> </table>
<br/> <br/>
......
src/plugins/clientControl/src/web/confirm-bookmark-delete.jsp
View file @ 803c461b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<%@ page import="org.jivesoftware.util.Log" %> <%@ page import="org.jivesoftware.util.Log" %>
<%@ page import="org.jivesoftware.openfire.XMPPServer" %> <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
<%@ page import="org.jivesoftware.openfire.muc.MUCRoom" %> <%@ 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" %> <%@ page import="java.util.Collection" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
...@@ -170,20 +170,4 @@ else { %> ...@@ -170,20 +170,4 @@ else { %>
return returnStr; 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
View file @ 803c461b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<%@ page import="org.jivesoftware.util.ParamUtils" %> <%@ page import="org.jivesoftware.util.ParamUtils" %>
<%@ page import="org.jivesoftware.openfire.XMPPServer" %> <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
<%@ page import="org.jivesoftware.openfire.muc.MUCRoom" %> <%@ 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.ArrayList" %>
<%@ page import="java.util.Collection" %> <%@ page import="java.util.Collection" %>
<%@ page import="java.util.HashMap" %> <%@ page import="java.util.HashMap" %>
...@@ -415,20 +415,4 @@ else { %> ...@@ -415,20 +415,4 @@ else { %>
return returnStr; 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
View file @ 803c461b
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4"> <module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<output url="file://$MODULE_DIR$/../../../work" /> <output url="file://$MODULE_DIR$/../../../work" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/build/lib/smack.jar!/" /> <root url="jar://$MODULE_DIR$/build/lib/smack.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/build/lib/smackx.jar!/" /> <root url="jar://$MODULE_DIR$/build/lib/smackx.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntryProperties /> <orderEntryProperties />
</component> </component>
</module> </module>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023