[376748] Source files not included in WEB-INF/classes when exporting a WAR if .component file contains non-existing folders
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 dbb941d..cc9d97c 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
@@ -16,6 +16,7 @@
<p>Bug <a href='https://bugs.eclipse.org/373416'>373416</a>. Remove reference to JBoss</p>
<p>Bug <a href='https://bugs.eclipse.org/373565'>373565</a>. Do not use fragments when resolving URI from component in MappedComponentXMIHelper</p>
<p>Bug <a href='https://bugs.eclipse.org/373570'>373570</a>. V2 Validation Framework ignoring IResourceDelta.REMOVED events</p>
+<p>Bug <a href='https://bugs.eclipse.org/376748'>376748</a>. Source files not included in WEB-INF/classes when exporting a WAR if .component file contains non-existing folders</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 c718a68..d5a6fd6 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
@@ -30,6 +30,7 @@
Bug https://bugs.eclipse.org/373416 Remove reference to JBoss\n\
Bug https://bugs.eclipse.org/373565 Do not use fragments when resolving URI from component in MappedComponentXMIHelper\n\
Bug https://bugs.eclipse.org/373570 V2 Validation Framework ignoring IResourceDelta.REMOVED events\n\
+Bug https://bugs.eclipse.org/376748 Source files not included in WEB-INF/classes when exporting a WAR if .component file contains non-existing folders\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java
index b775aca..69b7cfe 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -214,7 +214,10 @@
}
}
}
- }
+ else {
+ allNames.remove(localName);
+ }
+ }
}
}
}
