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/11 23:31:25 UTC
svn commit: r1057896 - in
/mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp:
modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java
server/s2s/RunS2SServers.java
Author: ngn
Date: Tue Jan 11 22:31:24 2011
New Revision: 1057896
URL: http://svn.apache.org/viewvc?rev=1057896&view=rev
Log:
Using entities instead of strings for AccountManagement
Modified:
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/server/s2s/RunS2SServers.java
Modified: mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java?rev=1057896&r1=1057895&r2=1057896&view=diff
==============================================================================
--- mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java (original)
+++ mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java Tue Jan 11 22:31:24 2011
@@ -28,6 +28,7 @@ import junit.framework.TestCase;
import org.apache.vysper.mina.TCPEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.authorization.AccountManagement;
import org.apache.vysper.xmpp.server.XMPPServer;
import org.jivesoftware.smack.ConnectionConfiguration;
@@ -83,8 +84,8 @@ public abstract class AbstractIntegratio
StorageProviderRegistry providerRegistry = new MemoryStorageProviderRegistry();
AccountManagement accountManagement = (AccountManagement) providerRegistry.retrieve(AccountManagement.class);
- accountManagement.addUser(TEST_USERNAME1, TEST_PASSWORD1);
- accountManagement.addUser(TEST_USERNAME2, TEST_PASSWORD2);
+ accountManagement.addUser(EntityImpl.parseUnchecked(TEST_USERNAME1), TEST_PASSWORD1);
+ accountManagement.addUser(EntityImpl.parseUnchecked(TEST_USERNAME2), TEST_PASSWORD2);
server = new XMPPServer(SERVER_DOMAIN);
Modified: mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/server/s2s/RunS2SServers.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/server/s2s/RunS2SServers.java?rev=1057896&r1=1057895&r2=1057896&view=diff
==============================================================================
--- mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/server/s2s/RunS2SServers.java (original)
+++ mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/server/s2s/RunS2SServers.java Tue Jan 11 22:31:24 2011
@@ -196,7 +196,7 @@ public class RunS2SServers extends TestC
.retrieve(AccountManagement.class);
if (!accountManagement.verifyAccountExists(localUser)) {
- accountManagement.addUser(localUser.getFullQualifiedName(), password);
+ accountManagement.addUser(localUser, password);
}
// S2S endpoint