Skip to content

O
Openfire
Commit ecdf85ea authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger
Browse files
Options

Updated all plugins/core code to use non-deprecated XMPPServerInfo API. 

Couple of minor tweaks here and there, mostly alt tags for imgs.
Added emailListener and sip plugins to Plugin.iml, as well as necessary libraries.
Repaired incompatible API issue with TLSPolicy.


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9857 b35dd754-fafc-0310-a699-88a17e54d16e
parent 64f98d15
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 160 deletions
build/projects/Openfire.iml
View file @ ecdf85ea
......@@ -508,6 +508,15 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
......
build/projects/Plugins.iml
View file @ ecdf85ea
......@@ -10,6 +10,7 @@
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/contentFilter/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/debugger/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/dumper/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/emailListener/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/gateway/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/gateway/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/loadStats/src/java" isTestSource="false" />
......@@ -19,6 +20,7 @@
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/presence/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/registration/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/search/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/sip/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/subscription/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/userCreation/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/plugins/userImportExport/src/java" isTestSource="false" />
......@@ -238,6 +240,24 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../src/plugins/sip/lib/JainSipApi1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../src/plugins/sip/lib/nist-sip-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntryProperties />
</component>
</module>
......
src/java/org/jivesoftware/openfire/IQRouter.java
View file @ ecdf85ea
......@@ -231,7 +231,7 @@ public class IQRouter extends BasicModule {
public void initialize(XMPPServer server) {
super.initialize(server);
TaskEngine.getInstance().scheduleAtFixedRate(new TimeoutTask(), 5000, 5000);
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
routingTable = server.getRoutingTable();
multicastRouter = server.getMulticastRouter();
iqHandlers.addAll(server.getIQHandlers());
......
src/java/org/jivesoftware/openfire/MessageRouter.java
View file @ ecdf85ea
......@@ -169,7 +169,7 @@ public class MessageRouter extends BasicModule {
sessionManager = server.getSessionManager();
multicastRouter = server.getMulticastRouter();
userManager = server.getUserManager();
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
}
/**
......
src/java/org/jivesoftware/openfire/MulticastRouter.java
View file @ ecdf85ea
......@@ -95,7 +95,7 @@ public class MulticastRouter extends BasicModule implements ServerFeaturesProvid
List<String> targets = new ArrayList<String>();
Packet localBroadcast = packet.createCopy();
Element addresses = getAddresses(localBroadcast);
String localDomain = "@" + server.getServerInfo().getName();
String localDomain = "@" + server.getServerInfo().getXMPPDomain();
// Build the <addresses> element to be included for local users and identify
// remote domains that should receive the packet too
for (Iterator it=addresses.elementIterator("address");it.hasNext();) {
......@@ -183,7 +183,7 @@ public class MulticastRouter extends BasicModule implements ServerFeaturesProvid
// supports JEP-33 (Extended Stanza Addressing). The reply to the disco
// request is going to be process in #receivedAnswer(IQ packet)
IQ iq = new IQ(IQ.Type.get);
iq.setFrom(server.getServerInfo().getName());
iq.setFrom(server.getServerInfo().getXMPPDomain());
iq.setTo(domain);
iq.setChildElement("query", "http://jabber.org/protocol/disco#info");
// Indicate that we are searching for info of the specified domain
......@@ -301,7 +301,7 @@ public class MulticastRouter extends BasicModule implements ServerFeaturesProvid
if (isRoot && IQ.Type.error != packet.getType()) {
// Discover node items with the hope that a sub-item supports JEP-33
IQ iq = new IQ(IQ.Type.get);
iq.setFrom(server.getServerInfo().getName());
iq.setFrom(server.getServerInfo().getXMPPDomain());
iq.setTo(packet.getFrom());
iq.setChildElement("query", "http://jabber.org/protocol/disco#items");
// Send the disco#items request to the remote server or component. The reply will be
......@@ -356,7 +356,7 @@ public class MulticastRouter extends BasicModule implements ServerFeaturesProvid
for (Element item : items) {
// Discover if remote server supports JEP-33 (Extended Stanza Addressing)
IQ iq = new IQ(IQ.Type.get);
iq.setFrom(server.getServerInfo().getName());
iq.setFrom(server.getServerInfo().getXMPPDomain());
iq.setTo(item.attributeValue("jid"));
Element child = iq.setChildElement("query", "http://jabber.org/protocol/disco#info");
if (item.attributeValue("node") != null) {
......
src/java/org/jivesoftware/openfire/OfflineMessageStore.java
View file @ ecdf85ea
......@@ -113,7 +113,7 @@ public class OfflineMessageStore extends BasicModule implements UserEventListene
return;
}
else
if (!XMPPServer.getInstance().getServerInfo().getName().equals(recipient.getDomain())) {
if (!XMPPServer.getInstance().getServerInfo().getXMPPDomain().equals(recipient.getDomain())) {
// Do not store messages sent to users of remote servers
return;
}
......@@ -190,7 +190,7 @@ public class OfflineMessageStore extends BasicModule implements UserEventListene
}
// Add a delayed delivery (JEP-0091) element to the message.
Element delay = message.addChildElement("x", "jabber:x:delay");
delay.addAttribute("from", XMPPServer.getInstance().getServerInfo().getName());
delay.addAttribute("from", XMPPServer.getInstance().getServerInfo().getXMPPDomain());
delay.addAttribute("stamp", dateFormat.format(creationDate));
messages.add(message);
}
......@@ -248,7 +248,7 @@ public class OfflineMessageStore extends BasicModule implements UserEventListene
xmlReader.read(new StringReader(msgXML)).getRootElement());
// Add a delayed delivery (JEP-0091) element to the message.
Element delay = message.addChildElement("x", "jabber:x:delay");
delay.addAttribute("from", XMPPServer.getInstance().getServerInfo().getName());
delay.addAttribute("from", XMPPServer.getInstance().getServerInfo().getXMPPDomain());
delay.addAttribute("stamp", dateFormat.format(creationDate));
}
}
......
src/java/org/jivesoftware/openfire/OfflineMessageStrategy.java
View file @ ecdf85ea
......@@ -174,7 +174,7 @@ public class OfflineMessageStrategy extends BasicModule {
super.initialize(server);
messageStore = server.getOfflineMessageStore();
router = server.getPacketRouter();
serverAddress = new JID(server.getServerInfo().getName());
serverAddress = new JID(server.getServerInfo().getXMPPDomain());
String quota = JiveGlobals.getProperty("xmpp.offline.quota");
if (quota != null && quota.length() > 0) {
......
src/java/org/jivesoftware/openfire/PresenceRouter.java
View file @ ecdf85ea
......@@ -200,7 +200,7 @@ public class PresenceRouter extends BasicModule {
public void initialize(XMPPServer server) {
super.initialize(server);
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
routingTable = server.getRoutingTable();
updateHandler = server.getPresenceUpdateHandler();
subscribeHandler = server.getPresenceSubscribeHandler();
......
src/java/org/jivesoftware/openfire/SessionManager.java
View file @ ecdf85ea
......@@ -1218,7 +1218,7 @@ public class SessionManager extends BasicModule implements ClusterEventListener
router = server.getPacketRouter();
userManager = server.getUserManager();
routingTable = server.getRoutingTable();
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
serverAddress = new JID(serverName);
if (JiveGlobals.getBooleanProperty("xmpp.audit.active")) {
......
src/java/org/jivesoftware/openfire/auth/DefaultAuthProvider.java
View file @ ecdf85ea
......@@ -51,7 +51,7 @@ public class DefaultAuthProvider implements AuthProvider {
// Check that the specified domain matches the server's domain
int index = username.indexOf("@");
String domain = username.substring(index + 1);
if (domain.equals(XMPPServer.getInstance().getServerInfo().getName())) {
if (domain.equals(XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
username = username.substring(0, index);
} else {
// Unknown domain. Return authentication failed.
......@@ -78,7 +78,7 @@ public class DefaultAuthProvider implements AuthProvider {
// Check that the specified domain matches the server's domain
int index = username.indexOf("@");
String domain = username.substring(index + 1);
if (domain.equals(XMPPServer.getInstance().getServerInfo().getName())) {
if (domain.equals(XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
username = username.substring(0, index);
} else {
// Unknown domain. Return authentication failed.
......@@ -117,7 +117,7 @@ public class DefaultAuthProvider implements AuthProvider {
// Check that the specified domain matches the server's domain
int index = username.indexOf("@");
String domain = username.substring(index + 1);
if (domain.equals(XMPPServer.getInstance().getServerInfo().getName())) {
if (domain.equals(XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
username = username.substring(0, index);
} else {
// Unknown domain.
......@@ -163,7 +163,7 @@ public class DefaultAuthProvider implements AuthProvider {
// Check that the specified domain matches the server's domain
int index = username.indexOf("@");
String domain = username.substring(index + 1);
if (domain.equals(XMPPServer.getInstance().getServerInfo().getName())) {
if (domain.equals(XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
username = username.substring(0, index);
} else {
// Unknown domain.
......
src/java/org/jivesoftware/openfire/auth/JDBCAuthProvider.java
View file @ ecdf85ea
......@@ -104,7 +104,7 @@ public class JDBCAuthProvider implements AuthProvider {
// Check that the specified domain matches the server's domain
int index = username.indexOf("@");
String domain = username.substring(index + 1);
if (domain.equals(XMPPServer.getInstance().getServerInfo().getName())) {
if (domain.equals(XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
username = username.substring(0, index);
} else {
// Unknown domain. Return authentication failed.
......@@ -149,7 +149,7 @@ public class JDBCAuthProvider implements AuthProvider {
// Check that the specified domain matches the server's domain
int index = username.indexOf("@");
String domain = username.substring(index + 1);
if (domain.equals(XMPPServer.getInstance().getServerInfo().getName())) {
if (domain.equals(XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
username = username.substring(0, index);
} else {
// Unknown domain. Return authentication failed.
......@@ -193,7 +193,7 @@ public class JDBCAuthProvider implements AuthProvider {
// Check that the specified domain matches the server's domain
int index = username.indexOf("@");
String domain = username.substring(index + 1);
if (domain.equals(XMPPServer.getInstance().getServerInfo().getName())) {
if (domain.equals(XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
username = username.substring(0, index);
}
} else {
......@@ -229,7 +229,7 @@ public class JDBCAuthProvider implements AuthProvider {
// Check that the specified domain matches the server's domain
int index = username.indexOf("@");
String domain = username.substring(index + 1);
if (domain.equals(XMPPServer.getInstance().getServerInfo().getName())) {
if (domain.equals(XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
username = username.substring(0, index);
} else {
// Unknown domain.
......
src/java/org/jivesoftware/openfire/auth/NativeAuthProvider.java
View file @ ecdf85ea
......@@ -114,7 +114,7 @@ public class NativeAuthProvider implements AuthProvider {
// Check that the specified domain matches the server's domain
int index = username.indexOf("@");
String domain = username.substring(index + 1);
if (domain.equals(XMPPServer.getInstance().getServerInfo().getName())) {
if (domain.equals(XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
username = username.substring(0, index);
} else {
// Unknown domain. Return authentication failed.
......
src/java/org/jivesoftware/openfire/auth/POP3AuthProvider.java
View file @ ecdf85ea
......@@ -121,7 +121,7 @@ public class POP3AuthProvider implements AuthProvider {
// Check that the specified domain matches the server's domain
int index = username.indexOf("@");
String domain = username.substring(index + 1);
if (domain.equals(XMPPServer.getInstance().getServerInfo().getName())) {
if (domain.equals(XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
username = username.substring(0, index);
}
} else {
......
src/java/org/jivesoftware/openfire/commands/AdHocCommandHandler.java
View file @ ecdf85ea
......@@ -132,7 +132,7 @@ public class AdHocCommandHandler extends IQHandler
public void initialize(XMPPServer server) {
super.initialize(server);
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
infoHandler = server.getIQDiscoInfoHandler();
itemsHandler = server.getIQDiscoItemsHandler();
}
......
src/java/org/jivesoftware/openfire/commands/admin/GetServerStats.java
View file @ ecdf85ea
......@@ -64,7 +64,7 @@ public class GetServerStats extends AdHocCommand {
field = form.addField();
field.setLabel(LocaleUtils.getLocalizedString("index.domain_name"));
field.setVariable("domain");
field.addValue(XMPPServer.getInstance().getServerInfo().getName());
field.addValue(XMPPServer.getInstance().getServerInfo().getXMPPDomain());
field = form.addField();
field.setLabel(LocaleUtils.getLocalizedString("index.jvm"));
......
src/java/org/jivesoftware/openfire/component/ExternalComponentManager.java
View file @ ecdf85ea
......@@ -71,7 +71,7 @@ public class ExternalComponentManager {
config.setPermission(Permission.blocked);
addConfiguration(config);
// Check if the component was connected and proceed to close the connection
String domain = subdomain + "." + XMPPServer.getInstance().getServerInfo().getName();
String domain = subdomain + "." + XMPPServer.getInstance().getServerInfo().getXMPPDomain();
Session session = SessionManager.getInstance().getComponentSession(domain);
if (session != null) {
session.close();
......
src/java/org/jivesoftware/openfire/component/InternalComponentManager.java
View file @ ecdf85ea
......@@ -86,7 +86,7 @@ public class InternalComponentManager extends BasicModule implements ComponentMa
ComponentManagerFactory.setComponentManager(instance);
XMPPServer server = XMPPServer.getInstance();
serverDomain = server.getServerInfo().getName();
serverDomain = server.getServerInfo().getXMPPDomain();
// Set the address of this internal service. component.[domain]
serviceAddress = new JID(null, "component." + serverDomain, null);
if (!server.isSetupMode()) {
......
src/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java
View file @ ecdf85ea
......@@ -95,7 +95,7 @@ public class AdminConsolePlugin implements Plugin {
if (adminSecurePort > 0 && CertificateManager.isRSACertificate(SSLConfig.getKeyStore(), "*"))
{
if (!CertificateManager.isRSACertificate(SSLConfig.getKeyStore(),
XMPPServer.getInstance().getServerInfo().getName())) {
XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
Log.warn("Admin console: Using RSA certificates but they are not valid for the hosted domain");
}
......@@ -286,18 +286,18 @@ public class AdminConsolePlugin implements Plugin {
if (isPlainStarted && isSecureStarted) {
log(listening + ":" + System.getProperty("line.separator") +
" http://" + XMPPServer.getInstance().getServerInfo().getName() + ":" +
" http://" + XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":" +
adminPort + System.getProperty("line.separator") +
" https://" + XMPPServer.getInstance().getServerInfo().getName() + ":" +
" https://" + XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":" +
adminSecurePort);
}
else if (isSecureStarted) {
log(listening + " https://" +
XMPPServer.getInstance().getServerInfo().getName() + ":" + adminSecurePort);
XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":" + adminSecurePort);
}
else if (isPlainStarted) {
log(listening + " http://" +
XMPPServer.getInstance().getServerInfo().getName() + ":" + adminPort);
XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":" + adminPort);
}
}
......
src/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java
View file @ ecdf85ea
......@@ -103,7 +103,7 @@ public class IQDiscoInfoHandler extends IQHandler implements ClusterEventListene
// DiscoInfoProvider responsibility to provide information about the JID's name together
// with any possible requested node.
DiscoInfoProvider infoProvider = getProvider(packet.getTo() == null ?
XMPPServer.getInstance().getServerInfo().getName() : packet.getTo().getDomain());
XMPPServer.getInstance().getServerInfo().getXMPPDomain() : packet.getTo().getDomain());
if (infoProvider != null) {
// Get the JID's name
String name = packet.getTo() == null ? null : packet.getTo().getNode();
......@@ -328,7 +328,7 @@ public class IQDiscoInfoHandler extends IQHandler implements ClusterEventListene
}
}
setProvider(server.getServerInfo().getName(), getServerInfoProvider());
setProvider(server.getServerInfo().getXMPPDomain(), getServerInfoProvider());
// Listen to cluster events
ClusterManager.addListener(this);
}
......
src/java/org/jivesoftware/openfire/disco/IQDiscoItemsHandler.java
View file @ ecdf85ea
......@@ -105,7 +105,7 @@ public class IQDiscoItemsHandler extends IQHandler implements ServerFeaturesProv
// DiscoItemsProvider responsibility to provide the items associated with the JID's name
// together with any possible requested node.
DiscoItemsProvider itemsProvider = getProvider(packet.getTo() == null ?
XMPPServer.getInstance().getServerInfo().getName() : packet.getTo().getDomain());
XMPPServer.getInstance().getServerInfo().getXMPPDomain() : packet.getTo().getDomain());
if (itemsProvider != null) {
// Get the JID's name
String name = packet.getTo() == null ? null : packet.getTo().getNode();
......@@ -383,7 +383,7 @@ public class IQDiscoItemsHandler extends IQHandler implements ServerFeaturesProv
// Track the implementors of ServerItemsProvider so that we can collect the items
// provided by the server
infoHandler = server.getIQDiscoInfoHandler();
setProvider(server.getServerInfo().getName(), getServerItemsProvider());
setProvider(server.getServerInfo().getXMPPDomain(), getServerItemsProvider());
// Listen to cluster events
ClusterManager.addListener(this);
}
......
src/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesManager.java
View file @ ecdf85ea
......@@ -143,7 +143,7 @@ public class EntityCapabilitiesManager implements IQResultListener, UserEventLis
IQ iq = new IQ(IQ.Type.get);
iq.setTo(packet.getFrom());
String serverName = XMPPServer.getInstance().getServerInfo().getName();
String serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
iq.setFrom(serverName);
iq.setChildElement("query", "http://jabber.org/protocol/disco#info");
......
src/java/org/jivesoftware/openfire/filetransfer/proxy/FileTransferProxy.java
View file @ ecdf85ea
......@@ -268,7 +268,7 @@ public class FileTransferProxy extends BasicModule
* @return the file transfer server domain (service name + host name).
*/
public String getServiceDomain() {
return proxyServiceName + "." + XMPPServer.getInstance().getServerInfo().getName();
return proxyServiceName + "." + XMPPServer.getInstance().getServerInfo().getXMPPDomain();
}
public JID getAddress() {
......
src/java/org/jivesoftware/openfire/handler/IQAuthHandler.java
View file @ ecdf85ea
......@@ -288,7 +288,7 @@ public class IQAuthHandler extends IQHandler implements IQAuthInfo {
userManager = server.getUserManager();
sessionManager = server.getSessionManager();
routingTable = server.getRoutingTable();
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
}
public IQHandlerInfo getInfo() {
......
src/java/org/jivesoftware/openfire/handler/IQBindHandler.java
View file @ ecdf85ea
......@@ -140,7 +140,7 @@ public class IQBindHandler extends IQHandler {
public void initialize(XMPPServer server) {
super.initialize(server);
routingTable = server.getRoutingTable();
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
}
public IQHandlerInfo getInfo() {
......
src/java/org/jivesoftware/openfire/handler/IQRosterHandler.java
View file @ ecdf85ea
......@@ -263,7 +263,7 @@ public class IQRosterHandler extends IQHandler implements ServerFeaturesProvider
}
else {
// Recipient is remote so we just forward the packet to them
String serverDomain = localServer.getServerInfo().getName();
String serverDomain = localServer.getServerInfo().getXMPPDomain();
// Check if the recipient may be hosted by this server
if (!recipient.getDomain().contains(serverDomain)) {
// TODO Implete when s2s is implemented
......
src/java/org/jivesoftware/openfire/handler/IQSharedGroupHandler.java
View file @ ecdf85ea
......@@ -59,7 +59,7 @@ public class IQSharedGroupHandler extends IQHandler {
public void initialize(XMPPServer server) {
super.initialize(server);
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
rosterManager = server.getRosterManager();
}
}
src/java/org/jivesoftware/openfire/handler/PresenceSubscribeHandler.java
View file @ ecdf85ea
......@@ -474,7 +474,7 @@ public class PresenceSubscribeHandler extends BasicModule implements ChannelHand
public void initialize(XMPPServer server) {
super.initialize(server);
localServer = server;
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
routingTable = server.getRoutingTable();
deliverer = server.getPacketDeliverer();
presenceManager = server.getPresenceManager();
......
src/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java
View file @ ecdf85ea
......@@ -292,7 +292,7 @@ public class PresenceUpdateHandler extends BasicModule implements ChannelHandler
// Foreign updates will do a reverse lookup of entries in rosters
// on the server
Log.warn("Presence requested from server "
+ localServer.getServerInfo().getName()
+ localServer.getServerInfo().getXMPPDomain()
+ " by unknown user: " + update.getFrom());
}
}
......
src/java/org/jivesoftware/openfire/http/HttpBindManager.java
View file @ ecdf85ea
......@@ -132,7 +132,7 @@ public final class HttpBindManager {
try {
if (securePort > 0 && CertificateManager.isRSACertificate(SSLConfig.getKeyStore(), "*")) {
if (!CertificateManager.isRSACertificate(SSLConfig.getKeyStore(),
XMPPServer.getInstance().getServerInfo().getName())) {
XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
Log.warn("HTTP binding: Using RSA certificates but they are not valid for " +
"the hosted domain");
}
......@@ -180,17 +180,17 @@ public final class HttpBindManager {
}
public String getHttpBindUnsecureAddress() {
return "http://" + XMPPServer.getInstance().getServerInfo().getName() + ":" +
return "http://" + XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":" +
bindPort + "/http-bind/";
}
public String getHttpBindSecureAddress() {
return "https://" + XMPPServer.getInstance().getServerInfo().getName() + ":" +
return "https://" + XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":" +
bindSecurePort + "/http-bind/";
}
public String getJavaScriptUrl() {
return "http://" + XMPPServer.getInstance().getServerInfo().getName() + ":" +
return "http://" + XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":" +
bindPort + "/scripts/";
}
......
src/java/org/jivesoftware/openfire/interceptor/PacketCopier.java
View file @ ecdf85ea
......@@ -73,7 +73,7 @@ public class PacketCopier implements PacketInterceptor, ComponentEventListener {
// a component is no longer valid
InternalComponentManager.getInstance().addListener(this);
XMPPServer server = XMPPServer.getInstance();
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
routingTable = server.getRoutingTable();
// Add new instance to the PacketInterceptors list
......
src/java/org/jivesoftware/openfire/ldap/LdapAuthProvider.java
View file @ ecdf85ea
......@@ -73,7 +73,7 @@ public class LdapAuthProvider implements AuthProvider {
// Check that the specified domain matches the server's domain
int index = username.indexOf("@");
String domain = username.substring(index + 1);
if (domain.equals(XMPPServer.getInstance().getServerInfo().getName())) {
if (domain.equals(XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
username = username.substring(0, index);
} else {
// Unknown domain. Return authentication failed.
......
src/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java
View file @ ecdf85ea
......@@ -621,7 +621,7 @@ public class LdapGroupProvider implements GroupProvider {
}
XMPPServer server = XMPPServer.getInstance();
String serverName = server.getServerInfo().getName();
String serverName = server.getServerInfo().getXMPPDomain();
// Build 3 groups.
// group 1: uid=
// group 2: rest of the text until first comma
......
src/java/org/jivesoftware/openfire/mediaproxy/MediaProxyService.java
View file @ ecdf85ea
......@@ -65,7 +65,7 @@ public class MediaProxyService extends BasicModule
// In some cases, the domain name of the server may not be the actual address of the machine
// (ie, when using DNS SRV records). In that case, the "mediaproxy.externalip" property should be
// set to the IP address of the actual server where the media proxy is listening.
String ipAddress = JiveGlobals.getProperty("mediaproxy.externalip", server.getServerInfo().getName());
String ipAddress = JiveGlobals.getProperty("mediaproxy.externalip", server.getServerInfo().getXMPPDomain());
mediaProxy = new MediaProxy(ipAddress);
String defaultName = "rtpbridge";
......@@ -279,7 +279,7 @@ public class MediaProxyService extends BasicModule
* @return the file transfer server domain (service name + host name).
*/
public String getServiceDomain() {
return serviceName + "." + XMPPServer.getInstance().getServerInfo().getName();
return serviceName + "." + XMPPServer.getInstance().getServerInfo().getXMPPDomain();
}
public JID getAddress() {
......
src/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServerImpl.java
View file @ ecdf85ea
......@@ -307,7 +307,7 @@ public class MultiUserChatServerImpl extends BasicModule implements MultiUserCha
}
public String getServiceDomain() {
return chatServiceName + "." + XMPPServer.getInstance().getServerInfo().getName();
return chatServiceName + "." + XMPPServer.getInstance().getServerInfo().getXMPPDomain();
}
public JID getAddress() {
......
src/java/org/jivesoftware/openfire/multiplex/ClientSessionConnection.java
View file @ ecdf85ea
......@@ -37,7 +37,7 @@ public class ClientSessionConnection extends VirtualConnection {
public ClientSessionConnection(String connectionManagerName) {
this.connectionManagerName = connectionManagerName;
multiplexerManager = ConnectionMultiplexerManager.getInstance();
serverName = XMPPServer.getInstance().getServerInfo().getName();
serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
}
/**
......
src/java/org/jivesoftware/openfire/net/MulticastDNSService.java
View file @ ecdf85ea
......@@ -98,7 +98,7 @@ public class MulticastDNSService extends BasicModule {
if (jmdns == null) {
jmdns = new JmDNS();
}
String serverName = XMPPServer.getInstance().getServerInfo().getName();
String serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
if (clientPortNum != -1) {
ServiceInfo clientService = new ServiceInfo("_xmpp-client._tcp.local.",
......
src/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java
View file @ ecdf85ea
......@@ -173,7 +173,7 @@ public class LocalOutgoingServerSession extends LocalSession implements Outgoing
int index = hostname.indexOf('.');
while (index > -1 && index < hostname.length()) {
String newHostname = hostname.substring(index + 1);
String serverName = XMPPServer.getInstance().getServerInfo().getName();
String serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
if ("com".equals(newHostname) || "net".equals(newHostname) ||
"org".equals(newHostname) ||
"gov".equals(newHostname) ||
......
src/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java
View file @ ecdf85ea
......@@ -800,7 +800,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
public void start() {
super.start();
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
createListeners();
startListeners();
SocketSendingTracker.getInstance().start();
......
src/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java
View file @ ecdf85ea
......@@ -692,7 +692,7 @@ public class RoutingTableImpl extends BasicModule implements RoutingTable, Clust
public void initialize(XMPPServer server) {
super.initialize(server);
this.server = server;
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
iqRouter = server.getIQRouter();
messageRouter = server.getMessageRouter();
presenceRouter = server.getPresenceRouter();
......
src/java/org/jivesoftware/openfire/update/UpdateManager.java
View file @ ecdf85ea
......@@ -165,7 +165,7 @@ public class UpdateManager extends BasicModule {
public void initialize(XMPPServer server) {
super.initialize(server);
router = server.getMessageRouter();
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
}
/**
......
src/java/org/jivesoftware/openfire/user/UserManager.java
View file @ ecdf85ea
......@@ -336,7 +336,7 @@ public class UserManager implements IQResultListener {
// A disco#info is going to be sent to the bare JID of the user. This packet
// is going to be handled by the remote server.
IQ iq = new IQ(IQ.Type.get);
iq.setFrom(server.getServerInfo().getName());
iq.setFrom(server.getServerInfo().getXMPPDomain());
iq.setTo(user.toBareJID());
iq.setChildElement("query", "http://jabber.org/protocol/disco#info");
// Send the disco#info request to the remote server. The reply will be
......
src/plugins/contentFilter/src/java/org/jivesoftware/openfire/plugin/ContentFilterPlugin.java
View file @ ecdf85ea
......@@ -216,7 +216,7 @@ public class ContentFilterPlugin implements Plugin, PacketInterceptor {
contentFilter = new ContentFilter();
interceptorManager = InterceptorManager.getInstance();
violationNotificationFrom = new JID(XMPPServer.getInstance()
.getServerInfo().getName());
.getServerInfo().getXMPPDomain());
messageRouter = XMPPServer.getInstance().getMessageRouter();
}
......
src/plugins/contentFilter/src/web/contentfilter-props-edit-form.jsp
View file @ ecdf85ea
......@@ -154,7 +154,7 @@ Use the form below to edit content filter settings.<br>
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr>
<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">Settings updated successfully.</td>
</tr>
</tbody>
......@@ -167,7 +167,7 @@ Use the form below to edit content filter settings.<br>
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr>
<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">Error saving the settings.</td>
</tr>
</tbody>
......@@ -227,7 +227,7 @@ Use the form below to edit content filter settings.<br>
</tr>
<tr>
<td>&nbsp;</td>
<td><input type="checkbox" name="filterstatus" value="filterstatus" <%= filterStatusEnabled ? "checked" : "" %>>Filter users presence status.</input></td>
<td><input type="checkbox" name="filterstatus" value="filterstatus" <%= filterStatusEnabled ? "checked" : "" %>/>Filter users presence status.</td>
</tr>
</tbody>
</table>
......@@ -278,7 +278,7 @@ Use the form below to edit content filter settings.<br>
</tr>
<tr>
<td>&nbsp;</td>
<td><input type="checkbox" name="maskenabled" value="maskenabled" <%= maskEnabled ? "checked" : "" %>>Enable mask.</input></td>
<td><input type="checkbox" name="maskenabled" value="maskenabled" <%= maskEnabled ? "checked" : "" %>/>Enable mask.</td>
</tr>
</tbody>
</table>
......@@ -366,7 +366,7 @@ Use the form below to edit content filter settings.<br>
<tr>
<td>&nbsp;</td>
<td align="left">Username:&nbsp
<input type="text" size="20" maxlength="100" name="contactname" value="<%= (contactName != null ? contactName : "") %>">@<%= XMPPServer.getInstance().getServerInfo().getName() %>
<input type="text" size="20" maxlength="100" name="contactname" value="<%= (contactName != null ? contactName : "") %>">@<%= XMPPServer.getInstance().getServerInfo().getXMPPDomain() %>
<% if (errors.containsKey("missingContactName")) { %>
<span class="jive-error-text">
<br>Please enter a username.
......@@ -381,9 +381,9 @@ Use the form below to edit content filter settings.<br>
<tr>
<td>&nbsp;</td>
<td>
<input type="checkbox" name="notificationcb" value="notificationbyim" <%= notificationByIMEnabled ? "checked" : "" %>>Notify by IM.</input>
<input type="checkbox" name="notificationcb" value="notificationbyemail" <%= notificationByEmailEnabled ? "checked" : "" %>>Notify by Email.</input>
<input type="checkbox" name="notificationcb" value="notificationincludeoriginal" <%= includeOriginalEnabled ? "checked" : "" %>>Include original packet.</input>
<input type="checkbox" name="notificationcb" value="notificationbyim" <%= notificationByIMEnabled ? "checked" : "" %>/>Notify by IM.
<input type="checkbox" name="notificationcb" value="notificationbyemail" <%= notificationByEmailEnabled ? "checked" : "" %>/>Notify by Email.
<input type="checkbox" name="notificationcb" value="notificationincludeoriginal" <%= includeOriginalEnabled ? "checked" : "" %>/>Include original packet.
<% if (errors.containsKey("mailServerNotConfigured")) { %>
<span class="jive-error-text">
<br>Error, sending an email will fail because the mail server is not setup. Please go to the <a href="/system-email.jsp">mail settings page</a> and set the mail host.
......
src/plugins/emailListener/src/java/org/jivesoftware/openfire/plugin/emailListener/EmailListener.java
View file @ ecdf85ea
......@@ -56,6 +56,12 @@ public class EmailListener {
/**
* Returns true if a connection to the IMAP server was successful.
*
* @param host Host to connect to.
* @param port Port to connect over.
* @param isSSLEnabled True if an SSL connection will be attempted.
* @param user Username to use for authentication.
* @param password Password to use for authentication.
* @param folderName Folder to check.
* @return true if a connection to the IMAP server was successful.
*/
public static boolean testConnection(String host, int port, boolean isSSLEnabled, String user, String password,
......@@ -180,7 +186,7 @@ public class EmailListener {
for (String user : getUsers()) {
// Create notification message
org.xmpp.packet.Message notification = new org.xmpp.packet.Message();
notification.setFrom(XMPPServer.getInstance().getServerInfo().getName());
notification.setFrom(XMPPServer.getInstance().getServerInfo().getXMPPDomain());
notification.setTo(user);
notification.setSubject("New email has been received");
notification.setBody(sb.toString());
......@@ -235,8 +241,11 @@ public class EmailListener {
}
}
private static Folder openFolder(String host, int port, boolean isSSLEnabled, String user, String password,
private static Folder openFolder(String host, Integer port, Boolean isSSLEnabled, String user, String password,
String folder) {
if (host == null || port == null || isSSLEnabled == null || user == null || password == null || folder == null) {
return null;
}
try {
Properties props = System.getProperties();
......
src/plugins/motd/src/java/org/jivesoftware/openfire/plugin/MotDPlugin.java
View file @ ecdf85ea
......@@ -31,7 +31,7 @@ public class MotDPlugin implements Plugin {
private MotDSessionEventListener listener = new MotDSessionEventListener();
public void initializePlugin(PluginManager manager, File pluginDirectory) {
serverAddress = new JID(XMPPServer.getInstance().getServerInfo().getName());
serverAddress = new JID(XMPPServer.getInstance().getServerInfo().getXMPPDomain());
router = XMPPServer.getInstance().getMessageRouter();
SessionEventDispatcher.addListener(listener);
......
src/plugins/packetFilter/src/java/org/jivesoftware/openfire/plugin/PacketFilterUtil.java
View file @ ecdf85ea
......@@ -4,17 +4,14 @@ 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.plugin.component.ComponentList;
import org.jivesoftware.openfire.user.UserManager;
import org.jivesoftware.util.Log;
import org.xmpp.packet.JID;
import java.util.Collection;
/*
Static util methods.
*/
public class PacketFilterUtil {
static String serverName = XMPPServer.getInstance().getServerInfo().getName();
static String serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
public static boolean isGroup(String name) {
try {
......
src/plugins/packetFilter/src/java/org/jivesoftware/openfire/plugin/component/ComponentList.java
View file @ ecdf85ea
......@@ -77,7 +77,7 @@ public class ComponentList implements IQResultListener {
iqRouter = server.getIQRouter();
for (String componentDomain : components) {
IQ iq = new IQ(IQ.Type.get);
iq.setFrom(server.getServerInfo().getName());
iq.setFrom(server.getServerInfo().getXMPPDomain());
iq.setTo(componentDomain);
iq.setChildElement("query", "http://jabber.org/protocol/disco#info");
iqRouter.addIQResultListener(iq.getID(), this);
......
src/plugins/packetFilter/src/web/rule-edit-form.jsp
View file @ ecdf85ea
......@@ -57,7 +57,7 @@
Collection<String> userList = UserManager.getInstance().getUsernames();
String serverName = XMPPServer.getInstance().getServerInfo().getName();
String serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
Map<String, String> errors = new HashMap<String, String>();
......
src/plugins/packetFilter/src/web/rule-form.jsp
View file @ ecdf85ea
......@@ -40,7 +40,7 @@
Rule.SourceDestType[] type = Rule.SourceDestType.values();
Collection<String> userList = UserManager.getInstance().getUsernames();
String serverName = XMPPServer.getInstance().getServerInfo().getName();
String serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
Collection<String> components = cList.getComponentDomains();
Map<String, String> errors = new HashMap<String, String>();
......
src/plugins/presence/src/java/org/jivesoftware/openfire/plugin/PresencePlugin.java
View file @ ecdf85ea
......@@ -65,7 +65,7 @@ public class PresencePlugin implements Plugin, Component {
XMPPServer server = XMPPServer.getInstance();
userManager = server.getUserManager();
presenceManager = server.getPresenceManager();
hostname = server.getServerInfo().getName();
hostname = server.getServerInfo().getXMPPDomain();
probedPresence = new ConcurrentHashMap<String, Presence>();
componentJID = new JID(subdomain + "." + hostname);
// Register new component
......
src/plugins/presence/src/web/presence-service.jsp
View file @ ecdf85ea
......@@ -41,7 +41,7 @@
<div class="information">
<%
String serverName = XMPPServer.getInstance().getServerInfo().getName();
String serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
int port = JiveGlobals.getXMLProperty("adminConsole.port", -1);
int securePort = JiveGlobals.getXMLProperty("adminConsole.securePort", -1);
boolean secureOnly = (port == -1);
......
src/plugins/registration/src/java/org/jivesoftware/openfire/plugin/RegistrationPlugin.java
View file @ ecdf85ea
......@@ -111,7 +111,7 @@ public class RegistrationPlugin implements Plugin {
private List<String> emailContacts = new ArrayList<String>();
public RegistrationPlugin() {
serverName = XMPPServer.getInstance().getServerInfo().getName();
serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
serverAddress = new JID(serverName);
router = XMPPServer.getInstance().getMessageRouter();
......@@ -237,7 +237,7 @@ public class RegistrationPlugin implements Plugin {
}
public String webRegistrationAddress() {
return "http://" + XMPPServer.getInstance().getServerInfo().getName() + ":"
return "http://" + XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":"
+ JiveGlobals.getXMLProperty("adminConsole.port") + "/plugins/" + URL;
}
......
src/plugins/search/src/java/org/jivesoftware/openfire/plugin/SearchPlugin.java
View file @ ecdf85ea
......@@ -92,7 +92,7 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
serviceEnabled = JiveGlobals.getBooleanProperty(SERVICEENABLED, true);
exculudedFields = StringUtils.stringToCollection(JiveGlobals.getProperty(EXCLUDEDFIELDS, ""));
serverName = XMPPServer.getInstance().getServerInfo().getName();
serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
userManager = UserManager.getInstance();
// Some clients, such as Miranda, are hard-coded to search specific fields,
......@@ -980,6 +980,10 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
* A possible future improvement would be to have a third parameter that
* sets the maximum number of users returned and/or the number of users
* that are searched.
*
* @param field Field we will be searching on.
* @param query Comparison to make on specified field.
* @return Collection of User's matching query.
*/
public Collection<User> findUsers(String field, String query) {
List<User> foundUsers = new ArrayList<User>();
......
src/plugins/search/src/web/search-props-edit-form.jsp
View file @ ecdf85ea
......@@ -17,26 +17,27 @@
SearchPlugin plugin = (SearchPlugin) XMPPServer.getInstance().getPluginManager().getPlugin("search");
// Handle a save
Map errors = new HashMap();
Map<String,String> errors = new HashMap<String,String>();
if (save) {
if (searchName == null || searchName.indexOf('.') >= 0 || searchName.trim().length() < 1) {
errors.put("searchname", "searchname");
}
if (errors.size() == 0) {
plugin.setServiceEnabled(searchEnabled);
plugin.setServiceName(searchName.trim());
ArrayList<String> excludedFields = new ArrayList<String>();
for (String field : UserManager.getInstance().getSearchFields()) {
if (!ParamUtils.getBooleanParameter(request, field)) {
excludedFields.add(field);
else {
if (errors.size() == 0) {
plugin.setServiceEnabled(searchEnabled);
plugin.setServiceName(searchName.trim());
ArrayList<String> excludedFields = new ArrayList<String>();
for (String field : UserManager.getInstance().getSearchFields()) {
if (!ParamUtils.getBooleanParameter(request, field)) {
excludedFields.add(field);
}
}
plugin.setExcludedFields(excludedFields);
response.sendRedirect("search-props-edit-form.jsp?success=true");
return;
}
plugin.setExcludedFields(excludedFields);
response.sendRedirect("search-props-edit-form.jsp?success=true");
return;
}
}
else {
......@@ -67,7 +68,7 @@
<div class="jive-success">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">
<fmt:message key="search.props.edit.form.successful_edit" />
</td></tr>
......@@ -80,7 +81,7 @@
<div class="jive-error">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">
<fmt:message key="search.props.edit.form.error" />
</td></tr>
......@@ -131,7 +132,7 @@
<fmt:message key="search.props.edit.form.search_service_name" />:
</td>
<td>
<input type="text" size="30" maxlength="150" name="searchname" value="<%= (searchName != null ? searchName : "") %>">.<%=XMPPServer.getInstance().getServerInfo().getName() %>
<input type="text" size="30" maxlength="150" name="searchname" value="<%= (searchName != null ? searchName : "") %>">.<%=XMPPServer.getInstance().getServerInfo().getXMPPDomain() %>
<% if (errors.containsKey("searchname")) { %>
......
src/plugins/subscription/src/java/org/jivesoftware/openfire/plugin/SubscriptionPlugin.java
View file @ ecdf85ea
......@@ -55,7 +55,7 @@ public class SubscriptionPlugin implements Plugin {
public SubscriptionPlugin() {
XMPPServer server = XMPPServer.getInstance();
router = server.getPresenceRouter();
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
String list = JiveGlobals.getProperty(WHITE_LIST);
if (list != null) {
......@@ -132,11 +132,7 @@ public class SubscriptionPlugin implements Plugin {
private List<String> csvToList(String csv) {
List<String> list = new ArrayList<String>();
for (String s : csv.split(",")) {
list.add(s);
}
list.addAll(Arrays.asList(csv.split(",")));
return list;
}
......
src/plugins/subscription/src/web/subscription-plugin-properties.jsp
View file @ ecdf85ea
......@@ -92,7 +92,7 @@
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr>
<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">Service properties edited successfully.</td>
</tr>
</tbody>
......@@ -112,8 +112,8 @@
<tbody>
<tr>
<td width="1%">
<input type="radio" name="type" value="<%=plugin.DISABLED %>" id="rb01"
<%= (type.equals(plugin.DISABLED) ? "checked" : "") %>>
<input type="radio" name="type" value="<%= SubscriptionPlugin.DISABLED %>" id="rb01"
<%= (type.equals(SubscriptionPlugin.DISABLED) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb01"><strong>Disabled</strong></label> - No subscriptions requests will be intercepted.
......@@ -121,8 +121,8 @@
</tr>
<tr>
<td width="1%">
<input type="radio" name="type" value="<%=plugin.ACCEPT %>" id="rb02"
<%= (type.equals(plugin.ACCEPT) ? "checked" : "") %>>
<input type="radio" name="type" value="<%= SubscriptionPlugin.ACCEPT %>" id="rb02"
<%= (type.equals(SubscriptionPlugin.ACCEPT) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb02"><strong>Accept</strong></label> - Subscription requests will be intercepted and accepted.
......@@ -135,17 +135,17 @@
<table cellpadding="4" cellspacing="0" border="0" width="100%">
<tr>
<td width="1%">
<input type="radio" name="accept" value="<%=plugin.LOCAL %>" id="rb03"
<%= (level.equals(plugin.LOCAL) ? "checked" : "") %>>
<input type="radio" name="accept" value="<%= SubscriptionPlugin.LOCAL %>" id="rb03"
<%= (level.equals(SubscriptionPlugin.LOCAL) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb03"><strong>Local</strong></label> - Only subscription requests sent by users <u>who have</u> an account on <i><%=XMPPServer.getInstance().getServerInfo().getName() %></i> will be intercepted and accepted.
<label for="rb03"><strong>Local</strong></label> - Only subscription requests sent by users <u>who have</u> an account on <i><%=XMPPServer.getInstance().getServerInfo().getXMPPDomain() %></i> will be intercepted and accepted.
</td>
</tr>
<tr>
<td width="1%">
<input type="radio" name="accept" value="<%=plugin.ALL %>" id="rb04"
<%= (level.equals(plugin.ALL) ? "checked" : "") %>>
<input type="radio" name="accept" value="<%= SubscriptionPlugin.ALL %>" id="rb04"
<%= (level.equals(SubscriptionPlugin.ALL) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb04"><strong>All</strong></label> - All subscription requests will be intercepted and automatically accepted.
......@@ -156,8 +156,8 @@
</tr>
<tr>
<td width="1%">
<input type="radio" name="type" value="<%=plugin.REJECT %>" id="rb05"
<%= (type.equals(plugin.REJECT) ? "checked" : "") %>>
<input type="radio" name="type" value="<%= SubscriptionPlugin.REJECT %>" id="rb05"
<%= (type.equals(SubscriptionPlugin.REJECT) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb05"><strong>Reject</strong></label> - Subscription requests will be intercepted and rejected.
......@@ -169,17 +169,17 @@
<table cellpadding="4" cellspacing="0" border="0" width="100%">
<tr>
<td width="1%">
<input type="radio" name="reject" value="<%=plugin.LOCAL %>" id="rb06"
<%= (level.equals(plugin.LOCAL) ? "checked" : "") %>>
<input type="radio" name="reject" value="<%= SubscriptionPlugin.LOCAL %>" id="rb06"
<%= (level.equals(SubscriptionPlugin.LOCAL) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb06"><strong>Local</strong></label> - Only subscription requests sent by users <u>who do not have</u> an account on <i><%=XMPPServer.getInstance().getServerInfo().getName() %></i> will be intercepted and rejected.
<label for="rb06"><strong>Local</strong></label> - Only subscription requests sent by users <u>who do not have</u> an account on <i><%=XMPPServer.getInstance().getServerInfo().getXMPPDomain() %></i> will be intercepted and rejected.
</td>
</tr>
<tr>
<td width="1%">
<input type="radio" name="reject" value="<%=plugin.ALL %>" id="rb07"
<%= (level.equals(plugin.ALL) ? "checked" : "") %>>
<input type="radio" name="reject" value="<%= SubscriptionPlugin.ALL %>" id="rb07"
<%= (level.equals(SubscriptionPlugin.ALL) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb07"><strong>All</strong></label> - All subscription requests will be intercepted and rejected.
......@@ -210,7 +210,7 @@
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr>
<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">User successfully removed.</td>
</tr>
</tbody>
......@@ -223,7 +223,7 @@
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr>
<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">User successfully added.</td>
</tr>
</tbody>
......@@ -236,7 +236,7 @@
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr>
<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">Missing user.</td>
</tr>
</tbody>
......@@ -249,7 +249,7 @@
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr>
<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">User not found.</td>
</tr>
</tbody>
......@@ -291,7 +291,7 @@
title="Delete User?"
onclick="return confirm('Are you sure you want to delete this user?');"><img
src="images/delete-16x16.gif" width="16" height="16"
border="0"></a>
border="0" alt=""></a>
</td>
</tr>
......
src/plugins/userImportExport/src/java/org/jivesoftware/openfire/plugin/ImportExportPlugin.java
View file @ ecdf85ea
......@@ -50,7 +50,7 @@ public class ImportExportPlugin implements Plugin {
public ImportExportPlugin() {
userManager = XMPPServer.getInstance().getUserManager();
provider = UserManager.getUserProvider();
serverName = XMPPServer.getInstance().getServerInfo().getName();
serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
}
public void initializePlugin(PluginManager manager, File pluginDirectory) {
......
src/web/audit-policy.jsp
View file @ ecdf85ea
......@@ -113,7 +113,7 @@
String tok = tokenizer.nextToken();
String username = tok;
if (tok.contains("@")) {
if (tok.contains("@" + webManager.getServerInfo().getName())) {
if (tok.contains("@" + webManager.getServerInfo().getXMPPDomain())) {
username = new JID(tok).getNode();
}
else {
......
src/web/connection-managers-settings.jsp
View file @ ecdf85ea
......@@ -42,7 +42,7 @@
String secret = ParamUtils.getParameter(request,"secret");
boolean updateSucess = false;
String serverName = XMPPServer.getInstance().getServerInfo().getName();
String serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager();
......@@ -248,7 +248,7 @@
}
</style>
<b><fmt:message key="connection-manager.details.title" >
<fmt:param value="<%= XMPPServer.getInstance().getServerInfo().getName() %>" />
<fmt:param value="<%= XMPPServer.getInstance().getServerInfo().getXMPPDomain() %>" />
</fmt:message>
</b>
<br>
......
src/web/external-components-settings.jsp
View file @ ecdf85ea
......@@ -45,7 +45,7 @@
boolean blockSuccess = false;
boolean deleteSuccess = false;
String serverName = XMPPServer.getInstance().getServerInfo().getName();
String serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager();
......
src/web/import-certificate.jsp
View file @ ecdf85ea
......@@ -35,7 +35,7 @@
if (errors.isEmpty()) {
try {
// Create an alias for the signed certificate
String domain = XMPPServer.getInstance().getServerInfo().getName();
String domain = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
int index = 1;
String alias = domain + "_" + index;
while (SSLConfig.getKeyStore().containsAlias(alias)) {
......
src/web/index.jsp
View file @ ecdf85ea
......@@ -453,7 +453,7 @@
<tr>
<td><%= "0.0.0.0".equals(address.getHostName()) ? LocaleUtils.getLocalizedString("ports.all_ports") : address.getHostName() %></td>
<td><%= address.getPort() %></td>
<% if (LocalClientSession.getTLSPolicy() == Connection.TLSPolicy.disabled) { %>
<% if (LocalClientSession.getTLSPolicy() == org.jivesoftware.openfire.Connection.TLSPolicy.disabled) { %>
<td><img src="images/blank.gif" width="1" height="1" alt=""/></td>
<% } else { %>
<td><img src="images/lock.gif" width="16" height="16" border="0" alt=""/></td>
......@@ -510,7 +510,7 @@
<tr>
<td><%= "0.0.0.0".equals(address.getHostName()) ? LocaleUtils.getLocalizedString("ports.all_ports") : address.getHostName() %></td>
<td><%= address.getPort() %></td>
<% if (LocalConnectionMultiplexerSession.getTLSPolicy() == Connection.TLSPolicy.disabled) { %>
<% if (LocalConnectionMultiplexerSession.getTLSPolicy() == org.jivesoftware.openfire.Connection.TLSPolicy.disabled) { %>
<td><img src="images/blank.gif" width="1" height="1" alt=""></td>
<% } else { %>
<td><img src="images/lock.gif" width="16" height="16" border="0" alt=""/></td>
......
src/web/muc-room-edit-form.jsp
View file @ ecdf85ea
......@@ -11,7 +11,6 @@
<%@ page import="org.jivesoftware.util.ParamUtils,
java.text.DateFormat,
org.jivesoftware.admin.*,
java.util.*,
org.jivesoftware.openfire.muc.MUCRoom,
org.jivesoftware.openfire.forms.spi.*,
......@@ -119,7 +118,7 @@
}
else {
// Try to create a new room
JID address = new JID(webManager.getUser().getUsername(), webManager.getServerInfo().getName(), null);
JID address = new JID(webManager.getUser().getUsername(), webManager.getServerInfo().getXMPPDomain(), null);
try {
room = webManager.getMultiUserChatServer().getChatRoom(roomName, address);
// Check if the room was created concurrently by another user
......@@ -325,7 +324,7 @@
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr>
<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"/></td>
<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""/></td>
<td class="jive-icon-label">
<% if (errors.get("roomconfig_roomname") != null) { %>
......@@ -358,7 +357,7 @@
<div class="jive-success">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">
<% if (success) { %>
......@@ -526,7 +525,7 @@
</tr>
<tr>
<td><input type="checkbox" name="roomconfig_enablelogging" value="true" id="enablelogging" <% if ("true".equals(enableLog)) out.write("checked");%>>
<LABEL FOR="enablelogging"><fmt:message key="muc.room.edit.form.log" /></td>
<LABEL FOR="enablelogging"><fmt:message key="muc.room.edit.form.log" /></LABEL></td>
</tr>
</tbody>
</table>
......@@ -536,7 +535,6 @@
<td colspan="2"><input type="submit" name="Submit" value="<fmt:message key="global.save_changes" />">
<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />"></td>
</tr>
</tbody>
</table>
</form>
......
src/web/muc-server-props-edit-form.jsp
View file @ ecdf85ea
......@@ -31,11 +31,10 @@
<% // Get parameters
boolean save = request.getParameter("save") != null;
boolean success = request.getParameter("success") != null;
String name = ParamUtils.getParameter(request,"servername");
String muc = ParamUtils.getParameter(request,"mucname");
// Handle a save
Map errors = new HashMap();
Map<String,String> errors = new HashMap<String,String>();
if (save) {
// Make sure that the MUC Service is lower cased.
muc = muc.toLowerCase();
......@@ -51,11 +50,9 @@
}
}
else if(muc == null) {
name = webManager.getServerInfo().getName() == null ? "" : webManager.getServerInfo().getName();
muc = webManager.getMultiUserChatServer().getServiceName() == null ? "" : webManager.getMultiUserChatServer().getServiceName();
}
name = webManager.getServerInfo().getName();
if (errors.size() == 0 && muc == null) {
muc = webManager.getMultiUserChatServer().getServiceName();
}
......@@ -78,7 +75,7 @@
<div class="jive-success">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">
<fmt:message key="groupchat.service.properties.saved_successfully" /> <b><fmt:message key="global.restart" /></b> <fmt:message key="groupchat.service.properties.saved_successfully2" /> <a href="index.jsp"><fmt:message key="global.server_status" /></a>).
</td></tr>
......@@ -91,7 +88,7 @@
<div class="jive-error">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">
<fmt:message key="groupchat.service.properties.error_service_name" />
</td></tr>
......
src/web/plugin-admin.jsp
View file @ ecdf85ea
......@@ -18,7 +18,6 @@
<%@ page import="java.util.Collections" %>
<%@ page import="java.util.Comparator" %>
<%@ page import="java.util.List" %>
<%@ page import="org.apache.commons.fileupload.DiskFileUpload" %>
<%@ page import="java.io.*" %>
<%@ page import="org.jivesoftware.util.JiveGlobals" %>
<%@ page import="org.jivesoftware.util.Log" %>
......@@ -39,7 +38,6 @@
String reloadPlugin = ParamUtils.getParameter(request, "reloadplugin");
boolean showReadme = ParamUtils.getBooleanParameter(request, "showReadme", false);
boolean showChangelog = ParamUtils.getBooleanParameter(request, "showChangelog", false);
boolean showIcon = ParamUtils.getBooleanParameter(request, "showIcon", false);
boolean downloadRequested = request.getParameter("download") != null;
boolean uploadPlugin = request.getParameter("uploadplugin") != null;
String url = request.getParameter("url");
......@@ -601,7 +599,7 @@ else if ("false".equals(request.getParameter("uploadsuccess"))) { %>
<td colspan="8" align="center" class="update">
<table>
<tr>
<td id="<%= update.hashCode()%>-image"><img src="images/working-16x16.gif" border="0"/></td>
<td id="<%= update.hashCode()%>-image"><img src="images/working-16x16.gif" border="0" alt=""/></td>
<td id="<%= update.hashCode()%>-text" class="table-font"><fmt:message key="plugin.admin.updating" /></td>
</tr>
</table>
......
src/web/server-props.jsp
View file @ ecdf85ea
......@@ -99,8 +99,8 @@
}
if (errors.size() == 0) {
boolean needRestart = false;
if (!serverName.equals(server.getServerInfo().getName())) {
server.getServerInfo().setName(serverName);
if (!serverName.equals(server.getServerInfo().getXMPPDomain())) {
server.getServerInfo().setXMPPDomain(serverName);
needRestart = true;
}
connectionManager.setClientListenerPort(port);
......@@ -124,7 +124,7 @@
return;
}
} else {
serverName = server.getServerInfo().getName();
serverName = server.getServerInfo().getXMPPDomain();
sslEnabled = connectionManager.isClientSSLListenerEnabled();
port = connectionManager.getClientListenerPort();
sslPort = connectionManager.getClientSSLListenerPort();
......@@ -163,7 +163,7 @@
<div class="jive-success">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
<td class="jive-icon-label">
<% if ("true".equals(request.getParameter("restart"))) { %>
<fmt:message key="server.props.update" /> <b><fmt:message key="global.restart" /></b> <fmt:message key="server.props.update2" /> <a href="index.jsp"><fmt:message key="global.server_status" /></a>).
......
src/web/ssl-certificates.jsp
View file @ ecdf85ea
......@@ -47,7 +47,7 @@
}
if (generate) {
String domain = XMPPServer.getInstance().getServerInfo().getName();
String domain = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
try {
if (errors.containsKey("ioerror") && keyStore == null) {
keyStore = SSLConfig.initializeKeyStore();
......@@ -144,7 +144,7 @@
</tbody>
</table>
</div><br>
<% } else if (keyStore != null && keyStore.size() > 1 && !CertificateManager.isRSACertificate(SSLConfig.getKeyStore(), XMPPServer.getInstance().getServerInfo().getName())) { %>
<% } else if (keyStore != null && keyStore.size() > 1 && !CertificateManager.isRSACertificate(SSLConfig.getKeyStore(), XMPPServer.getInstance().getServerInfo().getXMPPDomain())) { %>
<div class="warning">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
......
src/web/ssl-signing-request.jsp
View file @ ecdf85ea
......@@ -61,7 +61,7 @@
if (errors.size() == 0) {
try {
// Regenerate self-sign certs whose subjectDN matches the issuerDN and set the new issuerDN
String domain = XMPPServer.getInstance().getServerInfo().getName();
String domain = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
StringBuilder issuerDN = new StringBuilder();
issuerDN.append("CN=").append(name);
issuerDN.append(", OU=").append(organizationalUnit);
......
src/web/user-delete.jsp
View file @ ecdf85ea
......@@ -51,7 +51,7 @@
// Delete the user
webManager.getUserManager().deleteUser(user);
// Delete the user's roster
JID userAddress = new JID(username, webManager.getServerInfo().getName(), null);
JID userAddress = new JID(username, webManager.getServerInfo().getXMPPDomain(), null);
// Delete the roster of the user
webManager.getRosterManager().deleteRoster(userAddress);
// Delete the user from all the Groups
......
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