[365135] [modulecore] Behavior when multiple src dirs are mapped to component root
diff --git a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
index 2947d2b..8c7e123 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
+++ b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
@@ -4,16 +4,16 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Build" content="Build">
-<title>WTP 3.2.2 Patches</title>
+<title>WTP 3.3.1 Patches</title>
</head>
<body>
- <h1>WTP 3.2.4 Patches</h1>
+<h1>WTP 3.3.1 Patches</h1>
- <h2>org.eclipse.wst.common_core.feature</h2>
+<h2>org.eclipse.wst.common_core.feature</h2>
- <p>Test only run</p>
+<p>Bug <a href='https://bugs.eclipse.org/365135'>365135</a>. [modulecore] Behavior when multiple src dirs are mapped to component root</p>
</body>
</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.properties b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
index f7a24e1..c850029 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
@@ -27,8 +27,7 @@
description=\
Contains fixes described in the following bugzilla(s):\n\
\n\
-test only\n\
-test only Bug https://bugs.eclipse.org/325991 Regression: child projects not targeted to parent project's runtime\n\
+Bug https://bugs.eclipse.org/365135 [modulecore] Behavior when multiple src dirs are mapped to component root\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.xml b/features/org.eclipse.wst.common_core.feature.patch/feature.xml
index df06ba5..7dc7489 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.xml
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.common_core.feature.patch"
label="%featureName"
- version="3.2.4.qualifier"
+ version="3.3.1.qualifier"
provider-name="%providerName">
<description>
@@ -18,7 +18,7 @@
</license>
<requires>
- <import feature="org.eclipse.wst.common_core.feature" version="3.2.4.v201103101400-7B7DFEuF7RZHOaLjSqMqRK" patch="true"/>
+ <import feature="org.eclipse.wst.common_core.feature" version="3.3.1.v201107190400-7B7DFO5F7RZHOeJ-SxQ1NJ" patch="true"/>
</requires>
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 19df5fe..4de8c9a 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-Name: %Bundle-Name.0
Bundle-Vendor: %provider
Bundle-SymbolicName: org.eclipse.wst.common.modulecore; singleton:=true
-Bundle-Version: 1.2.101.qualifier
+Bundle-Version: 1.2.102.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/resources/VirtualFolder.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFolder.java
index a3a1617..0753a61 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFolder.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFolder.java
@@ -151,17 +151,19 @@
public boolean tagResource(IPath aProjectRelativeLocation, String tag, IProgressMonitor monitor) {
StructureEdit moduleCore = null;
try {
- if (aProjectRelativeLocation.isUNC()){
- aProjectRelativeLocation = aProjectRelativeLocation.makeUNC(false);
- }
- IPath absolutePath = aProjectRelativeLocation.makeAbsolute();
- moduleCore = StructureEdit.getStructureEditForWrite(getProject());
- WorkbenchComponent aComponent = moduleCore.getComponent();
- ComponentResource[] resources = aComponent.findResourcesByRuntimePath(getRuntimePath());
- for (ComponentResource resource:resources){
- if (resource.getSourcePath().equals(absolutePath)){
- resource.setTag(tag);
- return true;
+ if (aProjectRelativeLocation != null){
+ if (aProjectRelativeLocation.isUNC()){
+ aProjectRelativeLocation = aProjectRelativeLocation.makeUNC(false);
+ }
+ IPath absolutePath = aProjectRelativeLocation.makeAbsolute();
+ moduleCore = StructureEdit.getStructureEditForWrite(getProject());
+ WorkbenchComponent aComponent = moduleCore.getComponent();
+ ComponentResource[] resources = aComponent.findResourcesByRuntimePath(getRuntimePath());
+ for (ComponentResource resource:resources){
+ if (resource.getSourcePath().equals(absolutePath)){
+ resource.setTag(tag);
+ return true;
+ }
}
}
return false;
