From 18415433de76502104e3f04081d96580376f4310 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Thu, 29 May 2008 06:37:05 +0000
Subject: [234041]  Prepare graduation
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=234041

---
 features/org.eclipse.emf.cdo-feature/feature.properties          | 9 ++++++---
 features/org.eclipse.emf.cdo-feature/feature.xml                 | 4 +++-
 .../sourceTemplateFeature/feature.properties                     | 9 ++++++---
 features/org.eclipse.emf.cdo.doc-feature/feature.properties      | 9 ++++++---
 features/org.eclipse.emf.cdo.doc-feature/feature.xml             | 4 +++-
 features/org.eclipse.emf.cdo.examples-feature/feature.properties | 9 ++++++---
 features/org.eclipse.emf.cdo.examples-feature/feature.xml        | 4 +++-
 .../sourceTemplateFeature/feature.properties                     | 9 ++++++---
 features/org.eclipse.emf.cdo.sdk-feature/feature.properties      | 9 ++++++---
 features/org.eclipse.emf.cdo.sdk-feature/feature.xml             | 4 +++-
 features/org.eclipse.emf.cdo.server-feature/feature.properties   | 9 ++++++---
 features/org.eclipse.emf.cdo.server-feature/feature.xml          | 4 +++-
 .../sourceTemplateFeature/feature.properties                     | 9 ++++++---
 .../feature.properties                                           | 9 ++++++---
 .../org.eclipse.emf.cdo.server.hibernate-feature/feature.xml     | 4 +++-
 .../sourceTemplateFeature/feature.properties                     | 9 ++++++---
 .../feature.properties                                           | 9 ++++++---
 features/org.eclipse.emf.cdo.server.product-feature/feature.xml  | 4 +++-
 features/org.eclipse.emf.cdo.tests-feature/feature.properties    | 9 ++++++---
 features/org.eclipse.emf.cdo.tests-feature/feature.xml           | 4 +++-
 .../sourceTemplateFeature/feature.properties                     | 9 ++++++---
 features/org.eclipse.net4j-feature/feature.properties            | 9 ++++++---
 features/org.eclipse.net4j-feature/feature.xml                   | 4 +++-
 .../sourceTemplateFeature/feature.properties                     | 9 ++++++---
 features/org.eclipse.net4j.db-feature/feature.properties         | 9 ++++++---
 features/org.eclipse.net4j.db-feature/feature.xml                | 4 +++-
 .../sourceTemplateFeature/feature.properties                     | 9 ++++++---
 features/org.eclipse.net4j.examples-feature/feature.properties   | 9 ++++++---
 features/org.eclipse.net4j.examples-feature/feature.xml          | 4 +++-
 .../sourceTemplateFeature/feature.properties                     | 9 ++++++---
 features/org.eclipse.net4j.sdk-feature/feature.properties        | 9 ++++++---
 features/org.eclipse.net4j.sdk-feature/feature.xml               | 4 +++-
 features/org.eclipse.net4j.tests-feature/feature.properties      | 9 ++++++---
 features/org.eclipse.net4j.tests-feature/feature.xml             | 4 +++-
 .../sourceTemplateFeature/feature.properties                     | 9 ++++++---
 features/org.eclipse.net4j.ui-feature/feature.properties         | 9 ++++++---
 features/org.eclipse.net4j.ui-feature/feature.xml                | 4 +++-
 .../sourceTemplateFeature/feature.properties                     | 9 ++++++---
 38 files changed, 186 insertions(+), 86 deletions(-)

diff --git a/features/org.eclipse.emf.cdo-feature/feature.properties b/features/org.eclipse.emf.cdo-feature/feature.properties
index 4a1d24225d..4449b456fc 100644
--- a/features/org.eclipse.emf.cdo-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Runtime
 providerName = Eclipse.org
-
+featureName = CDO Runtime
 description = CDO Runtime
+
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo-feature/feature.xml b/features/org.eclipse.emf.cdo-feature/feature.xml
index a38d2e2e87..14054f2df3 100644
--- a/features/org.eclipse.emf.cdo-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <plugin
diff --git a/features/org.eclipse.emf.cdo-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.emf.cdo-feature/sourceTemplateFeature/feature.properties
index 7070ae2d9b..3e6e743b95 100644
--- a/features/org.eclipse.emf.cdo-feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.emf.cdo-feature/sourceTemplateFeature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Source
 providerName = Eclipse.org
+featureName = CDO Source
+description = CDO Source
 
-description = CDO source code
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo.doc-feature/feature.properties b/features/org.eclipse.emf.cdo.doc-feature/feature.properties
index d36c4e412e..ff92f7654e 100644
--- a/features/org.eclipse.emf.cdo.doc-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.doc-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Documentation
 providerName = Eclipse.org
-
+featureName = CDO Documentation
 description = CDO Documentation
+
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo.doc-feature/feature.xml b/features/org.eclipse.emf.cdo.doc-feature/feature.xml
index a4bc858b96..302f69a40e 100644
--- a/features/org.eclipse.emf.cdo.doc-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.doc-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <requires>
diff --git a/features/org.eclipse.emf.cdo.examples-feature/feature.properties b/features/org.eclipse.emf.cdo.examples-feature/feature.properties
index eb3f669a0d..bb25121e04 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.examples-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Examples
 providerName = Eclipse.org
-
+featureName = CDO Examples
 description = CDO Examples
+
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo.examples-feature/feature.xml b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
index 5ab108fc32..dca43f0d9c 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <plugin
diff --git a/features/org.eclipse.emf.cdo.examples-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.emf.cdo.examples-feature/sourceTemplateFeature/feature.properties
index be70b83832..b9e424d2bb 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.emf.cdo.examples-feature/sourceTemplateFeature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Examples Source
 providerName = Eclipse.org
+featureName = CDO Examples Source
+description = CDO Examples Source
 
-description = CDO Examples source code
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+   
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.properties b/features/org.eclipse.emf.cdo.sdk-feature/feature.properties
index 0c889bd898..05b5a7c936 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO SDK
 providerName = Eclipse.org
+featureName = CDO SDK
+description = CDO SDK includes Runtime, Server, Tools, Examples, Documentation and Source.
 
-description = CDO SDK includes CDO, source code, test code and code examples.
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
index 1c7a00dafb..9fd4078c1f 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <includes
diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.properties b/features/org.eclipse.emf.cdo.server-feature/feature.properties
index 48852af002..6ae5de08b9 100644
--- a/features/org.eclipse.emf.cdo.server-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.server-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Server
 providerName = Eclipse.org
-
+featureName = CDO Server
 description = CDO Server
+
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.xml b/features/org.eclipse.emf.cdo.server-feature/feature.xml
index cc52f297d9..7e277b0b0e 100644
--- a/features/org.eclipse.emf.cdo.server-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <plugin
diff --git a/features/org.eclipse.emf.cdo.server-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.emf.cdo.server-feature/sourceTemplateFeature/feature.properties
index b341340764..ee5fe51ff0 100644
--- a/features/org.eclipse.emf.cdo.server-feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.emf.cdo.server-feature/sourceTemplateFeature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Server Source
 providerName = Eclipse.org
+featureName = CDO Server Source
+description = CDO Server Source
 
-description = CDO Server source code
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties
index c6100a7673..418db8991e 100644
--- a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Server Hibernate Support
 providerName = Eclipse.org
-
+featureName = CDO Server Hibernate Support
 description = CDO Server Hibernate Support
+
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml
index 297fb32103..0bebab774c 100644
--- a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <plugin
diff --git a/features/org.eclipse.emf.cdo.server.hibernate-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.emf.cdo.server.hibernate-feature/sourceTemplateFeature/feature.properties
index 17a1b534da..d478d1f065 100644
--- a/features/org.eclipse.emf.cdo.server.hibernate-feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.emf.cdo.server.hibernate-feature/sourceTemplateFeature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Server Hibernate Source
 providerName = Eclipse.org
+featureName = CDO Server Hibernate Source
+description = CDO Server Hibernate Source
 
-description = CDO Server Hibernate source code
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+ 
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/feature.properties b/features/org.eclipse.emf.cdo.server.product-feature/feature.properties
index 796a751a1f..243b6841fb 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.server.product-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Server Product
 providerName = Eclipse.org
-
+featureName = CDO Server Product
 description = CDO Server Product
+
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+ 
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/feature.xml b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
index 4ef09a2de6..64c14b20dd 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <plugin
diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.properties b/features/org.eclipse.emf.cdo.tests-feature/feature.properties
index a52dfd8c1d..4f078a7865 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.tests-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Tests
 providerName = Eclipse.org
-
+featureName = CDO Tests
 description = CDO Tests
+
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
index d1d1a1d39b..32b4a6df13 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <plugin
diff --git a/features/org.eclipse.emf.cdo.tests-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.emf.cdo.tests-feature/sourceTemplateFeature/feature.properties
index 4059615f2b..3cbc10f329 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.emf.cdo.tests-feature/sourceTemplateFeature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Tests Source
 providerName = Eclipse.org
+featureName = CDO Tests Source
+description = CDO Tests Source
 
-description = CDO Tests source code
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.net4j-feature/feature.properties b/features/org.eclipse.net4j-feature/feature.properties
index 4790a21755..8f2456947a 100644
--- a/features/org.eclipse.net4j-feature/feature.properties
+++ b/features/org.eclipse.net4j-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Net4j
 providerName = Eclipse.org
+featureName = Net4j Runtime
+description = Net4j Runtime
 
-description = Net4j 
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.net4j-feature/feature.xml b/features/org.eclipse.net4j-feature/feature.xml
index 573414f98e..14e757c6e4 100644
--- a/features/org.eclipse.net4j-feature/feature.xml
+++ b/features/org.eclipse.net4j-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <plugin
diff --git a/features/org.eclipse.net4j-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.net4j-feature/sourceTemplateFeature/feature.properties
index cdb3a125c2..1dbda6b419 100644
--- a/features/org.eclipse.net4j-feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.net4j-feature/sourceTemplateFeature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Net4j Source
 providerName = Eclipse.org
+featureName = Net4j Source
+description = Net4j Source
 
-description = Net4j source code
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.net4j.db-feature/feature.properties b/features/org.eclipse.net4j.db-feature/feature.properties
index 5e3e07300b..ca7b091bf2 100644
--- a/features/org.eclipse.net4j.db-feature/feature.properties
+++ b/features/org.eclipse.net4j.db-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Net4j DB
 providerName = Eclipse.org
-
+featureName = Net4j DB
 description = Net4j DB
+
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.net4j.db-feature/feature.xml b/features/org.eclipse.net4j.db-feature/feature.xml
index b7171b522d..4e8f40d49c 100644
--- a/features/org.eclipse.net4j.db-feature/feature.xml
+++ b/features/org.eclipse.net4j.db-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <plugin
diff --git a/features/org.eclipse.net4j.db-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.net4j.db-feature/sourceTemplateFeature/feature.properties
index 605344282c..70c95b9df9 100644
--- a/features/org.eclipse.net4j.db-feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.net4j.db-feature/sourceTemplateFeature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Net4j DB Source
 providerName = Eclipse.org
+featureName = Net4j DB Source
+description = Net4j DB Source
 
-description = Net4j DB source code
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.net4j.examples-feature/feature.properties b/features/org.eclipse.net4j.examples-feature/feature.properties
index 17c2e19a5d..c81588686e 100644
--- a/features/org.eclipse.net4j.examples-feature/feature.properties
+++ b/features/org.eclipse.net4j.examples-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Net4j Examples
 providerName = Eclipse.org
-
+featureName = Net4j Examples
 description = Net4j Examples
+
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.net4j.examples-feature/feature.xml b/features/org.eclipse.net4j.examples-feature/feature.xml
index b23fdc2736..98bb879e7d 100644
--- a/features/org.eclipse.net4j.examples-feature/feature.xml
+++ b/features/org.eclipse.net4j.examples-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <plugin
diff --git a/features/org.eclipse.net4j.examples-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.net4j.examples-feature/sourceTemplateFeature/feature.properties
index 070b35721f..ab283fc926 100644
--- a/features/org.eclipse.net4j.examples-feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.net4j.examples-feature/sourceTemplateFeature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Net4j Examples Source
 providerName = Eclipse.org
+featureName = Net4j Examples Source
+description = Net4j Examples Source
 
-description = Net4j Examples source code
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.net4j.sdk-feature/feature.properties b/features/org.eclipse.net4j.sdk-feature/feature.properties
index b7c4a2db0c..11504c19ed 100644
--- a/features/org.eclipse.net4j.sdk-feature/feature.properties
+++ b/features/org.eclipse.net4j.sdk-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Net4j SDK
 providerName = Eclipse.org
+featureName = Net4j SDK
+description = Net4j SDK includes Runtime, UI, DB, Examples, Documentation and Source.
 
-description = Net4j SDK includes Net4j, source code, test code and code examples.
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml
index fe5e99ac71..a2ead8202a 100644
--- a/features/org.eclipse.net4j.sdk-feature/feature.xml
+++ b/features/org.eclipse.net4j.sdk-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <includes
diff --git a/features/org.eclipse.net4j.tests-feature/feature.properties b/features/org.eclipse.net4j.tests-feature/feature.properties
index 0c0460c4ec..608336e48a 100644
--- a/features/org.eclipse.net4j.tests-feature/feature.properties
+++ b/features/org.eclipse.net4j.tests-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Net4j Tests
 providerName = Eclipse.org
-
+featureName = Net4j Tests
 description = Net4j Tests
+
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.net4j.tests-feature/feature.xml b/features/org.eclipse.net4j.tests-feature/feature.xml
index 2b0a7cfb44..76c57540fb 100644
--- a/features/org.eclipse.net4j.tests-feature/feature.xml
+++ b/features/org.eclipse.net4j.tests-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <plugin
diff --git a/features/org.eclipse.net4j.tests-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.net4j.tests-feature/sourceTemplateFeature/feature.properties
index 439ae3ad17..7119a27a9b 100644
--- a/features/org.eclipse.net4j.tests-feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.net4j.tests-feature/sourceTemplateFeature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Net4j Tests Source
 providerName = Eclipse.org
+featureName = Net4j Tests Source
+description = Net4j Tests Source
 
-description = Net4j Tests source code
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.net4j.ui-feature/feature.properties b/features/org.eclipse.net4j.ui-feature/feature.properties
index 942111ec70..cb133fd5a9 100644
--- a/features/org.eclipse.net4j.ui-feature/feature.properties
+++ b/features/org.eclipse.net4j.ui-feature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Net4j UI
 providerName = Eclipse.org
-
+featureName = Net4j UI
 description = Net4j UI
+
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
diff --git a/features/org.eclipse.net4j.ui-feature/feature.xml b/features/org.eclipse.net4j.ui-feature/feature.xml
index a0c8e98d83..91b3c0c5f9 100644
--- a/features/org.eclipse.net4j.ui-feature/feature.xml
+++ b/features/org.eclipse.net4j.ui-feature/feature.xml
@@ -32,7 +32,9 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <update label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emfUpdateSiteName" url="http://download.eclipse.org/modeling/emf/updates/"/>
+      <discovery label="%emftUpdateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
    <plugin
diff --git a/features/org.eclipse.net4j.ui-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.net4j.ui-feature/sourceTemplateFeature/feature.properties
index bb32a4e282..01056141e9 100644
--- a/features/org.eclipse.net4j.ui-feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.net4j.ui-feature/sourceTemplateFeature/feature.properties
@@ -16,10 +16,10 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Net4j UI Source
 providerName = Eclipse.org
+featureName = Net4j UI Source
+description = Net4j UI Source
 
-description = Net4j UI source code
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2004 - 2008 Eike Stepper, Germany. \n\
 All rights reserved. This program and the accompanying materials \n\
@@ -29,6 +29,7 @@ http://www.eclipse.org/legal/epl-v10.html \n\
  \n\
 Contributors: \n\
    Eike Stepper - initial API and implementation
+
 licenseURL = license.html
 license = \
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
@@ -121,7 +122,9 @@ using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
 
-updateSiteName = Eclipse Modeling Framework Technologies (EMFT) Updates
+# Label for the update site (on download1.eclipse.org)
+emfUpdateSiteName=Eclipse Modeling Framework (EMF) Updates
+emftUpdateSiteName=Eclipse Modeling Framework Technologies (EMFT) Updates
 
 # ==============================================================================
 # %%% END OF TRANSLATED PROPERTIES %%%
-- 
cgit v1.2.3