[258742] React to Jetty version change
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 f09c39b..7aff71e 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2008 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
@@ -41,7 +41,8 @@
"javax.servlet",
"javax.servlet.jsp",
"org.apache.jasper",
- "org.mortbay.jetty",
+ "org.mortbay.jetty.server",
+ "org.mortbay.jetty.util",
"org.eclipse.wst.server.preview"
};
@@ -72,8 +73,8 @@
jars[i] = path.toOSString();
}
- if (new File(jars[6] + "bin").exists())
- jars[6] = jars[6] + "bin";
+ if (new File(jars[7] + "bin").exists())
+ jars[7] = jars[7] + "bin";
IVMInstall vm = verifyVMInstall(configuration);
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
index a398bd6..2032f0e 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2008 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
@@ -37,10 +37,10 @@
*/
public class PreviewLaunchConfigurationDelegate extends LaunchConfigurationDelegate {
private static final String[] REQUIRED_BUNDLE_IDS = new String[] {
- "org.apache.commons.logging",
"javax.servlet",
"javax.servlet.jsp",
- "org.mortbay.jetty",
+ "org.mortbay.jetty.server",
+ "org.mortbay.jetty.util",
"org.eclipse.wst.server.preview"
};
@@ -64,9 +64,8 @@
PreviewServerBehaviour previewServer = (PreviewServerBehaviour) server.loadAdapter(PreviewServerBehaviour.class, null);
- int size = REQUIRED_BUNDLE_IDS.length;
- //String[] jars = new String[size];
StringBuffer cp = new StringBuffer();
+ int size = REQUIRED_BUNDLE_IDS.length;
for (int i = 0; i < size; i++) {
Bundle b = Platform.getBundle(REQUIRED_BUNDLE_IDS[i]);
IPath path = null;
@@ -75,6 +74,7 @@
if (path == null)
throw new CoreException(new Status(IStatus.ERROR, PreviewPlugin.PLUGIN_ID, "Could not find required bundle " + REQUIRED_BUNDLE_IDS[i]));
+ // run from workbench support
if (i == 4 && path.append("bin").toFile().exists())
path = path.append("bin");
