[404914] Lots of log entries from
org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider
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 08721b7..ebff4eb 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
@@ -13,4 +13,5 @@
<h2>org.eclipse.jst.enterprise_ui.feature</h2>
-<p>Bug <a href='https://bugs.eclipse.org/378160'>378160</a>. Service project and service project type need to be refreshed when web service target runtime changes</p>
\ No newline at end of file
+<p>Bug <a href='https://bugs.eclipse.org/378160'>378160</a>. Service project and service project type need to be refreshed when web service target runtime changes</p>
+<p>Bug <a href='https://bugs.eclipse.org/404752'>404752</a>. URL not calculated for servlets in web fragments </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 3a550b7..f4c166b 100644
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
+++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
@@ -29,6 +29,7 @@
The fixes are described in the following bugzilla entries:\n\
\n\
Bug https://bugs.eclipse.org/378160 Service project and service project type need to be refreshed when web service target runtime changes\n\
+Bug https://bugs.eclipse.org/404752 URL not calculated for servlets in web fragments \n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
index 30935c6..827fe91 100644
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
+++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
@@ -34,5 +34,12 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jst.jee.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
</feature>
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 fea3bb6..930c716 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
@@ -14,7 +14,10 @@
<h2>org.eclipse.jst.web_core.feature</h2>
<p>Bug <a href='https://bugs.eclipse.org/401742'>401742</a>. Server starts unnecessarily when removing projects from the workspace</p>
-<p>Bug <a href='https://bugs.eclipse.org/401742'>404090</a>. NullPointerException in ProjectValidationHelper.getOutputContainers</p>
+<p>Bug <a href='https://bugs.eclipse.org/404090'>404090</a>. NullPointerException in ProjectValidationHelper.getOutputContainers</p>
+<p>Bug <a href='https://bugs.eclipse.org/404855'>404855</a>. Incorrect name for connector xml catalog entries</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/404914'>404914</a>. Lots of log entries from org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider</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 d65bb26..f1187a3 100644
--- a/features/org.eclipse.jst.web_core.feature.patch/feature.properties
+++ b/features/org.eclipse.jst.web_core.feature.patch/feature.properties
@@ -28,7 +28,10 @@
The bugs and fixes are described in the following bugzilla entries:\n\
\n\
Bug https://bugs.eclipse.org/401742 Server starts unnecessarily when removing projects from the workspace\n\
-Bug https://bugs.eclipse.org/404090 Bug https://bugs.eclipse.org/401742 Server starts unnecessarily when removing projects from the workspace\n\
+Bug https://bugs.eclipse.org/404090 NullPointerException in ProjectValidationHelper.getOutputContainers\n\
+Bug https://bugs.eclipse.org/404855 Incorrect name for connector xml catalog entries\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/404914 Lots of log entries from org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider.\n\
\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.jst.web_core.feature.patch/feature.xml b/features/org.eclipse.jst.web_core.feature.patch/feature.xml
index e3cee14..156f2a8 100644
--- a/features/org.eclipse.jst.web_core.feature.patch/feature.xml
+++ b/features/org.eclipse.jst.web_core.feature.patch/feature.xml
@@ -27,5 +27,26 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
+ <plugin
+ id="org.eclipse.jst.jsp.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jst.standard.schemas"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jst.j2ee.web"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/plugins/org.eclipse.jst.j2ee.web/.gitignore b/plugins/org.eclipse.jst.j2ee.web/.gitignore
new file mode 100644
index 0000000..5e56e04
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.web/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
index 0a63e78..2072e51 100644
--- a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Web Plug-in
Bundle-SymbolicName: org.eclipse.jst.j2ee.web; singleton:=true
-Bundle-Version: 1.1.601.qualifier
+Bundle-Version: 1.1.602.qualifier
Bundle-Activator: org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
index b696c7b..7e73ccb 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
@@ -66,8 +66,8 @@
if (model.isPropertySet(FACET_PROJECT_NAME))
{
String projectName = model.getStringProperty(FACET_PROJECT_NAME);
- IProject project = (projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
-
+ IPath path = new Path(projectName);
+ IProject project = (projectName.length() > 0 && path.isValidSegment(projectName)) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
if (project != null && project.exists()) {
if (ModuleCoreNature.isFlexibleProject(project))
{
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
index 9f1c235..2e0e854 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
@@ -19,6 +19,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
@@ -53,8 +54,8 @@
if (model.isPropertySet(FACET_PROJECT_NAME))
{
String projectName = model.getStringProperty(FACET_PROJECT_NAME);
- IProject project = (projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
-
+ IPath path = new Path(projectName);
+ IProject project = (projectName.length() > 0 && path.isValidSegment(projectName)) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
if (project != null && project.exists()) {
if (ModuleCoreNature.isFlexibleProject(project))
{
