antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

autochanges by jetty6to7 tool

Browse source
This commit is contained in:
Simon Oberhammer 2012-03-20 10:14:13 +01:00 • committed by Tobi Schäfer
parent c7e9f4c6cb
commit 56871c7072
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/helma/main/ApplicationManager.java
View file

@ -22,11 +22,11 @@ import helma.framework.repository.FileRepository;
import helma.util.StringUtils;
import org.apache.xmlrpc.XmlRpcHandler;
import org.apache.commons.logging.Log;
import org.mortbay.jetty.handler.ContextHandler;
import org.mortbay.jetty.handler.ContextHandlerCollection;
import org.mortbay.jetty.handler.ResourceHandler;
import org.mortbay.jetty.servlet.ServletHandler;
import org.mortbay.jetty.servlet.ServletHolder;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import java.io.*;
import java.util.*;

18
src/helma/main/JettyServer.java
View file

@ -17,11 +17,11 @@
package helma.main;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.ajp.Ajp13SocketConnector;
import org.mortbay.jetty.bio.SocketConnector;
import org.mortbay.jetty.nio.SelectChannelConnector;
import org.mortbay.xml.XmlConfiguration;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.ajp.Ajp13SocketConnector;
import org.eclipse.jetty.server.bio.SocketConnector;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.xml.XmlConfiguration;
import java.net.URL;
import java.net.InetSocketAddress;
@ -31,7 +31,7 @@ import java.io.File;
public class JettyServer {
// the embedded web server
protected org.mortbay.jetty.Server http;
protected org.eclipse.jetty.server.Server http;
// the AJP13 Listener, used for connecting from external webserver to servlet via JK
protected Ajp13SocketConnector ajp13;
@ -47,7 +47,7 @@ public class JettyServer {
}
private JettyServer(URL url) throws IOException {
http = new org.mortbay.jetty.Server();
http = new org.eclipse.jetty.server.Server();
try {
XmlConfiguration config = new XmlConfiguration(url);
@ -64,7 +64,7 @@ public class JettyServer {
private JettyServer(InetSocketAddress webPort, InetSocketAddress ajpPort, Server server)
throws IOException {
http = new org.mortbay.jetty.Server();
http = new org.eclipse.jetty.server.Server();
http.setServer(http);
// start embedded web server if port is specified
@ -99,7 +99,7 @@ public class JettyServer {
openListeners();
}
public org.mortbay.jetty.Server getHttpServer() {
public org.eclipse.jetty.server.Server getHttpServer() {
return http;
}