[eclipse-wtp] 06/06: Regenerate code from EMF models
Jakub Adam
xhaakon-guest at alioth.debian.org
Sat Aug 31 18:49:47 UTC 2013
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master
in repository eclipse-wtp.
commit b9f5db9cf297d10ff6b7754ecc3742be45a189ef
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sat Aug 31 16:11:32 2013 +0200
Regenerate code from EMF models
---
debian/changelog | 1 +
debian/emfRegenerate.xml | 78 ++
debian/patches/genmodel-customizations.patch | 1607 ++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 9 +
5 files changed, 1696 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index bd86527..73c0d61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ eclipse-wtp (3.5.0-1) UNRELEASED; urgency=low
- debian-custom-build.patch
- regenerate-xpath2-parser.patch.
* Add patch for compatibility with rhino 1.7R4.
+ * Regenerate code from EMF models.
-- Jakub Adam <jakub.adam at ktknet.cz> Fri, 28 Jun 2013 08:42:01 +0200
diff --git a/debian/emfRegenerate.xml b/debian/emfRegenerate.xml
new file mode 100644
index 0000000..0f6cb3e
--- /dev/null
+++ b/debian/emfRegenerate.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="codegen" default="default">
+ <description>
+ Generates Java code from EMF models
+ </description>
+
+ <target name="default">
+ <property name="modulecoreProjectDir"
+ value=".eclipse-build/org.eclipse.wst.common.modulecore"/>
+
+ <emf.Ecore2Java
+ genModel="${modulecoreProjectDir}/model/componentCore.genmodel"
+ model="${modulecoreProjectDir}/model/componentCore.ecore"
+ generateModelProject="false"
+ generateTestsProject="false"
+ generateEditProject="false"
+ generateEditorProject="false"
+ reconcilegenmodel="reload"/>
+
+ <property name="wsProjectDir"
+ value=".eclipse-build/org.eclipse.wst.ws"/>
+
+ <emf.XSD2Java
+ genModel="${wsProjectDir}/RT.genmodel"
+ generateModelProject="false"
+ generateTestsProject="false"
+ generateEditProject="false"
+ generateEditorProject="false"
+ reconcilegenmodel="keep">
+ <model file="${wsProjectDir}/model/Index.xsd"/>
+ <model file="${wsProjectDir}/model/Registry.xsd"/>
+ <model file="${wsProjectDir}/model/Taxonomy.xsd"/>
+ <model file="${wsProjectDir}/model/UDDIRegistry.xsd"/>
+ </emf.XSD2Java>
+
+ <property name="wsdlProjectDir"
+ value=".eclipse-build/org.eclipse.wst.wsdl"/>
+
+ <emf.Rose2Java
+ genModel="${wsdlProjectDir}/model/HTTP.genmodel"
+ model="${wsdlProjectDir}/model/HTTP.mdl"
+ generateModelProject="false"
+ generateTestsProject="false"
+ generateEditProject="false"
+ generateEditorProject="false"
+ reconcilegenmodel="keep"/>
+
+ <emf.Rose2Java
+ genModel="${wsdlProjectDir}/model/SOAP.genmodel"
+ model="${wsdlProjectDir}/model/SOAP.mdl"
+ generateModelProject="false"
+ generateTestsProject="false"
+ generateEditProject="false"
+ generateEditorProject="false"
+ reconcilegenmodel="keep"/>
+
+ <emf.Rose2Java
+ genModel="${wsdlProjectDir}/model/WSDL.genmodel"
+ model="${wsdlProjectDir}/model/WSDL.mdl"
+ generateModelProject="false"
+ generateTestsProject="false"
+ generateEditProject="false"
+ generateEditorProject="false"
+ reconcilegenmodel="keep"/>
+
+ <property name="wbenchProjectDir"
+ value=".eclipse-build/org.eclipse.wst.common.emfworkbench.integration"/>
+
+ <emf.Rose2Java
+ genModel="${wbenchProjectDir}/rose/ModuleCore.genmodel"
+ model="${wbenchProjectDir}/rose/moduleCore.mdl"
+ generateModelProject="false"
+ generateTestsProject="false"
+ generateEditProject="false"
+ generateEditorProject="false"
+ reconcilegenmodel="keep"/>
+ </target>
+</project>
diff --git a/debian/patches/genmodel-customizations.patch b/debian/patches/genmodel-customizations.patch
new file mode 100644
index 0000000..f25f730
--- /dev/null
+++ b/debian/patches/genmodel-customizations.patch
@@ -0,0 +1,1607 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Fri, 30 Aug 2013 19:57:21 +0200
+Subject: genmodel-customizations
+
+---
+ .../model/componentCore.genmodel | 3 +-
+ .../internal/ComponentcoreFactory.java | 92 --
+ .../internal/ComponentcorePackage.java | 1146 --------------------
+ .../internal/ModuleStructuralModel.java | 1 +
+ .../componentcore/internal/StructureEdit.java | 1 +
+ .../internal/impl/ComponentResourceImpl.java | 1 -
+ .../internal/impl/ComponentTypeImpl.java | 1 -
+ .../internal/impl/ComponentcoreFactoryImpl.java | 2 -
+ .../internal/impl/ComponentcorePackageImpl.java | 2 -
+ .../internal/impl/ModuleIndexingAdapter.java | 2 +-
+ .../internal/impl/ProjectComponentsImpl.java | 1 -
+ .../componentcore/internal/impl/PropertyImpl.java | 1 -
+ .../internal/impl/ReferencedComponentImpl.java | 1 -
+ .../internal/impl/ResourceTreeNode.java | 2 +-
+ .../internal/impl/ResourceTreeRoot.java | 3 +-
+ .../internal/impl/WTPModulesInit.java | 4 +-
+ .../internal/impl/WorkbenchComponentImpl.java | 1 -
+ .../internal/resources/VirtualComponent.java | 4 +-
+ .../internal/util/ComponentcoreAdapterFactory.java | 1 -
+ .../internal/util/ComponentcoreSwitch.java | 1 -
+ .../internal/util/DependencyTypeTranslator.java | 2 +-
+ .../internal/util/DeployedPathProvider.java | 2 +-
+ .../internal/util/EclipseResourceAdapter.java | 2 +-
+ .../internal/util/SourcePathProvider.java | 2 +-
+ .../internal/util/WTPModulesTranslator.java | 2 +-
+ .../resolvers/DefaultReferenceResolver.java | 2 +-
+ org.eclipse.wst.ws/RT.genmodel | 2 +-
+ 27 files changed, 19 insertions(+), 1265 deletions(-)
+ delete mode 100644 org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcoreFactory.java
+ delete mode 100644 org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
+
+diff --git a/org.eclipse.wst.common.modulecore/model/componentCore.genmodel b/org.eclipse.wst.common.modulecore/model/componentCore.genmodel
+index 2e55524..4f24970 100644
+--- a/org.eclipse.wst.common.modulecore/model/componentCore.genmodel
++++ b/org.eclipse.wst.common.modulecore/model/componentCore.genmodel
+@@ -4,7 +4,8 @@
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.wst.common.modulecore/modulecore-src"
+ editDirectory="/org.eclipse.wst.common.modulecore.edit/src" editorDirectory="/org.eclipse.wst.common.modulecore.editor/src"
+ modelPluginID="org.eclipse.wst.common.modulecore" runtimeJar="true" modelName="ComponentCore"
+- editPluginClass="componentcore.provider.ComponentCoreEditPlugin" editorPluginClass="componentcore.presentation.ComponentCoreEditorPlugin">
++ editPluginClass="componentcore.provider.ComponentCoreEditPlugin" editorPluginClass="componentcore.presentation.ComponentCoreEditorPlugin"
++ complianceLevel="6.0">
+ <foreignModel>componentCore.ecore</foreignModel>
+ <genPackages prefix="Componentcore" basePackage="org.eclipse.wst.common" disposableProviderFactory="true"
+ interfacePackageSuffix="internal" classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util"
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcoreFactory.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcoreFactory.java
+deleted file mode 100644
+index 25de4f9..0000000
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcoreFactory.java
++++ /dev/null
+@@ -1,92 +0,0 @@
+-/**
+- * <copyright>
+- * </copyright>
+- *
+- * $Id: ComponentcoreFactory.java,v 1.2 2006/04/27 04:17:40 cbridgha Exp $
+- */
+-package org.eclipse.wst.common.componentcore.internal;
+-
+-import org.eclipse.emf.ecore.EFactory;
+-import org.eclipse.wst.common.componentcore.internal.impl.ComponentcoreFactoryImpl;
+-
+-/**
+- * <!-- begin-user-doc -->
+- * The <b>Factory</b> for the model.
+- * It provides a create method for each non-abstract class of the model.
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentcorePackage
+- * @generated
+- */
+-public interface ComponentcoreFactory extends EFactory {
+- /**
+- * The singleton instance of the factory.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- ComponentcoreFactory eINSTANCE = ComponentcoreFactoryImpl.init();
+-
+- /**
+- * Returns a new object of class '<em>Workbench Component</em>'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return a new object of class '<em>Workbench Component</em>'.
+- * @generated
+- */
+- WorkbenchComponent createWorkbenchComponent();
+-
+- /**
+- * Returns a new object of class '<em>Component Resource</em>'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return a new object of class '<em>Component Resource</em>'.
+- * @generated
+- */
+- ComponentResource createComponentResource();
+-
+- /**
+- * Returns a new object of class '<em>Component Type</em>'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return a new object of class '<em>Component Type</em>'.
+- * @generated
+- */
+- ComponentType createComponentType();
+-
+- /**
+- * Returns a new object of class '<em>Property</em>'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return a new object of class '<em>Property</em>'.
+- * @generated
+- */
+- Property createProperty();
+-
+- /**
+- * Returns a new object of class '<em>Referenced Component</em>'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return a new object of class '<em>Referenced Component</em>'.
+- * @generated
+- */
+- ReferencedComponent createReferencedComponent();
+-
+- /**
+- * Returns a new object of class '<em>Project Components</em>'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return a new object of class '<em>Project Components</em>'.
+- * @generated
+- */
+- ProjectComponents createProjectComponents();
+-
+- /**
+- * Returns the package supported by this factory.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the package supported by this factory.
+- * @generated
+- */
+- ComponentcorePackage getComponentcorePackage();
+-
+-} //ComponentcoreFactory
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
+deleted file mode 100644
+index 737cc80..0000000
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
++++ /dev/null
+@@ -1,1146 +0,0 @@
+-/**
+- * <copyright>
+- * </copyright>
+- *
+- * $Id: ComponentcorePackage.java,v 1.10 2011/08/10 21:40:14 rsanchez Exp $
+- */
+-package org.eclipse.wst.common.componentcore.internal;
+-
+-import org.eclipse.emf.ecore.EAttribute;
+-import org.eclipse.emf.ecore.EClass;
+-import org.eclipse.emf.ecore.EDataType;
+-import org.eclipse.emf.ecore.EEnum;
+-import org.eclipse.emf.ecore.EPackage;
+-import org.eclipse.emf.ecore.EReference;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
+-
+-/**
+- * <!-- begin-user-doc -->
+- * The <b>Package</b> for the model.
+- * It contains accessors for the meta objects to represent
+- * <ul>
+- * <li>each class,</li>
+- * <li>each feature of each class,</li>
+- * <li>each enum,</li>
+- * <li>and each data type</li>
+- * </ul>
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.ComponentcoreFactory
+- * @model kind="package"
+- * @generated
+- */
+-public interface ComponentcorePackage extends EPackage {
+- /**
+- * The package name.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- String eNAME = "componentcore";
+-
+- /**
+- * The package namespace URI.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- String eNS_URI = "componentcore.xmi"; //$NON-NLS-1$
+-
+- /**
+- * The package namespace name.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- String eNS_PREFIX = "org.eclipse.wst.common.componentcore"; //$NON-NLS-1$
+-
+- /**
+- * The singleton instance of the package.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- ComponentcorePackage eINSTANCE = org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl.init();
+-
+- /**
+- * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.WorkbenchComponentImpl <em>Workbench Component</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.WorkbenchComponentImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getWorkbenchComponent()
+- * @generated
+- */
+- int WORKBENCH_COMPONENT = 0;
+-
+- /**
+- * The feature id for the '<em><b>Name</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int WORKBENCH_COMPONENT__NAME = 0;
+-
+- /**
+- * The feature id for the '<em><b>Resources</b></em>' containment reference list.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int WORKBENCH_COMPONENT__RESOURCES = 1;
+-
+- /**
+- * The feature id for the '<em><b>Component Type</b></em>' containment reference.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int WORKBENCH_COMPONENT__COMPONENT_TYPE = 2;
+-
+- /**
+- * The feature id for the '<em><b>Referenced Components</b></em>' containment reference list.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int WORKBENCH_COMPONENT__REFERENCED_COMPONENTS = 3;
+-
+- /**
+- * The feature id for the '<em><b>Properties</b></em>' reference list.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int WORKBENCH_COMPONENT__PROPERTIES = 4;
+-
+- /**
+- * The feature id for the '<em><b>Metadata Resources</b></em>' attribute list.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int WORKBENCH_COMPONENT__METADATA_RESOURCES = 5;
+-
+- /**
+- * The number of structural features of the '<em>Workbench Component</em>' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int WORKBENCH_COMPONENT_FEATURE_COUNT = 6;
+-
+- /**
+- * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl <em>Component Resource</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getComponentResource()
+- * @generated
+- */
+- int COMPONENT_RESOURCE = 1;
+-
+- /**
+- * The feature id for the '<em><b>Source Path</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_RESOURCE__SOURCE_PATH = 0;
+-
+- /**
+- * The feature id for the '<em><b>Runtime Path</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_RESOURCE__RUNTIME_PATH = 1;
+-
+- /**
+- * The feature id for the '<em><b>Exclusions</b></em>' attribute list.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_RESOURCE__EXCLUSIONS = 2;
+-
+- /**
+- * The feature id for the '<em><b>Component</b></em>' container reference.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_RESOURCE__COMPONENT = 3;
+-
+- /**
+- * The feature id for the '<em><b>Resource Type</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_RESOURCE__RESOURCE_TYPE = 4;
+-
+- /**
+- * The feature id for the '<em><b>Tag</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_RESOURCE__TAG = 5;
+-
+- /**
+- * The number of structural features of the '<em>Component Resource</em>' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_RESOURCE_FEATURE_COUNT = 6;
+-
+- /**
+- * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentTypeImpl <em>Component Type</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentTypeImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getComponentType()
+- * @generated
+- */
+- int COMPONENT_TYPE = 2;
+-
+- /**
+- * The feature id for the '<em><b>Component Type Id</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_TYPE__COMPONENT_TYPE_ID = 0;
+-
+- /**
+- * The feature id for the '<em><b>Version</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_TYPE__VERSION = 1;
+-
+- /**
+- * The feature id for the '<em><b>Properties</b></em>' reference list.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_TYPE__PROPERTIES = 2;
+-
+- /**
+- * The feature id for the '<em><b>Metadata Resources</b></em>' attribute list.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_TYPE__METADATA_RESOURCES = 3;
+-
+- /**
+- * The number of structural features of the '<em>Component Type</em>' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int COMPONENT_TYPE_FEATURE_COUNT = 4;
+-
+- /**
+- * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.PropertyImpl <em>Property</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.PropertyImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getProperty()
+- * @generated
+- */
+- int PROPERTY = 3;
+-
+- /**
+- * The feature id for the '<em><b>Name</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int PROPERTY__NAME = 0;
+-
+- /**
+- * The feature id for the '<em><b>Value</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int PROPERTY__VALUE = 1;
+-
+- /**
+- * The number of structural features of the '<em>Property</em>' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int PROPERTY_FEATURE_COUNT = 2;
+-
+- /**
+- * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ReferencedComponentImpl <em>Referenced Component</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ReferencedComponentImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getReferencedComponent()
+- * @generated
+- */
+- int REFERENCED_COMPONENT = 4;
+-
+- /**
+- * The feature id for the '<em><b>Handle</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int REFERENCED_COMPONENT__HANDLE = 0;
+-
+- /**
+- * The feature id for the '<em><b>Runtime Path</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int REFERENCED_COMPONENT__RUNTIME_PATH = 1;
+-
+- /**
+- * The feature id for the '<em><b>Dependency Type</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int REFERENCED_COMPONENT__DEPENDENCY_TYPE = 2;
+-
+- /**
+- * The feature id for the '<em><b>Dependent Object</b></em>' reference.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int REFERENCED_COMPONENT__DEPENDENT_OBJECT = 3;
+-
+- /**
+- * The feature id for the '<em><b>Archive Name</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int REFERENCED_COMPONENT__ARCHIVE_NAME = 4;
+-
+- /**
+- * The number of structural features of the '<em>Referenced Component</em>' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int REFERENCED_COMPONENT_FEATURE_COUNT = 5;
+-
+- /**
+- * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ProjectComponentsImpl <em>Project Components</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ProjectComponentsImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getProjectComponents()
+- * @generated
+- */
+- int PROJECT_COMPONENTS = 5;
+-
+- /**
+- * The feature id for the '<em><b>Project Name</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int PROJECT_COMPONENTS__PROJECT_NAME = 0;
+-
+- /**
+- * The feature id for the '<em><b>Components</b></em>' containment reference list.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int PROJECT_COMPONENTS__COMPONENTS = 1;
+-
+- /**
+- * The feature id for the '<em><b>Version</b></em>' attribute.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int PROJECT_COMPONENTS__VERSION = 2;
+-
+- /**
+- * The number of structural features of the '<em>Project Components</em>' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- * @ordered
+- */
+- int PROJECT_COMPONENTS_FEATURE_COUNT = 3;
+-
+- /**
+- * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.DependencyType <em>Dependency Type</em>}' enum.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.DependencyType
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getDependencyType()
+- * @generated
+- */
+- int DEPENDENCY_TYPE = 6;
+-
+- /**
+- * The meta object id for the '<em>IPath</em>' data type.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.core.runtime.IPath
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getIPath()
+- * @generated
+- */
+- int IPATH = 7;
+-
+- /**
+- * The meta object id for the '<em>URI</em>' data type.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.emf.common.util.URI
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getURI()
+- * @generated
+- */
+- int URI = 8;
+-
+-
+- /**
+- * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent <em>Workbench Component</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for class '<em>Workbench Component</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent
+- * @generated
+- */
+- EClass getWorkbenchComponent();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getName <em>Name</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Name</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getName()
+- * @see #getWorkbenchComponent()
+- * @generated
+- */
+- EAttribute getWorkbenchComponent_Name();
+-
+- /**
+- * Returns the meta object for the containment reference list '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getResources <em>Resources</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the containment reference list '<em>Resources</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getResources()
+- * @see #getWorkbenchComponent()
+- * @generated
+- */
+- EReference getWorkbenchComponent_Resources();
+-
+- /**
+- * Returns the meta object for the containment reference '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getComponentType <em>Component Type</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the containment reference '<em>Component Type</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getComponentType()
+- * @see #getWorkbenchComponent()
+- * @generated
+- */
+- EReference getWorkbenchComponent_ComponentType();
+-
+- /**
+- * Returns the meta object for the containment reference list '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getReferencedComponents <em>Referenced Components</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the containment reference list '<em>Referenced Components</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getReferencedComponents()
+- * @see #getWorkbenchComponent()
+- * @generated
+- */
+- EReference getWorkbenchComponent_ReferencedComponents();
+-
+- /**
+- * Returns the meta object for the reference list '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getProperties <em>Properties</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the reference list '<em>Properties</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getProperties()
+- * @see #getWorkbenchComponent()
+- * @generated
+- */
+- EReference getWorkbenchComponent_Properties();
+-
+- /**
+- * Returns the meta object for the attribute list '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getMetadataResources <em>Metadata Resources</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute list '<em>Metadata Resources</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getMetadataResources()
+- * @see #getWorkbenchComponent()
+- * @generated
+- */
+- EAttribute getWorkbenchComponent_MetadataResources();
+-
+- /**
+- * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource <em>Component Resource</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for class '<em>Component Resource</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentResource
+- * @generated
+- */
+- EClass getComponentResource();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getSourcePath <em>Source Path</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Source Path</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getSourcePath()
+- * @see #getComponentResource()
+- * @generated
+- */
+- EAttribute getComponentResource_SourcePath();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getRuntimePath <em>Runtime Path</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Runtime Path</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getRuntimePath()
+- * @see #getComponentResource()
+- * @generated
+- */
+- EAttribute getComponentResource_RuntimePath();
+-
+- /**
+- * Returns the meta object for the attribute list '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getExclusions <em>Exclusions</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute list '<em>Exclusions</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getExclusions()
+- * @see #getComponentResource()
+- * @generated
+- */
+- EAttribute getComponentResource_Exclusions();
+-
+- /**
+- * Returns the meta object for the container reference '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getComponent <em>Component</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the container reference '<em>Component</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getComponent()
+- * @see #getComponentResource()
+- * @generated
+- */
+- EReference getComponentResource_Component();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getResourceType <em>Resource Type</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Resource Type</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getResourceType()
+- * @see #getComponentResource()
+- * @generated
+- */
+- EAttribute getComponentResource_ResourceType();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getTag <em>Tag</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Tag</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getTag()
+- * @see #getComponentResource()
+- * @generated
+- */
+- EAttribute getComponentResource_Tag();
+-
+- /**
+- * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.ComponentType <em>Component Type</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for class '<em>Component Type</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentType
+- * @generated
+- */
+- EClass getComponentType();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentType#getComponentTypeId <em>Component Type Id</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Component Type Id</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentType#getComponentTypeId()
+- * @see #getComponentType()
+- * @generated
+- */
+- EAttribute getComponentType_ComponentTypeId();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentType#getVersion <em>Version</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Version</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentType#getVersion()
+- * @see #getComponentType()
+- * @generated
+- */
+- EAttribute getComponentType_Version();
+-
+- /**
+- * Returns the meta object for the reference list '{@link org.eclipse.wst.common.componentcore.internal.ComponentType#getProperties <em>Properties</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the reference list '<em>Properties</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentType#getProperties()
+- * @see #getComponentType()
+- * @generated
+- */
+- EReference getComponentType_Properties();
+-
+- /**
+- * Returns the meta object for the attribute list '{@link org.eclipse.wst.common.componentcore.internal.ComponentType#getMetadataResources <em>Metadata Resources</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute list '<em>Metadata Resources</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ComponentType#getMetadataResources()
+- * @see #getComponentType()
+- * @generated
+- */
+- EAttribute getComponentType_MetadataResources();
+-
+- /**
+- * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.Property <em>Property</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for class '<em>Property</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.Property
+- * @generated
+- */
+- EClass getProperty();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.Property#getName <em>Name</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Name</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.Property#getName()
+- * @see #getProperty()
+- * @generated
+- */
+- EAttribute getProperty_Name();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.Property#getValue <em>Value</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Value</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.Property#getValue()
+- * @see #getProperty()
+- * @generated
+- */
+- EAttribute getProperty_Value();
+-
+- /**
+- * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent <em>Referenced Component</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for class '<em>Referenced Component</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent
+- * @generated
+- */
+- EClass getReferencedComponent();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getHandle <em>Handle</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Handle</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getHandle()
+- * @see #getReferencedComponent()
+- * @generated
+- */
+- EAttribute getReferencedComponent_Handle();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getRuntimePath <em>Runtime Path</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Runtime Path</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getRuntimePath()
+- * @see #getReferencedComponent()
+- * @generated
+- */
+- EAttribute getReferencedComponent_RuntimePath();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getDependencyType <em>Dependency Type</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Dependency Type</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getDependencyType()
+- * @see #getReferencedComponent()
+- * @generated
+- */
+- EAttribute getReferencedComponent_DependencyType();
+-
+- /**
+- * Returns the meta object for the reference '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getDependentObject <em>Dependent Object</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the reference '<em>Dependent Object</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getDependentObject()
+- * @see #getReferencedComponent()
+- * @generated
+- */
+- EReference getReferencedComponent_DependentObject();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getArchiveName <em>Archive Name</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Archive Name</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getArchiveName()
+- * @see #getReferencedComponent()
+- * @generated
+- */
+- EAttribute getReferencedComponent_ArchiveName();
+-
+- /**
+- * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.ProjectComponents <em>Project Components</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for class '<em>Project Components</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ProjectComponents
+- * @generated
+- */
+- EClass getProjectComponents();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ProjectComponents#getProjectName <em>Project Name</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Project Name</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ProjectComponents#getProjectName()
+- * @see #getProjectComponents()
+- * @generated
+- */
+- EAttribute getProjectComponents_ProjectName();
+-
+- /**
+- * Returns the meta object for the containment reference list '{@link org.eclipse.wst.common.componentcore.internal.ProjectComponents#getComponents <em>Components</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the containment reference list '<em>Components</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ProjectComponents#getComponents()
+- * @see #getProjectComponents()
+- * @generated
+- */
+- EReference getProjectComponents_Components();
+-
+- /**
+- * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ProjectComponents#getVersion <em>Version</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for the attribute '<em>Version</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.ProjectComponents#getVersion()
+- * @see #getProjectComponents()
+- * @generated
+- */
+- EAttribute getProjectComponents_Version();
+-
+- /**
+- * Returns the meta object for enum '{@link org.eclipse.wst.common.componentcore.internal.DependencyType <em>Dependency Type</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for enum '<em>Dependency Type</em>'.
+- * @see org.eclipse.wst.common.componentcore.internal.DependencyType
+- * @generated
+- */
+- EEnum getDependencyType();
+-
+- /**
+- * Returns the meta object for data type '{@link org.eclipse.core.runtime.IPath <em>IPath</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for data type '<em>IPath</em>'.
+- * @see org.eclipse.core.runtime.IPath
+- * @model instanceClass="org.eclipse.core.runtime.IPath"
+- * annotation="keywords datatype='null'"
+- * @generated
+- */
+- EDataType getIPath();
+-
+- /**
+- * Returns the meta object for data type '{@link org.eclipse.emf.common.util.URI <em>URI</em>}'.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the meta object for data type '<em>URI</em>'.
+- * @see org.eclipse.emf.common.util.URI
+- * @model instanceClass="org.eclipse.emf.common.util.URI"
+- * annotation="keywords datatype='null'"
+- * @generated
+- */
+- EDataType getURI();
+-
+- /**
+- * Returns the factory that creates the instances of the model.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @return the factory that creates the instances of the model.
+- * @generated
+- */
+- ComponentcoreFactory getComponentcoreFactory();
+-
+- /**
+- * <!-- begin-user-doc -->
+- * Defines literals for the meta objects that represent
+- * <ul>
+- * <li>each class,</li>
+- * <li>each feature of each class,</li>
+- * <li>each enum,</li>
+- * <li>and each data type</li>
+- * </ul>
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- interface Literals {
+- /**
+- * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.WorkbenchComponentImpl <em>Workbench Component</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.WorkbenchComponentImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getWorkbenchComponent()
+- * @generated
+- */
+- EClass WORKBENCH_COMPONENT = eINSTANCE.getWorkbenchComponent();
+-
+- /**
+- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute WORKBENCH_COMPONENT__NAME = eINSTANCE.getWorkbenchComponent_Name();
+-
+- /**
+- * The meta object literal for the '<em><b>Resources</b></em>' containment reference list feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EReference WORKBENCH_COMPONENT__RESOURCES = eINSTANCE.getWorkbenchComponent_Resources();
+-
+- /**
+- * The meta object literal for the '<em><b>Component Type</b></em>' containment reference feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EReference WORKBENCH_COMPONENT__COMPONENT_TYPE = eINSTANCE.getWorkbenchComponent_ComponentType();
+-
+- /**
+- * The meta object literal for the '<em><b>Referenced Components</b></em>' containment reference list feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EReference WORKBENCH_COMPONENT__REFERENCED_COMPONENTS = eINSTANCE.getWorkbenchComponent_ReferencedComponents();
+-
+- /**
+- * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EReference WORKBENCH_COMPONENT__PROPERTIES = eINSTANCE.getWorkbenchComponent_Properties();
+-
+- /**
+- * The meta object literal for the '<em><b>Metadata Resources</b></em>' attribute list feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute WORKBENCH_COMPONENT__METADATA_RESOURCES = eINSTANCE.getWorkbenchComponent_MetadataResources();
+-
+- /**
+- * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl <em>Component Resource</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getComponentResource()
+- * @generated
+- */
+- EClass COMPONENT_RESOURCE = eINSTANCE.getComponentResource();
+-
+- /**
+- * The meta object literal for the '<em><b>Source Path</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute COMPONENT_RESOURCE__SOURCE_PATH = eINSTANCE.getComponentResource_SourcePath();
+-
+- /**
+- * The meta object literal for the '<em><b>Runtime Path</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute COMPONENT_RESOURCE__RUNTIME_PATH = eINSTANCE.getComponentResource_RuntimePath();
+-
+- /**
+- * The meta object literal for the '<em><b>Exclusions</b></em>' attribute list feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute COMPONENT_RESOURCE__EXCLUSIONS = eINSTANCE.getComponentResource_Exclusions();
+-
+- /**
+- * The meta object literal for the '<em><b>Component</b></em>' container reference feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EReference COMPONENT_RESOURCE__COMPONENT = eINSTANCE.getComponentResource_Component();
+-
+- /**
+- * The meta object literal for the '<em><b>Resource Type</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute COMPONENT_RESOURCE__RESOURCE_TYPE = eINSTANCE.getComponentResource_ResourceType();
+-
+- /**
+- * The meta object literal for the '<em><b>Tag</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute COMPONENT_RESOURCE__TAG = eINSTANCE.getComponentResource_Tag();
+-
+- /**
+- * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentTypeImpl <em>Component Type</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentTypeImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getComponentType()
+- * @generated
+- */
+- EClass COMPONENT_TYPE = eINSTANCE.getComponentType();
+-
+- /**
+- * The meta object literal for the '<em><b>Component Type Id</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute COMPONENT_TYPE__COMPONENT_TYPE_ID = eINSTANCE.getComponentType_ComponentTypeId();
+-
+- /**
+- * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute COMPONENT_TYPE__VERSION = eINSTANCE.getComponentType_Version();
+-
+- /**
+- * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EReference COMPONENT_TYPE__PROPERTIES = eINSTANCE.getComponentType_Properties();
+-
+- /**
+- * The meta object literal for the '<em><b>Metadata Resources</b></em>' attribute list feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute COMPONENT_TYPE__METADATA_RESOURCES = eINSTANCE.getComponentType_MetadataResources();
+-
+- /**
+- * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.PropertyImpl <em>Property</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.PropertyImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getProperty()
+- * @generated
+- */
+- EClass PROPERTY = eINSTANCE.getProperty();
+-
+- /**
+- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name();
+-
+- /**
+- * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute PROPERTY__VALUE = eINSTANCE.getProperty_Value();
+-
+- /**
+- * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ReferencedComponentImpl <em>Referenced Component</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ReferencedComponentImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getReferencedComponent()
+- * @generated
+- */
+- EClass REFERENCED_COMPONENT = eINSTANCE.getReferencedComponent();
+-
+- /**
+- * The meta object literal for the '<em><b>Handle</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute REFERENCED_COMPONENT__HANDLE = eINSTANCE.getReferencedComponent_Handle();
+-
+- /**
+- * The meta object literal for the '<em><b>Runtime Path</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute REFERENCED_COMPONENT__RUNTIME_PATH = eINSTANCE.getReferencedComponent_RuntimePath();
+-
+- /**
+- * The meta object literal for the '<em><b>Dependency Type</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute REFERENCED_COMPONENT__DEPENDENCY_TYPE = eINSTANCE.getReferencedComponent_DependencyType();
+-
+- /**
+- * The meta object literal for the '<em><b>Dependent Object</b></em>' reference feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EReference REFERENCED_COMPONENT__DEPENDENT_OBJECT = eINSTANCE.getReferencedComponent_DependentObject();
+-
+- /**
+- * The meta object literal for the '<em><b>Archive Name</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute REFERENCED_COMPONENT__ARCHIVE_NAME = eINSTANCE.getReferencedComponent_ArchiveName();
+-
+- /**
+- * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ProjectComponentsImpl <em>Project Components</em>}' class.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ProjectComponentsImpl
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getProjectComponents()
+- * @generated
+- */
+- EClass PROJECT_COMPONENTS = eINSTANCE.getProjectComponents();
+-
+- /**
+- * The meta object literal for the '<em><b>Project Name</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute PROJECT_COMPONENTS__PROJECT_NAME = eINSTANCE.getProjectComponents_ProjectName();
+-
+- /**
+- * The meta object literal for the '<em><b>Components</b></em>' containment reference list feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EReference PROJECT_COMPONENTS__COMPONENTS = eINSTANCE.getProjectComponents_Components();
+-
+- /**
+- * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @generated
+- */
+- EAttribute PROJECT_COMPONENTS__VERSION = eINSTANCE.getProjectComponents_Version();
+-
+- /**
+- * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.DependencyType <em>Dependency Type</em>}' enum.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.wst.common.componentcore.internal.DependencyType
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getDependencyType()
+- * @generated
+- */
+- EEnum DEPENDENCY_TYPE = eINSTANCE.getDependencyType();
+-
+- /**
+- * The meta object literal for the '<em>IPath</em>' data type.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.core.runtime.IPath
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getIPath()
+- * @generated
+- */
+- EDataType IPATH = eINSTANCE.getIPath();
+-
+- /**
+- * The meta object literal for the '<em>URI</em>' data type.
+- * <!-- begin-user-doc -->
+- * <!-- end-user-doc -->
+- * @see org.eclipse.emf.common.util.URI
+- * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getURI()
+- * @generated
+- */
+- EDataType URI = eINSTANCE.getURI();
+-
+- }
+-
+-} //ComponentcorePackage
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
+index c120a83..ba92063 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
+@@ -38,6 +38,7 @@ import org.eclipse.emf.common.util.URI;
+ import org.eclipse.emf.ecore.EObject;
+ import org.eclipse.emf.ecore.resource.Resource;
+ import org.eclipse.emf.ecore.xmi.XMIResource;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.impl.ResourceTreeNode;
+ import org.eclipse.wst.common.componentcore.internal.impl.ResourceTreeRoot;
+ import org.eclipse.wst.common.componentcore.internal.impl.WTPModulesResource;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
+index 9e0ac3f..fbc763a 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
+@@ -34,6 +34,7 @@ import org.eclipse.emf.common.util.EList;
+ import org.eclipse.emf.common.util.URI;
+ import org.eclipse.jem.util.UIContextDetermination;
+ import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
++import org.eclipse.wst.common.componentcore.ComponentcoreFactory;
+ import org.eclipse.wst.common.componentcore.IEditModelHandler;
+ import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+ import org.eclipse.wst.common.componentcore.UnresolveableURIException;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
+index e076bc4..069c3b9 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
+@@ -21,7 +21,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
+ import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+ import org.eclipse.emf.ecore.util.EcoreUtil;
+ import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
+ import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil.ESynchronizedAdapterList;
+
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentTypeImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentTypeImpl.java
+index b0c2f21..2b33b2b 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentTypeImpl.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentTypeImpl.java
+@@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
+ import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+ import org.eclipse.wst.common.componentcore.internal.ComponentType;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.Property;
+
+ /**
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcoreFactoryImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcoreFactoryImpl.java
+index 0bcab20..23c98d5 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcoreFactoryImpl.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcoreFactoryImpl.java
+@@ -16,8 +16,6 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
+ import org.eclipse.emf.ecore.plugin.EcorePlugin;
+ import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+ import org.eclipse.wst.common.componentcore.internal.ComponentType;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.DependencyType;
+ import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
+ import org.eclipse.wst.common.componentcore.internal.Property;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
+index cb71b6a..1137c5a 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
+@@ -16,8 +16,6 @@ import org.eclipse.emf.ecore.EReference;
+ import org.eclipse.emf.ecore.impl.EPackageImpl;
+ import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+ import org.eclipse.wst.common.componentcore.internal.ComponentType;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.DependencyType;
+ import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
+ import org.eclipse.wst.common.componentcore.internal.Property;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleIndexingAdapter.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleIndexingAdapter.java
+index 039799d..206cbb1 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleIndexingAdapter.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleIndexingAdapter.java
+@@ -13,7 +13,7 @@ package org.eclipse.wst.common.componentcore.internal.impl;
+ import org.eclipse.emf.common.notify.Notification;
+ import org.eclipse.emf.common.notify.impl.AdapterImpl;
+ import org.eclipse.emf.ecore.EObject;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
+
+ public class ModuleIndexingAdapter extends AdapterImpl {
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ProjectComponentsImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ProjectComponentsImpl.java
+index e0645d7..d391ba0 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ProjectComponentsImpl.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ProjectComponentsImpl.java
+@@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
+ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+ import org.eclipse.emf.ecore.util.EcoreUtil;
+ import org.eclipse.emf.ecore.util.InternalEList;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
+ import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
+
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PropertyImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PropertyImpl.java
+index eae8a93..0c77c7d 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PropertyImpl.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PropertyImpl.java
+@@ -11,7 +11,6 @@ import org.eclipse.emf.ecore.EClass;
+ import org.eclipse.emf.ecore.EStructuralFeature;
+ import org.eclipse.emf.ecore.impl.ENotificationImpl;
+ import org.eclipse.emf.ecore.impl.EObjectImpl;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.Property;
+
+ /**
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java
+index f17b3dc..74da1a9 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java
+@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.InternalEObject;
+
+ import org.eclipse.emf.ecore.impl.ENotificationImpl;
+ import org.eclipse.emf.ecore.impl.EObjectImpl;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.DependencyType;
+ import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java
+index d2a956e..1cf96d8 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java
+@@ -22,7 +22,7 @@ import org.eclipse.core.resources.IContainer;
+ import org.eclipse.core.resources.IResource;
+ import org.eclipse.core.runtime.IPath;
+ import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.StructureEdit;
+ import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
+ import org.eclipse.wst.common.componentcore.internal.util.IPathProvider;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeRoot.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeRoot.java
+index 15e61a4..30f86b8 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeRoot.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeRoot.java
+@@ -20,7 +20,8 @@ import org.eclipse.emf.common.notify.impl.AdapterImpl;
+ import org.eclipse.emf.common.util.URI;
+ import org.eclipse.wst.common.componentcore.UnresolveableURIException;
+ import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+ import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
+ import org.eclipse.wst.common.componentcore.internal.util.IPathProvider;
+ import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPModulesInit.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPModulesInit.java
+index 08f357d..e6d816d 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPModulesInit.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPModulesInit.java
+@@ -12,8 +12,8 @@ package org.eclipse.wst.common.componentcore.internal.impl;
+
+ import org.eclipse.emf.ecore.EFactory;
+ import org.eclipse.emf.ecore.EPackage;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.ComponentcoreFactory;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
+ import org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactory;
+ import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
+ import org.eclipse.wst.common.internal.emf.utilities.EncoderDecoderRegistry;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
+index 5e65bab..6f56f43 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
+@@ -35,7 +35,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
+ import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
+ import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+ import org.eclipse.wst.common.componentcore.internal.ComponentType;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.Property;
+ import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+ import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
+index 6a3ea0f..1d83000 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
+@@ -34,8 +34,8 @@ import org.eclipse.emf.ecore.resource.Resource;
+ import org.eclipse.wst.common.componentcore.ComponentCore;
+ import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+ import org.eclipse.wst.common.componentcore.UnresolveableURIException;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.ComponentcoreFactory;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
+ import org.eclipse.wst.common.componentcore.internal.Property;
+ import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java
+index 39b9c64..917f6a8 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java
+@@ -12,7 +12,6 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+ import org.eclipse.emf.ecore.EObject;
+ import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+ import org.eclipse.wst.common.componentcore.internal.ComponentType;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
+ import org.eclipse.wst.common.componentcore.internal.Property;
+ import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
+index 74a7b67..97016b7 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
+@@ -12,7 +12,6 @@ import org.eclipse.emf.ecore.EClass;
+ import org.eclipse.emf.ecore.EObject;
+ import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+ import org.eclipse.wst.common.componentcore.internal.ComponentType;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
+ import org.eclipse.wst.common.componentcore.internal.Property;
+ import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DependencyTypeTranslator.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DependencyTypeTranslator.java
+index 2a9127c..cbc52ad 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DependencyTypeTranslator.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DependencyTypeTranslator.java
+@@ -17,7 +17,7 @@
+ package org.eclipse.wst.common.componentcore.internal.util;
+
+ import org.eclipse.emf.ecore.EObject;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.DependencyType;
+ import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DeployedPathProvider.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DeployedPathProvider.java
+index 58a071e..7720ffd 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DeployedPathProvider.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DeployedPathProvider.java
+@@ -13,7 +13,7 @@ package org.eclipse.wst.common.componentcore.internal.util;
+ import org.eclipse.core.runtime.IPath;
+ import org.eclipse.emf.ecore.EStructuralFeature;
+ import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
+
+ public class DeployedPathProvider implements IPathProvider {
+
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java
+index 3f6af3b..af2e69e 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java
+@@ -18,7 +18,7 @@ import org.eclipse.emf.common.notify.Adapter;
+ import org.eclipse.emf.common.notify.Notification;
+ import org.eclipse.emf.common.notify.impl.AdapterImpl;
+ import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.StructureEdit;
+
+ public class EclipseResourceAdapter extends AdapterImpl implements Adapter {
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/SourcePathProvider.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/SourcePathProvider.java
+index 1bce206..0e82f28 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/SourcePathProvider.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/SourcePathProvider.java
+@@ -13,7 +13,7 @@ package org.eclipse.wst.common.componentcore.internal.util;
+ import org.eclipse.core.runtime.IPath;
+ import org.eclipse.emf.ecore.EStructuralFeature;
+ import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
+
+ public class SourcePathProvider implements IPathProvider {
+
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java
+index 47fa640..55d9ea4 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java
+@@ -11,7 +11,7 @@
+ package org.eclipse.wst.common.componentcore.internal.util;
+
+ import org.eclipse.emf.ecore.EStructuralFeature;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
+ import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
+ import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
+ import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
+diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/DefaultReferenceResolver.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/DefaultReferenceResolver.java
+index e8fcd73..5d3ac5b 100644
+--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/DefaultReferenceResolver.java
++++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/DefaultReferenceResolver.java
+@@ -5,7 +5,7 @@ import org.eclipse.core.runtime.IPath;
+ import org.eclipse.emf.common.util.URI;
+ import org.eclipse.wst.common.componentcore.ComponentCore;
+ import org.eclipse.wst.common.componentcore.UnresolveableURIException;
+-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
++import org.eclipse.wst.common.componentcore.ComponentcorePackage;
+ import org.eclipse.wst.common.componentcore.internal.DependencyType;
+ import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+ import org.eclipse.wst.common.componentcore.internal.StructureEdit;
+diff --git a/org.eclipse.wst.ws/RT.genmodel b/org.eclipse.wst.ws/RT.genmodel
+index 9aaa4f1..6d0c9ff 100644
+--- a/org.eclipse.wst.ws/RT.genmodel
++++ b/org.eclipse.wst.ws/RT.genmodel
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <genmodel:GenModel xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/RegistryModel2/src"
++ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.wst.ws/src"
+ editDirectory="/RegistryModel2.edit/src" editorDirectory="/RegistryModel2.editor/src"
+ modelPluginID="RegistryModel2" runtimeJar="true" modelName="RT" editPluginClass="org.eclipse.wst.ws.internal.model.v10.rtindex.provider.RTEditPlugin"
+ editorPluginClass="org.eclipse.wst.ws.internal.model.v10.rtindex.presentation.RTEditorPlugin"
diff --git a/debian/patches/series b/debian/patches/series
index 2abc420..60e1d61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ add-debian-system-catalog-reader.patch
regenerate-js-parser-resources.patch
use-xslt-xsd-from-system-location.patch
rhino-1.7R4-compatibility.patch
+genmodel-customizations.patch
diff --git a/debian/rules b/debian/rules
index c9acab8..3bc22a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,15 @@ HELP_PLUGINS := org.eclipse.wst.command.env.doc.user org.eclipse.wst.dtdeditor.d
dh $@ --with eclipse-helper
override_jh_compilefeatures:
+ # Regenerate classes from EMF models
+ /usr/lib/eclipse/eclipse \
+ -application org.eclipse.ant.core.antRunner \
+ -configuration debian/.eclipse-build/.platform/configuration \
+ -buildfile debian/emfRegenerate.xml \
+ -data debian/.eclipse-build \
+ -Dosgi.sharedConfiguration.area=debian/.eclipse-build/build/home \
+ -consoleLog -noSplash
+
# Regenerate XML10Names and XMLHeadTokenizer classes
cd debian/.eclipse-build/org.eclipse.wst.xml.core/DevTimeSupport; \
ant -f buildNames.xml; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-wtp.git
More information about the pkg-java-commits
mailing list