[365681] Remove prereqs on org.mortbay.jetty plugins - part2
diff --git a/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
index 124ae0f..c431839 100644
--- a/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@
Bundle-Localization: plugin
Export-Package: org.eclipse.wst.server.preview.internal;x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jetty.http;bundle-version="[8.0.4,9.0.0)",
org.eclipse.jetty.server;bundle-version="[8.0.4,9.0.0)",
org.eclipse.jetty.util;bundle-version="[8.0.4,9.0.0)",
org.apache.commons.logging;bundle-version="[1.0.4,2.0.0)",
diff --git a/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/PreviewStarter.java b/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/PreviewStarter.java
index 067c3aa..c3cb8b6 100644
--- a/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/PreviewStarter.java
+++ b/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/PreviewStarter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,8 +13,8 @@
import java.io.File;
import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.HandlerList;
-import org.eclipse.jetty.webapp.WebAppContext;
public class PreviewStarter {
protected String configPath;
@@ -57,9 +57,9 @@
resourceHandler.setContext(module.getContext());
handlers.addHandler(resourceHandler);
} else {
- WebAppContext wac = new WebAppContext();
+ ContextHandler wac = new ContextHandler();
wac.setContextPath(module.getContext());
- wac.setWar(module.getPath());
+// wac.setWar(module.getPath());
wac.setErrorHandler(errorHandler);
handlers.addHandler(wac);
}
diff --git a/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPDefaultHandler.java b/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPDefaultHandler.java
index a7ce90e..673a31e 100644
--- a/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPDefaultHandler.java
+++ b/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPDefaultHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008,2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;
@@ -32,13 +33,14 @@
this.modules = modules;
}
- public void handle(String target, HttpServletRequest request, HttpServletResponse response,
- int dispatch) throws IOException, ServletException {
- Request base_request = request instanceof Request?(Request)request:HttpConnection.getCurrentConnection().getRequest();
-
- if (response.isCommitted() || base_request.isHandled())
+ public void handle(String target, Request baseRequest, HttpServletRequest request,
+ HttpServletResponse response) throws IOException, ServletException {
+ if (baseRequest == null) {
+ baseRequest = request instanceof Request?(Request)request:HttpConnection.getCurrentConnection().getRequest();
+ }
+ if (response.isCommitted() || baseRequest.isHandled())
return;
- base_request.setHandled(true);
+ baseRequest.setHandled(true);
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType(MimeTypes.TEXT_HTML);
@@ -72,4 +74,5 @@
writer.writeTo(out);
out.close();
}
+
}
diff --git a/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPErrorHandler.java b/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPErrorHandler.java
index c6f3bf0..940df02 100644
--- a/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPErrorHandler.java
+++ b/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPErrorHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,10 +24,12 @@
public class WTPErrorHandler extends ErrorHandler {
private static final long serialVersionUID = 1L;
- public void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch) throws IOException {
- super.handle(target, request, response, dispatch);
- Request base_request = request instanceof Request?(Request)request:HttpConnection.getCurrentConnection().getRequest();
- base_request.setHandled(true);
+ public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException {
+ super.handle(target, baseRequest, request, response);
+ if (baseRequest == null) {
+ baseRequest = request instanceof Request?(Request)request:HttpConnection.getCurrentConnection().getRequest();
+ }
+ baseRequest.setHandled(true);
}
protected void writeErrorPageBody(HttpServletRequest request, Writer writer, int code, String message, boolean showStacks)
diff --git a/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPLogger.java b/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPLogger.java
index b082d2c..1ea5afb 100644
--- a/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPLogger.java
+++ b/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPLogger.java
@@ -14,29 +14,56 @@
public class WTPLogger implements Logger {
protected boolean debug = false;
+ protected boolean warn = false;
+ protected boolean info = false;
+ protected boolean ignore = false;
+
+ public void debug(Throwable t) {
+ debug(null, t);
+ }
public void debug(String msg, Throwable t) {
if (debug) {
- System.out.println(msg);
+ if (msg != null) {
+ System.out.println(msg);
+ }
t.printStackTrace();
}
}
- public void debug(String msg, Object arg1, Object arg2) {
- if (debug) {
+ public void debug(String msg, Object... args) {
+ if (debug) {
System.out.println(msg);
- }
- }
+ }
+ }
+
+ public String getName() {
+ // TODO Auto-generated method stub
+ return "org.eclipse.wst.server.preview.internal.WTPLogger";
+ }
public Logger getLogger(String name) {
return this;
}
- public void info(String msg, Object arg1, Object arg2) {
+ public void info(Throwable t) {
+ info("", t);
+ }
+
+ public void info(String msg, Throwable t) {
+ if (info) {
+ if (msg != null) {
+ System.out.println(msg);
+ }
+ t.printStackTrace();
+ }
+ }
+
+ public void info(String msg, Object... args) {
if (debug) {
System.out.println(msg);
}
- }
+ }
public boolean isDebugEnabled() {
return debug;
@@ -46,16 +73,51 @@
this.debug = debug;
}
+ public boolean isWarn() {
+ return warn;
+ }
+
+ public void setWarn(boolean warn) {
+ this.warn = warn;
+ }
+
+ public boolean isInfo() {
+ return info;
+ }
+
+ public void setInfo(boolean info) {
+ this.info = info;
+ }
+
+ public boolean isIgnore() {
+ return ignore;
+ }
+
+ public void setIgnore(boolean ignore) {
+ this.ignore = ignore;
+ }
+
public void warn(String msg, Throwable t) {
- if (debug) {
+ if (warn) {
System.out.println(msg);
t.printStackTrace();
}
}
- public void warn(String msg, Object arg1, Object arg2) {
- if (debug) {
+ public void warn(String msg, Object... args) {
+ if (warn) {
System.out.println(msg);
}
- }
+ }
+
+ public void warn(Throwable t) {
+ warn(null, t);
+ }
+
+ public void ignore(Throwable msg) {
+ if (ignore) {
+ System.out.println(msg);
+ }
+ }
+
}
