[573485] jst.server.preview.adapter and wst.server.preview unresolved

This is why we build jetty.plus, because it satisfies the OSGI
capability requirements.
diff --git a/features/org.eclipse.wst.server_adapters.feature/feature.xml b/features/org.eclipse.wst.server_adapters.feature/feature.xml
index 93acb28..6b1db63 100644
--- a/features/org.eclipse.wst.server_adapters.feature/feature.xml
+++ b/features/org.eclipse.wst.server_adapters.feature/feature.xml
@@ -53,6 +53,13 @@
          unpack="false"/>

 

    <plugin

+         id="org.eclipse.jetty.plus"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

          id="org.eclipse.jetty.xml"

          download-size="0"

          install-size="0"

diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
index 9325985..6843100 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
@@ -51,7 +51,7 @@
 		getBundleForClass(org.apache.jasper.JspCompilationContext.class),
 		getBundleForClass(javax.el.ELContext.class),
 		getBundleForClass(com.sun.el.ExpressionFactoryImpl.class),
-		"org.apache.commons.logging",
+		"slf4j.api",
 		"org.eclipse.jetty.http",
 		"org.eclipse.jetty.io",
 		"org.eclipse.jetty.security",
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
index 0e81122..6e44ba6 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
@@ -1709,7 +1709,7 @@
 		try {
 			launchConfigs = launchManager.getLaunchConfigurations(launchConfigType);
 		} catch (CoreException e) {
-			// ignore
+			Trace.trace(Trace.STRING_SEVERE, "Error configuring launch", e);
 		}
 		
 		if (launchConfigs != null) {
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 28d2bba..e105ea5 100644
--- a/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@
  org.eclipse.jetty.server;bundle-version="[10.0.1,11.0.0)",
  org.eclipse.jetty.servlet;bundle-version="[10.0.1,11.0.0)",
  org.eclipse.jetty.util;bundle-version="[10.0.1,11.0.0)",
- org.eclipse.jetty.webapp;bundle-version="[10.0.1,11.0.0)"
+ org.eclipse.jetty.webapp;bundle-version="[10.0.1,11.0.0)",
+ org.eclipse.jetty.plus;bundle-version="[10.0.1,11.0.0)"
 Import-Package: javax.servlet;version="[4.0.0,5.0.0)",
  javax.servlet.http;version="[4.0.0,5.0.0)",
  javax.transaction.xa