You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2013/07/23 13:29:50 UTC
[1/2] git commit: improve and enhance the embedded WAR example app
Updated Branches:
refs/heads/master c54475ff7 -> 0dc0c9662
improve and enhance the embedded WAR example app
Project: http://git-wip-us.apache.org/repos/asf/mina-vysper/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-vysper/commit/c34c344b
Tree: http://git-wip-us.apache.org/repos/asf/mina-vysper/tree/c34c344b
Diff: http://git-wip-us.apache.org/repos/asf/mina-vysper/diff/c34c344b
Branch: refs/heads/master
Commit: c34c344bc9e51ab0b2158bab301acb7c637b46b4
Parents: 10ef5b2
Author: Bernd Fondermann <be...@brainlounge.de>
Authored: Tue Jul 23 11:32:27 2013 +0200
Committer: Bernd Fondermann <be...@brainlounge.de>
Committed: Tue Jul 23 11:32:27 2013 +0200
----------------------------------------------------------------------
examples/embedded-war/pom.xml | 12 ++++++----
.../exemples/embeddedwar/VysperListener.java | 25 +++++++++++++++++---
2 files changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-vysper/blob/c34c344b/examples/embedded-war/pom.xml
----------------------------------------------------------------------
diff --git a/examples/embedded-war/pom.xml b/examples/embedded-war/pom.xml
index 50e6065..6b10f9c 100644
--- a/examples/embedded-war/pom.xml
+++ b/examples/embedded-war/pom.xml
@@ -23,8 +23,7 @@
<version>0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.vysper.examples</groupId>
- <artifactId>vysper-embedded-war</artifactId>
+ <artifactId>vysper-embedded-war</artifactId>
<name>Apache Vysper Embedded in a WAR demo</name>
<version>0.8-SNAPSHOT</version>
<packaging>war</packaging>
@@ -35,13 +34,12 @@
<artifactId>vysper-core</artifactId>
</dependency>
-<!--
- Only works when deployed on Jetty.
<dependency>
<groupId>org.apache.vysper.extensions</groupId>
<artifactId>vysper-websockets</artifactId>
</dependency>
+<!--
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
@@ -77,6 +75,12 @@
</dependency>
-->
+ <!-- for having a BOSH endpoint -->
+ <dependency>
+ <groupId>org.apache.vysper.extensions</groupId>
+ <artifactId>xep0124-xep0206-bosh</artifactId>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
http://git-wip-us.apache.org/repos/asf/mina-vysper/blob/c34c344b/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
----------------------------------------------------------------------
diff --git a/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java b/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
index 0c990bb..896c0f8 100644
--- a/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
+++ b/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
@@ -23,15 +23,18 @@ import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
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;
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.authentication.AccountManagement;
+import org.apache.vysper.xmpp.extension.xep0124.BoshEndpoint;
import org.apache.vysper.xmpp.modules.extension.xep0054_vcardtemp.VcardTempModule;
import org.apache.vysper.xmpp.modules.extension.xep0092_software_version.SoftwareVersionModule;
import org.apache.vysper.xmpp.modules.extension.xep0199_xmppping.XmppPingModule;
import org.apache.vysper.xmpp.modules.extension.xep0202_entity_time.EntityTimeModule;
+import org.apache.vysper.xmpp.server.ServerFeatures;
import org.apache.vysper.xmpp.server.XMPPServer;
public class VysperListener implements ServletContextListener {
@@ -51,12 +54,24 @@ public class VysperListener implements ServletContextListener {
if (!accountManagement.verifyAccountExists(user1)) {
accountManagement.addUser(user1, "password1");
}
-
+
+ final String pathToTLSCertificate = "/WEB-INF/bogus_mina_tls.cert";
+
server = new XMPPServer(domain);
+ // enable classic TCP bases access
server.addEndpoint(new C2SEndpoint());
+
+ // enable bosh
+ final BoshEndpoint boshEndpoint = new BoshEndpoint();
+ boshEndpoint.setContextPath("/bosh");
+ boshEndpoint.setPort(8090);
+ server.addEndpoint(boshEndpoint);
+
+ // allow XMPP federation
+ server.addEndpoint(new S2SEndpoint());
+
server.setStorageProviderRegistry(providerRegistry);
- final String pathToTLSCertificate = "/WEB-INF/bogus_mina_tls.cert";
server.setTLSCertificateInfo(sce.getServletContext().getResourceAsStream(pathToTLSCertificate), "boguspw");
try {
@@ -65,7 +80,11 @@ public class VysperListener implements ServletContextListener {
} catch (Exception e) {
throw new RuntimeException(e);
}
-
+
+ final ServerFeatures serverFeatures = server.getServerRuntimeContext().getServerFeatures();
+ serverFeatures.setRelayingToFederationServers(true);
+ serverFeatures.setCheckFederationServerCertificates(false);
+
server.addModule(new SoftwareVersionModule());
server.addModule(new EntityTimeModule());
server.addModule(new VcardTempModule());
[2/2] git commit: improve and enhance the embedded WAR example app
Posted by be...@apache.org.
improve and enhance the embedded WAR example app
Project: http://git-wip-us.apache.org/repos/asf/mina-vysper/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-vysper/commit/0dc0c966
Tree: http://git-wip-us.apache.org/repos/asf/mina-vysper/tree/0dc0c966
Diff: http://git-wip-us.apache.org/repos/asf/mina-vysper/diff/0dc0c966
Branch: refs/heads/master
Commit: 0dc0c96627d142a0e114dbe0b9f169f785578a6c
Parents: c54475f c34c344
Author: Bernd Fondermann <be...@brainlounge.de>
Authored: Tue Jul 23 13:21:02 2013 +0200
Committer: Bernd Fondermann <be...@brainlounge.de>
Committed: Tue Jul 23 13:22:33 2013 +0200
----------------------------------------------------------------------
examples/embedded-war/pom.xml | 12 ++++++----
.../exemples/embeddedwar/VysperListener.java | 25 +++++++++++++++++---
2 files changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------