[423847] Container Selection dialog in new Servlet wizard does not recognize nested source folders [423825] Duplicate classpath entry org.eclipse.jst.j2ee.internal.module.container when installing Java EE facet

diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html b/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
index ce27507..e3eed70 100644
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
+++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html

@@ -18,4 +18,5 @@
 <p>Bug <a href='https://bugs.eclipse.org/406595'>406595</a>. Disable Java EE module creation if not supported by target server runtime</p>
 <p>Bug <a href='https://bugs.eclipse.org/400036'>400036</a>. Restrict supported servers for client and service runtimes</p>
 <p>Bug <a href='https://bugs.eclipse.org/415168'>415168</a>. Restrict supported servers for client and service runtimes - supportedServers bug </p>
+<p>Bug <a href='https://bugs.eclipse.org/423847'>423847</a>. Container Selection dialog in new Servlet wizard does not recognize nested source folders </p>
 

diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
index 4f05f19..f4230d8 100644
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
+++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties

@@ -33,6 +33,7 @@
 Bug https://bugs.eclipse.org/406595 Disable Java EE module creation if not supported by target server runtime\n\
 Bug https://bugs.eclipse.org/400036 Restrict supported servers for client and service runtimes\n\
 Bug https://bugs.eclipse.org/415168 Restrict supported servers for client and service runtimes - supportedServers bug \n\
+Bug https://bugs.eclipse.org/423847 Container Selection dialog in new Servlet wizard does not recognize nested source folders  \n\
 \n\
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\

diff --git a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
index 50a46ac..bec4270 100644
--- a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
+++ b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html

@@ -26,6 +26,7 @@
 <p>Bug <a href='https://bugs.eclipse.org/408055'>408055</a>. ResourceNotFoundException logged frequently when dragging items from the Palette</p>
 <p>Bug <a href='https://bugs.eclipse.org/413730'>413730</a>. DependencyGraphImpl deadlocks if workspace lock has been acquired on another thread</p>
 <p>Bug <a href='https://bugs.eclipse.org/403943'>403943</a>. CategorizedProblems problem in JSP file are disappearing when the annotations processor is turned on</p>
+<p>Bug <a href='https://bugs.eclipse.org/423825'>423825</a>. Duplicate classpath entry org.eclipse.jst.j2ee.internal.module.container when installing Java EE facet</p>
 
 </body>
 </html>
\ No newline at end of file

diff --git a/features/org.eclipse.jst.web_core.feature.patch/feature.properties b/features/org.eclipse.jst.web_core.feature.patch/feature.properties
index 9f65166..40db732 100644
--- a/features/org.eclipse.jst.web_core.feature.patch/feature.properties
+++ b/features/org.eclipse.jst.web_core.feature.patch/feature.properties

@@ -40,6 +40,7 @@
 Bug https://bugs.eclipse.org/408055 ResourceNotFoundException logged frequently when dragging items from the Palette\n\
 Bug https://bugs.eclipse.org/413730 DependencyGraphImpl deadlocks if workspace lock has been acquired on another thread\n\
 Bug https://bugs.eclipse.org/403943 CategorizedProblems problem in JSP file are disappearing when the annotations processor is turned on\n\
+Bug https://bugs.eclipse.org/423825 Duplicate classpath entry org.eclipse.jst.j2ee.internal.module.container when installing Java EE facet\n\
 \n\
 \n\
 # "copyright" property - text of the "Feature Update Copyright"

diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
index 2365c92..4c20fd0 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2014 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
@@ -545,7 +545,7 @@
 	}
 
 	/**
-	 * Returns a new instance of the Selection Listner for the Container
+	 * Returns a new instance of the Selection Listener for the Container
 	 * Selection Dialog
 	 */
 	protected ViewerFilter getContainerDialogViewerFilter() {
@@ -561,7 +561,7 @@
 					IProject project = ProjectUtilities.getProject(model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
 					IPackageFragmentRoot[] sourceFolders = J2EEProjectUtilities.getSourceContainers(project);
 					for (int i = 0; i < sourceFolders.length; i++) {
-						if (sourceFolders[i].getResource()!= null && sourceFolders[i].getResource().equals(folder))
+						if(sourceFolders[i].getResource()!= null && folder.getFullPath().isPrefixOf(sourceFolders[i].getResource().getFullPath())) 						
 							return true;
 					}
 				}