diff options
author | Steven Hung | 2015-11-26 15:33:47 +0000 |
---|---|---|
committer | Steven Hung | 2015-11-26 15:33:47 +0000 |
commit | 80a90a67483c4528dcdfe5a769bebe633f502e69 (patch) | |
tree | f6aaec4b068c0ad38b048e22c398f24dda264457 | |
parent | 5d9762a3fa6c7ce1c94565f2f58306e285d0497a (diff) | |
download | webtools.servertools.tests-R3_7_maintenance.tar.gz webtools.servertools.tests-R3_7_maintenance.tar.xz webtools.servertools.tests-R3_7_maintenance.zip |
[476909] ExtensionUpdateSite does not support update sites with spacesv20151126_1034R3_7_2R3_7_maintenance
3 files changed, 3 insertions, 11 deletions
diff --git a/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF index 5bd090a..a3cfdc8 100644 --- a/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.wst.server.ui.tests Bundle-SymbolicName: org.eclipse.wst.server.ui.tests;singleton:=true -Bundle-Version: 1.1.500.qualifier +Bundle-Version: 1.1.501.qualifier Bundle-ClassPath: tests.jar Bundle-Activator: org.eclipse.wst.server.ui.tests.TestsPlugin Bundle-Vendor: Eclipse.org diff --git a/tests/org.eclipse.wst.server.ui.tests/pom.xml b/tests/org.eclipse.wst.server.ui.tests/pom.xml index 643ebe6..dcd1bc1 100644 --- a/tests/org.eclipse.wst.server.ui.tests/pom.xml +++ b/tests/org.eclipse.wst.server.ui.tests/pom.xml @@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.wst.server.ui.tests</artifactId> - <version>1.1.500-SNAPSHOT</version> + <version>1.1.501-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/discovery/ServerDiscoveryTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/discovery/ServerDiscoveryTestCase.java index 90ad706..3af3c42 100644 --- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/discovery/ServerDiscoveryTestCase.java +++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/discovery/ServerDiscoveryTestCase.java @@ -48,15 +48,7 @@ public class ServerDiscoveryTestCase extends TestCase { String finalPath = filePath.toString();
String os = System.getProperty("os.name"); //$NON-NLS-1$
- // Building the URI for Windows does not work using the File.toURI().toURL().
- // Windows needs to be handled with a special case by appending the "file:///"
- if (os != null && os.toUpperCase().indexOf("WINDOWS") >= 0){ //$NON-NLS-1$
- finalPath = finalPath.replaceAll("\\\\", "/"); //$NON-NLS-1$ //$NON-NLS-2$
- finalPath = "file:///" + finalPath; //$NON-NLS-1$
- }
- else {
- finalPath = filePath.toURI().toURL().toString();
- }
+ finalPath = filePath.toURI().toURL().toString();
ExtensionUpdateSite extensionUpdateSite = new ExtensionUpdateSite(finalPath, null, null);
|