You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2008/02/17 12:50:28 UTC
svn commit: r628480 - in /labs/vysper/src:
main/java/org/apache/vysper/xmpp/applicationdomains/bind/handler/
main/java/org/apache/vysper/xmpp/applicationdomains/session/handler/
main/java/org/apache/vysper/xmpp/authorization/ main/java/org/apache/vyspe...
Author: berndf
Date: Sun Feb 17 03:50:16 2008
New Revision: 628480
URL: http://svn.apache.org/viewvc?rev=628480&view=rev
Log:
[vysper] connection establishment now working with BasicClient/Smack
Modified:
labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/bind/handler/IQBindHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/session/handler/IQSessionHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Anonymous.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/resourcebinding/ResourceRegistry.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/uuid/JVMBuiltinUUIDGenerator.java
labs/vysper/src/test/java/org/apache/vysper/smack/BasicClient.java
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/bind/handler/IQBindHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/bind/handler/IQBindHandler.java?rev=628480&r1=628479&r2=628480&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/bind/handler/IQBindHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/bind/handler/IQBindHandler.java Sun Feb 17 03:50:16 2008
@@ -81,7 +81,8 @@
StanzaBuilder stanzaBuilder =
StanzaBuilder.createIQStanza(IQStanzaType.RESULT, stanza.getID()).
- startInnerElement("bind", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND).
+ startInnerElement("bind").
+ addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND).
startInnerElement("jid").addText(entity.getFullQualifiedName()).endInnerElement().
endInnerElement();
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/session/handler/IQSessionHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/session/handler/IQSessionHandler.java?rev=628480&r1=628479&r2=628480&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/session/handler/IQSessionHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/session/handler/IQSessionHandler.java Sun Feb 17 03:50:16 2008
@@ -26,7 +26,7 @@
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
/**
- * handles bind requests
+ * handles session requests
*/
public class IQSessionHandler extends IQHandler {
@@ -40,7 +40,7 @@
case SET:
return StanzaBuilder.createIQStanza(IQStanzaType.RESULT, stanza.getID())
- .addAttribute("from", sessionContext.getServerJID().toString()).getFinalStanza();
+ .addAttribute("from", sessionContext.getServerJID().getFullQualifiedName()).getFinalStanza();
case GET:
case ERROR:
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Anonymous.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Anonymous.java?rev=628480&r1=628479&r2=628480&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Anonymous.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Anonymous.java Sun Feb 17 03:50:16 2008
@@ -16,20 +16,31 @@
***********************************************************************/
package org.apache.vysper.xmpp.authorization;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.protocol.SessionStateHolder;
import org.apache.vysper.xmpp.server.SessionContext;
import org.apache.vysper.xmpp.server.SessionState;
import org.apache.vysper.xmpp.stanza.Stanza;
+import org.apache.vysper.xmpp.uuid.JVMBuiltinUUIDGenerator;
+import org.apache.vysper.xmpp.uuid.UUIDGenerator;
/**
* handles SASL ANONYMOUS mechanism
*/
public class Anonymous implements SASLMechanism {
+
+ UUIDGenerator uuidGenerator = new JVMBuiltinUUIDGenerator();
+
public String getName() {
return "ANONYMOUS";
}
public Stanza started(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza authStanza) {
+
+ // assign a self-created node name
+ EntityImpl initiatingEntity = new EntityImpl(uuidGenerator.create(), sessionContext.getServerJID().getDomain(), null);
+ sessionContext.setInitiatingEntity(initiatingEntity);
+
sessionStateHolder.setState(SessionState.AUTHENTICATED);
return new AuthorizationResponses().getSuccess();
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/resourcebinding/ResourceRegistry.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/resourcebinding/ResourceRegistry.java?rev=628480&r1=628479&r2=628480&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/resourcebinding/ResourceRegistry.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/resourcebinding/ResourceRegistry.java Sun Feb 17 03:50:16 2008
@@ -35,7 +35,6 @@
public String bindSession(SessionContext sessionContext) {
String resourceId = resourceIdGenerator.create();
- resourceId = resourceId.replace("-", "");
boundResources.add(resourceId);
return resourceId;
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/uuid/JVMBuiltinUUIDGenerator.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/uuid/JVMBuiltinUUIDGenerator.java?rev=628480&r1=628479&r2=628480&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/uuid/JVMBuiltinUUIDGenerator.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/uuid/JVMBuiltinUUIDGenerator.java Sun Feb 17 03:50:16 2008
@@ -27,7 +27,9 @@
// TODO
// generates UUID-type 4, pseudo random session id
// is this random enough?
- return UUID.randomUUID().toString();
+ String uuidRaw = UUID.randomUUID().toString();
+ String uuidTrimmed = uuidRaw.replace("-", "");
+ return uuidTrimmed;
}
}
Modified: labs/vysper/src/test/java/org/apache/vysper/smack/BasicClient.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/smack/BasicClient.java?rev=628480&r1=628479&r2=628480&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/smack/BasicClient.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/smack/BasicClient.java Sun Feb 17 03:50:16 2008
@@ -44,11 +44,11 @@
SASLAuthentication saslAuthentication = connection.getSASLAuthentication();
// saslAuthentication.authenticateAnonymously();
- saslAuthentication.authenticate("user1@localhost", "password1", "test");
+// saslAuthentication.authenticate("user1@localhost", "password1", "test");
// if (!saslAuthentication.isAuthenticated()) return;
-// connection.login("user1@vysper.org", "password1");
+ connection.login("user1@vysper.org", "password1");
/*
Chat chat = connection.getChatManager().createChat("user2@vysper.org", new MessageListener() {
public void processMessage(Chat chat, Message message) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org