diff options
author | Carl Anderson | 2014-08-13 20:36:39 +0000 |
---|---|---|
committer | Carl Anderson | 2014-08-13 20:36:39 +0000 |
commit | 520aa3f87318da9256d18384fd6f9e7a980b87c9 (patch) | |
tree | c81925e3fe97cd2a71daf5e04d449e98c1352dc9 | |
parent | bbc2cfde5b215aad06a34aca64b2b999141611cf (diff) | |
download | webtools.common-520aa3f87318da9256d18384fd6f9e7a980b87c9.tar.gz webtools.common-520aa3f87318da9256d18384fd6f9e7a980b87c9.tar.xz webtools.common-520aa3f87318da9256d18384fd6f9e7a980b87c9.zip |
[437564] Can't remove external jar from the Deployment Assembly page
5 files changed, 8 insertions, 11 deletions
diff --git a/features/org.eclipse.wst.common_core.feature/feature.xml b/features/org.eclipse.wst.common_core.feature/feature.xml index 19eafa93c..bcc6df897 100644 --- a/features/org.eclipse.wst.common_core.feature/feature.xml +++ b/features/org.eclipse.wst.common_core.feature/feature.xml @@ -2,7 +2,7 @@ <feature
id="org.eclipse.wst.common_core.feature"
label="%featureName"
- version="3.6.0.qualifier"
+ version="3.6.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.wst.common_core.feature/pom.xml b/features/org.eclipse.wst.common_core.feature/pom.xml index 0dd856e68..c94b5d14a 100644 --- a/features/org.eclipse.wst.common_core.feature/pom.xml +++ b/features/org.eclipse.wst.common_core.feature/pom.xml @@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.wst.common_core.feature</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF index d014f1c87..e7896d685 100644 --- a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-Vendor: %provider Bundle-SymbolicName: org.eclipse.wst.common.modulecore; singleton:=true -Bundle-Version: 1.2.400.qualifier +Bundle-Version: 1.2.401.qualifier Bundle-Activator: org.eclipse.wst.common.componentcore.internal.ModulecorePlugin Bundle-Localization: plugin Export-Package: org.eclipse.wst.common.componentcore, diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java index 5a4720d55..6a35cf003 100644 --- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java +++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java @@ -116,15 +116,12 @@ public class ModuleURIUtil { } public static URI trimToRelativePath(URI aURI, int aStartIndex) { - StringBuffer relativePath = new StringBuffer(); + URI relativeURI = URI.createURI(""); //$NON-NLS-1$ for (int segmentIndex = aStartIndex; segmentIndex < aURI.segmentCount(); segmentIndex++) { - relativePath.append(aURI.segment(segmentIndex)); - if (segmentIndex < (aURI.segmentCount() - 1)) - relativePath.append(IPath.SEPARATOR); + relativeURI = relativeURI.appendSegment(aURI.segment(segmentIndex)); } - return URI.createURI(relativePath.toString()); - } - + return relativeURI; + } /** * @param aModuleResourcePath diff --git a/plugins/org.eclipse.wst.common.modulecore/pom.xml b/plugins/org.eclipse.wst.common.modulecore/pom.xml index a1208d0ed..b6291f826 100644 --- a/plugins/org.eclipse.wst.common.modulecore/pom.xml +++ b/plugins/org.eclipse.wst.common.modulecore/pom.xml @@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.wst.common.modulecore</artifactId>
- <version>1.2.400-SNAPSHOT</version>
+ <version>1.2.401-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
|