[nobug] Recontribute the Enhanced Java Rendering for Web navigator
        content provider

plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
index 7dfd592..133923a 100644
--- a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
@@ -1,8 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
+Automatic-Module-Name: org.eclipse.jst.servlet.ui
 Bundle-SymbolicName: org.eclipse.jst.servlet.ui; singleton:=true
-Bundle-Version: 1.1.1300.qualifier
+Bundle-Version: 1.1.1400.qualifier
 Bundle-Activator: org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin
 Bundle-Vendor: %pluginVendor
 Bundle-Localization: plugin

plugins/org.eclipse.jst.servlet.ui/plugin.xml

diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.xml b/plugins/org.eclipse.jst.servlet.ui/plugin.xml
index 1e5a71f..f788039 100644
--- a/plugins/org.eclipse.jst.servlet.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.servlet.ui/plugin.xml
@@ -356,7 +356,103 @@
       id="org.eclipse.jst.j2ee.internal.web.container">
     </classpathContainerPage>
   </extension>
+  <extension
+        point="org.eclipse.ui.navigator.navigatorContent">
+     <navigatorContent
+           activeByDefault="false"
+           contentProvider="org.eclipse.jst.servlet.ui.internal.navigator.WebJavaContentProvider"
+           icon="icons/full/ctool16/webjava-icon.gif"
+           id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"
+           labelProvider="org.eclipse.jst.servlet.ui.internal.navigator.WebJavaLabelProvider"
+           name="%enhanced.java.for.web.name"
+           priority="higher">
+        <override
+              policy="InvokeOnlyIfSuppressedExtAlsoVisibleAndActive"
+              suppressedExtensionId="org.eclipse.jdt.java.ui.javaContent"/>					   
+        <triggerPoints>
+        	<or>
+				<and>
+					<adapt
+						type="org.eclipse.core.resources.IProject">
+						<or> 
+							<test forcePluginActivation="true"
+								property="org.eclipse.wst.common.project.facet.core.projectFacet"
+								value="jst.web" />
+						</or>
+					</adapt>
+				</and>
+				<instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
+			</or>        
+        </triggerPoints>
+        <possibleChildren>
+           <or>
+              <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"/>
+              <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+              <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
+              <instanceof value="org.eclipse.core.resources.IFolder"/>
+              <instanceof value="org.eclipse.jdt.internal.ui.packageview.ClassPathContainer"/>
+              <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaLibraries"/>
+           </or>
+        </possibleChildren> 
+		<actionProvider
+			class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider"
+			id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering.actions.NewActionProvider">
+			<enablement>
+				<instanceof
+					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
+			</enablement>
+		</actionProvider>        
+        <commonSorter
+              class="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaSorter"
+              id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering.sorter">
+           <parentExpression>
+              <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"/>
+           </parentExpression>
+        </commonSorter>
+ 
+		   <commonWizard
+		        type="new"
+		        wizardId="org.eclipse.jdt.ui.wizards.NewPackageCreationWizard">
+		     <enablement>
+				<instanceof
+					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
+		     </enablement>
+		  </commonWizard>
+		  <commonWizard
+		        type="new"
+		        wizardId="org.eclipse.jdt.ui.wizards.NewClassCreationWizard">
+		     <enablement>
+				<instanceof
+					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
+		     </enablement>
+		  </commonWizard>
 
+   	      <commonWizard
+		        type="new"
+		        wizardId="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard">
+		     <enablement>
+				<instanceof
+					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
+		     </enablement>
+		  </commonWizard> 
+		    <commonWizard
+		          type="new"
+		          wizardId="org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard">
+				<enablement>				        
+					<instanceof
+						value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
+			     </enablement>
+			 </commonWizard>        			 
+     </navigatorContent>
+  </extension>
+  <extension
+        point="org.eclipse.ui.navigator.viewer">
+     <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+        <includes>
+           <contentExtension pattern="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"/>
+        </includes>
+     </viewerContentBinding>
+  </extension>
   <extension
         point="org.eclipse.core.runtime.adapters">
      <factory

plugins/org.eclipse.jst.servlet.ui/pom.xml

diff --git a/plugins/org.eclipse.jst.servlet.ui/pom.xml b/plugins/org.eclipse.jst.servlet.ui/pom.xml
index 0c11f6b..d814252 100644
--- a/plugins/org.eclipse.jst.servlet.ui/pom.xml
+++ b/plugins/org.eclipse.jst.servlet.ui/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.servlet.ui</artifactId>
-  <version>1.1.1300-SNAPSHOT</version>
+  <version>1.1.1400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>