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/03/27 15:16:54 UTC
svn commit: r1085929 - in /mina/vysper/trunk/server/core/src:
main/java/org/apache/vysper/xmpp/server/ServerFeatures.java
test/java/org/apache/vysper/xmpp/server/s2s/ServerMain.java
Author: ngn
Date: Sun Mar 27 13:16:54 2011
New Revision: 1085929
URL: http://svn.apache.org/viewvc?rev=1085929&view=rev
Log:
Disabling external relaying by default (VYSPER-281)
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerFeatures.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/ServerMain.java
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerFeatures.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerFeatures.java?rev=1085929&r1=1085928&r2=1085929&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerFeatures.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerFeatures.java Sun Mar 27 13:16:54 2011
@@ -49,7 +49,7 @@ public class ServerFeatures {
/**
* flag indicating whether stanzas are sent to remote servers or not
*/
- private boolean relayToFederationServers = true;
+ private boolean relayToFederationServers = false;
/**
* counter, how many times a session can try authentication before session is terminated
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/ServerMain.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/ServerMain.java?rev=1085929&r1=1085928&r2=1085929&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/ServerMain.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/ServerMain.java Sun Mar 27 13:16:54 2011
@@ -56,8 +56,9 @@ public class ServerMain {
* -Dvysper.add.module=org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.PublishSubscribeModule,... more ...
*
* @param args
+ * @throws Exception
*/
- public static void main(String[] args) throws AccountCreationException, EntityFormatException, FileNotFoundException {
+ public static void main(String[] args) throws Exception {
Entity localServer = EntityImpl.parseUnchecked(args[0]);
Entity localUser = EntityImpl.parseUnchecked(args[1]);
String keystorePath;
@@ -89,6 +90,7 @@ public class ServerMain {
XMPPServer server = new XMPPServer(localServer.getFullQualifiedName());
+
// S2S endpoint
server.addEndpoint(new S2SEndpoint());
@@ -100,24 +102,22 @@ public class ServerMain {
server.setTLSCertificateInfo(new File(keystorePath), keystorePassword);
- try {
- server.start();
- System.out.println("vysper server is running...");
- } catch (Exception e) {
- e.printStackTrace();
- }
-
server.addModule(new SoftwareVersionModule());
server.addModule(new EntityTimeModule());
server.addModule(new VcardTempModule());
server.addModule(new XmppPingModule());
server.addModule(new PrivateDataModule());
-
+
if (listOfModules != null) {
for (Module module : listOfModules) {
server.addModule(module);
}
}
+
+ server.start();
+ System.out.println("vysper server is running...");
+
+ server.getServerRuntimeContext().getServerFeatures().setRelayingToFederationServers(true);
}
private static List<Module> createModuleInstances(String[] moduleClassNames) {