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/04/20 14:00:07 UTC
svn commit: r1095383 - in /mina/vysper/trunk:
examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/
server/admin-console/src/test/java/org/apache/vysper/console/
server/core-inttest/src/test/java/org/apache/vysper/xmpp/module...
Author: ngn
Date: Wed Apr 20 12:00:06 2011
New Revision: 1095383
URL: http://svn.apache.org/viewvc?rev=1095383&view=rev
Log:
Implemented a dedicated client-to-client endpoint (VYSPER-282)
Added:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/C2SEndpoint.java
- copied, changed from r1095381, mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/C2SEndpointTest.java
- copied, changed from r1095381, mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/S2SEndpointTest.java
- copied, changed from r1095381, mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/TCPEndpointTestTemplate.java
Modified:
mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/ServerMain.java
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
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/TCPEndpoint.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerMain.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/Server2Server.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/ServerMain.java
mina/vysper/trunk/server/extensions/websockets/src/examples/java/org/apache/vysper/xmpp/extension/websockets/DemoServer.java
mina/vysper/trunk/server/extensions/websockets/src/examples/java/org/apache/vysper/xmpp/extension/websockets/ServerMain.java
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/demo/pubsub/client/ServerMain.java
mina/vysper/trunk/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IntegrationTest.java
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/ServerMain.java
Modified: mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java (original)
+++ mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java Wed Apr 20 12:00:06 2011
@@ -22,7 +22,7 @@ package org.apache.vysper.xmpp.exemples.
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -53,7 +53,7 @@ public class VysperListener implements S
}
server = new XMPPServer(domain);
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
server.setStorageProviderRegistry(providerRegistry);
server.setTLSCertificateInfo(sce.getServletContext().getResourceAsStream("WEB-INF/bogus_mina_tls.cert"), "boguspw");
Modified: mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/ServerMain.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/ServerMain.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/ServerMain.java (original)
+++ mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/ServerMain.java Wed Apr 20 12:00:06 2011
@@ -22,7 +22,7 @@ package org.apache.vysper.console;
import java.io.File;
import java.util.Arrays;
-import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -66,7 +66,7 @@ public class ServerMain {
}
XMPPServer server = new XMPPServer(domain);
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
//server.addEndpoint(new StanzaSessionFactory());
server.setStorageProviderRegistry(providerRegistry);
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=1095383&r1=1095382&r2=1095383&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 Wed Apr 20 12:00:06 2011
@@ -25,6 +25,7 @@ import java.net.ServerSocket;
import junit.framework.TestCase;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.mina.TCPEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
@@ -89,7 +90,7 @@ public abstract class AbstractIntegratio
server = new XMPPServer(SERVER_DOMAIN);
- TCPEndpoint endpoint = new TCPEndpoint();
+ TCPEndpoint endpoint = new C2SEndpoint();
endpoint.setPort(port);
server.addEndpoint(endpoint);
server.setStorageProviderRegistry(providerRegistry);
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=1095383&r1=1095382&r2=1095383&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 Wed Apr 20 12:00:06 2011
@@ -31,7 +31,8 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.mina.C2SEndpoint;
+import org.apache.vysper.mina.S2SEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -219,7 +220,7 @@ public class RunS2SServers extends TestC
server.addEndpoint(new S2SEndpoint());
// C2S endpoint
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
server.setStorageProviderRegistry(providerRegistry);
server.setTLSCertificateInfo(new File(keystorePath), keystorePassword);
Copied: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/C2SEndpoint.java (from r1095381, mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java)
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/C2SEndpoint.java?p2=mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/C2SEndpoint.java&p1=mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java&r1=1095381&r2=1095383&rev=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/C2SEndpoint.java Wed Apr 20 12:00:06 2011
@@ -21,14 +21,15 @@ package org.apache.vysper.mina;
/**
- * Endpoint used for server-to-servr (s2s) connections
+ * Endpoint used for client-to-server (c2s) connections. Defaults
+ * to listen on port 5222.
*
* @author The Apache MINA Project (dev@mina.apache.org)
*/
-public class S2SEndpoint extends TCPEndpoint {
+public class C2SEndpoint extends TCPEndpoint {
- public S2SEndpoint() {
- setPort(5269);
+ public C2SEndpoint() {
+ super(5222);
}
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java Wed Apr 20 12:00:06 2011
@@ -21,14 +21,15 @@ package org.apache.vysper.mina;
/**
- * Endpoint used for server-to-servr (s2s) connections
+ * Endpoint used for server-to-server (s2s) connections. Defaults
+ * to listen on port 5269.
*
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class S2SEndpoint extends TCPEndpoint {
public S2SEndpoint() {
- setPort(5269);
+ super(5269);
}
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/TCPEndpoint.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/TCPEndpoint.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/TCPEndpoint.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/TCPEndpoint.java Wed Apr 20 12:00:06 2011
@@ -44,7 +44,16 @@ public class TCPEndpoint implements Endp
private int port = 5222;
private SocketAcceptor acceptor;
+
+ /**
+ * @deprecated Use {@link C2SEndpoint} or {@link S2SEndpoint} instead. This class will
+ * be made abstract in a future release.
+ */
+ public TCPEndpoint() {
+ }
+ protected TCPEndpoint(int port) {
+ this.port = port;
}
public void setServerRuntimeContext(ServerRuntimeContext serverRuntimeContext) {
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerMain.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerMain.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerMain.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerMain.java Wed Apr 20 12:00:06 2011
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -81,7 +81,7 @@ public class ServerMain {
}
XMPPServer server = new XMPPServer(domain);
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
//server.addEndpoint(new StanzaSessionFactory());
server.setStorageProviderRegistry(providerRegistry);
Copied: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/C2SEndpointTest.java (from r1095381, mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java)
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/C2SEndpointTest.java?p2=mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/C2SEndpointTest.java&p1=mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java&r1=1095381&r2=1095383&rev=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/C2SEndpointTest.java Wed Apr 20 12:00:06 2011
@@ -17,18 +17,21 @@
* under the License.
*
*/
-package org.apache.vysper.mina;
+package org.apache.vysper.mina.codec;
+
+import org.apache.vysper.mina.C2SEndpoint;
+import org.apache.vysper.mina.TCPEndpoint;
/**
- * Endpoint used for server-to-servr (s2s) connections
- *
- * @author The Apache MINA Project (dev@mina.apache.org)
*/
-public class S2SEndpoint extends TCPEndpoint {
+public class C2SEndpointTest extends TCPEndpointTestTemplate {
- public S2SEndpoint() {
- setPort(5269);
+ protected TCPEndpoint createEndpoint() {
+ return new C2SEndpoint();
}
+ protected int getDefaultPort() {
+ return 5222;
+ }
}
Copied: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/S2SEndpointTest.java (from r1095381, mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java)
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/S2SEndpointTest.java?p2=mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/S2SEndpointTest.java&p1=mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java&r1=1095381&r2=1095383&rev=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/S2SEndpoint.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/S2SEndpointTest.java Wed Apr 20 12:00:06 2011
@@ -17,18 +17,21 @@
* under the License.
*
*/
-package org.apache.vysper.mina;
+package org.apache.vysper.mina.codec;
+
+import org.apache.vysper.mina.S2SEndpoint;
+import org.apache.vysper.mina.TCPEndpoint;
/**
- * Endpoint used for server-to-servr (s2s) connections
- *
- * @author The Apache MINA Project (dev@mina.apache.org)
*/
-public class S2SEndpoint extends TCPEndpoint {
+public class S2SEndpointTest extends TCPEndpointTestTemplate {
- public S2SEndpoint() {
- setPort(5269);
+ protected TCPEndpoint createEndpoint() {
+ return new S2SEndpoint();
}
+ protected int getDefaultPort() {
+ return 5269;
+ }
}
Added: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/TCPEndpointTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/TCPEndpointTestTemplate.java?rev=1095383&view=auto
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/TCPEndpointTestTemplate.java (added)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/TCPEndpointTestTemplate.java Wed Apr 20 12:00:06 2011
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.vysper.mina.codec;
+
+import java.io.IOException;
+
+import org.apache.vysper.mina.C2SEndpoint;
+import org.apache.vysper.mina.TCPEndpoint;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
+
+
+/**
+ */
+public abstract class TCPEndpointTestTemplate {
+
+ private TCPEndpoint endpoint = createEndpoint();
+
+ protected abstract TCPEndpoint createEndpoint();
+ protected abstract int getDefaultPort();
+
+ @Test
+ public void getPort() throws IOException {
+ Assert.assertEquals(getDefaultPort(), endpoint.getPort());
+ endpoint.setPort(0);
+ Assert.assertEquals(0, endpoint.getPort());
+
+ endpoint.start();
+
+ Assert.assertTrue(0 != endpoint.getPort());
+ }
+
+ @Test(expected=IllegalStateException.class)
+ public void setPortAfterStarted() throws IOException {
+ endpoint.setPort(0);
+ endpoint.start();
+
+ endpoint.setPort(12345);
+ }
+
+ @After
+ public void tearDown() {
+ endpoint.stop();
+ }
+
+}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/Server2Server.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/Server2Server.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/Server2Server.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/s2s/Server2Server.java Wed Apr 20 12:00:06 2011
@@ -20,8 +20,8 @@
package org.apache.vysper.xmpp.server.s2s;
import java.io.File;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.mina.S2SEndpoint;
-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.Entity;
@@ -74,7 +74,7 @@ public class Server2Server {
server.addEndpoint(new S2SEndpoint());
// C2S endpoint
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
server.setStorageProviderRegistry(providerRegistry);
server.setTLSCertificateInfo(new File(keystorePath), keystorePassword);
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=1095383&r1=1095382&r2=1095383&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 Wed Apr 20 12:00:06 2011
@@ -23,8 +23,8 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.mina.S2SEndpoint;
-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.Entity;
@@ -92,7 +92,7 @@ public class ServerMain {
server.addEndpoint(new S2SEndpoint());
// C2S endpoint
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
//server.addEndpoint(new StanzaSessionFactory());
server.setStorageProviderRegistry(providerRegistry);
Modified: mina/vysper/trunk/server/extensions/websockets/src/examples/java/org/apache/vysper/xmpp/extension/websockets/DemoServer.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/websockets/src/examples/java/org/apache/vysper/xmpp/extension/websockets/DemoServer.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/websockets/src/examples/java/org/apache/vysper/xmpp/extension/websockets/DemoServer.java (original)
+++ mina/vysper/trunk/server/extensions/websockets/src/examples/java/org/apache/vysper/xmpp/extension/websockets/DemoServer.java Wed Apr 20 12:00:06 2011
@@ -22,7 +22,7 @@ package org.apache.vysper.xmpp.extension
import java.io.File;
import java.io.FileNotFoundException;
-import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -76,7 +76,7 @@ public class DemoServer {
XMPPServer server = new XMPPServer("vysper.org");
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
WebSocketEndpoint wsEndpoint = new WebSocketEndpoint() {
Modified: mina/vysper/trunk/server/extensions/websockets/src/examples/java/org/apache/vysper/xmpp/extension/websockets/ServerMain.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/websockets/src/examples/java/org/apache/vysper/xmpp/extension/websockets/ServerMain.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/websockets/src/examples/java/org/apache/vysper/xmpp/extension/websockets/ServerMain.java (original)
+++ mina/vysper/trunk/server/extensions/websockets/src/examples/java/org/apache/vysper/xmpp/extension/websockets/ServerMain.java Wed Apr 20 12:00:06 2011
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -83,7 +83,7 @@ public class ServerMain {
XMPPServer server = new XMPPServer("vysper.org");
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
WebSocketEndpoint wsEndpoint = new WebSocketEndpoint();
// wsEndpoint.setSSLEnabled(true);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java Wed Apr 20 12:00:06 2011
@@ -25,6 +25,7 @@ import java.net.ServerSocket;
import junit.framework.TestCase;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.mina.TCPEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
@@ -89,7 +90,7 @@ public abstract class AbstractIntegratio
server = new XMPPServer(SERVER_DOMAIN);
- TCPEndpoint endpoint = new TCPEndpoint();
+ TCPEndpoint endpoint = new C2SEndpoint();
endpoint.setPort(port);
server.addEndpoint(endpoint);
server.setStorageProviderRegistry(providerRegistry);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ServerMain.java Wed Apr 20 12:00:06 2011
@@ -21,7 +21,7 @@ package org.apache.vysper.xmpp.modules.e
import java.io.File;
-import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
import org.apache.vysper.xmpp.addressing.EntityImpl;
@@ -54,7 +54,7 @@ public class ServerMain {
accountManagement.addUser(EntityImpl.parseUnchecked("user2@vysper.org"), "password1");
XMPPServer server = new XMPPServer("vysper.org");
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
server.setStorageProviderRegistry(providerRegistry);
server.setTLSCertificateInfo(new File("src/main/config/bogus_mina_tls.cert"), "boguspw");
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/demo/pubsub/client/ServerMain.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/demo/pubsub/client/ServerMain.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/demo/pubsub/client/ServerMain.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/demo/pubsub/client/ServerMain.java Wed Apr 20 12:00:06 2011
@@ -22,7 +22,7 @@ package org.apache.vysper.demo.pubsub.cl
import java.io.File;
import java.io.FileNotFoundException;
-import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -77,7 +77,7 @@ public class ServerMain {
}
XMPPServer server = new XMPPServer("vysper.org");
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
//server.addEndpoint(new StanzaSessionFactory());
server.setStorageProviderRegistry(providerRegistry);
Modified: mina/vysper/trunk/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IntegrationTest.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IntegrationTest.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IntegrationTest.java (original)
+++ mina/vysper/trunk/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IntegrationTest.java Wed Apr 20 12:00:06 2011
@@ -27,7 +27,7 @@ import java.io.UnsupportedEncodingExcept
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -182,7 +182,7 @@ public class Socks5IntegrationTest {
accountManagement.addUser(USER2, PASSWORD);
XMPPServer server = new XMPPServer(SERVER);
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
server.setStorageProviderRegistry(providerRegistry);
server.setTLSCertificateInfo(new File("src/test/resources/bogus_mina_tls.cert"), "boguspw");
Modified: mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/ServerMain.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/ServerMain.java?rev=1095383&r1=1095382&r2=1095383&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/ServerMain.java (original)
+++ mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/ServerMain.java Wed Apr 20 12:00:06 2011
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.mina.C2SEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -88,7 +88,7 @@ public class ServerMain {
XMPPServer server = new XMPPServer("vysper.org");
- server.addEndpoint(new TCPEndpoint());
+ server.addEndpoint(new C2SEndpoint());
BoshEndpoint boshEndpoint = new BoshEndpoint();
boshEndpoint.setAccessControlAllowOrigin(Arrays.asList("*"));