Author: berndf
Date: Tue Sep 1 07:55:52 2009
New Revision: 809873
URL: http://svn.apache.org/viewvc?rev=809873&view=rev
Log:
MUC: create the domain muc is running on on intialization time
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractServerInfoDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCServerInfoDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java?rev=809873&r1=809872&r2=809873&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
Tue Sep 1 07:55:52 2009
@@ -58,31 +58,28 @@
*/
public class MUCModule extends DefaultDiscoAwareModule implements
ServerInfoRequestListener, InfoRequestListener, ItemRequestListener, Component {
+ private String subdomain = "chat";
private Conference conference;
- private Entity domain;
+ private Entity fullDomain;
private final Logger logger = LoggerFactory.getLogger(MUCModule.class);
private ServerRuntimeContext serverRuntimeContext;
private ComponentStanzaProcessor stanzaProcessor;
-
- public MUCModule(Entity domain) {
- this(domain, new Conference("Conference"));
- }
-
- public MUCModule(Entity domain, Conference conference) {
- this.domain = domain;
- this.conference = conference;
+
+ public MUCModule(String subdomain) {
+ this(subdomain, new Conference("Conference"));
}
- public MUCModule(String domain) throws EntityFormatException {
- this(EntityImpl.parse(domain));
+ public MUCModule() {
+ this.conference = new Conference("Conference");
}
- public MUCModule(String domain, Conference conference) throws
EntityFormatException {
- this(EntityImpl.parse(domain), conference);
+ public MUCModule(String subdomain, Conference conference) {
+ this.subdomain = subdomain;
+ this.conference = conference;
}
-
+
/**
* Initializes the MUC module, configuring the storage providers.
*/
@@ -92,9 +89,15 @@
this.serverRuntimeContext = serverRuntimeContext;
+ try {
+ fullDomain = EntityImpl.parse(subdomain + "." +
serverRuntimeContext.getServerEnitity().getDomain());
+ } catch (EntityFormatException e) {
+ throw new RuntimeException("failed to initialize MUC domain", e);
+ }
+
ComponentStanzaProcessor processor = new
ComponentStanzaProcessor(serverRuntimeContext);
processor.addHandler(new MUCPresenceHandler(conference));
- processor.addHandler(new MUCMessageHandler(conference, domain));
+ processor.addHandler(new MUCMessageHandler(conference, fullDomain));
stanzaProcessor = processor;
RoomStorageProvider roomStorageProvider = (RoomStorageProvider)
serverRuntimeContext.getStorageProvider(RoomStorageProvider.class);
@@ -214,7 +217,7 @@
}
public String getSubdomain() {
- return domain.getDomain();
+ return subdomain;
}
public StanzaProcessor getStanzaProcessor() {
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java?rev=809873&r1=809872&r2=809873&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java
Tue Sep 1 07:55:52 2009
@@ -52,6 +52,7 @@
}
}
+ @Override
protected IQHandler createDiscoIQHandler() {
return new DiscoItemIQHandler();
}
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java?rev=809873&r1=809872&r2=809873&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
Tue Sep 1 07:55:52 2009
@@ -4,14 +4,8 @@
import
org.apache.vysper.xmpp.modules.extension.xep0045_muc.handler.AbstractMUCHandlerTestCase;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
import
org.apache.vysper.xmpp.modules.servicediscovery.collection.ServiceCollector;
-import
org.apache.vysper.xmpp.modules.servicediscovery.handler.DiscoInfoIQHandler;
-import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.protocol.ProtocolException;
import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;
-import org.apache.vysper.xmpp.protocol.SessionStateHolder;
-import org.apache.vysper.xmpp.protocol.StanzaHandler;
-import org.apache.vysper.xmpp.server.DefaultServerRuntimeContext;
-import org.apache.vysper.xmpp.server.TestSessionContext;
import org.apache.vysper.xmpp.stanza.IQStanzaType;
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
@@ -37,7 +31,7 @@
super.setUp();
ServiceCollector serviceCollector = new ServiceCollector();
- MUCModule module = new MUCModule(MODULE_JID, conference);
+ MUCModule module = new MUCModule(MODULE_JID.getDomain(), conference);
module.initialize(sessionContext.getServerRuntimeContext());
serviceCollector.addInfoRequestListener(module);
serviceCollector.addItemRequestListener(module);
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractServerInfoDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractServerInfoDiscoTestCase.java?rev=809873&r1=809872&r2=809873&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractServerInfoDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractServerInfoDiscoTestCase.java
Tue Sep 1 07:55:52 2009
@@ -39,6 +39,7 @@
}
}
+ @Override
protected Entity getTo() {
return SERVER_JID;
}
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java?rev=809873&r1=809872&r2=809873&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
Tue Sep 1 07:55:52 2009
@@ -43,7 +43,7 @@
Conference conference = new Conference("Foo");
conference.createRoom(ROOM1_JID, "room1");
conference.createRoom(ROME2_JID, "room2");
- return new MUCModule(MODULE_JID, conference);
+ return new MUCModule(MODULE_JID.getDomain(), conference);
}
@Override
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java?rev=809873&r1=809872&r2=809873&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java
Tue Sep 1 07:55:52 2009
@@ -42,7 +42,7 @@
protected Module getModule() {
Conference conference = new Conference("Foo");
conference.createRoom(ROOM_JID, "Room1", RoomType.Hidden,
RoomType.PasswordProtected);
- return new MUCModule(MODULE_JID, conference);
+ return new MUCModule(MODULE_JID.getDomain(), conference);
}
@Override
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java?rev=809873&r1=809872&r2=809873&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
Tue Sep 1 07:55:52 2009
@@ -52,7 +52,7 @@
Room room = conference.createRoom(ROOM_JID, "room1");
room.addOccupant(USER1_JID, "Nick 1");
room.addOccupant(USER2_JID, "Nick 2");
- return new MUCModule(MODULE_JID, conference);
+ return new MUCModule(MODULE_JID.getDomain(), conference);
}
@Override
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCServerInfoDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCServerInfoDiscoTestCase.java?rev=809873&r1=809872&r2=809873&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCServerInfoDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCServerInfoDiscoTestCase.java
Tue Sep 1 07:55:52 2009
@@ -36,7 +36,7 @@
@Override
protected Module getModule() {
Conference conference = new Conference("Foo");
- return new MUCModule(MODULE_JID, conference);
+ return new MUCModule(MODULE_JID.getDomain(), conference);
}
@Override
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java?rev=809873&r1=809872&r2=809873&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
Tue Sep 1 07:55:52 2009
@@ -40,7 +40,7 @@
*/
public class MUCIntegrationTestCase extends AbstractIntegrationTestCase {
- private static final Entity MUC_DOMAIN =
TestUtil.parseUnchecked("chat.vysper.org");
+ private static final String MUC_SUBDOMAIN = "chat";
private static final String ROOM_JID = "[email protected]";
private Conference conference = new Conference("test conference");
@@ -53,7 +53,7 @@
@Override
protected void addModules(XMPPServer server) {
- server.addModule(new MUCModule(MUC_DOMAIN, conference));
+ server.addModule(new MUCModule(MUC_SUBDOMAIN, conference));
}
@Override
