[227616] UML2 runtime feature has many dependencies and plugins
https://bugs.eclipse.org/bugs/show_bug.cgi?id=227616

Refactor the UML2 run-time and SDK features into finer-grained particles according to the most common client requirements.
diff --git a/plugins/org.eclipse.uml2-feature/feature.properties b/plugins/org.eclipse.uml2-feature/feature.properties
index 9657d68..b43f79b 100644
--- a/plugins/org.eclipse.uml2-feature/feature.properties
+++ b/plugins/org.eclipse.uml2-feature/feature.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2003, 2011 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
 # All rights reserved.   This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
 #   Kenn Hussey (Embarcadero Technologies) - 204200
 #   Kenn Hussey - 314388, 341158
 #   Kenn Hussey - 351776
+#   Christian W. Damus (CEA) - 227616
 #
 
 # NLS_MESSAGEFORMAT_VAR
@@ -28,4 +29,4 @@
 update.label = Eclipse Modeling Project Updates
 
 # "description" property - description of the feature
-description = Unified Modeling Language 2.x
+description = Run-time APIs, editors, and code generation for the Unified Modeling Language 2.x.
diff --git a/plugins/org.eclipse.uml2-feature/feature.xml b/plugins/org.eclipse.uml2-feature/feature.xml
index ec71a20..10e3d85 100644
--- a/plugins/org.eclipse.uml2-feature/feature.xml
+++ b/plugins/org.eclipse.uml2-feature/feature.xml
@@ -13,7 +13,7 @@
    </description>
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2003, 2012 IBM Corporation, Embarcadero Technologies, CEA, and others.
+      Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
 All rights reserved.   This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
@@ -29,6 +29,39 @@
       <discovery label="%update.label" url="http://www.eclipse.org/modeling/updates/"/>
    </url>
 
+   <includes
+         id="org.eclipse.uml2.codegen.ecore.ui"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.uml2.common"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.uml2.common.edit"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.uml2.uml"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.uml2.uml.edit"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.uml2.uml"/>
+      <import plugin="org.eclipse.emf.exporter"/>
+      <import plugin="org.eclipse.uml2.codegen.ecore"/>
+      <import plugin="org.eclipse.emf.importer"/>
+      <import plugin="org.eclipse.uml2.uml.edit"/>
+      <import plugin="org.eclipse.emf.ecore.xmi"/>
+      <import plugin="org.eclipse.emf.edit.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+   </requires>
+
    <plugin
          id="org.eclipse.uml2"
          download-size="0"
@@ -37,48 +70,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.uml2.codegen.ecore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.uml2.codegen.ecore.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.uml2.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.uml2.common.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.uml2.types"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.uml2.uml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.uml2.uml.ecore.exporter"
          download-size="0"
          install-size="0"
@@ -93,38 +84,10 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.uml2.uml.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.uml2.uml.editor"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.uml2.uml.profile.l2"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.uml2.uml.profile.l3"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.uml2.uml.resources"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/.gitignore b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/.gitignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/.project b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/.project
new file mode 100644
index 0000000..2268a33
--- /dev/null
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.uml2.codegen.ecore.ui-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/build.properties b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/build.properties
new file mode 100644
index 0000000..4fc9841
--- /dev/null
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/build.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2003, 2011 IBM Corporation, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (CEA) - 351776
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+bin.includes = eclipse_update_120.jpg,\
+               feature.*
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/eclipse_update_120.jpg b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/eclipse_update_120.jpg
new file mode 100644
index 0000000..bfdf708
--- /dev/null
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/eclipse_update_120.jpg
Binary files differ
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.properties b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.properties
new file mode 100644
index 0000000..70d0051
--- /dev/null
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.properties
@@ -0,0 +1,32 @@
+# Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (Embarcadero Technologies) - 204200
+#   Kenn Hussey - 314388, 341158
+#   Kenn Hussey - 351776
+#   Christian W. Damus (CEA) - 227616
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+
+# "feature.label" property - name of the feature
+feature.label = UML Ecore Code Generation
+
+# "feature.provider-name" property - name of the company that provides the feature
+feature.provider-name = Eclipse Modeling Project
+
+# "update.label" property - label for the update site
+update.label = Eclipse Modeling Project Updates
+
+# "description" property - description of the feature
+description = Provides code generation templates for generation of EMF-based Java APIs for class models described with UML.
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.xml b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.xml
new file mode 100644
index 0000000..ef7ae9e
--- /dev/null
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.uml2.codegen.ecore.ui"
+      label="%feature.label"
+      version="4.2.0.qualifier"
+      provider-name="%feature.provider-name"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.uml2.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+All rights reserved.   This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%update.label" url="http://www.eclipse.org/modeling/updates/"/>
+      <discovery label="%update.label" url="http://www.eclipse.org/modeling/updates/"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.emf.ecore.xmi"/>
+      <import plugin="org.eclipse.emf.codegen.ecore"/>
+      <import plugin="org.eclipse.jdt.core"/>
+      <import plugin="org.eclipse.uml2.types"/>
+      <import plugin="org.eclipse.emf.codegen.ecore.ui"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.uml2.codegen.ecore"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.uml2.codegen.ecore.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/about.ini b/plugins/org.eclipse.uml2.codegen.ecore.ui/about.ini
new file mode 100644
index 0000000..cd69eeb
--- /dev/null
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText = %aboutText
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage = modeling32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/about.mappings b/plugins/org.eclipse.uml2.codegen.ecore.ui/about.mappings
new file mode 100644
index 0000000..eb5946f
--- /dev/null
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/about.mappings
@@ -0,0 +1,17 @@
+# Copyright (c) 2006, 2013 IBM Corporation, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Christian W. Damus (CEA) - 227616
+#
+
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/about.properties b/plugins/org.eclipse.uml2.codegen.ecore.ui/about.properties
new file mode 100644
index 0000000..3236ff5
--- /dev/null
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/about.properties
@@ -0,0 +1,28 @@
+# Copyright (c) 2006, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (Embarcadero Technologies) - 219804, 204200
+#   Kenn Hussey - 323181
+#   Christian W. Damus (CEA) - 227616
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+
+aboutText = UML Ecore Code Generation\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Eclipse contributors and others 2003, 2013.  All rights reserved.\n\
+Visit http://www.eclipse.org/uml2
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/build.properties b/plugins/org.eclipse.uml2.codegen.ecore.ui/build.properties
index 3f3c066..5d27483 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore.ui/build.properties
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/build.properties
@@ -1,18 +1,19 @@
-# Copyright (c) 2005, 2007 IBM Corporation and others.
+# Copyright (c) 2005, 2013 IBM Corporation, CEA, and others.
 # All rights reserved.   This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
-# Contributors: 
+# Contributors:
 #   IBM - initial API and implementation
+#   Christian W. Damus (CEA) - 227616
 #
-# $Id: build.properties,v 1.8 2007/04/04 02:19:57 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 source.. = src/
 output.. = bin/
-bin.includes = about.html,\
+bin.includes = about.*,\
+               modeling32.png,\
                plugin.*,\
                .,\
                META-INF/
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/modeling32.png b/plugins/org.eclipse.uml2.codegen.ecore.ui/modeling32.png
new file mode 100644
index 0000000..6b08de2
--- /dev/null
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/modeling32.png
Binary files differ
diff --git a/plugins/org.eclipse.uml2.common-feature/.gitignore b/plugins/org.eclipse.uml2.common-feature/.gitignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common-feature/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/plugins/org.eclipse.uml2.common-feature/.project b/plugins/org.eclipse.uml2.common-feature/.project
new file mode 100644
index 0000000..72bac19
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common-feature/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.uml2.common-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.uml2.common-feature/build.properties b/plugins/org.eclipse.uml2.common-feature/build.properties
new file mode 100644
index 0000000..4fc9841
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common-feature/build.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2003, 2011 IBM Corporation, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (CEA) - 351776
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+bin.includes = eclipse_update_120.jpg,\
+               feature.*
diff --git a/plugins/org.eclipse.uml2.common-feature/eclipse_update_120.jpg b/plugins/org.eclipse.uml2.common-feature/eclipse_update_120.jpg
new file mode 100644
index 0000000..bfdf708
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common-feature/eclipse_update_120.jpg
Binary files differ
diff --git a/plugins/org.eclipse.uml2.common-feature/feature.properties b/plugins/org.eclipse.uml2.common-feature/feature.properties
new file mode 100644
index 0000000..9a108a1
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common-feature/feature.properties
@@ -0,0 +1,32 @@
+# Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (Embarcadero Technologies) - 204200
+#   Kenn Hussey - 314388, 341158
+#   Kenn Hussey - 351776
+#   Christian W. Damus (CEA) - 227616
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+
+# "feature.label" property - name of the feature
+feature.label = UML2 Common Run-time APIs
+
+# "feature.provider-name" property - name of the company that provides the feature
+feature.provider-name = Eclipse Modeling Project
+
+# "update.label" property - label for the update site
+update.label = Eclipse Modeling Project Updates
+
+# "description" property - description of the feature
+description = The common run-time APIs supporting the implementation of the UML metamodel and any model generated by the UML2 SDK from a UML source.
diff --git a/plugins/org.eclipse.uml2.common-feature/feature.xml b/plugins/org.eclipse.uml2.common-feature/feature.xml
new file mode 100644
index 0000000..f759d31
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common-feature/feature.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.uml2.common"
+      label="%feature.label"
+      version="4.2.0.qualifier"
+      provider-name="%feature.provider-name"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.uml2.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+All rights reserved.   This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%update.label" url="http://www.eclipse.org/modeling/updates/"/>
+      <discovery label="%update.label" url="http://www.eclipse.org/modeling/updates/"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.emf.ecore"/>
+      <import plugin="org.eclipse.core.runtime"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.uml2.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.uml2.types"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/plugins/org.eclipse.uml2.common.edit-feature/.gitignore b/plugins/org.eclipse.uml2.common.edit-feature/.gitignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common.edit-feature/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/plugins/org.eclipse.uml2.common.edit-feature/.project b/plugins/org.eclipse.uml2.common.edit-feature/.project
new file mode 100644
index 0000000..55d73eb
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common.edit-feature/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.uml2.common.edit-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.uml2.common.edit-feature/build.properties b/plugins/org.eclipse.uml2.common.edit-feature/build.properties
new file mode 100644
index 0000000..4fc9841
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common.edit-feature/build.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2003, 2011 IBM Corporation, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (CEA) - 351776
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+bin.includes = eclipse_update_120.jpg,\
+               feature.*
diff --git a/plugins/org.eclipse.uml2.common.edit-feature/eclipse_update_120.jpg b/plugins/org.eclipse.uml2.common.edit-feature/eclipse_update_120.jpg
new file mode 100644
index 0000000..bfdf708
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common.edit-feature/eclipse_update_120.jpg
Binary files differ
diff --git a/plugins/org.eclipse.uml2.common.edit-feature/feature.properties b/plugins/org.eclipse.uml2.common.edit-feature/feature.properties
new file mode 100644
index 0000000..18ea570
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common.edit-feature/feature.properties
@@ -0,0 +1,32 @@
+# Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (Embarcadero Technologies) - 204200
+#   Kenn Hussey - 314388, 341158
+#   Kenn Hussey - 351776
+#   Christian W. Damus (CEA) - 227616
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+
+# "feature.label" property - name of the feature
+feature.label = UML2 Common Model Edit Support
+
+# "feature.provider-name" property - name of the company that provides the feature
+feature.provider-name = Eclipse Modeling Project
+
+# "update.label" property - label for the update site
+update.label = Eclipse Modeling Project Updates
+
+# "description" property - description of the feature
+description = The model edit-providers framework supporting editors (graphical and otherwise) for the UML metamodel and any model generated by the UML2 SDK from a UML source.
diff --git a/plugins/org.eclipse.uml2.common.edit-feature/feature.xml b/plugins/org.eclipse.uml2.common.edit-feature/feature.xml
new file mode 100644
index 0000000..2203fea
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common.edit-feature/feature.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.uml2.common.edit"
+      label="%feature.label"
+      version="4.2.0.qualifier"
+      provider-name="%feature.provider-name"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.uml2.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+All rights reserved.   This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%update.label" url="http://www.eclipse.org/modeling/updates/"/>
+      <discovery label="%update.label" url="http://www.eclipse.org/modeling/updates/"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.uml2.common"/>
+      <import plugin="org.eclipse.emf.ecore.edit"/>
+      <import plugin="org.eclipse.emf.ecore.change"/>
+      <import plugin="org.eclipse.core.runtime"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.uml2.common.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/plugins/org.eclipse.uml2.common.edit/about.ini b/plugins/org.eclipse.uml2.common.edit/about.ini
new file mode 100644
index 0000000..cd69eeb
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common.edit/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText = %aboutText
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage = modeling32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
diff --git a/plugins/org.eclipse.uml2.common.edit/about.mappings b/plugins/org.eclipse.uml2.common.edit/about.mappings
new file mode 100644
index 0000000..eb5946f
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common.edit/about.mappings
@@ -0,0 +1,17 @@
+# Copyright (c) 2006, 2013 IBM Corporation, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Christian W. Damus (CEA) - 227616
+#
+
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.common.edit/about.properties b/plugins/org.eclipse.uml2.common.edit/about.properties
new file mode 100644
index 0000000..adc85df
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common.edit/about.properties
@@ -0,0 +1,28 @@
+# Copyright (c) 2006, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (Embarcadero Technologies) - 219804, 204200
+#   Kenn Hussey - 323181
+#   Christian W. Damus (CEA) - 227616
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+
+aboutText = UML2 Common Model Edit Support\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Eclipse contributors and others 2003, 2013.  All rights reserved.\n\
+Visit http://www.eclipse.org/uml2
diff --git a/plugins/org.eclipse.uml2.common.edit/build.properties b/plugins/org.eclipse.uml2.common.edit/build.properties
index 308032f..97da4ad 100644
--- a/plugins/org.eclipse.uml2.common.edit/build.properties
+++ b/plugins/org.eclipse.uml2.common.edit/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others.
+# Copyright (c) 2005, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
 # All rights reserved.   This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -7,13 +7,14 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #   Kenn Hussey (Embarcadero Technologies) - 204200
+#   Christian W. Damus (CEA) - 227616
 #
-# $Id: build.properties,v 1.11 2008/02/19 23:16:36 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 source.. = src/
 output.. = bin/
-bin.includes = about.html,\
+bin.includes = about.*,\
+               modeling32.png,\
                plugin.properties,\
                .,\
                META-INF/
diff --git a/plugins/org.eclipse.uml2.common.edit/modeling32.png b/plugins/org.eclipse.uml2.common.edit/modeling32.png
new file mode 100644
index 0000000..6b08de2
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common.edit/modeling32.png
Binary files differ
diff --git a/plugins/org.eclipse.uml2.common/about.ini b/plugins/org.eclipse.uml2.common/about.ini
new file mode 100644
index 0000000..cd69eeb
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText = %aboutText
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage = modeling32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
diff --git a/plugins/org.eclipse.uml2.common/about.mappings b/plugins/org.eclipse.uml2.common/about.mappings
new file mode 100644
index 0000000..eb5946f
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common/about.mappings
@@ -0,0 +1,17 @@
+# Copyright (c) 2006, 2013 IBM Corporation, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Christian W. Damus (CEA) - 227616
+#
+
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.common/about.properties b/plugins/org.eclipse.uml2.common/about.properties
new file mode 100644
index 0000000..b593b0c
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common/about.properties
@@ -0,0 +1,28 @@
+# Copyright (c) 2006, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (Embarcadero Technologies) - 219804, 204200
+#   Kenn Hussey - 323181
+#   Christian W. Damus (CEA) - 227616
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+
+aboutText = UML2 Common Run-time APIs\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Eclipse contributors and others 2003, 2013.  All rights reserved.\n\
+Visit http://www.eclipse.org/uml2
diff --git a/plugins/org.eclipse.uml2.common/build.properties b/plugins/org.eclipse.uml2.common/build.properties
index faf722a..97da4ad 100644
--- a/plugins/org.eclipse.uml2.common/build.properties
+++ b/plugins/org.eclipse.uml2.common/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2008 IBM Corporation, Embarcadero Technologies, and others.
+# Copyright (c) 2005, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
 # All rights reserved.   This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -7,13 +7,14 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #   Kenn Hussey (Embarcadero Technologies) - 204200
+#   Christian W. Damus (CEA) - 227616
 #
-# $Id: build.properties,v 1.11 2008/02/19 23:16:37 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 source.. = src/
 output.. = bin/
-bin.includes = about.html,\
+bin.includes = about.*,\
+               modeling32.png,\
                plugin.properties,\
                .,\
                META-INF/
diff --git a/plugins/org.eclipse.uml2.common/modeling32.png b/plugins/org.eclipse.uml2.common/modeling32.png
new file mode 100644
index 0000000..6b08de2
--- /dev/null
+++ b/plugins/org.eclipse.uml2.common/modeling32.png
Binary files differ
diff --git a/plugins/org.eclipse.uml2.sdk-feature/feature.properties b/plugins/org.eclipse.uml2.sdk-feature/feature.properties
index 422ea44..ff71ab0 100644
--- a/plugins/org.eclipse.uml2.sdk-feature/feature.properties
+++ b/plugins/org.eclipse.uml2.sdk-feature/feature.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2003, 2011 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
 # All rights reserved.   This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
 #   Kenn Hussey (Embarcadero Technologies) - 204200
 #   Kenn Hussey - 314388, 341158
 #   Kenn Hussey (CEA) - 351776
+#   Christian W. Damus (CEA) - 227616
 #
 
 # NLS_MESSAGEFORMAT_VAR
@@ -28,4 +29,4 @@
 update.label = Eclipse Modeling Project Updates
 
 # "description" property - description of the feature
-description = Unified Modeling Language 2.x SDK
+description = Developer resources (documentation, source code, examples) for the run-time APIs, editors, and code generation for the Unified Modeling Language 2.x.
diff --git a/plugins/org.eclipse.uml2.sdk-feature/feature.xml b/plugins/org.eclipse.uml2.sdk-feature/feature.xml
index 6da1851..ff60ead 100644
--- a/plugins/org.eclipse.uml2.sdk-feature/feature.xml
+++ b/plugins/org.eclipse.uml2.sdk-feature/feature.xml
@@ -13,7 +13,7 @@
    </description>
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2003, 2012 IBM Corporation, Embarcadero Technologies, CEA, and others.
+      Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
 All rights reserved.   This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.uml2.uml-feature/.gitignore b/plugins/org.eclipse.uml2.uml-feature/.gitignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml-feature/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/plugins/org.eclipse.uml2.uml-feature/.project b/plugins/org.eclipse.uml2.uml-feature/.project
new file mode 100644
index 0000000..5e7cea7
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml-feature/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.uml2.uml-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.uml2.uml-feature/build.properties b/plugins/org.eclipse.uml2.uml-feature/build.properties
new file mode 100644
index 0000000..4fc9841
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml-feature/build.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2003, 2011 IBM Corporation, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (CEA) - 351776
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+bin.includes = eclipse_update_120.jpg,\
+               feature.*
diff --git a/plugins/org.eclipse.uml2.uml-feature/eclipse_update_120.jpg b/plugins/org.eclipse.uml2.uml-feature/eclipse_update_120.jpg
new file mode 100644
index 0000000..bfdf708
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml-feature/eclipse_update_120.jpg
Binary files differ
diff --git a/plugins/org.eclipse.uml2.uml-feature/feature.properties b/plugins/org.eclipse.uml2.uml-feature/feature.properties
new file mode 100644
index 0000000..be4b93c
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml-feature/feature.properties
@@ -0,0 +1,32 @@
+# Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (Embarcadero Technologies) - 204200
+#   Kenn Hussey - 314388, 341158
+#   Kenn Hussey - 351776
+#   Christian W. Damus (CEA) - 227616
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+
+# "feature.label" property - name of the feature
+feature.label = UML 2.x Metamodel
+
+# "feature.provider-name" property - name of the company that provides the feature
+feature.provider-name = Eclipse Modeling Project
+
+# "update.label" property - label for the update site
+update.label = Eclipse Modeling Project Updates
+
+# "description" property - description of the feature
+description = Implementation of the Unified Modeling Language 2.x (UML) metamodel and supporting model resources such as standard profiles and model libraries.
diff --git a/plugins/org.eclipse.uml2.uml-feature/feature.xml b/plugins/org.eclipse.uml2.uml-feature/feature.xml
new file mode 100644
index 0000000..1e7d9db
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml-feature/feature.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.uml2.uml"
+      label="%feature.label"
+      version="4.2.0.qualifier"
+      provider-name="%feature.provider-name"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.uml2.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+All rights reserved.   This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%update.label" url="http://www.eclipse.org/modeling/updates/"/>
+      <discovery label="%update.label" url="http://www.eclipse.org/modeling/updates/"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.emf.ecore"/>
+      <import plugin="org.eclipse.emf.ecore.xmi"/>
+      <import plugin="org.eclipse.uml2.common"/>
+      <import plugin="org.eclipse.uml2.types"/>
+      <import plugin="org.eclipse.emf.mapping.ecore2xml"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.uml2.uml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.uml2.uml.profile.l2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.uml2.uml.profile.l3"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.uml2.uml.resources"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/plugins/org.eclipse.uml2.uml.edit-feature/.gitignore b/plugins/org.eclipse.uml2.uml.edit-feature/.gitignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.edit-feature/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/plugins/org.eclipse.uml2.uml.edit-feature/.project b/plugins/org.eclipse.uml2.uml.edit-feature/.project
new file mode 100644
index 0000000..79d7720
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.edit-feature/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.uml2.uml.edit-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.uml2.uml.edit-feature/build.properties b/plugins/org.eclipse.uml2.uml.edit-feature/build.properties
new file mode 100644
index 0000000..4fc9841
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.edit-feature/build.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2003, 2011 IBM Corporation, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (CEA) - 351776
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+bin.includes = eclipse_update_120.jpg,\
+               feature.*
diff --git a/plugins/org.eclipse.uml2.uml.edit-feature/eclipse_update_120.jpg b/plugins/org.eclipse.uml2.uml.edit-feature/eclipse_update_120.jpg
new file mode 100644
index 0000000..bfdf708
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.edit-feature/eclipse_update_120.jpg
Binary files differ
diff --git a/plugins/org.eclipse.uml2.uml.edit-feature/feature.properties b/plugins/org.eclipse.uml2.uml.edit-feature/feature.properties
new file mode 100644
index 0000000..b784b65
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.edit-feature/feature.properties
@@ -0,0 +1,32 @@
+# Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (Embarcadero Technologies) - 204200
+#   Kenn Hussey - 314388, 341158
+#   Kenn Hussey - 351776
+#   Christian W. Damus (CEA) - 227616
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+
+# "feature.label" property - name of the feature
+feature.label = UML 2.x Metamodel Edit Support
+
+# "feature.provider-name" property - name of the company that provides the feature
+feature.provider-name = Eclipse Modeling Project
+
+# "update.label" property - label for the update site
+update.label = Eclipse Modeling Project Updates
+
+# "description" property - description of the feature
+description = Model edit-providers for the UML 2.x metamodel.  These support editors (graphical and otherwise) for UML models.
diff --git a/plugins/org.eclipse.uml2.uml.edit-feature/feature.xml b/plugins/org.eclipse.uml2.uml.edit-feature/feature.xml
new file mode 100644
index 0000000..cdb67d7
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.edit-feature/feature.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.uml2.uml.edit"
+      label="%feature.label"
+      version="4.2.0.qualifier"
+      provider-name="%feature.provider-name"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.uml2.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+All rights reserved.   This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%update.label" url="http://www.eclipse.org/modeling/updates/"/>
+      <discovery label="%update.label" url="http://www.eclipse.org/modeling/updates/"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.emf.edit"/>
+      <import plugin="org.eclipse.uml2.common.edit"/>
+      <import plugin="org.eclipse.uml2.uml"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.uml2.uml.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/plugins/org.eclipse.uml2.uml.edit/about.ini b/plugins/org.eclipse.uml2.uml.edit/about.ini
new file mode 100644
index 0000000..cd69eeb
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.edit/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText = %aboutText
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage = modeling32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
diff --git a/plugins/org.eclipse.uml2.uml.edit/about.mappings b/plugins/org.eclipse.uml2.uml.edit/about.mappings
new file mode 100644
index 0000000..eb5946f
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.edit/about.mappings
@@ -0,0 +1,17 @@
+# Copyright (c) 2006, 2013 IBM Corporation, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Christian W. Damus (CEA) - 227616
+#
+
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.uml.edit/about.properties b/plugins/org.eclipse.uml2.uml.edit/about.properties
new file mode 100644
index 0000000..e28e182
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.edit/about.properties
@@ -0,0 +1,28 @@
+# Copyright (c) 2006, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (Embarcadero Technologies) - 219804, 204200
+#   Kenn Hussey - 323181
+#   Christian W. Damus (CEA) - 227616
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+
+aboutText = UML 2.x Metamodel Edit Support\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Eclipse contributors and others 2003, 2013.  All rights reserved.\n\
+Visit http://www.eclipse.org/uml2
diff --git a/plugins/org.eclipse.uml2.uml.edit/build.properties b/plugins/org.eclipse.uml2.uml.edit/build.properties
index 1bbdabc..04f105d 100644
--- a/plugins/org.eclipse.uml2.uml.edit/build.properties
+++ b/plugins/org.eclipse.uml2.uml.edit/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2007 IBM Corporation and others.
+# Copyright (c) 2005, 2013 IBM Corporation, CEA, and others.
 # All rights reserved.   This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -6,13 +6,14 @@
 #
 # Contributors:
 #   IBM - initial API and implementation
+#   Christian W. Damus (CEA) - 227616
 #
-# $Id: build.properties,v 1.6 2007/04/04 02:19:59 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 source.. = src/
 output.. = bin/
-bin.includes = about.html,\
+bin.includes = about.*,\
+               modeling32.png,\
                plugin.*,\
                .,\
                icons/,\
diff --git a/plugins/org.eclipse.uml2.uml.edit/modeling32.png b/plugins/org.eclipse.uml2.uml.edit/modeling32.png
new file mode 100644
index 0000000..6b08de2
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.edit/modeling32.png
Binary files differ
diff --git a/plugins/org.eclipse.uml2.uml/about.ini b/plugins/org.eclipse.uml2.uml/about.ini
new file mode 100644
index 0000000..cd69eeb
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText = %aboutText
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage = modeling32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
diff --git a/plugins/org.eclipse.uml2.uml/about.mappings b/plugins/org.eclipse.uml2.uml/about.mappings
new file mode 100644
index 0000000..eb5946f
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml/about.mappings
@@ -0,0 +1,17 @@
+# Copyright (c) 2006, 2013 IBM Corporation, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Christian W. Damus (CEA) - 227616
+#
+
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.uml/about.properties b/plugins/org.eclipse.uml2.uml/about.properties
new file mode 100644
index 0000000..9c13172
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml/about.properties
@@ -0,0 +1,28 @@
+# Copyright (c) 2006, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# All rights reserved.   This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors: 
+#   IBM - initial API and implementation
+#   Kenn Hussey (Embarcadero Technologies) - 219804, 204200
+#   Kenn Hussey - 323181
+#   Christian W. Damus (CEA) - 227616
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+
+aboutText = UML 2.x Metamodel\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Eclipse contributors and others 2003, 2013.  All rights reserved.\n\
+Visit http://www.eclipse.org/uml2
diff --git a/plugins/org.eclipse.uml2.uml/build.properties b/plugins/org.eclipse.uml2.uml/build.properties
index 7a951a5..4795ee9 100644
--- a/plugins/org.eclipse.uml2.uml/build.properties
+++ b/plugins/org.eclipse.uml2.uml/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2011 IBM Corporation, CEA, and others.
+# Copyright (c) 2005, 2013 IBM Corporation, CEA, and others.
 # All rights reserved.   This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -6,15 +6,16 @@
 #
 # Contributors:
 #   IBM - initial API and implementation
-#   Kennn Hussey (CEA) - 327039
+#   Kenn Hussey (CEA) - 327039
+#   Christian W. Damus (CEA) - 227616
 #
-# $Id: build.properties,v 1.13 2007/09/28 21:14:32 jbruck Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 
 source.. = src/
 output.. = bin/
-bin.includes = about.html,\
+bin.includes = about.*,\
+               modeling32.png,\
                plugin.*,\
                .,\
                model/*.ecore,\
diff --git a/plugins/org.eclipse.uml2.uml/modeling32.png b/plugins/org.eclipse.uml2.uml/modeling32.png
new file mode 100644
index 0000000..6b08de2
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml/modeling32.png
Binary files differ