Skip to content

O
Openfire
Commit a3a2bfb5 authored by Alex Wenckus's avatar Alex Wenckus Committed by alex
Browse files
Options

Decoupled http-binding service from file system. No longer dependent on the... 

Decoupled http-binding service from file system. No longer dependent on the web.xml in the spank directory. JM-1074

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@8388 b35dd754-fafc-0310-a699-88a17e54d16e
parent bdd5f54e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 1895 deletions
3_3_1_branch/src/java/org/jivesoftware/openfire/http/HttpBindManager.java
View file @ a3a2bfb5
......@@ -14,8 +14,10 @@ package org.jivesoftware.openfire.http;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.servlet.ServletHandler;
import org.mortbay.jetty.handler.ContextHandlerCollection;
import org.mortbay.jetty.handler.DefaultHandler;
import org.mortbay.jetty.handler.ContextHandler;
import org.mortbay.jetty.webapp.WebAppContext;
import org.mortbay.jetty.security.SslSocketConnector;
import org.mortbay.jetty.nio.SelectChannelConnector;
......@@ -58,7 +60,7 @@ public final class HttpBindManager {
private CertificateListener certificateListener;
private HttpSessionManager httpSessionManager;
private ContextHandlerCollection contexts;
public static HttpBindManager getInstance() {
......@@ -132,7 +134,8 @@ public final class HttpBindManager {
if (securePort > 0 && CertificateManager.isRSACertificate(SSLConfig.getKeyStore(), "*")) {
if (!CertificateManager.isRSACertificate(SSLConfig.getKeyStore(),
XMPPServer.getInstance().getServerInfo().getName())) {
Log.warn("HTTP binding: Using RSA certificates but they are not valid for the hosted domain");
Log.warn("HTTP binding: Using RSA certificates but they are not valid for " +
"the hosted domain");
}
SslSocketConnector sslConnector = new JiveSslConnector();
......@@ -222,8 +225,7 @@ public final class HttpBindManager {
}
private synchronized void changeHttpBindPorts(int unsecurePort, int securePort)
throws Exception
{
throws Exception {
if (unsecurePort < 0 && securePort < 0) {
throw new IllegalArgumentException("At least one port must be greater than zero.");
}
......@@ -264,15 +266,33 @@ public final class HttpBindManager {
if (httpsConnector != null) {
httpBindServer.addConnector(httpsConnector);
}
createWebAppContext();
httpBindServer.setHandlers(new Handler[] { contexts, new DefaultHandler() });
createBoshHandler(contexts, "/http-bind");
loadStaticDirectory(contexts);
httpBindServer.setHandlers(new Handler[]{contexts, new DefaultHandler()});
}
private WebAppContext createWebAppContext() {
WebAppContext context = new WebAppContext(contexts, JiveGlobals.getHomeDirectory() +
File.separator + "resources" + File.separator + "spank", "/");
context.setWelcomeFiles(new String[]{"index.html"});
return context;
private void createBoshHandler(ContextHandlerCollection contexts, String boshPath) {
ServletHandler handler = new ServletHandler();
handler.addServletWithMapping(HttpBindServlet.class, "/");
ContextHandler boshContextHandler = new ContextHandler(contexts, boshPath);
boshContextHandler.setHandler(handler);
}
private void loadStaticDirectory(ContextHandlerCollection contexts) {
File spankDirectory = new File(JiveGlobals.getHomeDirectory() + File.separator
+ "resources" + File.separator + "spank");
if (spankDirectory.exists()) {
if (spankDirectory.canRead()) {
WebAppContext context = new WebAppContext(contexts, spankDirectory.getPath(), "/");
context.setWelcomeFiles(new String[]{"index.html"});
}
else {
Log.warn("Openfire cannot read the directory: " + spankDirectory);
}
}
}
public ContextHandlerCollection getContexts() {
......@@ -348,7 +368,7 @@ public final class HttpBindManager {
}
private synchronized void restartServer() {
if(httpBindServer != null) {
if (httpBindServer != null) {
try {
httpBindServer.stop();
}
......@@ -428,7 +448,7 @@ public final class HttpBindManager {
}
public void certificateDeleted(KeyStore keyStore, String alias) {
restartServer();
restartServer();
}
public void certificateSigned(KeyStore keyStore, String alias,
......
3_3_1_branch/src/spank/WEB-INF/web.xml
View file @ a3a2bfb5
......@@ -4,36 +4,4 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<servlet>
<servlet-name>HttpBindServlet</servlet-name>
<servlet-class>org.jivesoftware.openfire.http.HttpBindServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>HttpBindServlet</servlet-name>
<url-pattern>/http-bind/</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>JavaScriptServlet</servlet-name>
<servlet-class>org.jivesoftware.openfire.http.ResourceServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>JavaScriptServlet</servlet-name>
<url-pattern>/scripts/</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>FlashCrossDomain</servlet-name>
<servlet-class>org.jivesoftware.openfire.http.FlashCrossDomainServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>FlashCrossDomain</servlet-name>
<url-pattern>/crossdomain.xml</url-pattern>
</servlet-mapping>
</web-app>
3_3_1_branch/src/spank/scripts/flash.js deleted 100644 → 0
View file @ bdd5f54e
var Flash = {
installed: false,
callbacks: new Array(),
install: function(callbackName) {
dojo.event.connect(dojo.flash, "loaded", callbackName);
dojo.flash.setSwf({flash6: "/crossdomain_version6.swf",
flash8: "/crossdomain_version8.swf",
visible: false});
},
request: function() {
var self = this;
var _method, _url = null;
var _contentType = "application/x-www-form-urlencoded";
var _headers = new Array();
// responseXML
// status
this.open = function(method, url, async, user, password) {
_method = method;
_url = url;
}
this.send = function(body) {
function callback(response) {
self.responseText = response;
self.responseXML = XmlDocument.create();
self.responseXML.loadXML(response);
if (self.onload) {
self.onload(self);
}
}
dojo.flash.comm.XmlHttp(
_url, Flash.registerCallback(callback), _method, body, _contentType);
}
this.setRequestHeader = function(header, value) {
if (header.toLowerCase() == "Content-Type".toLowerCase()) {
_contentType = value;
return;
}
}
this.getRequestHeader = function() { alert("not supported"); }
this.getResponseHeader = function(a) { alert("not supported"); }
this.getAllResponseHeaders = function() { alert("not supported"); }
this.abort = function() { alert("not supported"); }
this.addEventListener = function(a, b, c) { alert("not supported"); }
this.dispatchEvent = function(e) { alert("not supported"); }
this.openRequest = function(a, b, c, d, e) { this.open(a, b, c, d, e); }
this.overrideMimeType = function(e) { alert("not supported"); }
this.removeEventListener = function(a, b, c) { alert("not supported"); }
},
registerCallback: function(callback) {
// todo: could be improved (look for the first available spot in the callbacks table,
// if necessary, expand it)
var length = this.callbacks.push(selfDeleteCallback);
var callbackID = length - 1;
return "Flash.callbacks[" + callbackID + "]";
function selfDeleteCallback(obj) {
delete Flash.callbacks[callbackID];
setTimeout(function() { callback(obj); }, 0);
return;
}
}
}
\ No newline at end of file
3_3_1_branch/src/spank/scripts/prototype.js deleted 100644 → 0
View file @ bdd5f54e
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023