Skip to content

O
Openfire
Commit 6322163e authored by guus's avatar guus
Browse files
Options

OF-481: Updating Jetty to 7.5.1 (as provided in the patch by Dele) 

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@12943 b35dd754-fafc-0310-a699-88a17e54d16e
parent 9c2a7955
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 66 deletions
build/lib/versions.txt
View file @ 6322163e
......@@ -16,15 +16,16 @@ dbutil.jar | Jive Code, no release version.
hamcrest.jar | 1.0 (JMock 2.1.0) | New BSD License
hamcrest-api.jar | 1.0 (JMock 2.1.0) | New BSD License
hsqldb.jar | 1.8.0.5 | BSD (http://hsqldb.org/web/hsqlLicense.html)
jetty-continuation.jar | Jetty 7.0.1.v20091125 | Apache 2.0, Eclipse 1.0
jetty-http.jar | Jetty 7.0.1.v20091125 | Apache 2.0, Eclipse 1.0
jetty-io.jar | Jetty 7.0.1.v20091125 | Apache 2.0, Eclipse 1.0
jetty-security.jar | Jetty 7.0.1.v20091125 | Apache 2.0, Eclipse 1.0
jetty-server.jar | Jetty 7.0.1.v20091125 | Apache 2.0, Eclipse 1.0
jetty-servlet.jar | Jetty 7.0.1.v20091125 | Apache 2.0, Eclipse 1.0
jetty-util.jar | Jetty 7.0.1.v20091125 | Apache 2.0, Eclipse 1.0
jetty-webapp.jar | Jetty 7.0.1.v20091125 | Apache 2.0, Eclipse 1.0
jetty-xml.jar | Jetty 7.0.1.v20091125 | Apache 2.0, Eclipse 1.0
jetty-continuation.jar | Jetty 7.5.4.v20111024 | Apache 2.0, Eclipse 1.0
jetty-http.jar | Jetty 7.5.4.v20111024 | Apache 2.0, Eclipse 1.0
jetty-io.jar | Jetty 7.5.4.v20111024 | Apache 2.0, Eclipse 1.0
jetty-security.jar | Jetty 7.5.4.v20111024 | Apache 2.0, Eclipse 1.0
jetty-server.jar | Jetty 7.5.4.v20111024 | Apache 2.0, Eclipse 1.0
jetty-servlet.jar | Jetty 7.5.4.v20111024 | Apache 2.0, Eclipse 1.0
jetty-util.jar | Jetty 7.5.4.v20111024 | Apache 2.0, Eclipse 1.0
jetty-webapp.jar | Jetty 7.5.4.v20111024 | Apache 2.0, Eclipse 1.0
jetty-websocket.jar | Jetty 7.5.4.v20111024 | Apache 2.0, Eclipse 1.0
jetty-xml.jar | Jetty 7.5.4.v20111024 | Apache 2.0, Eclipse 1.0
jasper-compiler.jar | Jetty 6.1.0 (5.5.15) |
jasper-runtime.jar | Jetty 6.1.0 (5.5.15) |
jaxen.jar | 1.1 beta 4 (from DOM4J 1.6.1) | Apache 1.1
......
src/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java
View file @ 6322163e
......@@ -127,7 +127,7 @@ public class AdminConsolePlugin implements Plugin {
Log.warn("Admin console: Using RSA certificates but they are not valid for the hosted domain");
}
JiveSslConnector httpsConnector = new JiveSslConnector();
SslSelectChannelConnector httpsConnector = new SslSelectChannelConnector();
String bindInterface = getBindInterface();
httpsConnector.setHost(bindInterface);
httpsConnector.setPort(adminSecurePort);
......@@ -364,12 +364,4 @@ public class AdminConsolePlugin implements Plugin {
}
}
}
private class JiveSslConnector extends SslSelectChannelConnector {
@Override
protected SSLContext createSSLContext() throws Exception {
return SSLConfig.getSSLContext();
}
}
}
src/java/org/jivesoftware/openfire/http/HttpBindManager.java
View file @ 6322163e
......@@ -28,27 +28,25 @@ import java.util.Map;
import javax.net.ssl.SSLContext;
import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.openfire.net.SSLConfig;
import org.jivesoftware.util.CertificateEventListener;
import org.jivesoftware.util.CertificateManager;
import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.PropertyEventDispatcher;
import org.jivesoftware.util.PropertyEventListener;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.webapp.WebAppContext;
import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.openfire.net.SSLConfig;
import org.jivesoftware.util.CertificateEventListener;
import org.jivesoftware.util.CertificateManager;
import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.PropertyEventDispatcher;
import org.jivesoftware.util.PropertyEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -164,7 +162,7 @@ public final class HttpBindManager {
"the hosted domain");
}
JiveSslConnector sslConnector = new JiveSslConnector();
SslSelectChannelConnector sslConnector = new SslSelectChannelConnector();
sslConnector.setHost(getBindInterface());
sslConnector.setPort(securePort);
......@@ -334,21 +332,16 @@ public final class HttpBindManager {
collection.setHandlers(new Handler[] { contexts, new DefaultHandler() });
}
private void createBoshHandler(ContextHandlerCollection contexts, String boshPath) {
ServletHandler handler = new ServletHandler();
handler.addServletWithMapping(HttpBindServlet.class, "/");
handler.addFilterWithMapping(org.eclipse.jetty.continuation.ContinuationFilter.class,"/*",0);
ContextHandler boshContextHandler = new ContextHandler(contexts, boshPath);
boshContextHandler.setHandler(handler);
private void createBoshHandler(ContextHandlerCollection contexts, String boshPath)
{
ServletContextHandler context = new ServletContextHandler(contexts, boshPath, ServletContextHandler.SESSIONS);
context.addServlet(new ServletHolder(new HttpBindServlet()),"/*");
}
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 createCrossDomainHandler(ContextHandlerCollection contexts, String crossPath)
{
ServletContextHandler context = new ServletContextHandler(contexts, crossPath, ServletContextHandler.SESSIONS);
context.addServlet(new ServletHolder(new HttpBindServlet()),"/crossdomain.xml");
}
private void loadStaticDirectory(ContextHandlerCollection contexts) {
......@@ -531,14 +524,6 @@ public final class HttpBindManager {
}
}
private class JiveSslConnector extends SslSelectChannelConnector {
@Override
protected SSLContext createSSLContext() throws Exception {
return SSLConfig.getc2sSSLContext();
}
}
private class CertificateListener implements CertificateEventListener {
public void certificateCreated(KeyStore keyStore, String alias, X509Certificate cert) {
......
src/java/org/jivesoftware/util/log/util/JettyLog.java
View file @ 6322163e
......@@ -50,37 +50,55 @@ public class JettyLog implements org.eclipse.jetty.util.log.Logger {
// Do nothing.
}
public void info(String string) {
Log.info("JettyLog: " + string);
}
public void info(String string, Object object, Object object1) {
public void info(String string, Object... object) {
// Send info log messages to debug because they are generally not useful.
Log.debug("JettyLog: "+format(string,object,object1));
Log.debug("JettyLog: " + object);
}
public void debug(String string) {
public void info(String string, Throwable throwable) {
Log.debug("JettyLog: " + string);
}
public void debug(String string, Throwable throwable) {
Log.debug("JettyLog: "+string, throwable);
public void info(Throwable throwable) {
// do nothing
}
public void debug(String string, Object object, Object object1) {
Log.debug("JettyLog: "+format(string,object,object1));
public void debug(String string, Object... object) {
Log.debug("JettyLog: " + object);
}
public void debug(String string, Throwable throwable) {
Log.debug(string);
}
public void warn(String string) {
Log.warn("JettyLog: " + string);
public void debug(Throwable throwable) {
// do nothing
}
public void warn(String string, Object object, Object object1) {
Log.warn(format(string,object,object1));
public void warn(String string, Object... object) {
Log.warn("JettyLog: "+ object);
}
public void warn(String string, Throwable throwable) {
Log.warn(string, throwable);
Log.warn(string);
}
public void warn(Throwable throwable) {
// do nothing
}
public void ignore(Throwable throwable) {
// do nothing
}
public Logger getLogger(String string) {
......
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