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/01/21 18:59:22 UTC
svn commit: r1061936 - in /mina/vysper/trunk/examples/embedded-war/src/main:
java/org/apache/vysper/xmpp/exemples/embeddedwar/IndexServlet.java
java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
webapp/WEB-INF/web.xml
Author: ngn
Date: Fri Jan 21 17:59:22 2011
New Revision: 1061936
URL: http://svn.apache.org/viewvc?rev=1061936&view=rev
Log:
Commenting out websockets to make the example deployable on any servlet engine
Add a servlet for showing the status of Vysper
Added:
mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/IndexServlet.java
Modified:
mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
mina/vysper/trunk/examples/embedded-war/src/main/webapp/WEB-INF/web.xml
Added: mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/IndexServlet.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/IndexServlet.java?rev=1061936&view=auto
==============================================================================
--- mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/IndexServlet.java (added)
+++ mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/IndexServlet.java Fri Jan 21 17:59:22 2011
@@ -0,0 +1,31 @@
+package org.apache.vysper.xmpp.exemples.embeddedwar;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.vysper.xmpp.server.XMPPServer;
+
+public class IndexServlet extends HttpServlet {
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ PrintWriter out = resp.getWriter();
+ out.println("Web application deployed successfully");
+
+ XMPPServer server = (XMPPServer) getServletContext().getAttribute("vysper");
+ if(server != null) {
+ if(server.getServerRuntimeContext() != null) {
+ out.println("Vysper started");
+ } else {
+ out.println("Vysper stopped, check error log");
+ }
+ } else {
+ out.println("Vysper not enabled, check error log");
+ }
+ }
+}
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=1061936&r1=1061935&r2=1061936&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 Fri Jan 21 17:59:22 2011
@@ -9,7 +9,6 @@ import org.apache.vysper.storage.inmemor
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.authorization.AccountManagement;
-import org.apache.vysper.xmpp.extension.websockets.XmppWebSocketServlet;
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.xep0119_xmppping.XmppPingModule;
@@ -38,7 +37,7 @@ public class VysperListener implements S
server.addEndpoint(new TCPEndpoint());
server.setStorageProviderRegistry(providerRegistry);
- server.setTLSCertificateInfo(sce.getServletContext().getResourceAsStream("WEB-INF/bogus_mina_tls.cert"), "password");
+ server.setTLSCertificateInfo(sce.getServletContext().getResourceAsStream("WEB-INF/bogus_mina_tls.cert"), "boguspw");
try {
server.start();
@@ -51,9 +50,12 @@ public class VysperListener implements S
server.addModule(new EntityTimeModule());
server.addModule(new VcardTempModule());
server.addModule(new XmppPingModule());
-
- sce.getServletContext().setAttribute(XmppWebSocketServlet.SERVER_RUNTIME_CONTEXT_ATTRIBUTE, server.getServerRuntimeContext());
+
+ // Used by the websocket endpoint, if enabled
+ sce.getServletContext().setAttribute("org.apache.vysper.xmpp.server.ServerRuntimeContext", server.getServerRuntimeContext());
+ sce.getServletContext().setAttribute("vysper", server);
} catch (Exception e) {
+ e.printStackTrace();
throw new RuntimeException(e);
}
}
Modified: mina/vysper/trunk/examples/embedded-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/examples/embedded-war/src/main/webapp/WEB-INF/web.xml?rev=1061936&r1=1061935&r2=1061936&view=diff
==============================================================================
--- mina/vysper/trunk/examples/embedded-war/src/main/webapp/WEB-INF/web.xml (original)
+++ mina/vysper/trunk/examples/embedded-war/src/main/webapp/WEB-INF/web.xml Fri Jan 21 17:59:22 2011
@@ -29,7 +29,8 @@
<listener-class>org.apache.vysper.xmpp.exemples.embeddedwar.VysperListener</listener-class>
</listener>
-
+<!--
+ Only works when deployed on Jetty.
<servlet>
<servlet-name>WebSocket Servlet</servlet-name>
<servlet-class>org.apache.vysper.xmpp.extension.websockets.XmppWebSocketServlet</servlet-class>
@@ -39,4 +40,15 @@
<servlet-name>WebSocket Servlet</servlet-name>
<url-pattern>/ws</url-pattern>
</servlet-mapping>
+ -->
+ <servlet>
+ <servlet-name>Index</servlet-name>
+ <servlet-class>org.apache.vysper.xmpp.exemples.embeddedwar.IndexServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Index</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+
</web-app>
\ No newline at end of file