This is an automated email from the ASF dual-hosted git repository.
ralaoui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-vysper.git
The following commit(s) were added to refs/heads/master by this push:
new 1767a66 Rename getServerEnitity to getServerEntity
1767a66 is described below
commit 1767a6621fe66349564d649851f564d9820e4b0e
Author: Réda Housni Alaoui <reda.housniala...@gmail.com>
AuthorDate: Sat Aug 24 15:23:33 2019 +0200
Rename getServerEnitity to getServerEntity
---
.../java/org/apache/vysper/xmpp/addressing/EntityUtils.java | 2 +-
.../org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java | 6 +++---
.../xmpp/modules/core/base/handler/RelayingIQHandler.java | 6 ++----
.../xep0050_adhoc_commands/AdhocCommandsModule.java | 2 +-
.../xep0077_inbandreg/InBandRegistrationHandler.java | 4 ++--
.../ServiceAdministrationModule.java | 2 +-
.../extension/xep0220_server_dailback/DbResultHandler.java | 2 +-
.../extension/xep0220_server_dailback/DbVerifyHandler.java | 2 +-
.../modules/servicediscovery/handler/DiscoInfoIQHandler.java | 2 +-
.../modules/servicediscovery/handler/DiscoItemIQHandler.java | 2 +-
.../java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java | 2 +-
.../org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java | 2 +-
.../apache/vysper/xmpp/server/AbstractSessionContext.java | 2 +-
.../vysper/xmpp/server/DefaultServerRuntimeContext.java | 6 +++---
.../org/apache/vysper/xmpp/server/ServerRuntimeContext.java | 2 +-
.../vysper/xmpp/server/s2s/DefaultXMPPServerConnector.java | 12 ++++++------
.../org/apache/vysper/xmpp/server/s2s/FeaturesHandler.java | 2 +-
.../vysper/xmpp/delivery/StanzaRelayBrokerTestCase.java | 2 +-
.../xep007_inbandreg/InBandRegistrationHandlerTestCase.java | 2 +-
.../xep0220_server_dailback/DbVerifyHandlerTestCase.java | 2 +-
.../servicediscovery/handler/DiscoInfoIQHandlerTestCase.java | 2 +-
.../vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java | 8 ++++----
.../s2s/DefaultXMPPServerConnectorRegistryTestCase.java | 2 +-
.../vysper/xmpp/server/s2s/FeaturesHandlerTestCase.java | 2 +-
.../vysper/xmpp/server/s2s/TlsProceedHandlerTestCase.java | 2 +-
.../vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java | 2 +-
.../extension/xep0060_pubsub/PublishSubscribeModule.java | 2 +-
.../xmpp/extension/xep0065_socks/Socks5ModuleTest.java | 2 +-
.../xmpp/extension/xep0124/BoshBackedSessionContextTest.java | 2 +-
.../vysper/xmpp/extension/xep0124/BoshHandlerTest.java | 2 +-
30 files changed, 44 insertions(+), 46 deletions(-)
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/addressing/EntityUtils.java
b/server/core/src/main/java/org/apache/vysper/xmpp/addressing/EntityUtils.java
index 92cd722..2401848 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/addressing/EntityUtils.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/addressing/EntityUtils.java
@@ -54,7 +54,7 @@ public class EntityUtils {
*/
public static Entity createComponentDomain(String subdomain,
ServerRuntimeContext serverRuntimeContext) {
try {
- return EntityImpl.parse(subdomain + "." +
serverRuntimeContext.getServerEnitity().getDomain());
+ return EntityImpl.parse(subdomain + "." +
serverRuntimeContext.getServerEntity().getDomain());
} catch (EntityFormatException e) {
// only happens when server entity is bad.
throw new RuntimeException("could not create component domain", e);
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
b/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
index 0ffe5eb..7270b73 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
@@ -75,9 +75,9 @@ public class StanzaRelayBroker implements StanzaRelay {
}
boolean toServerTLD = receiver == null
- || (!receiver.isNodeSet() &&
EntityUtils.isAddressingServer(receiver,
serverRuntimeContext.getServerEnitity()));
+ || (!receiver.isNodeSet() &&
EntityUtils.isAddressingServer(receiver,
serverRuntimeContext.getServerEntity()));
- boolean toComponent = receiver != null &&
EntityUtils.isAddressingServerComponent(receiver,
serverRuntimeContext.getServerEnitity());
+ boolean toComponent = receiver != null &&
EntityUtils.isAddressingServerComponent(receiver,
serverRuntimeContext.getServerEntity());
if (toServerTLD) {
// TODO handle by server
@@ -91,7 +91,7 @@ public class StanzaRelayBroker implements StanzaRelay {
boolean relayToExternal =
serverRuntimeContext.getServerFeatures().isRelayingToFederationServers();
- if (EntityUtils.isAddressingServer(receiver,
serverRuntimeContext.getServerEnitity()) || toComponent) {
+ if (EntityUtils.isAddressingServer(receiver,
serverRuntimeContext.getServerEntity()) || toComponent) {
internalRelay.relay(receiver, stanza, deliveryFailureStrategy);
} else {
if (!relayToExternal)
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
index 2fad3dc..e3e5ebe 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
@@ -34,8 +34,6 @@ import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
import org.apache.vysper.xmpp.stanza.StanzaErrorType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.Collections;
import java.util.List;
@@ -64,7 +62,7 @@ public class RelayingIQHandler extends IQHandler {
if (outboundStanza) {
try {
- boolean toComponent =
EntityUtils.isAddressingServerComponent(to,
serverRuntimeContext.getServerEnitity());
+ boolean toComponent =
EntityUtils.isAddressingServerComponent(to,
serverRuntimeContext.getServerEntity());
Entity from = stanza.getFrom();
if (from == null || !from.isResourceSet()) {
@@ -98,7 +96,7 @@ public class RelayingIQHandler extends IQHandler {
Entity from = stanza.getFrom();
- boolean fromComponent = (from != null) &&
EntityUtils.isAddressingServerComponent(from,
serverRuntimeContext.getServerEnitity());
+ boolean fromComponent = (from != null) &&
EntityUtils.isAddressingServerComponent(from,
serverRuntimeContext.getServerEntity());
// determine if 'from' is a component or a matching subscription...
boolean isToContact = false;
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandsModule.java
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandsModule.java
index 8073240..00e1a4c 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandsModule.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandsModule.java
@@ -117,7 +117,7 @@ public class AdhocCommandsModule extends
DefaultDiscoAwareModule
List<Item> items = new ArrayList<Item>();
for (CommandInfo commandInfo : allCommandInfos) {
Entity jid = commandInfo.getJid();
- if (jid == null) jid = serverRuntimeContext.getServerEnitity();
+ if (jid == null) jid = serverRuntimeContext.getServerEntity();
String node = commandInfo.getNode();
if (node == null) {
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0077_inbandreg/InBandRegistrationHandler.java
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0077_inbandreg/InBandRegistrationHandler.java
index 1f39b8a..55216fe 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0077_inbandreg/InBandRegistrationHandler.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0077_inbandreg/InBandRegistrationHandler.java
@@ -120,11 +120,11 @@ public class InBandRegistrationHandler extends
DefaultIQHandler {
Entity user;
if(username.contains("@")) {
user = EntityImpl.parse(username);
-
if(!EntityUtils.isAddressingServer(serverRuntimeContext.getServerEnitity(),
user)) {
+
if(!EntityUtils.isAddressingServer(serverRuntimeContext.getServerEntity(),
user)) {
throw new XMLSemanticError("Username must be in the
same domain as the server");
}
} else {
- user = EntityImpl.parse(username + "@" +
serverRuntimeContext.getServerEnitity());
+ user = EntityImpl.parse(username + "@" +
serverRuntimeContext.getServerEntity());
}
if(sessionContext.getState().equals(SessionState.AUTHENTICATED)) {
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java
index 7bd7754..93886ef 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java
@@ -146,7 +146,7 @@ public class ServiceAdministrationModule extends
DefaultModule implements AdhocC
if (commandNode.equals(COMMAND_NODE_ADD_USER)) {
if (accountManagement == null) return null;
- return new AddUserCommandHandler(accountManagement,
Arrays.asList(serverRuntimeContext.getServerEnitity().getDomain()));
+ return new AddUserCommandHandler(accountManagement,
Arrays.asList(serverRuntimeContext.getServerEntity().getDomain()));
} else if (commandNode.equals(COMMAND_CHANGE_USER_PASSWORD)) {
return new ChangeUserPasswordCommandHandler(accountManagement,
null);
} else if (commandNode.equals(COMMAND_GET_ONLINE_USERS_NUM)) {
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbResultHandler.java
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbResultHandler.java
index 8f463fd..2392771 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbResultHandler.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbResultHandler.java
@@ -75,7 +75,7 @@ public class DbResultHandler implements StanzaHandler {
String streamId = sessionContext.getSessionId();
String dailbackId = stanza.getInnerText().getText();
Entity receiving =
EntityImpl.parseUnchecked(stanza.getAttributeValue("from"));
- Entity originating = serverRuntimeContext.getServerEnitity();
+ Entity originating = serverRuntimeContext.getServerEntity();
try {
XMPPServerConnector connector =
serverRuntimeContext.getServerConnectorRegistry().connectForDialback(receiving,
sessionContext, sessionStateHolder);
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandler.java
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandler.java
index 2a9746c..f6bea28 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandler.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandler.java
@@ -66,7 +66,7 @@ public class DbVerifyHandler implements StanzaHandler {
String type = stanza.getAttributeValue("type");
String id = stanza.getAttributeValue("id");
Entity receiving =
EntityImpl.parseUnchecked(stanza.getAttributeValue("from"));
- Entity originating = serverRuntimeContext.getServerEnitity();
+ Entity originating = serverRuntimeContext.getServerEntity();
if(type == null) {
// acting as a Authoritative server
// getting asked for verification from the Receiving server
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
index 5d8942f..2db8685 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
@@ -91,7 +91,7 @@ public class DiscoInfoIQHandler extends DefaultIQHandler {
Entity to = stanza.getTo();
boolean isServerInfoRequest = false;
boolean isComponentInfoRequest = false;
- Entity serverEntity = serverRuntimeContext.getServerEnitity();
+ Entity serverEntity = serverRuntimeContext.getServerEntity();
if (to == null || to.equals(serverEntity)) {
isServerInfoRequest = true; // this can only be meant to query the
server
} else if (serverRuntimeContext.getComponentStanzaProcessor(to) !=
null) {
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
index 9763eb0..30b6208 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
@@ -89,7 +89,7 @@ public class DiscoItemIQHandler extends DefaultIQHandler {
if (to == null) {
isServerInfoRequest = true; // this can only be meant to query the
server
} else if (!to.isNodeSet()) {
- isServerInfoRequest =
serverRuntimeContext.getServerEnitity().equals(to);
+ isServerInfoRequest =
serverRuntimeContext.getServerEntity().equals(to);
isComponentInfoRequest =
serverRuntimeContext.getComponentStanzaProcessor(to) != null;
if (!isServerInfoRequest && !isComponentInfoRequest) {
return
Collections.singletonList(ServerErrorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND,
stanza,
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
index f9a229d..c8496a7 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
@@ -142,7 +142,7 @@ public class ProtocolWorker implements StanzaProcessor {
coreStanza, StanzaErrorType.MODIFY, "Missing to
attribute", null, null);
ResponseWriter.writeResponse(sessionContext, errorStanza);
return;
- } else
if(!EntityUtils.isAddressingServer(serverRuntimeContext.getServerEnitity(),
to)) {
+ } else
if(!EntityUtils.isAddressingServer(serverRuntimeContext.getServerEntity(), to))
{
// TODO what's the appropriate error?
StreamErrorCondition.IMPROPER_ADDRESSING?
Stanza errorStanza =
ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST,
coreStanza, StanzaErrorType.MODIFY, "Invalid to
attribute", null, null);
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
index 529f225..9820487 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
@@ -110,7 +110,7 @@ public class StanzaHandlerLookup extends
AbstractStanzaHandlerLookup {
StanzaHandler handlerForElement = null;
Entity to = stanza.getTo();
- Entity serverEntity = (serverRuntimeContext == null) ? null :
serverRuntimeContext.getServerEnitity();
+ Entity serverEntity = (serverRuntimeContext == null) ? null :
serverRuntimeContext.getServerEntity();
boolean isAddressedToServerOrComponent = (to == null ||
(!to.isNodeSet() && !to.isResourceSet()));
boolean isAddressedToComponent = (to != null) &&
isAddressedToServerOrComponent && serverEntity != null
&& (!serverEntity.equals(to));
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java
b/server/core/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java
index cdb7181..20a3f4f 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java
@@ -66,7 +66,7 @@ public abstract class AbstractSessionContext implements
SessionContext {
public AbstractSessionContext(ServerRuntimeContext serverRuntimeContext,
SessionStateHolder sessionStateHolder) {
this.serverRuntimeContext = serverRuntimeContext;
sessionId = serverRuntimeContext.getNextSessionId();
- serverEntity = serverRuntimeContext.getServerEnitity();
+ serverEntity = serverRuntimeContext.getServerEntity();
xmlLang = serverRuntimeContext.getDefaultXMLLang();
this.sessionStateHolder = sessionStateHolder;
}
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java
b/server/core/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java
index 56a7475..e9e5c69 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java
@@ -178,7 +178,7 @@ public class DefaultServerRuntimeContext implements
ServerRuntimeContext, Module
return sessionIdGenerator.create();
}
- public Entity getServerEnitity() {
+ public Entity getServerEntity() {
return serverEntity;
}
@@ -373,8 +373,8 @@ public class DefaultServerRuntimeContext implements
ServerRuntimeContext, Module
}
public StanzaProcessor getComponentStanzaProcessor(Entity entity) {
- String serverDomain = getServerEnitity().getDomain();
- if (!EntityUtils.isAddressingServerComponent(entity,
getServerEnitity())) {
+ String serverDomain = getServerEntity().getDomain();
+ if (!EntityUtils.isAddressingServerComponent(entity,
getServerEntity())) {
return null;
}
String domain = entity.getDomain();
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerRuntimeContext.java
b/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerRuntimeContext.java
index 13a4c90..8715d4e 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerRuntimeContext.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerRuntimeContext.java
@@ -49,7 +49,7 @@ public interface ServerRuntimeContext {
String getNextSessionId();
- Entity getServerEnitity();
+ Entity getServerEntity();
String getDefaultXMLLang();
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnector.java
b/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnector.java
index 6287769..d4fd051 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnector.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnector.java
@@ -229,10 +229,10 @@ public class DefaultXMPPServerConnector implements
XmppPingListener, XMPPServerC
String version = stanza.getAttributeValue("version");
if(version == null) {
// old protocol, assume dialback
- String dailbackId = new
DialbackIdGenerator().generate(remoteServer,
serverRuntimeContext.getServerEnitity(), sessionContext.getSessionId());
+ String dailbackId = new
DialbackIdGenerator().generate(remoteServer,
serverRuntimeContext.getServerEntity(), sessionContext.getSessionId());
Stanza dbResult = new StanzaBuilder("result",
NamespaceURIs.JABBER_SERVER_DIALBACK, "db")
- .addAttribute("from",
serverRuntimeContext.getServerEnitity().getDomain())
+ .addAttribute("from",
serverRuntimeContext.getServerEntity().getDomain())
.addAttribute("to", remoteServer.getDomain())
.addText(dailbackId)
.build();
@@ -256,7 +256,7 @@ public class DefaultXMPPServerConnector implements
XmppPingListener, XMPPServerC
return;
}
// only deliver messages to directly server directly
- if
(!serverRuntimeContext.getServerEnitity().equals(stanza.getTo())) {
+ if
(!serverRuntimeContext.getServerEntity().equals(stanza.getTo())) {
LOG.info("not handling messages to clients here received from
{} to {}", remoteServer, stanza.getTo());
sessionContext.close();
return;
@@ -275,7 +275,7 @@ public class DefaultXMPPServerConnector implements
XmppPingListener, XMPPServerC
sessionContext.setIsReopeningXMLStream();
- Stanza opener = new
ServerResponses().getStreamOpenerForServerConnector(serverRuntimeContext.getServerEnitity(),
remoteServer, XMPPVersion.VERSION_1_0, sessionContext);
+ Stanza opener = new
ServerResponses().getStreamOpenerForServerConnector(serverRuntimeContext.getServerEntity(),
remoteServer, XMPPVersion.VERSION_1_0, sessionContext);
sessionContext.write(opener);
}
@@ -284,7 +284,7 @@ public class DefaultXMPPServerConnector implements
XmppPingListener, XMPPServerC
LOG.info("XMPP server session opened to {}", remoteServer);
sessionContext = new MinaBackedSessionContext(serverRuntimeContext,
sessionStateHolder, session);
sessionStateHolder.setState(SessionState.INITIATED);
- Stanza opener = new
ServerResponses().getStreamOpenerForServerConnector(serverRuntimeContext.getServerEnitity(),
remoteServer, XMPPVersion.VERSION_1_0, sessionContext);
+ Stanza opener = new
ServerResponses().getStreamOpenerForServerConnector(serverRuntimeContext.getServerEntity(),
remoteServer, XMPPVersion.VERSION_1_0, sessionContext);
sessionContext.write(opener);
}
@@ -341,7 +341,7 @@ public class DefaultXMPPServerConnector implements
XmppPingListener, XMPPServerC
public void run() {
XmppPingModule pingModule =
serverRuntimeContext.getModule(XmppPingModule.class);
LOG.info("pinging federated XMPP server {}", remoteServer);
- pingModule.ping(DefaultXMPPServerConnector.this,
serverRuntimeContext.getServerEnitity(), remoteServer, pingTimeout,
DefaultXMPPServerConnector.this);
+ pingModule.ping(DefaultXMPPServerConnector.this,
serverRuntimeContext.getServerEntity(), remoteServer, pingTimeout,
DefaultXMPPServerConnector.this);
}
}
}
diff --git
a/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandler.java
b/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandler.java
index dfba3ef..e8b0a67 100644
---
a/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandler.java
+++
b/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandler.java
@@ -70,7 +70,7 @@ public class FeaturesHandler implements StanzaHandler {
return new ResponseStanzaContainerImpl(startTlsStanza);
} else if(dialbackSupported(stanza)) {
- Entity originating = serverRuntimeContext.getServerEnitity();
+ Entity originating = serverRuntimeContext.getServerEntity();
String dailbackId = new
DialbackIdGenerator().generate(otherServer, originating,
sessionContext.getSessionId());
diff --git
a/server/core/src/test/java/org/apache/vysper/xmpp/delivery/StanzaRelayBrokerTestCase.java
b/server/core/src/test/java/org/apache/vysper/xmpp/delivery/StanzaRelayBrokerTestCase.java
index 8bc04b5..c40baa8 100644
---
a/server/core/src/test/java/org/apache/vysper/xmpp/delivery/StanzaRelayBrokerTestCase.java
+++
b/server/core/src/test/java/org/apache/vysper/xmpp/delivery/StanzaRelayBrokerTestCase.java
@@ -61,7 +61,7 @@ public class StanzaRelayBrokerTestCase extends Mockito {
@Before
public void before() {
- when(serverRuntimeContext.getServerEnitity()).thenReturn(SERVER);
+ when(serverRuntimeContext.getServerEntity()).thenReturn(SERVER);
when(serverRuntimeContext.getServerFeatures()).thenReturn(serverFeatures);
broker.setExternalRelay(externalRelay);
diff --git
a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep007_inbandreg/InBandRegistrationHandlerTestCase.java
b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep007_inbandreg/InBandRegistrationHandlerTestCase.java
index f67f691..fa395bf 100644
---
a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep007_inbandreg/InBandRegistrationHandlerTestCase.java
+++
b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep007_inbandreg/InBandRegistrationHandlerTestCase.java
@@ -59,7 +59,7 @@ public class InBandRegistrationHandlerTestCase {
@Before
public void before() {
Mockito.when(serverRuntimeContext.getStorageProvider(AccountManagement.class)).thenReturn(accountManagement);
-
Mockito.when(serverRuntimeContext.getServerEnitity()).thenReturn(SERVER);
+
Mockito.when(serverRuntimeContext.getServerEntity()).thenReturn(SERVER);
Mockito.when(accountManagement.verifyAccountExists(EXISTING)).thenReturn(true);
Mockito.when(sessionContext.getState()).thenReturn(SessionState.STARTED);
}
diff --git
a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandlerTestCase.java
b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandlerTestCase.java
index f7118ac..24c202c 100644
---
a/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandlerTestCase.java
+++
b/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0220_server_dailback/DbVerifyHandlerTestCase.java
@@ -59,7 +59,7 @@ public class DbVerifyHandlerTestCase extends TestCase {
private void assertExecuteVerification(String token, String expectedType) {
ServerRuntimeContext serverRuntimeContext =
Mockito.mock(ServerRuntimeContext.class);
- Mockito.when(serverRuntimeContext.getServerEnitity()).thenReturn(TO);
+ Mockito.when(serverRuntimeContext.getServerEntity()).thenReturn(TO);
Stanza stanza = new StanzaBuilder("verify",
NamespaceURIs.JABBER_SERVER_DIALBACK)
.addAttribute("from", FROM.getFullQualifiedName())
diff --git
a/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java
b/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java
index 9710db2..a6f8309 100644
---
a/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java
+++
b/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java
@@ -154,7 +154,7 @@ public class DiscoInfoIQHandlerTestCase extends Mockito {
when(serverRuntimeContext.getServerRuntimeContextService(ServiceDiscoveryRequestListenerRegistry.SERVICE_DISCOVERY_REQUEST_LISTENER_REGISTRY))
.thenReturn(serviceCollector);
- when(serverRuntimeContext.getServerEnitity()).thenReturn(SERVER);
+ when(serverRuntimeContext.getServerEntity()).thenReturn(SERVER);
when(serverRuntimeContext.getStanzaRelay()).thenReturn(stanzaRelay);
when(sessionContext.getResponseWriter()).thenReturn(stanzaWriter);
}
diff --git
a/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
b/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
index 6a89e74..5abac0e 100644
---
a/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
+++
b/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
@@ -170,7 +170,7 @@ public class ProtocolWorkerProcessTestCase extends TestCase
{
public void testDetectWrongFromAddress() throws XMLSemanticError {
- Entity server =
sessionContext.getServerRuntimeContext().getServerEnitity();
+ Entity server =
sessionContext.getServerRuntimeContext().getServerEntity();
sessionContext.setSessionState(SessionState.AUTHENTICATED);
// the session is running for 'mark'
sessionContext.setInitiatingEntity(new EntityImpl("mark",
server.getDomain(), null));
@@ -198,7 +198,7 @@ public class ProtocolWorkerProcessTestCase extends TestCase
{
public void testAllowProperFromResourceId() throws XMLSemanticError,
BindException {
- Entity server =
sessionContext.getServerRuntimeContext().getServerEnitity();
+ Entity server =
sessionContext.getServerRuntimeContext().getServerEntity();
sessionContext.setSessionState(SessionState.AUTHENTICATED);
// the session is running for 'charlotte'
sessionContext.setInitiatingEntity(new EntityImpl("charlotte",
server.getDomain(), null));
@@ -221,7 +221,7 @@ public class ProtocolWorkerProcessTestCase extends TestCase
{
public void testDetectWrongFromResourceId() throws XMLSemanticError,
BindException {
- Entity server =
sessionContext.getServerRuntimeContext().getServerEnitity();
+ Entity server =
sessionContext.getServerRuntimeContext().getServerEntity();
sessionContext.setSessionState(SessionState.AUTHENTICATED);
// the session is running for 'charlotte'
sessionContext.setInitiatingEntity(new EntityImpl("charlotte",
server.getDomain(), null));
@@ -256,7 +256,7 @@ public class ProtocolWorkerProcessTestCase extends TestCase
{
// if there is more than one resource bound in the same session, from
must come
// fully qualified, e.g. from="cli...@vysper.org/resourceId"
- Entity server =
sessionContext.getServerRuntimeContext().getServerEnitity();
+ Entity server =
sessionContext.getServerRuntimeContext().getServerEntity();
sessionContext.setSessionState(SessionState.AUTHENTICATED);
// the session is running for 'lea'
sessionContext.setInitiatingEntity(new EntityImpl("lea",
server.getDomain(), null));
diff --git
a/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnectorRegistryTestCase.java
b/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnectorRegistryTestCase.java
index 713481b..8872c13 100644
---
a/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnectorRegistryTestCase.java
+++
b/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/DefaultXMPPServerConnectorRegistryTestCase.java
@@ -50,7 +50,7 @@ public class DefaultXMPPServerConnectorRegistryTestCase {
public void before() {
SSLContext sslContext = Mockito.mock(SSLContext.class);
Mockito.when(serverRuntimeContext.getSslContext()).thenReturn(sslContext);
- Mockito.when(serverRuntimeContext.getServerEnitity()).thenReturn(TO);
+ Mockito.when(serverRuntimeContext.getServerEntity()).thenReturn(TO);
Mockito.when(sessionContext.getInitiatingEntity()).thenReturn(FROM);
Mockito.when(sessionContext.getSessionId()).thenReturn("session-id");
diff --git
a/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandlerTestCase.java
b/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandlerTestCase.java
index de1b133..c165032 100644
---
a/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandlerTestCase.java
+++
b/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/FeaturesHandlerTestCase.java
@@ -54,7 +54,7 @@ public class FeaturesHandlerTestCase {
public void before() {
SSLContext sslContext = Mockito.mock(SSLContext.class);
Mockito.when(serverRuntimeContext.getSslContext()).thenReturn(sslContext);
- Mockito.when(serverRuntimeContext.getServerEnitity()).thenReturn(TO);
+ Mockito.when(serverRuntimeContext.getServerEntity()).thenReturn(TO);
Mockito.when(sessionContext.getInitiatingEntity()).thenReturn(FROM);
Mockito.when(sessionContext.getSessionId()).thenReturn("session-id");
diff --git
a/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/TlsProceedHandlerTestCase.java
b/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/TlsProceedHandlerTestCase.java
index 486d75a..a40b2a8 100644
---
a/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/TlsProceedHandlerTestCase.java
+++
b/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/TlsProceedHandlerTestCase.java
@@ -53,7 +53,7 @@ public class TlsProceedHandlerTestCase {
public void before() {
SSLContext sslContext = Mockito.mock(SSLContext.class);
Mockito.when(serverRuntimeContext.getSslContext()).thenReturn(sslContext);
- Mockito.when(serverRuntimeContext.getServerEnitity()).thenReturn(TO);
+ Mockito.when(serverRuntimeContext.getServerEntity()).thenReturn(TO);
Mockito.when(sessionContext.getInitiatingEntity()).thenReturn(FROM);
Mockito.when(sessionContext.getSessionId()).thenReturn("session-id");
diff --git
a/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
b/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
index 1aaa388..8ce6f5b 100644
---
a/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
+++
b/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
@@ -192,7 +192,7 @@ public class MUCModule extends DefaultDiscoAwareModule
implements Component, Com
if (fullDomain.equals(to)) {
List<Item> conferenceItems = conference.getItemsFor(request);
return conferenceItems;
- } else if (serverRuntimeContext.getServerEnitity().equals(to)) {
+ } else if (serverRuntimeContext.getServerEntity().equals(to)) {
List<Item> componentItem = new ArrayList<Item>();
componentItem.add(new Item(fullDomain));
return componentItem;
diff --git
a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
index 9ae9448..6210167 100644
---
a/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
+++
b/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
@@ -210,7 +210,7 @@ public class PublishSubscribeModule extends
DefaultDiscoAwareModule implements C
List<Item> items = null;
if (request.getNode() == null || request.getNode().length() == 0) {
- if
(serverRuntimeContext.getServerEnitity().equals(request.getTo())) {
+ if
(serverRuntimeContext.getServerEntity().equals(request.getTo())) {
// top level item request. for example return entry for
"pubsub.vysper.org" on request for "vysper.org"
List<Item> componentItem = new ArrayList<Item>();
componentItem.add(new Item(fullDomain));
diff --git
a/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5ModuleTest.java
b/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5ModuleTest.java
index de8af6b..ec611b0 100644
---
a/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5ModuleTest.java
+++
b/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5ModuleTest.java
@@ -63,7 +63,7 @@ public class Socks5ModuleTest extends Mockito {
@Before
public void before() {
- when(serverRuntimeContext.getServerEnitity()).thenReturn(SERVER);
+ when(serverRuntimeContext.getServerEntity()).thenReturn(SERVER);
module.setConnectionsRegistry(connectionsRegistry);
}
diff --git
a/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshBackedSessionContextTest.java
b/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshBackedSessionContextTest.java
index ff40695..750f4ca 100644
---
a/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshBackedSessionContextTest.java
+++
b/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshBackedSessionContextTest.java
@@ -59,7 +59,7 @@ public class BoshBackedSessionContextTest {
boshHandler = mocksControl.createMock(BoshHandler.class);
serverRuntimeContext =
mocksControl.createMock(ServerRuntimeContext.class);
expect(serverRuntimeContext.getNextSessionId()).andReturn("123");
- expect(serverRuntimeContext.getServerEnitity()).andReturn(new
EntityImpl(null, "vysper.org", null));
+ expect(serverRuntimeContext.getServerEntity()).andReturn(new
EntityImpl(null, "vysper.org", null));
expect(serverRuntimeContext.getDefaultXMLLang()).andReturn("en");
inactivityChecker = new InactivityChecker(boshHandler);
// inactivityChecker.start();
diff --git
a/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandlerTest.java
b/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandlerTest.java
index 60181d4..e41f759 100644
---
a/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandlerTest.java
+++
b/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandlerTest.java
@@ -78,7 +78,7 @@ public class BoshHandlerTest {
// test session creation
HttpServletRequest httpServletRequest =
mocksControl.createMock(HttpServletRequest.class);
expect(serverRuntimeContext.getNextSessionId()).andReturn("200");
- expect(serverRuntimeContext.getServerEnitity()).andReturn(new
EntityImpl(null, "vysper.org", null));
+ expect(serverRuntimeContext.getServerEntity()).andReturn(new
EntityImpl(null, "vysper.org", null));
expect(serverRuntimeContext.getDefaultXMLLang()).andReturn("en");
AsyncContext asyncContext =
mocksControl.createMock(AsyncContext.class);
expect(httpServletRequest.startAsync()).andReturn(asyncContext).atLeastOnce();
