My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions

Issue 1619 attachment: compile_with_jetty8.patch (12.7 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
diff --git a/gerrit-gwtdebug/src/main/java/com/google/gerrit/gwtdebug/GerritDebugLauncher.java b/gerrit-gwtdebug/src/main/java/com/google/gerrit/gwtdebug/GerritDebugLauncher.java
index d23aa35..d900de7 100644
--- a/gerrit-gwtdebug/src/main/java/com/google/gerrit/gwtdebug/GerritDebugLauncher.java
+++ b/gerrit-gwtdebug/src/main/java/com/google/gerrit/gwtdebug/GerritDebugLauncher.java
@@ -21,19 +21,20 @@ import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.shell.jetty.JettyNullLogger;

-import org.mortbay.component.AbstractLifeCycle;
-import org.mortbay.jetty.AbstractConnector;
-import org.mortbay.jetty.HttpFields.Field;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.RequestLog;
-import org.mortbay.jetty.Response;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.RequestLogHandler;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppClassLoader;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.log.Log;
-import org.mortbay.log.Logger;
+import org.eclipse.jetty.util.component.AbstractLifeCycle;
+import org.eclipse.jetty.server.AbstractConnector;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpFields.Field;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.RequestLog;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.RequestLogHandler;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppClassLoader;
+import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;

import java.io.File;
import java.io.IOException;
@@ -91,27 +92,18 @@ public class GerritDebugLauncher extends ServletContainerLauncher {
+ request.getMethod() + ' ' + request.getUri() + " ("
+ userString + request.getRemoteHost() + ')' + bytesString);
if (branch.isLoggable(logHeaders)) {
- // Request headers
- TreeLogger headers = branch.branch(logHeaders, "Request headers");
- Iterator<Field> headerFields =
- request.getConnection().getRequestFields().getFields();
- while (headerFields.hasNext()) {
- Field headerField = headerFields.next();
- headers.log(logHeaders, headerField.getName() + ": "
- + headerField.getValue());
- }
- // Response headers
- headers = branch.branch(logHeaders, "Response headers");
- headerFields = response.getHttpFields().getFields();
- while (headerFields.hasNext()) {
- Field headerField = headerFields.next();
- headers.log(logHeaders, headerField.getName() + ": "
- + headerField.getValue());
- }
+ logHeaders(logHeaders, branch.branch(logHeaders, "Request headers"), request.getConnection().getRequestFields());
+ logHeaders(logHeaders, branch.branch(logHeaders, "Response headers"), response.getHttpFields());
}
}
}
}
+
+ private static void logHeaders(TreeLogger.Type logHeaders, TreeLogger headers, HttpFields fields) {
+ for(String name : fields.getFieldNamesCollection()) {
+ headers.log(logHeaders, name + ": " + fields.getStringField(name));
+ }
+ }

/**
* An adapter for the Jetty logging system to GWT's TreeLogger. This
@@ -131,8 +123,9 @@ public class GerritDebugLauncher extends ServletContainerLauncher {
this.logger = logger;
}

- public void debug(String msg, Object arg0, Object arg1) {
- logger.log(TreeLogger.SPAM, format(msg, arg0, arg1));
+ @Override
+ public void debug(String msg, Object... objs) {
+ logger.log(TreeLogger.SPAM, format(msg, objs[0], objs[1]));
}

public void debug(String msg, Throwable th) {
@@ -164,7 +157,7 @@ public class GerritDebugLauncher extends ServletContainerLauncher {
}

/**
- * Copied from org.mortbay.log.StdErrLog.
+ * Copied from org.eclipse.jetty.log.StdErrLog.
*/
private String format(String msg, Object arg0, Object arg1) {
int i0 = msg.indexOf("{}");
@@ -178,6 +171,46 @@ public class GerritDebugLauncher extends ServletContainerLauncher {
}
return msg;
}
+
+ @Override
+ public void debug(Throwable throwable) {
+ logger.log(TreeLogger.DEBUG, "debug", throwable);
+ }
+
+ @Override
+ public String getName() {
+ return "gerrit logger";
+ }
+
+ @Override
+ public void ignore(Throwable throwable) {
+ logger.log(TreeLogger.SPAM, "ignore", throwable);
+ }
+
+ @Override
+ public void info(Throwable throwable) {
+ logger.log(TreeLogger.INFO, "info", throwable);
+ }
+
+ @Override
+ public void info(String msg, Object... objs) {
+ logger.log(TreeLogger.INFO, msg);
+ }
+
+ @Override
+ public void info(String msg, Throwable throwable) {
+ logger.log(TreeLogger.INFO, msg, throwable);
+ }
+
+ @Override
+ public void warn(Throwable throwable) {
+ logger.log(TreeLogger.WARN, "warn", throwable);
+ }
+
+ @Override
+ public void warn(String msg, Object... objs) {
+ logger.log(TreeLogger.WARN, msg);
+ }
}

/**
@@ -274,7 +307,7 @@ public class GerritDebugLauncher extends ServletContainerLauncher {

// Prevent file locking on Windows; pick up file changes.
getInitParams().put(
- "org.mortbay.jetty.servlet.Default.useFileMappedBuffer", "false");
+ "org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false");

// Since the parent class loader is bootstrap-only, prefer it first.
setParentLoaderPriority(true);
@@ -306,22 +339,13 @@ public class GerritDebugLauncher extends ServletContainerLauncher {
}

@Override
- public boolean isSystemPath(String name) {
- name = name.replace('/', '.');
- return super.isSystemPath(name) //
- || name.startsWith("org.bouncycastle.");
- }
-
- @Override
protected Class<?> findClass(String name) throws ClassNotFoundException {
// For system path, always prefer the outside world.
- if (isSystemPath(name)) {
try {
return systemClassLoader.loadClass(name);
} catch (ClassNotFoundException e) {
+ return super.findClass(name);
}
- }
- return super.findClass(name);
}
}
}
@@ -329,7 +353,7 @@ public class GerritDebugLauncher extends ServletContainerLauncher {
static {
// Suppress spammy Jetty log initialization.
System
- .setProperty("org.mortbay.log.class", JettyNullLogger.class.getName());
+ .setProperty("org.eclipse.jetty.log.class", JettyNullLogger.class.getName());
Log.getLog();

/*
@@ -364,7 +388,7 @@ public class GerritDebugLauncher extends ServletContainerLauncher {
Log.setLog(new JettyTreeLogger(branch));

// Turn off XML validation.
- System.setProperty("org.mortbay.xml.XmlParser.Validating", "false");
+ System.setProperty("org.eclipse.jetty.xml.XmlParser.Validating", "false");

AbstractConnector connector = getConnector();
if (bindAddress != null) {
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java
index 7fe9159..cbd83ab 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java
@@ -165,7 +165,8 @@ class HttpPluginServlet extends HttpServlet
}

try {
- WrappedContext ctx = new WrappedContext(plugin, base + name);
+ WrappedContextHandler handler = new WrappedContextHandler();
+ WrappedContextHandler.WrappedContext ctx = handler.new WrappedContext(plugin, base + name);
filter.init(new WrappedFilterConfig(ctx));
} catch (ServletException e) {
log.warn(String.format("Plugin %s failed to initialize HTTP", name), e);
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/WrappedContext.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/WrappedContext.java
index daeb6ff..12d2539 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/WrappedContext.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/WrappedContext.java
@@ -34,8 +34,12 @@ import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;

-class WrappedContext implements ServletContext {
- private static final Logger log = LoggerFactory.getLogger("plugin");
+import org.eclipse.jetty.server.handler.ContextHandler;
+
+class WrappedContextHandler extends ContextHandler {
+ private static final Logger log = LoggerFactory.getLogger("plugin");
+class WrappedContext extends ContextHandler.Context {
+
private final Plugin plugin;
private final String contextPath;
private final ConcurrentMap<String, Object> attributes;
@@ -51,11 +55,6 @@ class WrappedContext implements ServletContext {
return contextPath;
}

- @Override
- public String getInitParameter(String name) {
- return null;
- }
-
@SuppressWarnings("rawtypes")
@Override
public Enumeration getInitParameterNames() {
@@ -63,47 +62,6 @@ class WrappedContext implements ServletContext {
}

@Override
- public ServletContext getContext(String name) {
- return null;
- }
-
- @Override
- public RequestDispatcher getNamedDispatcher(String name) {
- return null;
- }
-
- @Override
- public RequestDispatcher getRequestDispatcher(String name) {
- return null;
- }
-
- @Override
- public URL getResource(String name) throws MalformedURLException {
- return null;
- }
-
- @Override
- public InputStream getResourceAsStream(String name) {
- return null;
- }
-
- @SuppressWarnings("rawtypes")
- @Override
- public Set getResourcePaths(String name) {
- return null;
- }
-
- @Override
- public Servlet getServlet(String name) throws ServletException {
- return null;
- }
-
- @Override
- public String getRealPath(String name) {
- return null;
- }
-
- @Override
public String getServletContextName() {
return plugin.getName();
}
@@ -156,18 +114,13 @@ class WrappedContext implements ServletContext {
}

@Override
- public String getMimeType(String file) {
- return null;
- }
-
- @Override
public int getMajorVersion() {
- return 2;
+ return 3;
}

@Override
public int getMinorVersion() {
- return 5;
+ return 0;
}

@Override
@@ -176,3 +129,4 @@ class WrappedContext implements ServletContext {
return "Gerrit Code Review/" + (v != null ? v : "dev");
}
}
+}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/WrappedFilterConfig.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/WrappedFilterConfig.java
index c9107dc..3837d8c 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/WrappedFilterConfig.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/WrappedFilterConfig.java
@@ -22,6 +22,8 @@ import java.util.Enumeration;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;

+import com.google.gerrit.httpd.plugins.WrappedContextHandler.WrappedContext;
+
class WrappedFilterConfig implements FilterConfig {
private final WrappedContext context;

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
index 5823940..825820b 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
@@ -60,6 +60,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.EnumSet;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.List;
@@ -67,6 +68,8 @@ import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;

+import javax.servlet.DispatcherType;
+
@Singleton
public class JettyServer {
static class Lifecycle implements LifecycleListener {
@@ -336,7 +339,7 @@ public class JettyServer {
// already have built.
//
GuiceFilter filter = env.webInjector.getInstance(GuiceFilter.class);
- app.addFilter(new FilterHolder(filter), "/*", FilterMapping.DEFAULT);
+ app.addFilter(new FilterHolder(filter), "/*", EnumSet.of(DispatcherType.REQUEST));
app.addEventListener(new GuiceServletContextListener() {
@Override
protected Injector getInjector() {
Powered by Google Project Hosting