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 2009/11/27 15:48:16 UTC
svn commit: r884886 -
/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java
Author: ngn
Date: Fri Nov 27 14:48:15 2009
New Revision: 884886
URL: http://svn.apache.org/viewvc?rev=884886&view=rev
Log:
Fix setting namespaces for the initial sequence
Modified:
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java?rev=884886&r1=884885&r2=884886&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java Fri Nov 27 14:48:15 2009
@@ -75,10 +75,9 @@
public Stanza getFeaturesForEncryption(SessionContext sessionContext) {
StanzaBuilder stanzaBuilder = startFeatureStanza();
- stanzaBuilder.startInnerElement("starttls")
- .addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
+ stanzaBuilder.startInnerElement("starttls", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
if (sessionContext.getServerRuntimeContext().getServerFeatures().isStartTLSRequired()) {
- stanzaBuilder.startInnerElement("required").endInnerElement();
+ stanzaBuilder.startInnerElement("required", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS).endInnerElement();
}
stanzaBuilder.endInnerElement();
@@ -88,10 +87,9 @@
public Stanza getFeaturesForAuthentication(List<SASLMechanism> authenticationMethods) {
StanzaBuilder stanzaBuilder = startFeatureStanza();
- stanzaBuilder.startInnerElement("mechanisms")
- .addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
+ stanzaBuilder.startInnerElement("mechanisms", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
for (SASLMechanism authenticationMethod : authenticationMethods) {
- stanzaBuilder.startInnerElement("mechanism").addText(authenticationMethod.getName()).endInnerElement();
+ stanzaBuilder.startInnerElement("mechanism", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL).addText(authenticationMethod.getName()).endInnerElement();
}
stanzaBuilder.endInnerElement();
@@ -101,22 +99,20 @@
private Stanza getFeaturesForSession() {
StanzaBuilder stanzaBuilder = startFeatureStanza();
- stanzaBuilder.startInnerElement("bind")
- .addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND)
- .startInnerElement("required").endInnerElement();
+ stanzaBuilder.startInnerElement("bind", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND)
+ .startInnerElement("required", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND).endInnerElement();
stanzaBuilder.endInnerElement();
// session establishment is here for RFC3921 compatibility and is planed to be removed in revisions of this RFC.
- stanzaBuilder.startInnerElement("session")
- .addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SESSION)
- .startInnerElement("required").endInnerElement();
+ stanzaBuilder.startInnerElement("session", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SESSION)
+ .startInnerElement("required", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SESSION).endInnerElement();
stanzaBuilder.endInnerElement();
return stanzaBuilder.build();
}
protected StanzaBuilder startFeatureStanza() {
- StanzaBuilder stanzaBuilder = new StanzaBuilder("features", null, "stream");
+ StanzaBuilder stanzaBuilder = new StanzaBuilder("features", NamespaceURIs.HTTP_ETHERX_JABBER_ORG_STREAMS, "stream");
return stanzaBuilder;
}