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 22:15:49 UTC
svn commit: r1062033 - in /mina/vysper/trunk/examples/embedded-war/src/main:
java/org/apache/vysper/xmpp/exemples/embeddedwar/ webapp/WEB-INF/
Author: ngn
Date: Fri Jan 21 21:15:46 2011
New Revision: 1062033
URL: http://svn.apache.org/viewvc?rev=1062033&view=rev
Log:
Simplify the example a bit
Added:
mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/StatusServlet.java
- copied, changed from r1061936, mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/IndexServlet.java
Removed:
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
Copied: mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/StatusServlet.java (from r1061936, 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/StatusServlet.java?p2=mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/StatusServlet.java&p1=mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/IndexServlet.java&r1=1061936&r2=1062033&rev=1062033&view=diff
==============================================================================
--- mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/IndexServlet.java (original)
+++ mina/vysper/trunk/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/StatusServlet.java Fri Jan 21 21:15:46 2011
@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.vysper.xmpp.server.XMPPServer;
-public class IndexServlet extends HttpServlet {
+public class StatusServlet extends HttpServlet {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
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=1062033&r1=1062032&r2=1062033&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 21:15:46 2011
@@ -21,14 +21,14 @@ public class VysperListener implements S
public void contextInitialized(ServletContextEvent sce) {
try {
- String domain = sce.getServletContext().getInitParameter("domain");
+ String domain = "vysper.org";
StorageProviderRegistry providerRegistry = new MemoryStorageProviderRegistry();
final AccountManagement accountManagement = (AccountManagement) providerRegistry
.retrieve(AccountManagement.class);
- Entity user1 = EntityImpl.parse("user1@vysper.org");
+ Entity user1 = EntityImpl.parse("user1@" + domain);
if (!accountManagement.verifyAccountExists(user1)) {
accountManagement.addUser(user1, "password1");
}
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=1062033&r1=1062032&r2=1062033&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 21:15:46 2011
@@ -20,11 +20,6 @@
<description>Embedded Vysper</description>
- <context-param>
- <param-name>domain</param-name>
- <param-value>vysper.org</param-value>
- </context-param>
-
<listener>
<listener-class>org.apache.vysper.xmpp.exemples.embeddedwar.VysperListener</listener-class>
</listener>
@@ -42,12 +37,12 @@
</servlet-mapping>
-->
<servlet>
- <servlet-name>Index</servlet-name>
- <servlet-class>org.apache.vysper.xmpp.exemples.embeddedwar.IndexServlet</servlet-class>
+ <servlet-name>Status</servlet-name>
+ <servlet-class>org.apache.vysper.xmpp.exemples.embeddedwar.StatusServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
- <servlet-name>Index</servlet-name>
+ <servlet-name>Status</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>