[579719] Preview server refers to older slf4j.api bundle Change-Id: Ie6cbf551d98adf1e3d36b1729b6465a2ba5a493d
diff --git a/features/org.eclipse.wst.server_adapters.feature/feature.xml b/features/org.eclipse.wst.server_adapters.feature/feature.xml index 6e3c920..902ecdb 100644 --- a/features/org.eclipse.wst.server_adapters.feature/feature.xml +++ b/features/org.eclipse.wst.server_adapters.feature/feature.xml
@@ -15,7 +15,7 @@ <feature id="org.eclipse.wst.server_adapters.feature" label="%featureName" - version="3.2.900.qualifier" + version="3.2.1000.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.wst.server_adapters.feature/pom.xml b/features/org.eclipse.wst.server_adapters.feature/pom.xml index 059ffa3..72f21ab 100644 --- a/features/org.eclipse.wst.server_adapters.feature/pom.xml +++ b/features/org.eclipse.wst.server_adapters.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.wst.server_adapters.feature</artifactId> - <version>3.2.900-SNAPSHOT</version> + <version>3.2.1000-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF index 5f28052..0872d73 100644 --- a/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.server.preview.adapter;singleton:=true -Bundle-Version: 1.1.700.qualifier +Bundle-Version: 1.1.800.qualifier Bundle-Activator: org.eclipse.jst.server.preview.adapter.internal.PreviewPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/pom.xml b/plugins/org.eclipse.jst.server.preview.adapter/pom.xml index 00204bb..273475a 100644 --- a/plugins/org.eclipse.jst.server.preview.adapter/pom.xml +++ b/plugins/org.eclipse.jst.server.preview.adapter/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server.preview.adapter</artifactId> - <version>1.1.700-SNAPSHOT</version> + <version>1.1.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
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 6843100..948b9c1 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, 2021 IBM Corporation and others. + * Copyright (c) 2007, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -51,7 +51,7 @@ getBundleForClass(org.apache.jasper.JspCompilationContext.class), getBundleForClass(javax.el.ELContext.class), getBundleForClass(com.sun.el.ExpressionFactoryImpl.class), - "slf4j.api", + "org.slf4j.api", "org.eclipse.jetty.http", "org.eclipse.jetty.io", "org.eclipse.jetty.security",
diff --git a/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF index 33c1a87..e32acb8 100644 --- a/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-Name: %bundleName Bundle-Vendor: %bundleVendor Bundle-SymbolicName: org.eclipse.wst.server.discovery;singleton:=true -Bundle-Version: 1.3.400.qualifier +Bundle-Version: 1.3.500.qualifier Bundle-Activator: org.eclipse.wst.server.discovery.internal.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0)", org.eclipse.ui;bundle-version="[3.5.0,4.0)",
diff --git a/plugins/org.eclipse.wst.server.discovery/pom.xml b/plugins/org.eclipse.wst.server.discovery/pom.xml index 5987d9f..e67da38 100644 --- a/plugins/org.eclipse.wst.server.discovery/pom.xml +++ b/plugins/org.eclipse.wst.server.discovery/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.wst.server.discovery</artifactId> - <version>1.3.400-SNAPSHOT</version> + <version>1.3.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml b/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml index f5adcb1..9cf51f8 100644 --- a/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml +++ b/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml
@@ -3,8 +3,8 @@ <site url="https://sourceforge.net/projects/sapnweclipse/files/updates/" /> <site url="https://download.eclipse.org/jetty/updates/jetty-wtp/" /> <site url="https://www.caucho.com/eclipse/" /> - <site url="https://download.jboss.org/jbosstools/updates/webtools/photon/" /> + <site url="https://download.jboss.org/jbosstools/photon/stable/updates/" /> <site url="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/updates/libertyAdapter/2020-09/" /> <!-- <site url="https://download.oracle.com/otn_software/oepe/oxygen/"/> --> <site url="https://download.oracle.com/otn_software/oepe/12.2.1.10/photon/repository/" /> -</extensions> \ No newline at end of file +</extensions>
diff --git a/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF index 211e0fb..e327dcf 100644 --- a/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jst.server.core.tests Bundle-SymbolicName: org.eclipse.jst.server.core.tests -Bundle-Version: 1.1.400.qualifier +Bundle-Version: 1.1.500.qualifier Bundle-ClassPath: tests.jar Bundle-Activator: org.eclipse.jst.server.core.tests.TestsPlugin Bundle-Vendor: Eclipse.org
diff --git a/tests/org.eclipse.jst.server.core.tests/pom.xml b/tests/org.eclipse.jst.server.core.tests/pom.xml index 4838deb..b3c620c 100644 --- a/tests/org.eclipse.jst.server.core.tests/pom.xml +++ b/tests/org.eclipse.jst.server.core.tests/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server.core.tests</artifactId> - <version>1.1.400-SNAPSHOT</version> + <version>1.1.500-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties>
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ProjectUnzipUtil.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ProjectUnzipUtil.java index d368496..a3e50fc 100644 --- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ProjectUnzipUtil.java +++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ProjectUnzipUtil.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. + * Copyright (c) 2005, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -21,20 +21,18 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.eclipse.core.internal.resources.ProjectDescription; -import org.eclipse.core.internal.resources.ProjectDescriptionReader; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; public class ProjectUnzipUtil { private IPath zipLocation; private String[] projectNames; - private static final String META_PROJECT_NAME = ".project"; public ProjectUnzipUtil(IPath aZipLocation, String[] aProjectNames) { zipLocation = aZipLocation; @@ -43,9 +41,9 @@ public boolean createProjects() { try { + buildProjects(); expandZip(); ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null); - buildProjects(); } catch (CoreException e) { e.printStackTrace(); return false; @@ -53,7 +51,6 @@ e.printStackTrace(); return false; } - return true; } @@ -106,20 +103,16 @@ } } - private void buildProjects() throws IOException, CoreException { - for (String projectName : projectNames) { - ProjectDescriptionReader pd = new ProjectDescriptionReader(); - IPath projectPath = new Path("/" + projectName + "/" + META_PROJECT_NAME); - IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(projectPath); - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - ProjectDescription description; + private void buildProjects() throws CoreException { + for (int i = 0; i < projectNames.length; i++) { + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IProjectDescription description = workspace.newProjectDescription(projectNames[i]); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectNames[i]); try { - description = pd.read(path); project.create(description, new NullProgressMonitor()); project.open(new NullProgressMonitor()); - } catch (IOException e) { - throw e; - } catch (CoreException e) { + } + catch (CoreException e) { throw e; } }