[JM-1196] misread issue, crossdomain is now served off of http bind port, no longer off of 9090

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

src/java/org/jivesoftware/openfire/http/HttpBindManager.java

@@ -267,6 +267,7 @@ public final class HttpBindManager {
         }
 
         createBoshHandler(contexts, "/http-bind");
+        createCrossDomainHandler(contexts, "/");
         loadStaticDirectory(contexts);
 
         httpBindServer.setHandlers(new Handler[]{contexts, new DefaultHandler()});
@@ -280,6 +281,14 @@ public final class HttpBindManager {
         boshContextHandler.setHandler(handler);
     }
 
+    private void createCrossDomainHandler(ContextHandlerCollection contexts, String crossPath) {
+        ServletHandler handler = new ServletHandler();
+        handler.addServletWithMapping(FlashCrossDomainServlet.class, "/crossdomain.xml");
+
+        ContextHandler crossContextHandler = new ContextHandler(contexts, crossPath);
+        crossContextHandler.setHandler(handler);
+    }
+
     private void loadStaticDirectory(ContextHandlerCollection contexts) {
         File spankDirectory = new File(JiveGlobals.getHomeDirectory() + File.separator
                 + "resources" + File.separator + "spank");

src/web/WEB-INF/web.xml

@@ -116,11 +116,6 @@
         <servlet-class>org.jivesoftware.openfire.container.PluginIconServlet</servlet-class>
     </servlet>
 
-    <servlet>
-        <servlet-name>FlashCrossDomainServlet</servlet-name>
-        <servlet-class>org.jivesoftware.openfire.http.FlashCrossDomainServlet</servlet-class>
-    </servlet>
-
 
     <!--@@JSPC-SERVLETS@@-->
 
@@ -139,12 +134,6 @@
         <url-pattern>/geticon</url-pattern>
     </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>FlashCrossDomainServlet</servlet-name>
-        <url-pattern>/crossdomain.xml</url-pattern>
-    </servlet-mapping>
-
-
     <servlet-mapping>
         <servlet-name>dwr-invoker</servlet-name>
         <url-pattern>/dwr/*</url-pattern>