XMPPBootServlet can always start -- just make it smarter!

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

build/build.xml

@@ -353,16 +353,10 @@
         <mkdir dir="${war.dest.dir}"/>
         <mkdir dir="${war.dest.dir}/build"/>
         <!-- Make a new web.xml file in the build dir -->
-        <loadfile property="startup-def" srcFile="${web.dir}/WEB-INF/web.xml.startup.servlet"/>
-        <copy file="${webapp.dest.dir}/WEB-INF/web.xml" toFile="${war.dest.dir}/build/web.xml" overwrite="${overwrite}">
-            <filterset begintoken="&lt;!--@@" endtoken="@@--&gt;">
-                <filter token="STARTUP-SERVLET" value="${startup-def}"/>
-            </filterset>
-        </copy>
+        <copy file="${webapp.dest.dir}/WEB-INF/web.xml" toFile="${war.dest.dir}/build/web.xml" overwrite="${overwrite}"/>
         <!-- Make the war -->
         <war destfile="${war.dest.dir}/${war.name}" basedir="${web.dir}"
-            webxml="${war.dest.dir}/build/web.xml"
-            excludes="*.jsp*,WEB-INF/web.xml.startup.servlet">
+            webxml="${war.dest.dir}/build/web.xml">
             <patternset refid="web.sources"/>
             <lib dir="${jar.dest.dir}" excludes="jasper-compiler.jar, servlet.jar, startup.jar"/>
         </war>
@@ -943,7 +937,6 @@
                         <fileset dir="${web.dir}">
                             <include name="WEB-INF/**/*.*"/>
                             <exclude name="WEB-INF/web.xml"/>
-                            <exclude name="WEB-INF/web.xml.startup.servlet"/>
                             <exclude name="WEB-INF/classes/messenger_init.xml"/>
                             <exclude name="WEB-INF/tmp/**/*.*"/>
                             <exclude name="WEB-INF/work/**/*.*"/>

src/java/org/jivesoftware/messenger/XMPPBootServlet.java

@@ -23,8 +23,9 @@ public class XMPPBootServlet extends HttpServlet {
     private Object serverLock = new Object();
 
     public void init(ServletConfig servletConfig) throws ServletException {
-        if (server == null) {
-            synchronized (serverLock) {
+        synchronized (serverLock) {
+            // only start up if it hasn't already...
+            if (XMPPServer.getInstance() == null) {
                 if (server == null) {
                     server = new XMPPServer();
                 }

src/web/WEB-INF/web.xml

@@ -63,16 +63,11 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
 
-    <!-- Uncomment this servlet when starting the server in a webapp -->
-    <!--
     <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@@-->