Changes to support war deployments

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@236 b35dd754-fafc-0310-a699-88a17e54d16e

src/web/WEB-INF/web.xml

@@ -10,13 +10,8 @@
         <param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
         <param-value>messenger_i18n_en</param-value>
     </context-param>
-    <!-- Uncomment if running in application server only 
-    <servlet>
-        <servlet-name>XMPPBootServlet</servlet-name>
-        <servlet-class>org.jivesoftware.messenger.XMPPBootServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-</servlet>
-    -->
+
+    <!--@@STARTUP-SERVLET@@-->
 
     <!--@@JSPC-SERVLETS@@-->
 

src/web/WEB-INF/web.xml.startup.servlet

+<servlet>
+    <servlet-name>XMPPBootServlet</servlet-name>
+    <servlet-class>org.jivesoftware.messenger.XMPPBootServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+</servlet>
\ No newline at end of file