remove EARNature, JCC

plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceFactory.java

diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceFactory.java
index 877d542..b946f53 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceFactory.java
@@ -13,12 +13,12 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
 import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
 import org.eclipse.wst.common.internal.emf.resource.Renderer;
 import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
 import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
 import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
+import org.eclipse.wst.common.modulecore.internal.impl.WTPResourceFactoryRegistry;
 
 
 public class ApplicationResourceFactory extends TranslatorResourceFactory {
@@ -51,7 +51,7 @@
 	 * Register myself with the Resource.Factory.Registry
 	 */
 	public static void registerWith(RendererFactory aRendererFactory) {
-		J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.APPLICATION_DD_SHORT_NAME, new ApplicationResourceFactory(aRendererFactory));
+		WTPResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.APPLICATION_DD_SHORT_NAME, new ApplicationResourceFactory(aRendererFactory));
 	}
 	
 	/**
@@ -64,7 +64,7 @@
 
 	
 	public static Resource.Factory getRegisteredFactory() {
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.APPLICATION_DD_URI_OBJ);
+		return WTPResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.APPLICATION_DD_URI_OBJ);
 	}
 
 }

plugins/org.eclipse.jst.j2ee.core/plugin.xml

diff --git a/plugins/org.eclipse.jst.j2ee.core/plugin.xml b/plugins/org.eclipse.jst.j2ee.core/plugin.xml
index 588a95c..f045761 100644
--- a/plugins/org.eclipse.jst.j2ee.core/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.core/plugin.xml
@@ -31,6 +31,7 @@
       <import plugin="org.eclipse.wst.common.emf"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.wst.validation"/>
+      <import plugin="org.eclipse.wst.common.modulecore"/>
    </requires>
 
 

plugins/org.eclipse.jst.j2ee/plugin.xml

diff --git a/plugins/org.eclipse.jst.j2ee/plugin.xml b/plugins/org.eclipse.jst.j2ee/plugin.xml
index 7761fce..c686393 100644
--- a/plugins/org.eclipse.jst.j2ee/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee/plugin.xml
@@ -115,6 +115,7 @@
 <!--============================-->
 <!-- EAR Project Nature Contributions                -->
 <!--============================-->
+<!--
    <extension
          id="EARNature"
          name="EAR Properties"
@@ -125,6 +126,17 @@
          </run>
       </runtime>
    </extension>
+-->
+   <extension
+         point="org.eclipse.wst.common.emfworkbench.integration.editModel">
+      <editModel
+            editModelID="jst.ear"
+            factoryClass="org.eclipse.wst.common.modulecore.internal.impl.ArtifactEditModelFactory">
+         <editModelResource
+               autoload="false"
+               URI="META-INF/application.xml"/>
+      </editModel>
+   </extension>
 <!-- Register the nature id with the EMFNature -->
    <extension
          point="com.ibm.wtp.emf.workbench.nature_registration">