[320417] modulemap.xmi has no class
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml
index b29b5a8..e4578f2 100644
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml
@@ -33,9 +33,6 @@
 						<test forcePluginActivation="true"
 							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
 							value="application.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="modulemap.xmi" />
 					</or>
 				</and>
 				<and>
@@ -102,9 +99,6 @@
 							value="client.xmi" />
 						<test forcePluginActivation="true"
 							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="modulemap.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
 							value="ejb.xmi" />
 						<test forcePluginActivation="true"
 							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
@@ -138,9 +132,6 @@
 							<test forcePluginActivation="true"
 								property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
 								value="application.xmi" />
-							<test forcePluginActivation="true"
-								property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-								value="modulemap.xmi" />
 						</or>
 					</and>
 					<instanceof
diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
index 222b574..322f8e6 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
@@ -310,14 +310,6 @@
          	   id="org.eclipse.ui.navigator.ProjectExplorer">
          </view>
       </adapterFactory>
-      <adapterFactory
-            className="org.eclipse.jst.j2ee.internal.provider.J2EEModulemapItemProviderAdapterFactory"
-            packageURI="modulemap.xmi"
-            id="org.eclipse.jst.j2ee.internal.provider.J2EEModulemapItemProviderAdapterFactory">
-          <view 
-         	   id="org.eclipse.ui.navigator.ProjectExplorer">
-         </view>
-      </adapterFactory>
    </extension>
    <extension point="org.eclipse.ui.popupMenus">
       <objectContribution objectClass="org.eclipse.core.resources.IProject" adaptable="true" id="org.eclipse.jst.j2ee.ui.popupMenu">
diff --git a/plugins/org.eclipse.jst.j2ee/plugin.xml b/plugins/org.eclipse.jst.j2ee/plugin.xml
index 3546d19..58653c0 100644
--- a/plugins/org.eclipse.jst.j2ee/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee/plugin.xml
@@ -255,29 +255,6 @@
          </runStrategy>
       </validator>
    </extension>
-<!--ModuleMapInit-->
-<!--============================-->
-<!-- J2EE Extension Point Registry-->
-<!--============================-->
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="modulemap.xmi"
-            class="org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage">
-      </package>
-   </extension>
-<!-- ====================================================== -->
-<!-- Register package mappings                              -->
-<!-- Several that have not changed are still registered as  -->
-<!-- a place holder for the future.                         -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.wst.common.emf.packageURIMap">
-      <map
-            uri="modulemap.xmi"
-            prefix="modulemap">
-      </map>
-   </extension>
 <!-- ====================================================== -->
 <!-- Extendable Operations                                  -->
 <!-- These operation are extendable in other plugins        -->
@@ -327,15 +304,6 @@
    </extension>
    <extension
          point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.provider.ModulemapItemProviderAdapterFactory"
-            packageURI="modulemap.xmi"
-            id="org.eclipse.jst.j2ee.ear.modulemap.provider.ModulemapItemProviderAdapterFactory">
-      </adapterFactory>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
       <adapterFactory 
             className="org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory"
             packageURI="org.eclipse.emf.ecore.resource"