[551700] Fix packaging issues

Bug 551700

Change-Id: I5535ceccf1c929e339dc8edefd9d6d17405f2097
Signed-off-by: Thomas Guiu <thomas.guiu@soyatec.com>
diff --git a/examples/workspace/org.eclipse.egf.examples.installer/about.ini b/examples/workspace/org.eclipse.egf.examples.installer/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/examples/workspace/org.eclipse.egf.examples.installer/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/examples/workspace/org.eclipse.egf.examples.installer/build.properties b/examples/workspace/org.eclipse.egf.examples.installer/build.properties
index 8be1b38..364b551 100644
--- a/examples/workspace/org.eclipse.egf.examples.installer/build.properties
+++ b/examples/workspace/org.eclipse.egf.examples.installer/build.properties
@@ -4,6 +4,8 @@
                META-INF/,\

                zips/,\

                icons/,\

+               egf.png,\

+               about.ini,\

                plugin.properties,\

                about.html

 source.. = src/

diff --git a/examples/workspace/org.eclipse.egf.examples.installer/egf.png b/examples/workspace/org.eclipse.egf.examples.installer/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/examples/workspace/org.eclipse.egf.examples.installer/egf.png
Binary files differ
diff --git a/features/org.eclipse.egf.application.feature/feature.xml b/features/org.eclipse.egf.application.feature/feature.xml
index 85c5764..303fae2 100644
--- a/features/org.eclipse.egf.application.feature/feature.xml
+++ b/features/org.eclipse.egf.application.feature/feature.xml
@@ -16,6 +16,8 @@
       label="%featureName"

       version="1.6.1.qualifier"

       provider-name="%providerName"

+      license-feature="org.eclipse.license"

+      license-feature-version="0.0.0"

       plugin="org.eclipse.egf.common"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.common.feature/feature.xml b/features/org.eclipse.egf.common.feature/feature.xml
index 514bf5e..168b5ca 100644
--- a/features/org.eclipse.egf.common.feature/feature.xml
+++ b/features/org.eclipse.egf.common.feature/feature.xml
@@ -17,6 +17,8 @@
       version="1.6.1.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.egf.common"

+      license-feature="org.eclipse.license"

+      license-feature-version="0.0.0"

       image="eclipse_update_120.jpg">

 

    <description>

diff --git a/features/org.eclipse.egf.common.ui.feature/feature.xml b/features/org.eclipse.egf.common.ui.feature/feature.xml
index 8a04d5b..bf0cbd5 100644
--- a/features/org.eclipse.egf.common.ui.feature/feature.xml
+++ b/features/org.eclipse.egf.common.ui.feature/feature.xml
@@ -12,10 +12,12 @@
        Thales - initial API and implementation

 -->

 <feature

-    id="org.eclipse.egf.common.ui.feature"

+	id="org.eclipse.egf.common.ui.feature"

     label="%featureName"

     version="1.6.1.qualifier"

     provider-name="%providerName"

+    license-feature="org.eclipse.license"

+    license-feature-version="0.0.0"

     plugin="org.eclipse.egf.common.ui"

     image="eclipse_update_120.jpg"

 >

diff --git a/features/org.eclipse.egf.core.feature/feature.xml b/features/org.eclipse.egf.core.feature/feature.xml
index 7c8490b..cb52d41 100644
--- a/features/org.eclipse.egf.core.feature/feature.xml
+++ b/features/org.eclipse.egf.core.feature/feature.xml
@@ -16,7 +16,10 @@
       label="%featureName"

       version="1.6.1.qualifier"

       provider-name="%providerName"

-      image="eclipse_update_120.jpg">

+      plugin="org.eclipse.egf.core"

+      image="eclipse_update_120.jpg"

+      license-feature="org.eclipse.license"

+      license-feature-version="0.0.0">

 

    <description>

       %description

diff --git a/features/org.eclipse.egf.core.ui.feature/feature.xml b/features/org.eclipse.egf.core.ui.feature/feature.xml
index f113190..ee86b7f 100644
--- a/features/org.eclipse.egf.core.ui.feature/feature.xml
+++ b/features/org.eclipse.egf.core.ui.feature/feature.xml
@@ -16,6 +16,8 @@
       label="%featureName"

       version="1.6.1.qualifier"

       provider-name="%providerName"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       plugin="org.eclipse.egf.core.ui"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.doc.feature/feature.xml b/features/org.eclipse.egf.doc.feature/feature.xml
index d6fd389..b015c57 100644
--- a/features/org.eclipse.egf.doc.feature/feature.xml
+++ b/features/org.eclipse.egf.doc.feature/feature.xml
@@ -16,6 +16,8 @@
       label="%featureName"

       version="1.6.1.qualifier"

       provider-name="%providerName"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       plugin="org.eclipse.egf.doc.user"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.examples.feature/feature.xml b/features/org.eclipse.egf.examples.feature/feature.xml
index b45f9ce..5a0ef9d 100644
--- a/features/org.eclipse.egf.examples.feature/feature.xml
+++ b/features/org.eclipse.egf.examples.feature/feature.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Copyright (c) 2009, 2019 THALES GLOBAL SERVICES.

+<!--
+  Copyright (c) 2009, 2019 THALES GLOBAL SERVICES.
   This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  https://www.eclipse.org/legal/epl-2.0

-

-  SPDX-License-Identifier: EPL-2.0

-

-  Contributors:

-       Thales - initial API and implementation

+  https://www.eclipse.org/legal/epl-2.0
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Contributors:
+       Thales - initial API and implementation
 -->

 <feature

       id="org.eclipse.egf.examples.feature"

       label="%featureName"

       version="1.6.1.qualifier"

       provider-name="%providerName"

-      image="eclipse_update_120.jpg">

+      plugin="org.eclipse.egf.examples.installer"

+      image="eclipse_update_120.jpg"

+      license-feature="org.eclipse.license"

+      license-feature-version="0.0.0">

 

    <description>

       %description

    </description>

 

    <copyright>

-	%copyright

+      %copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.feature/feature.xml b/features/org.eclipse.egf.feature/feature.xml
index 8fc73a4..ae17851 100644
--- a/features/org.eclipse.egf.feature/feature.xml
+++ b/features/org.eclipse.egf.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       plugin="org.eclipse.egf.core"

       image="eclipse_update_120.jpg">

diff --git a/features/org.eclipse.egf.model.edit.feature/feature.xml b/features/org.eclipse.egf.model.edit.feature/feature.xml
index 03b47f8..ed2bbfd 100644
--- a/features/org.eclipse.egf.model.edit.feature/feature.xml
+++ b/features/org.eclipse.egf.model.edit.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.model.edit.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       plugin="org.eclipse.egf.model.edit"

       image="eclipse_update_120.jpg">

diff --git a/features/org.eclipse.egf.model.feature/feature.xml b/features/org.eclipse.egf.model.feature/feature.xml
index 8779281..ccf88dc 100644
--- a/features/org.eclipse.egf.model.feature/feature.xml
+++ b/features/org.eclipse.egf.model.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.model.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       plugin="org.eclipse.egf.model"

       image="eclipse_update_120.jpg">

diff --git a/features/org.eclipse.egf.model.fprod.edit.feature/feature.xml b/features/org.eclipse.egf.model.fprod.edit.feature/feature.xml
index a135872..cbfff6b 100644
--- a/features/org.eclipse.egf.model.fprod.edit.feature/feature.xml
+++ b/features/org.eclipse.egf.model.fprod.edit.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.model.fprod.edit.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       plugin="org.eclipse.egf.model.fprod.edit"

       image="eclipse_update_120.jpg">

diff --git a/features/org.eclipse.egf.model.fprod.feature/feature.xml b/features/org.eclipse.egf.model.fprod.feature/feature.xml
index ad0589f..b97d014 100644
--- a/features/org.eclipse.egf.model.fprod.feature/feature.xml
+++ b/features/org.eclipse.egf.model.fprod.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.model.fprod.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       plugin="org.eclipse.egf.model.fprod"

       image="eclipse_update_120.jpg">

diff --git a/features/org.eclipse.egf.model.ftask.edit.feature/feature.xml b/features/org.eclipse.egf.model.ftask.edit.feature/feature.xml
index f5bddd8..47d7089 100644
--- a/features/org.eclipse.egf.model.ftask.edit.feature/feature.xml
+++ b/features/org.eclipse.egf.model.ftask.edit.feature/feature.xml
@@ -15,6 +15,8 @@
     id="org.eclipse.egf.model.ftask.edit.feature"

     label="%featureName"

     version="1.6.1.qualifier"

+	license-feature="org.eclipse.license"

+	license-feature-version="0.0.0"

     provider-name="%providerName"

     plugin="org.eclipse.egf.model.ftask.edit"

     image="eclipse_update_120.jpg"

diff --git a/features/org.eclipse.egf.model.ftask.feature/feature.xml b/features/org.eclipse.egf.model.ftask.feature/feature.xml
index 9273e95..47ff4b9 100644
--- a/features/org.eclipse.egf.model.ftask.feature/feature.xml
+++ b/features/org.eclipse.egf.model.ftask.feature/feature.xml
@@ -15,6 +15,8 @@
     id="org.eclipse.egf.model.ftask.feature"

     label="%featureName"

     version="1.6.1.qualifier"

+	license-feature="org.eclipse.license"

+	license-feature-version="0.0.0"

     provider-name="%providerName"

     plugin="org.eclipse.egf.model.ftask"

     image="eclipse_update_120.jpg"

diff --git a/features/org.eclipse.egf.model.ui.feature/feature.xml b/features/org.eclipse.egf.model.ui.feature/feature.xml
index bba81e0..1793943 100644
--- a/features/org.eclipse.egf.model.ui.feature/feature.xml
+++ b/features/org.eclipse.egf.model.ui.feature/feature.xml
@@ -16,6 +16,8 @@
       label="%featureName"

       version="1.6.1.qualifier"

       provider-name="%providerName"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       plugin="org.eclipse.egf.model.editor"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/feature.xml b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/feature.xml
index 3c5f1b1..665b1fb 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.acceleo3.examples.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.portfolio.acceleo3.examples.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.portfolio.acceleo3.feature/feature.xml b/features/org.eclipse.egf.portfolio.acceleo3.feature/feature.xml
index 629c5d6..d674440 100644
--- a/features/org.eclipse.egf.portfolio.acceleo3.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.acceleo3.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.portfolio.acceleo3.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.portfolio.atl.examples.feature/feature.xml b/features/org.eclipse.egf.portfolio.atl.examples.feature/feature.xml
index c773cfa..9f1a7f3 100644
--- a/features/org.eclipse.egf.portfolio.atl.examples.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.atl.examples.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.portfolio.atl.examples.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.portfolio.atl.feature/feature.xml b/features/org.eclipse.egf.portfolio.atl.feature/feature.xml
index cf5a04a..9804944 100644
--- a/features/org.eclipse.egf.portfolio.atl.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.atl.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.portfolio.atl.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.portfolio.emf.feature/feature.xml b/features/org.eclipse.egf.portfolio.emf.feature/feature.xml
index 171fe74..114be61 100644
--- a/features/org.eclipse.egf.portfolio.emf.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.emf.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.portfolio.emf.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       plugin="org.eclipse.egf.emf.pattern"

       image="eclipse_update_120.jpg">

diff --git a/features/org.eclipse.egf.portfolio.feature/feature.xml b/features/org.eclipse.egf.portfolio.feature/feature.xml
index d7b7f39..84e2fbe 100644
--- a/features/org.eclipse.egf.portfolio.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.portfolio.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       plugin="org.eclipse.egf.eclipse.resources.mgt"

       image="eclipse_update_120.jpg">

diff --git a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.xml b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.xml
index 9f25c67..4717272 100644
--- a/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.genchain.ecoretools.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.portfolio.genchain.ecoretools.feature"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.portfolio.genchain.feature/feature.xml b/features/org.eclipse.egf.portfolio.genchain.feature/feature.xml
index 89393ab..1e26218 100644
--- a/features/org.eclipse.egf.portfolio.genchain.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.genchain.feature/feature.xml
@@ -16,6 +16,8 @@
       label="%featureName"

       version="1.6.1.qualifier"

       provider-name="%providerName"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       plugin="org.eclipse.egf.portfolio.genchain"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.portfolio.task.ant.feature/feature.xml b/features/org.eclipse.egf.portfolio.task.ant.feature/feature.xml
index 634899b..fdb1e9d 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.task.ant.feature/feature.xml
@@ -16,6 +16,8 @@
       label="%featureName"

       version="1.6.1.qualifier"

       provider-name="%providerName"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       plugin="org.eclipse.egf.portfolio.task.ant"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.portfolio.task.ant.test.feature/feature.xml b/features/org.eclipse.egf.portfolio.task.ant.test.feature/feature.xml
index 43d2ad3..f4004bc 100644
--- a/features/org.eclipse.egf.portfolio.task.ant.test.feature/feature.xml
+++ b/features/org.eclipse.egf.portfolio.task.ant.test.feature/feature.xml
@@ -16,6 +16,8 @@
       label="%featureName"

       version="1.6.1.qualifier"

       provider-name="%providerName"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       plugin="org.eclipse.egf.portfolio.task.ant.test"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.producer.feature/feature.xml b/features/org.eclipse.egf.producer.feature/feature.xml
index e9a1ed5..f6b5ac5 100644
--- a/features/org.eclipse.egf.producer.feature/feature.xml
+++ b/features/org.eclipse.egf.producer.feature/feature.xml
@@ -16,6 +16,8 @@
     label="%featureName"

     version="1.6.1.qualifier"

     provider-name="%providerName"

+	license-feature="org.eclipse.license"

+	license-feature-version="0.0.0"

     plugin="org.eclipse.egf.producer"

     image="eclipse_update_120.jpg"

 >

diff --git a/features/org.eclipse.egf.producer.ui.feature/feature.xml b/features/org.eclipse.egf.producer.ui.feature/feature.xml
index 167e1f4..72be712 100644
--- a/features/org.eclipse.egf.producer.ui.feature/feature.xml
+++ b/features/org.eclipse.egf.producer.ui.feature/feature.xml
@@ -16,6 +16,8 @@
       label="%featureName"

       version="1.6.1.qualifier"

       provider-name="%providerName"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       plugin="org.eclipse.egf.producer.ui"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.egf.releng.feature/feature.xml b/features/org.eclipse.egf.releng.feature/feature.xml
index 4a10f32..9adaed3 100644
--- a/features/org.eclipse.egf.releng.feature/feature.xml
+++ b/features/org.eclipse.egf.releng.feature/feature.xml
@@ -15,6 +15,8 @@
       id="org.eclipse.egf.releng"

       label="%featureName"

       version="1.6.1.qualifier"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       provider-name="%providerName">

 

    <description>

diff --git a/features/org.eclipse.egf.sdk.feature/feature.xml b/features/org.eclipse.egf.sdk.feature/feature.xml
index d263bc2..c92a479 100644
--- a/features/org.eclipse.egf.sdk.feature/feature.xml
+++ b/features/org.eclipse.egf.sdk.feature/feature.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Copyright (c) 2009, 2019 THALES GLOBAL SERVICES.

+<!--
+  Copyright (c) 2009, 2019 THALES GLOBAL SERVICES.
   This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  https://www.eclipse.org/legal/epl-2.0

-

-  SPDX-License-Identifier: EPL-2.0

-

-  Contributors:

-       Thales - initial API and implementation

+  https://www.eclipse.org/legal/epl-2.0
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Contributors:
+       Thales - initial API and implementation
 -->

 <feature

       id="org.eclipse.egf.sdk.feature"

       label="%featureName"

       version="1.6.1.qualifier"

       provider-name="%providerName"

-      image="eclipse_update_120.jpg">

+      plugin="org.eclipse.egf.core"

+      image="eclipse_update_120.jpg"

+      license-feature="org.eclipse.license"

+      license-feature-version="0.0.0">

 

    <description>

       %description

    </description>

 

    <copyright>

-	%copyright

+      %copyright

    </copyright>

 

    <license url="%licenseURL">

diff --git a/features/org.eclipse.egf.test.feature/feature.xml b/features/org.eclipse.egf.test.feature/feature.xml
index 61dd975..8080c07 100644
--- a/features/org.eclipse.egf.test.feature/feature.xml
+++ b/features/org.eclipse.egf.test.feature/feature.xml
@@ -17,6 +17,8 @@
       version="1.6.1.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.egf.core.test"

+	  license-feature="org.eclipse.license"

+	  license-feature-version="0.0.0"

       image="eclipse_update_120.jpg">

 

    <description>

diff --git a/plugins/org.eclipse.egf.common.ui/about.ini b/plugins/org.eclipse.egf.common.ui/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.common.ui/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.common.ui/build.properties b/plugins/org.eclipse.egf.common.ui/build.properties
index 8a7debd..c32e4a0 100644
--- a/plugins/org.eclipse.egf.common.ui/build.properties
+++ b/plugins/org.eclipse.egf.common.ui/build.properties
@@ -17,6 +17,8 @@
                icons/,\

                about.html,\

                .,\

+               egf.png,\

+               about.ini,\

                .options,\

                plugin.properties

 src.includes = about.html

diff --git a/plugins/org.eclipse.egf.common.ui/egf.png b/plugins/org.eclipse.egf.common.ui/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.common.ui/egf.png
Binary files differ
diff --git a/plugins/org.eclipse.egf.common/about.ini b/plugins/org.eclipse.egf.common/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.common/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.common/build.properties b/plugins/org.eclipse.egf.common/build.properties
index f03c470..72c4c1b 100644
--- a/plugins/org.eclipse.egf.common/build.properties
+++ b/plugins/org.eclipse.egf.common/build.properties
@@ -19,6 +19,8 @@
                .,\

                .options,\

                plugin.properties,\

+               egf.png,\

+               about.ini,\

                about.html,\

                plugin.xml

 src.includes = about.html

diff --git a/plugins/org.eclipse.egf.common/egf.png b/plugins/org.eclipse.egf.common/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.common/egf.png
Binary files differ
diff --git a/plugins/org.eclipse.egf.core.ui/about.ini b/plugins/org.eclipse.egf.core.ui/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.core.ui/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.core.ui/build.properties b/plugins/org.eclipse.egf.core.ui/build.properties
index 31a9bcc..394240f 100644
--- a/plugins/org.eclipse.egf.core.ui/build.properties
+++ b/plugins/org.eclipse.egf.core.ui/build.properties
@@ -18,6 +18,8 @@
                .options,\

                icons/,\

                about.html,\

+               egf.png,\

+               about.ini,\

                plugin.xml,\

                plugin.properties

 src.includes = about.html

diff --git a/plugins/org.eclipse.egf.core.ui/egf.png b/plugins/org.eclipse.egf.core.ui/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.core.ui/egf.png
Binary files differ
diff --git a/plugins/org.eclipse.egf.model.edit/about.ini b/plugins/org.eclipse.egf.model.edit/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.edit/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.model.edit/build.properties b/plugins/org.eclipse.egf.model.edit/build.properties
index 1bfada2..01d3a66 100644
--- a/plugins/org.eclipse.egf.model.edit/build.properties
+++ b/plugins/org.eclipse.egf.model.edit/build.properties
@@ -18,6 +18,8 @@
                icons/,\

                META-INF/,\

                plugin.xml,\

+               egf.png,\

+               about.ini,\

                plugin.properties,\

                about.html

 src.includes = about.html

diff --git a/plugins/org.eclipse.egf.model.edit/egf.png b/plugins/org.eclipse.egf.model.edit/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.edit/egf.png
Binary files differ
diff --git a/plugins/org.eclipse.egf.model.editor/about.ini b/plugins/org.eclipse.egf.model.editor/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.editor/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.model.editor/build.properties b/plugins/org.eclipse.egf.model.editor/build.properties
index 682764d..3c1e898 100644
--- a/plugins/org.eclipse.egf.model.editor/build.properties
+++ b/plugins/org.eclipse.egf.model.editor/build.properties
@@ -18,6 +18,8 @@
                icons/,\

                META-INF/,\

                about.html,\

+               egf.png,\

+               about.ini,\

                plugin.xml,\

                plugin.properties

 src.includes = about.html

diff --git a/plugins/org.eclipse.egf.model.editor/egf.png b/plugins/org.eclipse.egf.model.editor/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.editor/egf.png
Binary files differ
diff --git a/plugins/org.eclipse.egf.model.fprod.edit/about.ini b/plugins/org.eclipse.egf.model.fprod.edit/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.fprod.edit/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.model.fprod.edit/build.properties b/plugins/org.eclipse.egf.model.fprod.edit/build.properties
index 1bfada2..01d3a66 100644
--- a/plugins/org.eclipse.egf.model.fprod.edit/build.properties
+++ b/plugins/org.eclipse.egf.model.fprod.edit/build.properties
@@ -18,6 +18,8 @@
                icons/,\

                META-INF/,\

                plugin.xml,\

+               egf.png,\

+               about.ini,\

                plugin.properties,\

                about.html

 src.includes = about.html

diff --git a/plugins/org.eclipse.egf.model.fprod.edit/egf.png b/plugins/org.eclipse.egf.model.fprod.edit/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.fprod.edit/egf.png
Binary files differ
diff --git a/plugins/org.eclipse.egf.model.fprod/about.ini b/plugins/org.eclipse.egf.model.fprod/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.fprod/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.model.fprod/build.properties b/plugins/org.eclipse.egf.model.fprod/build.properties
index 20056bb..9e09ece 100644
--- a/plugins/org.eclipse.egf.model.fprod/build.properties
+++ b/plugins/org.eclipse.egf.model.fprod/build.properties
@@ -18,6 +18,8 @@
                model/,\

                META-INF/,\

                about.html,\

+               egf.png,\

+               about.ini,\

                plugin.xml,\

                plugin.properties

 src.includes = about.html

diff --git a/plugins/org.eclipse.egf.model.fprod/egf.png b/plugins/org.eclipse.egf.model.fprod/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.fprod/egf.png
Binary files differ
diff --git a/plugins/org.eclipse.egf.model.ftask.edit/about.ini b/plugins/org.eclipse.egf.model.ftask.edit/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.ftask.edit/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.model.ftask.edit/build.properties b/plugins/org.eclipse.egf.model.ftask.edit/build.properties
index 1ddf4d2..45ce185 100644
--- a/plugins/org.eclipse.egf.model.ftask.edit/build.properties
+++ b/plugins/org.eclipse.egf.model.ftask.edit/build.properties
@@ -18,6 +18,8 @@
                icons/,\

                META-INF/,\

                plugin.xml,\

+               egf.png,\

+               about.ini,\

                plugin.properties,\

                about.html

 src.includes = about.html

diff --git a/plugins/org.eclipse.egf.model.ftask.edit/egf.png b/plugins/org.eclipse.egf.model.ftask.edit/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.ftask.edit/egf.png
Binary files differ
diff --git a/plugins/org.eclipse.egf.model.ftask/about.ini b/plugins/org.eclipse.egf.model.ftask/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.ftask/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.model.ftask/build.properties b/plugins/org.eclipse.egf.model.ftask/build.properties
index 31286d6..7689441 100644
--- a/plugins/org.eclipse.egf.model.ftask/build.properties
+++ b/plugins/org.eclipse.egf.model.ftask/build.properties
@@ -19,6 +19,8 @@
                schema/,\

                META-INF/,\

                about.html,\

+               egf.png,\

+               about.ini,\

                plugin.xml,\

                plugin.properties

 src.includes = about.html

diff --git a/plugins/org.eclipse.egf.model.ftask/egf.png b/plugins/org.eclipse.egf.model.ftask/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.model.ftask/egf.png
Binary files differ
diff --git a/plugins/org.eclipse.egf.model/about.ini b/plugins/org.eclipse.egf.model/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.model/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.model/build.properties b/plugins/org.eclipse.egf.model/build.properties
index c9ce133..44c8c7d 100644
--- a/plugins/org.eclipse.egf.model/build.properties
+++ b/plugins/org.eclipse.egf.model/build.properties
@@ -19,6 +19,8 @@
                META-INF/,\

                about.html,\

                plugin.xml,\

+               egf.png,\

+               about.ini,\

                plugin.properties

 src.includes = templates/,\

                about.html

diff --git a/plugins/org.eclipse.egf.model/egf.png b/plugins/org.eclipse.egf.model/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.model/egf.png
Binary files differ
diff --git a/plugins/org.eclipse.egf.producer.ui/about.ini b/plugins/org.eclipse.egf.producer.ui/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.producer.ui/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.producer.ui/build.properties b/plugins/org.eclipse.egf.producer.ui/build.properties
index 0d7578b..a208008 100644
--- a/plugins/org.eclipse.egf.producer.ui/build.properties
+++ b/plugins/org.eclipse.egf.producer.ui/build.properties
@@ -18,6 +18,8 @@
                .,\

                .options,\

                about.html,\

+               egf.png,\

+               about.ini,\

                plugin.xml,\

                plugin.properties

 src.includes = about.html

diff --git a/plugins/org.eclipse.egf.producer.ui/egf.png b/plugins/org.eclipse.egf.producer.ui/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.producer.ui/egf.png
Binary files differ
diff --git a/plugins/org.eclipse.egf.producer/about.ini b/plugins/org.eclipse.egf.producer/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/plugins/org.eclipse.egf.producer/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/plugins/org.eclipse.egf.producer/build.properties b/plugins/org.eclipse.egf.producer/build.properties
index 31c949a..bff647f 100644
--- a/plugins/org.eclipse.egf.producer/build.properties
+++ b/plugins/org.eclipse.egf.producer/build.properties
@@ -18,6 +18,8 @@
                .,\

                .options,\

                about.html,\

+               egf.png,\

+               about.ini,\

                plugin.properties,\

                plugin.xml

 src.includes = about.html

diff --git a/plugins/org.eclipse.egf.producer/egf.png b/plugins/org.eclipse.egf.producer/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/plugins/org.eclipse.egf.producer/egf.png
Binary files differ
diff --git a/pom.xml b/pom.xml
index 5d36829..ef8d485 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,8 @@
 	</licenses>
 	
 	<properties>
-		<tycho-version>1.1.0</tycho-version>
-		<tycho-extras-version>1.1.0</tycho-extras-version>
+		<tycho-version>1.4.0</tycho-version>
+		<tycho-extras-version>${tycho-version}</tycho-extras-version>
 		<platform-version-name>2019-06</platform-version-name>
 		
 		<tycho.scmUrl>scm:git:https://git.eclipse.org/r/egf/org.eclipse.emf.egf</tycho.scmUrl>
@@ -109,6 +109,29 @@
 						</execution>
 					</executions>
 				</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>default-p2-metadata-default</id>
+						<configuration>
+							<attachP2Metadata>false</attachP2Metadata>
+						</configuration>
+					</execution>
+					<execution>
+						<id>attach-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<defaultP2Metadata>false</defaultP2Metadata>
+				</configuration>
+			</plugin>
 			</plugins>
 		</build>
 
@@ -354,6 +377,7 @@
 							<classifier>releng/org.eclipse.egf.targets/core-${platform-version-name}</classifier>
 						</artifact>
 					</target>
+					<includePackedArtifacts>true</includePackedArtifacts>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/about.ini b/portfolio/org.eclipse.egf.eclipse.resources.mgt/about.ini
new file mode 100644
index 0000000..46e430d
--- /dev/null
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/about.ini
@@ -0,0 +1,30 @@
+# 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=EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, such as code or application, in order to automate software development.\n\
+\n\Copyright (c) 2009, 2019 Thales Global Services\n\.  All rights reserved.\n\n\
+Visit http://eclipse.org/egf
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egf.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/build.properties b/portfolio/org.eclipse.egf.eclipse.resources.mgt/build.properties
index 8e8e0ff..6617865 100644
--- a/portfolio/org.eclipse.egf.eclipse.resources.mgt/build.properties
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/build.properties
@@ -18,6 +18,8 @@
                .settings/,\

                fcs/,\

                plugin.xml,\

+               egf.png,\

+               about.ini,\

                plugin.properties,\

                about.html

 src.includes = about.html

diff --git a/portfolio/org.eclipse.egf.eclipse.resources.mgt/egf.png b/portfolio/org.eclipse.egf.eclipse.resources.mgt/egf.png
new file mode 100644
index 0000000..cf6a65c
--- /dev/null
+++ b/portfolio/org.eclipse.egf.eclipse.resources.mgt/egf.png
Binary files differ
diff --git a/releng/org.eclipse.egf.targets/core-2019-06.target b/releng/org.eclipse.egf.targets/core-2019-06.target
index 4fda7ef..445b106 100644
--- a/releng/org.eclipse.egf.targets/core-2019-06.target
+++ b/releng/org.eclipse.egf.targets/core-2019-06.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <?pde?>

 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->

-<target name="core" sequenceNumber="1560184860">

+<target name="core" sequenceNumber="1569417239">

   <locations>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>

@@ -23,11 +23,15 @@
       <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.emf.ecoretools.design.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>

-      <repository id="eclipse" location="http://download.eclipse.org/releases/2019-06/"/>

+      <repository id="eclipse" location="https://download.eclipse.org/releases/2019-06/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>

+      <repository location="https://download.eclipse.org/cbi/updates/license/"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <unit id="org.eclipse.acceleo.sdk.feature.group" version="0.0.0"/>

-      <repository id="acceleo" location="http://download.eclipse.org/acceleo/updates/releases/3.7/R201705121344/"/>

+      <repository id="acceleo" location="https://download.eclipse.org/acceleo/updates/releases/3.7/R201705121344/"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <unit id="org.eclipse.amalgam.explorer.activity.feature.group" version="0.0.0"/>

@@ -38,7 +42,7 @@
       <unit id="org.eclipse.amalgam.explorer.contextual.sirius.source.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.amalgam.explorer.contextual.core.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.amalgam.explorer.contextual.core.source.feature.group" version="0.0.0"/>

-      <repository id="amalgam" location="http://download.eclipse.org/modeling/amalgam/staging/nightly/1.11.0-N133/capella"/>

+      <repository id="amalgam" location="https://download.eclipse.org/modeling/amalgam/staging/nightly/1.11.0-N133/capella"/>

     </location>

   </locations>

 </target>

diff --git a/releng/org.eclipse.egf.targets/core-2019-06.targetplatform b/releng/org.eclipse.egf.targets/core-2019-06.targetplatform
index f5d598f..a30b5ea 100644
--- a/releng/org.eclipse.egf.targets/core-2019-06.targetplatform
+++ b/releng/org.eclipse.egf.targets/core-2019-06.targetplatform
@@ -1,14 +1,11 @@
 target "core"  with source, requirements

 

 

-location eclipse "http://download.eclipse.org/releases/2019-06/" {

+location eclipse "https://download.eclipse.org/releases/2019-06/" {

 	org.eclipse.emf.workspace.feature.group lazy

 	org.eclipse.emf.transaction.feature.group lazy

 	org.eclipse.emf.query.feature.group lazy

 	org.eclipse.emf.validation.feature.group lazy

-

-

-

 	org.eclipse.sdk.feature.group lazy

 	org.eclipse.jdt.feature.group lazy

 	org.eclipse.pde.feature.group lazy

@@ -24,14 +21,17 @@
 	org.eclipse.emf.ecoretools.sdk.feature.group lazy

 	org.eclipse.emf.ecoretools.design.feature.group lazy

 	org.eclipse.emf.sdk.feature.group lazy

-	

 }

 

-location acceleo "http://download.eclipse.org/acceleo/updates/releases/3.7/R201705121344/" {

+location "https://download.eclipse.org/cbi/updates/license/" {

+	org.eclipse.license.feature.group lazy

+}

+

+location acceleo "https://download.eclipse.org/acceleo/updates/releases/3.7/R201705121344/" {

 	org.eclipse.acceleo.sdk.feature.group lazy

 }

 

-location amalgam "http://download.eclipse.org/modeling/amalgam/staging/nightly/1.11.0-N133/capella" {

+location amalgam "https://download.eclipse.org/modeling/amalgam/staging/nightly/1.11.0-N133/capella" {

 	org.eclipse.amalgam.explorer.activity.feature.group lazy

 	org.eclipse.amalgam.explorer.activity.source.feature.group lazy

 	org.eclipse.amalgam.explorer.contextual.feature.group lazy