Skip to content
Browse files

[366092] Jetty server WebAppContext missing from Eclipse 4.2

  • Loading branch information...
1 parent 0994f39 commit ea728642d86b8cf77490a85a29f6a8aa98c0cc08 @sghung sghung committed Jan 23, 2013
View
2 plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.preview.adapter;singleton:=true
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.201.qualifier
Bundle-Activator: org.eclipse.jst.server.preview.adapter.internal.PreviewPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
View
4 .../eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2013 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
@@ -53,6 +53,8 @@
"org.eclipse.jetty.io",
"org.eclipse.jetty.security",
"org.eclipse.jetty.servlet",
+ "org.eclipse.jetty.webapp",
+ "org.eclipse.jetty.xml",
"javax.el",
"com.sun.el",
"org.apache.jasper.glassfish",
View
7 plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.server.preview; singleton:=true
-Bundle-Version: 1.1.101.qualifier
+Bundle-Version: 1.1.102.qualifier
Bundle-Activator: org.eclipse.wst.server.preview.internal.PreviewServerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -12,6 +12,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.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)",
- javax.servlet;bundle-version="[2.6.0,3.1.0)"
+ javax.servlet;bundle-version="[2.6.0,3.1.0)",
+ org.eclipse.jetty.webapp;bundle-version="[8.0.4,9.0.0)",
+ org.eclipse.jetty.servlet;bundle-version="[8.0.4,9.0.0)",
+ org.eclipse.jetty.xml;bundle-version="[8.0.4,9.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
View
8 ...clipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/PreviewStarter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * Copyright (c) 2007, 2013 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 @@ protected void run() {
resourceHandler.setContext(module.getContext());
handlers.addHandler(resourceHandler);
} else {
- ContextHandler wac = new ContextHandler();
+ WebAppContext wac = new WebAppContext();
wac.setContextPath(module.getContext());
-// wac.setWar(module.getPath());
+ wac.setWar(module.getPath());
wac.setErrorHandler(errorHandler);
handlers.addHandler(wac);
}

0 comments on commit ea72864

Please sign in to comment.
Something went wrong with that request. Please try again.