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/05 20:07:00 UTC

svn commit: r1055586 - in /mina/vysper/trunk: examples/ examples/embedded-war/ examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/ server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/

Author: ngn
Date: Wed Jan  5 19:07:00 2011
New Revision: 1055586

URL: http://svn.apache.org/viewvc?rev=1055586&view=rev
Log:
Cleaning up example

Modified:
    mina/vysper/trunk/examples/   (props changed)
    mina/vysper/trunk/examples/embedded-war/   (props changed)
    mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
    mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/XmppWebSocketServlet.java

Propchange: mina/vysper/trunk/examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jan  5 19:07:00 2011
@@ -0,0 +1 @@
+target

Propchange: mina/vysper/trunk/examples/embedded-war/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jan  5 19:07:00 2011
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project

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=1055586&r1=1055585&r2=1055586&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 Jan  5 19:07:00 2011
@@ -1,7 +1,5 @@
 package org.apache.vysper.xmpp.exemples.embeddedwar;
 
-import java.io.File;
-
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
@@ -22,7 +20,6 @@ public class VysperListener implements S
     private XMPPServer server;
 
     public void contextInitialized(ServletContextEvent sce) {
-        System.out.println("starting listener");
         try {
             String domain = sce.getServletContext().getInitParameter("domain");
             
@@ -39,7 +36,6 @@ public class VysperListener implements S
     
             server = new XMPPServer(domain);
             server.addEndpoint(new TCPEndpoint());
-            //server.addEndpoint(new StanzaSessionFactory());
             server.setStorageProviderRegistry(providerRegistry);
     
             server.setTLSCertificateInfo(sce.getServletContext().getResourceAsStream("WEB-INF/bogus_mina_tls.cert"), "password");

Modified: mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/XmppWebSocketServlet.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/XmppWebSocketServlet.java?rev=1055586&r1=1055585&r2=1055586&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/XmppWebSocketServlet.java (original)
+++ mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/XmppWebSocketServlet.java Wed Jan  5 19:07:00 2011
@@ -58,7 +58,6 @@ public class XmppWebSocketServlet extend
         
         if(serverRuntimeContext == null) {
             serverRuntimeContext = (ServerRuntimeContext) getServletContext().getAttribute(SERVER_RUNTIME_CONTEXT_ATTRIBUTE);
-            System.out.println(serverRuntimeContext);
             if(serverRuntimeContext == null) {
                 throw new RuntimeException("Failed to get Vysper ServerRuntimeContext from servlet context attribute \"" + SERVER_RUNTIME_CONTEXT_ATTRIBUTE + "\"");
             }