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 2010/03/07 13:52:29 UTC
svn commit: r919982 - in /mina/sandbox/vysper/trunk: ./ dist/ server/
server/core/src/main/config/ server/extensions/
server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/
server/extensions/xep0045-muc/src/te...
Author: ngn
Date: Sun Mar 7 12:52:29 2010
New Revision: 919982
URL: http://svn.apache.org/viewvc?rev=919982&view=rev
Log:
Include MUC and PubSub in the distribution
Added:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java
- copied, changed from r888048, mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java
Removed:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java
Modified:
mina/sandbox/vysper/trunk/dist/pom.xml
mina/sandbox/vysper/trunk/pom.xml
mina/sandbox/vysper/trunk/server/ (props changed)
mina/sandbox/vysper/trunk/server/core/src/main/config/spring-config.xml
mina/sandbox/vysper/trunk/server/extensions/ (props changed)
Modified: mina/sandbox/vysper/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/dist/pom.xml?rev=919982&r1=919981&r2=919982&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/dist/pom.xml (original)
+++ mina/sandbox/vysper/trunk/dist/pom.xml Sun Mar 7 12:52:29 2010
@@ -27,6 +27,7 @@
<artifactId>vysper</artifactId>
<name>Apache Vysper</name>
<version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<dependencies>
<dependency>
@@ -34,12 +35,22 @@
<artifactId>nbxml</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.vysper</groupId>
<artifactId>vysper-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.vysper.extensions</groupId>
+ <artifactId>xep0045-muc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.vysper.extensions</groupId>
+ <artifactId>xep0060-pubsub</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<optional>true</optional>
Modified: mina/sandbox/vysper/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/pom.xml?rev=919982&r1=919981&r2=919982&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/pom.xml (original)
+++ mina/sandbox/vysper/trunk/pom.xml Sun Mar 7 12:52:29 2010
@@ -198,6 +198,12 @@
<dependency>
<groupId>org.apache.vysper</groupId>
+ <artifactId>nbxml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.vysper</groupId>
<artifactId>vysper-core</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -209,10 +215,15 @@
<version>${pom.version}</version>
</dependency>
- <!-- Spec compliance -->
<dependency>
- <groupId>org.apache.vysper</groupId>
- <artifactId>nbxml</artifactId>
+ <groupId>org.apache.vysper.extensions</groupId>
+ <artifactId>xep0045-muc</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.vysper.extensions</groupId>
+ <artifactId>xep0060-pubsub</artifactId>
<version>${pom.version}</version>
</dependency>
Propchange: mina/sandbox/vysper/trunk/server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 7 12:52:29 2010
@@ -0,0 +1 @@
+target
Modified: mina/sandbox/vysper/trunk/server/core/src/main/config/spring-config.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/config/spring-config.xml?rev=919982&r1=919981&r2=919982&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/config/spring-config.xml (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/config/spring-config.xml Sun Mar 7 12:52:29 2010
@@ -111,8 +111,8 @@
<bean class="org.apache.vysper.xmpp.modules.extension.xep0054_vcardtemp.VcardTempModule" />
<!-- below some more modules which are available as separatly-built jars.
make sure they are on the classpath when enabling them -->
- <!--<bean class="org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.PublishSubscribeModule" />-->
- <!--<bean class="org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCModule" />-->
+ <bean class="org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.PublishSubscribeModule" />
+ <bean class="org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCModule" />
</list>
</property>
</bean>
Propchange: mina/sandbox/vysper/trunk/server/extensions/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 7 12:52:29 2010
@@ -0,0 +1 @@
+target
Copied: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java (from r888048, mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.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/ServerMain.java?p2=mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java&p1=mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java&r1=888048&r2=919982&rev=919982&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java Sun Mar 7 12:52:29 2010
@@ -20,18 +20,13 @@
package org.apache.vysper.xmpp.modules.extension.xep0045_muc;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
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.EntityFormatException;
-import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.authorization.AccountCreationException;
import org.apache.vysper.xmpp.authorization.AccountManagement;
-import org.apache.vysper.xmpp.modules.Module;
-import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Conference;
import org.apache.vysper.xmpp.modules.extension.xep0049_privatedata.PrivateDataModule;
import org.apache.vysper.xmpp.modules.extension.xep0054_vcardtemp.VcardTempModule;
import org.apache.vysper.xmpp.modules.extension.xep0092_software_version.SoftwareVersionModule;
@@ -40,33 +35,26 @@
import org.apache.vysper.xmpp.server.XMPPServer;
/**
- * starts the server as a standalone application
+ * starts the server with MUC as a standalone application
+ *
+ * Note that this server assums to be running on vysper.org and with MUC on chat.vysper.org.
+ * You will need to alias these in /etc/hosts or change them below
*
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class ServerMain {
- /**
- * boots the server as a standalone application
- *
- * adding a module from the command line:
- * using a runtime property, one or more modules can be specified, like this:
- * -Dvysper.add.module=org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.PublishSubscribeModule,... more ...
- *
- * @param args
- */
public static void main(String[] args) throws AccountCreationException, EntityFormatException {
StorageProviderRegistry providerRegistry = new MemoryStorageProviderRegistry();
- final AccountManagement accountManagement = (AccountManagement)providerRegistry.retrieve(AccountManagement.class);
+ AccountManagement accountManagement = (AccountManagement)providerRegistry.retrieve(AccountManagement.class);
accountManagement.addUser("test@vysper.org", "password");
accountManagement.addUser("test2@vysper.org", "password");
XMPPServer server = new XMPPServer("vysper.org");
server.addEndpoint(new TCPEndpoint());
- //server.addEndpoint(new StanzaSessionFactory());
server.setStorageProviderRegistry(providerRegistry);
server.setTLSCertificateInfo(new File("src/main/config/bogus_mina_tls.cert"), "boguspw");