You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2011/01/08 21:53:57 UTC
svn commit: r1056796 - in /mina/vysper/trunk/server:
core/src/main/java/org/apache/vysper/mina/
core/src/main/java/org/apache/vysper/xmpp/delivery/failure/
core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/
core/src/main/java/org/apac...
Author: ngn
Date: Sat Jan 8 20:53:56 2011
New Revision: 1056796
URL: http://svn.apache.org/viewvc?rev=1056796&view=rev
Log:
Move ServerErrorResponses to static util rather than a singleton
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/failure/ReturnErrorToSenderFailureStrategy.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultIQHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultMessageHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultPresenceHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/XMPPCoreStanzaHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailabilityHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbstractSASLHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandIQHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseWriter.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ServiceUnavailableStanzaErrorHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerErrorResponsesTestCase.java
mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/WebSocketBackedSessionContext.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCIqAdminHandler.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java Sat Jan 8 20:53:56 2011
@@ -131,14 +131,14 @@ public class XmppIoHandlerAdapter implem
Stanza errorStanza;
if(throwable.getCause() != null && throwable.getCause() instanceof SAXParseException) {
logger.info("Client sent not well-formed XML, closing session: {}", throwable);
- errorStanza = ServerErrorResponses.getInstance().getStreamError(StreamErrorCondition.XML_NOT_WELL_FORMED,
+ errorStanza = ServerErrorResponses.getStreamError(StreamErrorCondition.XML_NOT_WELL_FORMED,
sessionContext.getXMLLang(), "Stanza not well-formed", null);
} else if(throwable instanceof WriteToClosedSessionException) {
// ignore
return;
} else {
logger.warn("error caught on transportation layer: {}", throwable);
- errorStanza = ServerErrorResponses.getInstance().getStreamError(StreamErrorCondition.UNDEFINED_CONDITION,
+ errorStanza = ServerErrorResponses.getStreamError(StreamErrorCondition.UNDEFINED_CONDITION,
sessionContext.getXMLLang(), "Unknown error", null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/failure/ReturnErrorToSenderFailureStrategy.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/failure/ReturnErrorToSenderFailureStrategy.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/failure/ReturnErrorToSenderFailureStrategy.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/failure/ReturnErrorToSenderFailureStrategy.java Sat Jan 8 20:53:56 2011
@@ -80,7 +80,7 @@ public class ReturnErrorToSenderFailureS
}
if (deliveryExceptions == null) {
- XMPPCoreStanza error = XMPPCoreStanza.getWrapper(ServerErrorResponses.getInstance().getStanzaError(
+ XMPPCoreStanza error = XMPPCoreStanza.getWrapper(ServerErrorResponses.getStanzaError(
stanzaErrorCondition, failedCoreStanza, errorType, "stanza could not be delivered", "en", null));
stanzaRelay.relay(error.getTo(), error, IgnoreFailureStrategy.IGNORE_FAILURE_STRATEGY);
} else if (deliveryExceptions.size() == 1) {
@@ -118,7 +118,7 @@ public class ReturnErrorToSenderFailureS
// RFC3921bis#10.4.3: return remote server error to sender
SmartDeliveryException smartDeliveryException = (SmartDeliveryException) deliveryException;
XMPPCoreStanza error = XMPPCoreStanza
- .getWrapper(ServerErrorResponses.getInstance().getStanzaError(
+ .getWrapper(ServerErrorResponses.getStanzaError(
smartDeliveryException.getStanzaErrorCondition(), failedCoreStanza,
smartDeliveryException.getStanzaErrorType(), smartDeliveryException.getErrorText(),
"en", null));
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultIQHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultIQHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultIQHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultIQHandler.java Sat Jan 8 20:53:56 2011
@@ -80,7 +80,7 @@ public abstract class DefaultIQHandler e
SessionContext sessionContext) {
logger.warn("IQ 'result' stanza not handled by {}: {}", getClass().getCanonicalName(), DenseStanzaLogRenderer
.render(stanza));
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
StanzaErrorType.CANCEL, "iq stanza of type 'result' is not handled for this namespace",
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
@@ -88,7 +88,7 @@ public abstract class DefaultIQHandler e
protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
logger.warn("IQ 'get' stanza not handled by {}: {}", getClass().getCanonicalName(), DenseStanzaLogRenderer
.render(stanza));
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
StanzaErrorType.CANCEL, "iq stanza of type 'get' is not handled for this namespace",
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
@@ -102,7 +102,7 @@ public abstract class DefaultIQHandler e
protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
logger.warn("IQ 'set' stanza not handled by {}: {}", getClass().getCanonicalName(), DenseStanzaLogRenderer
.render(stanza));
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
StanzaErrorType.CANCEL, "iq stanza of type 'set' is not handled for this namespace",
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultMessageHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultMessageHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultMessageHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultMessageHandler.java Sat Jan 8 20:53:56 2011
@@ -73,7 +73,7 @@ public class DefaultMessageHandler exten
protected Stanza executeMessageLogic(MessageStanza stanza, ServerRuntimeContext serverRuntimeContext,
SessionContext sessionContext) {
// this is default behavior and must be replaced by overrider
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
StanzaErrorType.CANCEL, null, null, null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultPresenceHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultPresenceHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultPresenceHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultPresenceHandler.java Sat Jan 8 20:53:56 2011
@@ -73,7 +73,7 @@ public class DefaultPresenceHandler exte
protected Stanza executePresenceLogic(PresenceStanza stanza, ServerRuntimeContext serverRuntimeContext,
SessionContext sessionContext) {
// this is default behavior and must be replaced by overrider
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
StanzaErrorType.CANCEL, null, null, null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java Sat Jan 8 20:53:56 2011
@@ -79,7 +79,7 @@ public class IQHandler extends XMPPCoreS
// rfc3920/9.2.3/1.
String id = stanza.getID();
if (id == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
StanzaErrorType.MODIFY, "iq-stanza requires 'id' attribute to be present",
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
@@ -88,7 +88,7 @@ public class IQHandler extends XMPPCoreS
IQStanzaType iqType = stanza.getIQType();
if (iqType == null) {
// missing or unknown type
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
StanzaErrorType.MODIFY, "iq-stanza requires a valid 'type' attribute to be present",
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
@@ -97,7 +97,7 @@ public class IQHandler extends XMPPCoreS
// assure, set or get contain one and only one element
// rfc3920/9.2.3/5.
if (!coreStanza.getVerifier().subElementsPresentExact(1)) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
StanzaErrorType.MODIFY, "iq stanza of type get or set require exactly one child",
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
@@ -105,7 +105,7 @@ public class IQHandler extends XMPPCoreS
// assure, result contains zero or one element
// rfc3920/9.2.3/6.
if (!coreStanza.getVerifier().subElementsPresentAtMost(1)) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
StanzaErrorType.MODIFY, "iq stanza of type result may not have more than one child",
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
@@ -129,7 +129,7 @@ public class IQHandler extends XMPPCoreS
protected Stanza executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, boolean outboundStanza,
SessionContext sessionContext) {
// this is default behavior and must be replaced by overrider
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED, stanza,
StanzaErrorType.CANCEL, null, null, null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java Sat Jan 8 20:53:56 2011
@@ -54,7 +54,7 @@ public class RelayingIQHandler extends I
// but we might will relay to a component (chat.vysper.org)
Entity to = stanza.getTo();
if (to == null || to.equals(sessionContext.getServerJID())) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FEATURE_NOT_IMPLEMENTED,
stanza, StanzaErrorType.CANCEL, null, null, null);
}
@@ -82,7 +82,7 @@ public class RelayingIQHandler extends I
}
// deny relaying if neither isFromContact nor toComponent
if (!isFromContact && !toComponent) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE,
stanza, StanzaErrorType.CANCEL, null, null, null);
}
@@ -110,7 +110,7 @@ public class RelayingIQHandler extends I
}
// ...otherwise relaying is denied
if (!isToContact && !fromComponent) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE,
stanza, StanzaErrorType.CANCEL, null, null, null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java Sat Jan 8 20:53:56 2011
@@ -134,7 +134,7 @@ public class StreamStartHandler implemen
try {
EntityImpl.parse(toValue);
} catch (EntityFormatException e) {
- return new ResponseStanzaContainerImpl(ServerErrorResponses.getInstance().getStreamError(
+ return new ResponseStanzaContainerImpl(ServerErrorResponses.getStreamError(
StreamErrorCondition.IMPROPER_ADDRESSING, sessionContext.getXMLLang(),
"could not parse incoming stanza's TO attribute", null));
@@ -154,7 +154,7 @@ public class StreamStartHandler implemen
try {
EntityImpl.parse(fromValue);
} catch (EntityFormatException e) {
- return new ResponseStanzaContainerImpl(ServerErrorResponses.getInstance().getStreamError(
+ return new ResponseStanzaContainerImpl(ServerErrorResponses.getStreamError(
StreamErrorCondition.INVALID_FROM, sessionContext.getXMLLang(),
"could not parse incoming stanza's FROM attribute", null));
}
@@ -186,12 +186,12 @@ public class StreamStartHandler implemen
}
private ResponseStanzaContainer respondIllegalNamespaceError(String descriptiveText) {
- return new ResponseStanzaContainerImpl(ServerErrorResponses.getInstance().getStreamError(
+ return new ResponseStanzaContainerImpl(ServerErrorResponses.getStreamError(
StreamErrorCondition.INVALID_NAMESPACE, null, descriptiveText, null));
}
private ResponseStanzaContainer respondUnsupportedStanzaType(String descriptiveText) {
- return new ResponseStanzaContainerImpl(ServerErrorResponses.getInstance().getStreamError(
+ return new ResponseStanzaContainerImpl(ServerErrorResponses.getStreamError(
StreamErrorCondition.UNSUPPORTED_STANZA_TYPE, null, descriptiveText, null));
}
@@ -199,7 +199,7 @@ public class StreamStartHandler implemen
String errorMessage) {
if (xmlLang == null)
xmlLang = "en_US";
- Stanza error = ServerErrorResponses.getInstance().getStreamError(StreamErrorCondition.UNSUPPORTED_VERSION,
+ Stanza error = ServerErrorResponses.getStreamError(StreamErrorCondition.UNSUPPORTED_VERSION,
xmlLang, errorMessage + versionAttributeValue, null);
return new ResponseStanzaContainerImpl(error);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/XMPPCoreStanzaHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/XMPPCoreStanzaHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/XMPPCoreStanzaHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/XMPPCoreStanzaHandler.java Sat Jan 8 20:53:56 2011
@@ -102,7 +102,7 @@ public abstract class XMPPCoreStanzaHand
Entity to = stanza.getTo();
if (sessionContext != null && sessionContext.isServerToServer() && to == null) {
// "to" MUST be present for jabber:server
- return new ResponseStanzaContainerImpl(ServerErrorResponses.getInstance().getStreamError(
+ return new ResponseStanzaContainerImpl(ServerErrorResponses.getStreamError(
StreamErrorCondition.IMPROPER_ADDRESSING, stanza.getXMLLang(), "missing to attribute", null));
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java Sat Jan 8 20:53:56 2011
@@ -57,7 +57,7 @@ public class AuthCompatibilityIQHandler
case GET:
case SET:
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE, stanza,
StanzaErrorType.CANCEL, "jabber:iq:auth not supported", "en", null);
case ERROR:
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailabilityHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailabilityHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailabilityHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailabilityHandler.java Sat Jan 8 20:53:56 2011
@@ -108,7 +108,7 @@ public class PresenceAvailabilityHandler
if (isOutboundStanza) {
Entity user = XMPPCoreStanzaHandler.extractUniqueSenderJID(presenceStanza, sessionContext);
if (user == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER,
presenceStanza, StanzaErrorType.MODIFY, "sender info insufficient: no from", null, null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbstractSASLHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbstractSASLHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbstractSASLHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbstractSASLHandler.java Sat Jan 8 20:53:56 2011
@@ -53,7 +53,7 @@ public abstract class AbstractSASLHandle
throws AuthorizationFailedException {
if (!AuthorizationRetriesCounter.getFromSession(sessionContext).hasTriesLeft()) {
AuthorizationFailedException failedException = new AuthorizationFailedException("too many retries");
- failedException.setErrorStanza(ServerErrorResponses.getInstance().getStreamError(
+ failedException.setErrorStanza(ServerErrorResponses.getStreamError(
StreamErrorCondition.POLICY_VIOLATION, null, null, null));
throw failedException;
}
@@ -72,7 +72,7 @@ public abstract class AbstractSASLHandle
}
protected ResponseStanzaContainer respondSASLFailure() {
- return new ResponseStanzaContainerImpl(ServerErrorResponses.getInstance().getSASLFailure(
+ return new ResponseStanzaContainerImpl(ServerErrorResponses.getSASLFailure(
SASLFailureType.MALFORMED_REQUEST));
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandler.java Sat Jan 8 20:53:56 2011
@@ -76,6 +76,6 @@ public class StartTLSHandler implements
}
private ResponseStanzaContainer respondTLSFailure() {
- return new ResponseStanzaContainerImpl(ServerErrorResponses.getInstance().getTLSFailure());
+ return new ResponseStanzaContainerImpl(ServerErrorResponses.getTLSFailure());
}
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataIQHandler.java Sat Jan 8 20:53:56 2011
@@ -70,7 +70,7 @@ public class PrivateDataIQHandler extend
// Not null, and not addressed to itself
if (to != null && !to.getBareJID().equals(sessionContext.getInitiatingEntity().getBareJID())) {
- return ServerErrorResponses.getInstance().getStreamError(StreamErrorCondition.BAD_FORMAT, null,
+ return ServerErrorResponses.getStreamError(StreamErrorCondition.BAD_FORMAT, null,
"Private data only modifiable by the owner", null);
}
@@ -79,19 +79,19 @@ public class PrivateDataIQHandler extend
// Example 4: http://xmpp.org/extensions/xep-0049.html
// Query element must have a child element with a non-null namespace
if (queryElement.getInnerElements().size() != 1) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
StanzaErrorType.MODIFY, "query's child element is missing", null, null);
}
XMLElement x = queryElement.getFirstInnerElement();
String ns = x.getAttribute("xmlns").getValue();
if (ns == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
StanzaErrorType.MODIFY, "no namespace", null, null);
}
// No persistancy Manager
if (persistenceManager == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
stanza, StanzaErrorType.WAIT, "internal storage inaccessible", null, null);
}
@@ -116,20 +116,20 @@ public class PrivateDataIQHandler extend
// Not null, and not addressed to itself
if (to != null && !to.getBareJID().equals(sessionContext.getInitiatingEntity().getBareJID())) {
- return ServerErrorResponses.getInstance().getStreamError(StreamErrorCondition.BAD_FORMAT, null,
+ return ServerErrorResponses.getStreamError(StreamErrorCondition.BAD_FORMAT, null,
"can only view your data", null);
}
XMLElement queryElement = stanza.getFirstInnerElement();
XMLElement x = queryElement.getFirstInnerElement();
if (x == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
StanzaErrorType.MODIFY, "query's child element missing", null, null);
}
// No persistancy Manager
if (persistenceManager == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
stanza, StanzaErrorType.WAIT, "internal storage inaccessible", null, null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandIQHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandIQHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandIQHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandIQHandler.java Sat Jan 8 20:53:56 2011
@@ -58,7 +58,7 @@ public class AdhocCommandIQHandler exten
try {
XMLElement commandElement = stanza.getSingleInnerElementsNamed("command");
if (commandElement == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
StanzaErrorType.MODIFY, "command is missing", null, null);
}
commandNode = commandElement.getAttributeValue("node");
@@ -76,13 +76,13 @@ public class AdhocCommandIQHandler exten
} else {
commandHandler = runningCommands.get(requestedSessionId);
if (commandHandler == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
StanzaErrorType.CANCEL, "command session id not found: " + requestedSessionId, null, null);
}
}
commandElements = commandElement.getInnerElements();
} catch (XMLSemanticError xmlSemanticError) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
StanzaErrorType.MODIFY, "command is not well-formed", null, null);
}
@@ -93,7 +93,7 @@ public class AdhocCommandIQHandler exten
// handle unauthorized access (or command does not exist at all)
if (commandHandler == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza,
StanzaErrorType.CANCEL, "command is not available", null, null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java Sat Jan 8 20:53:56 2011
@@ -72,13 +72,13 @@ public class VcardTempIQHandler extends
try {
vCardElement = stanza.getSingleInnerElementsNamed("vCard");
} catch (XMLSemanticError xmlSemanticError) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
StanzaErrorType.MODIFY, "vCard element is missing", null, null);
}
String vcardContent = new Renderer(vCardElement).getComplete();
if (persistenceManager == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
stanza, StanzaErrorType.WAIT, "internal storage inaccessible", null, null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java Sat Jan 8 20:53:56 2011
@@ -96,7 +96,7 @@ public class RosterIQHandler extends Def
Entity from = extractUniqueSenderJID(stanza, sessionContext);
if (from == null || !from.isResourceSet()) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER, stanza,
StanzaErrorType.MODIFY,
"sender info insufficient: " + ((from == null) ? "no from" : from.getFullQualifiedName()), null,
null);
@@ -138,7 +138,7 @@ public class RosterIQHandler extends Def
Entity user = extractUniqueSenderJID(stanza, sessionContext);
if (user == null || !user.isResourceSet()) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER, stanza,
StanzaErrorType.MODIFY,
"sender info insufficient: " + ((user == null) ? "no from" : user.getFullQualifiedName()), null,
null);
@@ -148,10 +148,10 @@ public class RosterIQHandler extends Def
try {
setRosterItem = RosterUtils.parseRosterItem(stanza);
} catch (RosterBadRequestException e) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
StanzaErrorType.MODIFY, e.getMessage(), null, null);
} catch (RosterNotAcceptableException e) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
StanzaErrorType.MODIFY, e.getMessage(), null, null);
}
@@ -185,7 +185,7 @@ public class RosterIQHandler extends Def
// update contact persistently
rosterManager.addContact(user.getBareJID(), existingItem);
} catch (RosterException e) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
StanzaErrorType.CANCEL, "roster item contact not (yet) in roster: " + contactJid, null, null);
}
@@ -215,7 +215,7 @@ public class RosterIQHandler extends Def
try {
rosterManager.removeContact(user.getBareJID(), contactJid);
} catch (RosterException e) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
StanzaErrorType.CANCEL, "roster item contact not in roster: " + contactJid, null, null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java Sat Jan 8 20:53:56 2011
@@ -83,7 +83,7 @@ public class DiscoInfoIQHandler extends
}
if (serviceCollector == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
stanza, StanzaErrorType.CANCEL, "cannot retrieve IQ-get-info result from internal components",
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
@@ -100,7 +100,7 @@ public class DiscoInfoIQHandler extends
} else if (!to.isNodeSet()) {
isServerInfoRequest = serviceEntity.equals(to);
if (!isServerInfoRequest) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
StanzaErrorType.CANCEL,
"server does not handle info query requests for " + to.getFullQualifiedName(),
getErrorLanguage(serverRuntimeContext, sessionContext), null);
@@ -130,7 +130,7 @@ public class DiscoInfoIQHandler extends
StanzaErrorCondition stanzaErrorCondition = e.getErrorCondition();
if (stanzaErrorCondition == null)
stanzaErrorCondition = StanzaErrorCondition.INTERNAL_SERVER_ERROR;
- return ServerErrorResponses.getInstance().getStanzaError(stanzaErrorCondition, stanza,
+ return ServerErrorResponses.getStanzaError(stanzaErrorCondition, stanza,
StanzaErrorType.CANCEL, "disco info request failed.",
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java Sat Jan 8 20:53:56 2011
@@ -77,7 +77,7 @@ public class DiscoItemIQHandler extends
}
if (serviceCollector == null) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.INTERNAL_SERVER_ERROR,
stanza, StanzaErrorType.CANCEL, "cannot retrieve IQ-get-items result from internal components",
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
@@ -91,7 +91,7 @@ public class DiscoItemIQHandler extends
isServerInfoRequest = serverRuntimeContext.getServerEnitity().equals(to);
isComponentInfoRequest = serverRuntimeContext.getComponentStanzaProcessor(to) != null;
if (!isServerInfoRequest && !isComponentInfoRequest) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza,
StanzaErrorType.CANCEL,
"server does not handle items query requests for " + to.getFullQualifiedName(),
getErrorLanguage(serverRuntimeContext, sessionContext), null);
@@ -113,7 +113,7 @@ public class DiscoItemIQHandler extends
StanzaErrorCondition stanzaErrorCondition = e.getErrorCondition();
if (stanzaErrorCondition == null)
stanzaErrorCondition = StanzaErrorCondition.INTERNAL_SERVER_ERROR;
- return ServerErrorResponses.getInstance().getStanzaError(stanzaErrorCondition, stanza,
+ return ServerErrorResponses.getStanzaError(stanzaErrorCondition, stanza,
StanzaErrorType.CANCEL, "disco info request failed.",
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java Sat Jan 8 20:53:56 2011
@@ -120,14 +120,14 @@ System.out.println(stanzaHandler);
if(coreStanza != null) {
// stanza must come from the origin server
if(from == null) {
- Stanza errorStanza = ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER,
+ Stanza errorStanza = ServerErrorResponses.getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER,
coreStanza, StanzaErrorType.MODIFY, "Missing from attribute", null, null);
ResponseWriter.writeResponse(sessionContext, errorStanza);
return;
} else if(!from.getDomain().equals(sessionContext.getInitiatingEntity().getDomain())) {
// make sure the from attribute refers to the correct remote server
- Stanza errorStanza = ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER,
+ Stanza errorStanza = ServerErrorResponses.getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER,
coreStanza, StanzaErrorType.MODIFY, "Incorrect from attribute", null, null);
ResponseWriter.writeResponse(sessionContext, errorStanza);
return;
@@ -136,13 +136,13 @@ System.out.println(stanzaHandler);
Entity to = stanza.getTo();
if(to == null) {
// TODO what's the appropriate error? StreamErrorCondition.IMPROPER_ADDRESSING?
- Stanza errorStanza = ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST,
+ Stanza errorStanza = ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST,
coreStanza, StanzaErrorType.MODIFY, "Missing to attribute", null, null);
ResponseWriter.writeResponse(sessionContext, errorStanza);
return;
} else if(!to.getDomain().equals(serverRuntimeContext.getServerEnitity().getDomain())) {
// TODO what's the appropriate error? StreamErrorCondition.IMPROPER_ADDRESSING?
- Stanza errorStanza = ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST,
+ Stanza errorStanza = ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST,
coreStanza, StanzaErrorType.MODIFY, "Invalid to attribute", null, null);
ResponseWriter.writeResponse(sessionContext, errorStanza);
return;
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseWriter.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseWriter.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseWriter.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ResponseWriter.java Sat Jan 8 20:53:56 2011
@@ -39,7 +39,7 @@ public class ResponseWriter {
public static void writeUnsupportedStanzaError(SessionContext sessionContext) {
- Stanza errorStanza = ServerErrorResponses.getInstance().getStreamError(
+ Stanza errorStanza = ServerErrorResponses.getStreamError(
StreamErrorCondition.UNSUPPORTED_STANZA_TYPE, sessionContext.getXMLLang(),
"service unavailable at this session state", null);
Stanza streamOpener = new ServerResponses().getStreamOpenerForError(false, sessionContext.getServerJID(),
@@ -74,21 +74,21 @@ public class ResponseWriter {
errorStanza = protocolException.getErrorStanza();
if (errorStanza == null) {
- errorStanza = ServerErrorResponses.getInstance().getStreamError(StreamErrorCondition.BAD_FORMAT,
+ errorStanza = ServerErrorResponses.getStreamError(StreamErrorCondition.BAD_FORMAT,
sessionContext.getXMLLang(), "could not process incoming stanza", receivedStanza);
}
writeErrorAndClose(sessionContext, errorStanza);
}
public void handleUnsupportedStanzaType(SessionContext sessionContext, Stanza receivedStanza) {
- Stanza errorStanza = ServerErrorResponses.getInstance().getStreamError(
+ Stanza errorStanza = ServerErrorResponses.getStreamError(
StreamErrorCondition.UNSUPPORTED_STANZA_TYPE, sessionContext.getXMLLang(),
"could not process incoming stanza", receivedStanza);
writeErrorAndClose(sessionContext, errorStanza);
}
public void handleNotAuthorized(SessionContext sessionContext, Stanza receivedStanza) {
- Stanza errorStanza = ServerErrorResponses.getInstance().getStreamError(StreamErrorCondition.NOT_AUTHORIZED,
+ Stanza errorStanza = ServerErrorResponses.getStreamError(StreamErrorCondition.NOT_AUTHORIZED,
sessionContext.getXMLLang(), "could not process incoming stanza", receivedStanza);
writeErrorAndClose(sessionContext, errorStanza);
}
@@ -100,7 +100,7 @@ public class ResponseWriter {
return;
}
- Stanza errorStanza = ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER,
+ Stanza errorStanza = ServerErrorResponses.getStanzaError(StanzaErrorCondition.UNKNOWN_SENDER,
receivedCoreStanza, StanzaErrorType.MODIFY, "from attribute does not match authorized entity", null,
null);
writeResponse(sessionContext, errorStanza);
@@ -110,7 +110,7 @@ public class ResponseWriter {
//TODO write the __right__ error response, not bad-format default only
if (e.getErrorCondition() != ParsingErrorCondition.BAD_FORMAT)
throw new RuntimeException("cannot handle this error condition yet");
- Stanza errorStanza = ServerErrorResponses.getInstance().getStreamError(StreamErrorCondition.BAD_FORMAT,
+ Stanza errorStanza = ServerErrorResponses.getStreamError(StreamErrorCondition.BAD_FORMAT,
sessionContext.getXMLLang(), "could not parse incoming stanza", null);
writeErrorAndClose(sessionContext, errorStanza);
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ServiceUnavailableStanzaErrorHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ServiceUnavailableStanzaErrorHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ServiceUnavailableStanzaErrorHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ServiceUnavailableStanzaErrorHandler.java Sat Jan 8 20:53:56 2011
@@ -55,7 +55,7 @@ public class ServiceUnavailableStanzaErr
throw new IllegalArgumentException("cannot coerce into a message, iq or presence stanza");
XMPPCoreStanza coreStanza = (XMPPCoreStanza) stanza;
- Stanza errorStanza = ServerErrorResponses.getInstance().getStanzaError(
+ Stanza errorStanza = ServerErrorResponses.getStanzaError(
StanzaErrorCondition.SERVICE_UNAVAILABLE, coreStanza, StanzaErrorType.CANCEL,
"namespace not supported", null, null);
return new ResponseStanzaContainerImpl(errorStanza);
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java Sat Jan 8 20:53:56 2011
@@ -35,20 +35,12 @@ import org.apache.vysper.xmpp.stanza.XMP
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class ServerErrorResponses {
- private static ServerErrorResponses serverErrorResponsesInstance = null;
- public static ServerErrorResponses getInstance() {
- if (serverErrorResponsesInstance == null) {
- serverErrorResponsesInstance = new ServerErrorResponses();
- }
- return serverErrorResponsesInstance;
- }
-
- protected ServerErrorResponses() {
+ private ServerErrorResponses() {
// empty
}
- public Stanza getStreamError(StreamErrorCondition definedErrorCondition, String languageCode,
+ public static Stanza getStreamError(StreamErrorCondition definedErrorCondition, String languageCode,
String descriptiveText, XMLElement applicationSpecificError) {
/*
@@ -91,11 +83,11 @@ public class ServerErrorResponses {
* @param errorConditionElement - optional application specific error condition element
* @return error response stanza
*/
- public Stanza getStanzaError(StanzaErrorCondition errorCondition, XMPPCoreStanza stanza, StanzaErrorType type,
+ public static Stanza getStanzaError(StanzaErrorCondition errorCondition, XMPPCoreStanza stanza, StanzaErrorType type,
String errorText, String errorLang, XMLElement errorConditionElement) {
if (stanza != null && "error".equals(stanza.getType())) {
- return ServerErrorResponses.getInstance().getStreamError(StreamErrorCondition.UNSUPPORTED_STANZA_TYPE,
+ return ServerErrorResponses.getStreamError(StreamErrorCondition.UNSUPPORTED_STANZA_TYPE,
errorLang, "cannot respond to IQ stanza of type error with the same", null);
}
@@ -106,7 +98,7 @@ public class ServerErrorResponses {
return responseBuilder.build();
}
- private void fillErrorStanza(XMPPCoreStanza stanza, StanzaErrorType type, StanzaErrorCondition errorCondition,
+ private static void fillErrorStanza(XMPPCoreStanza stanza, StanzaErrorType type, StanzaErrorCondition errorCondition,
String errorText, String errorLang, XMLElement errorConditionElement, StanzaBuilder responseBuilder) {
// inline incoming stanza as of RFC 3920 9.3.1
for (XMLElement innerElement : stanza.getInnerElements()) {
@@ -132,12 +124,12 @@ public class ServerErrorResponses {
responseBuilder.endInnerElement();
}
- public Stanza getTLSFailure() {
+ public static Stanza getTLSFailure() {
StanzaBuilder stanzaBuilder = new StanzaBuilder("failure", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
return stanzaBuilder.build();
}
- public Stanza getSASLFailure(SASLFailureType failureType) {
+ public static Stanza getSASLFailure(SASLFailureType failureType) {
StanzaBuilder stanzaBuilder = new StanzaBuilder("failure", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
if (failureType != null) {
stanzaBuilder.startInnerElement(failureType.toString(), NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerErrorResponsesTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerErrorResponsesTestCase.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerErrorResponsesTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerErrorResponsesTestCase.java Sat Jan 8 20:53:56 2011
@@ -51,9 +51,7 @@ public class ServerErrorResponsesTestCas
Stanza request = builder.build();
IQStanza requestIq = new IQStanza(request);
- ServerErrorResponses serverErrorResponses = ServerErrorResponses.getInstance();
-
- Stanza errorReply = serverErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE, requestIq,
+ Stanza errorReply = ServerErrorResponses.getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE, requestIq,
StanzaErrorType.CANCEL, "Test", "en", null);
assertEquals("error", errorReply.getAttributeValue("type"));
assertEquals(SERVER_JID, errorReply.getAttributeValue("from"));
Modified: mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/WebSocketBackedSessionContext.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/WebSocketBackedSessionContext.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/WebSocketBackedSessionContext.java (original)
+++ mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/WebSocketBackedSessionContext.java Sat Jan 8 20:53:56 2011
@@ -123,7 +123,7 @@ public class WebSocketBackedSessionConte
// should never happen since we read from a string
throw new RuntimeException(e);
} catch (SAXException e) {
- Stanza errorStanza = ServerErrorResponses.getInstance().getStreamError(StreamErrorCondition.XML_NOT_WELL_FORMED,
+ Stanza errorStanza = ServerErrorResponses.getStreamError(StreamErrorCondition.XML_NOT_WELL_FORMED,
getXMLLang(), "Stanza not well-formed", null);
write(errorStanza);
endSession(SessionTerminationCause.STREAM_ERROR);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCIqAdminHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCIqAdminHandler.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCIqAdminHandler.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCIqAdminHandler.java Sat Jan 8 20:53:56 2011
@@ -125,7 +125,7 @@ public class MUCIqAdminHandler extends D
private Stanza createBadRequestError(IQStanza stanza, ServerRuntimeContext serverRuntimeContext,
SessionContext sessionContext, String message) {
- return ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza,
StanzaErrorType.MODIFY, message,
getErrorLanguage(serverRuntimeContext, sessionContext), null);
}
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java?rev=1056796&r1=1056795&r2=1056796&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java Sat Jan 8 20:53:56 2011
@@ -46,9 +46,6 @@ public class ErrorStanzaGenerator {
protected static final String INVALID_JID = "invalid-jid";
- // The ServerErrorResponses object for generating type-safe error stanzas
- protected ServerErrorResponses errorResponses = ServerErrorResponses.getInstance();
-
/**
* Creates a "JID malformed" error stanza (not specific to the pubsub module).
*
@@ -58,7 +55,7 @@ public class ErrorStanzaGenerator {
* @return the generated stanza.
*/
public Stanza generateJIDMalformedErrorStanza(Entity sender, Entity receiver, IQStanza stanza) {
- return errorResponses.getStanzaError(StanzaErrorCondition.JID_MALFORMED, stanza, StanzaErrorType.MODIFY, null,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.JID_MALFORMED, stanza, StanzaErrorType.MODIFY, null,
null, null);
}
@@ -71,7 +68,7 @@ public class ErrorStanzaGenerator {
* @return the generated stanza.
*/
public Stanza generateInsufficientPrivilegesErrorStanza(Entity sender, Entity receiver, IQStanza stanza) {
- return errorResponses.getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza, StanzaErrorType.AUTH, null, null,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.FORBIDDEN, stanza, StanzaErrorType.AUTH, null, null,
null);
}
@@ -86,7 +83,7 @@ public class ErrorStanzaGenerator {
*/
public Stanza generateNoSuchSubscriberErrorStanza(Entity sender, Entity receiver, IQStanza stanza) {
XMLElement notSubscribed = createXMLElement(NOT_SUBSCRIBED, NamespaceURIs.XEP0060_PUBSUB_ERRORS);
- return errorResponses.getStanzaError(StanzaErrorCondition.UNEXPECTED_REQUEST, stanza, StanzaErrorType.CANCEL,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.UNEXPECTED_REQUEST, stanza, StanzaErrorType.CANCEL,
null, null, notSubscribed);
}
@@ -101,7 +98,7 @@ public class ErrorStanzaGenerator {
*/
public Stanza generateSubIDRequiredErrorStanza(Entity sender, Entity receiver, IQStanza stanza) {
XMLElement subidRequired = createXMLElement(SUBID_REQUIRED, NamespaceURIs.XEP0060_PUBSUB_ERRORS);
- return errorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza, StanzaErrorType.MODIFY, null,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza, StanzaErrorType.MODIFY, null,
null, subidRequired);
}
@@ -114,7 +111,7 @@ public class ErrorStanzaGenerator {
* @return the generated stanza.
*/
public Stanza generateNoNodeErrorStanza(Entity sender, Entity receiver, IQStanza stanza) {
- return errorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza, StanzaErrorType.CANCEL, null,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.ITEM_NOT_FOUND, stanza, StanzaErrorType.CANCEL, null,
null, null);
}
@@ -129,7 +126,7 @@ public class ErrorStanzaGenerator {
*/
public Stanza generateSubIDNotValidErrorStanza(Entity sender, Entity receiver, IQStanza stanza) {
XMLElement invalidSubID = createXMLElement(INVALID_SUBID, NamespaceURIs.XEP0060_PUBSUB_ERRORS);
- return errorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza, StanzaErrorType.MODIFY, null,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza, StanzaErrorType.MODIFY, null,
null, invalidSubID);
}
@@ -144,7 +141,7 @@ public class ErrorStanzaGenerator {
*/
public Stanza generateJIDDontMatchErrorStanza(Entity sender, Entity receiver, IQStanza stanza) {
XMLElement invalidJID = createXMLElement(INVALID_JID, NamespaceURIs.XEP0060_PUBSUB_ERRORS);
- return errorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza, StanzaErrorType.MODIFY, null,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza, StanzaErrorType.MODIFY, null,
null, invalidJID);
}
@@ -157,7 +154,7 @@ public class ErrorStanzaGenerator {
* @return the generated stanza.
*/
public Stanza generateBadRequestErrorStanza(Entity sender, Entity receiver, IQStanza stanza) {
- return errorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza, StanzaErrorType.MODIFY, null,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST, stanza, StanzaErrorType.MODIFY, null,
null, null);
}
@@ -170,7 +167,7 @@ public class ErrorStanzaGenerator {
* @return
*/
public Stanza generateDuplicateNodeErrorStanza(Entity sender, Entity receiver, IQStanza stanza) {
- return errorResponses.getStanzaError(StanzaErrorCondition.CONFLICT, stanza, StanzaErrorType.CANCEL, null, null,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.CONFLICT, stanza, StanzaErrorType.CANCEL, null, null,
null);
}
@@ -195,7 +192,7 @@ public class ErrorStanzaGenerator {
* @return the generated stanza.
*/
public Stanza generateNotAcceptableErrorStanza(Entity sender, Entity receiver, IQStanza stanza) {
- return errorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza, StanzaErrorType.MODIFY, null,
+ return ServerErrorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza, StanzaErrorType.MODIFY, null,
null, null);
}
}