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/07/05 09:37:51 UTC
svn commit: r1142910 - in
/mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src:
main/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandler.java
test/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandlerTest.java
Author: ngn
Date: Tue Jul 5 07:37:51 2011
New Revision: 1142910
URL: http://svn.apache.org/viewvc?rev=1142910&view=rev
Log:
Fixing compilation error in BoshHandler due to new parameter in ServerResponse
Modified:
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandler.java
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandlerTest.java
Modified: mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandler.java?rev=1142910&r1=1142909&r2=1142910&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandler.java (original)
+++ mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandler.java Tue Jul 5 07:37:51 2011
@@ -224,7 +224,7 @@ public class BoshHandler {
body.addAttribute("ack", Long.toString(session.getHighestReadRid()));
Stanza features = new ServerResponses().getFeaturesForAuthentication(serverRuntimeContext.getServerFeatures()
- .getAuthenticationMethods());
+ .getAuthenticationMethods(), session);
body.addPreparedElement(features);
return body.build();
}
Modified: mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandlerTest.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandlerTest.java?rev=1142910&r1=1142909&r2=1142910&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandlerTest.java (original)
+++ mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/test/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandlerTest.java Tue Jul 5 07:37:51 2011
@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletReq
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.authentication.SASLMechanism;
+import org.apache.vysper.xmpp.modules.extension.xep0077_inbandreg.InBandRegistrationModule;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.protocol.SessionStateHolder;
import org.apache.vysper.xmpp.protocol.StanzaProcessor;
@@ -92,6 +93,7 @@ public class BoshHandlerTest {
ServerFeatures serverFeatures = mocksControl.createMock(ServerFeatures.class);
expect(serverRuntimeContext.getServerFeatures()).andReturn(serverFeatures);
expect(serverFeatures.getAuthenticationMethods()).andReturn(Collections.<SASLMechanism> emptyList());
+ expect(serverRuntimeContext.getModule(InBandRegistrationModule.class)).andReturn(null);
Capture<BoshResponse> captured = new Capture<BoshResponse>();
continuation.setAttribute(eq("response"), EasyMock.<BoshResponse> capture(captured));