Avoid referencing the internal ProjectDescription implementation
Why. WHY?
diff --git a/tests/org.eclipse.wst.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.common.tests/META-INF/MANIFEST.MF
index f83e7b4..ad64472 100644
--- a/tests/org.eclipse.wst.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.common.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wst.common.tests; singleton:=true
-Bundle-Version: 1.2.500.qualifier
+Bundle-Version: 1.2.600.qualifier
Bundle-ClassPath: commontests.jar
Bundle-Activator: org.eclipse.wst.common.tests.CommonTestsPlugin
Bundle-Vendor: %Bundle-Vendor.0
diff --git a/tests/org.eclipse.wst.common.tests/apitools/org/eclipse/etools/common/test/apitools/ProjectUnzipUtil.java b/tests/org.eclipse.wst.common.tests/apitools/org/eclipse/etools/common/test/apitools/ProjectUnzipUtil.java
index 5767d21..6dc83c7 100644
--- a/tests/org.eclipse.wst.common.tests/apitools/org/eclipse/etools/common/test/apitools/ProjectUnzipUtil.java
+++ b/tests/org.eclipse.wst.common.tests/apitools/org/eclipse/etools/common/test/apitools/ProjectUnzipUtil.java
@@ -13,7 +13,9 @@
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;
@@ -38,9 +40,9 @@
public boolean createProjects() {
try {
+ buildProjects();
expandZip();
ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
- buildProjects();
} catch (CoreException e) {
e.printStackTrace();
return false;
@@ -116,19 +118,14 @@
private void buildProjects() throws IOException, CoreException {
for (int i = 0; i < projectNames.length; i++) {
- ProjectDescriptionReader pd = new ProjectDescriptionReader();
- IPath projectPath = new Path("/" + projectNames[i] + "/" + META_PROJECT_NAME);
- IPath path = rootLocation.append(projectPath);
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IProjectDescription description = workspace.newProjectDescription(projectNames[i]);
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectNames[i]);
- ProjectDescription description;
try {
- description = pd.read(path);
project.create(description, (getProgessMonitor()));
project.open(getProgessMonitor());
-
- } catch (IOException e) {
- throw e;
- } catch (CoreException e) {
+ }
+ catch (CoreException e) {
throw e;
}
}
diff --git a/tests/org.eclipse.wst.common.tests/pom.xml b/tests/org.eclipse.wst.common.tests/pom.xml
index c380f0e..55d379c 100644
--- a/tests/org.eclipse.wst.common.tests/pom.xml
+++ b/tests/org.eclipse.wst.common.tests/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.wst.common.tests</artifactId>
- <version>1.2.500-SNAPSHOT</version>
+ <version>1.2.600-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
