Remove update site URLs from features. Fix update site URL in main

feature.

7 files changed, 5 insertions, 30 deletions

diff --git a/org.eclipse.photran-feature/feature.xml b/org.eclipse.photran-feature/feature.xml
index f17b638f..a09987df 100644
--- a/org.eclipse.photran-feature/feature.xml
+++ b/org.eclipse.photran-feature/feature.xml
@@ -4,8 +4,7 @@
       label="%featureName"
       version="8.0.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.photran.core"
-      >
+      plugin="org.eclipse.photran.core">
 
    <description url="http://www.eclipse.org/photran">
       %description
@@ -20,7 +19,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/updates/indigo"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/updates/juno"/>
    </url>
 
    <includes
diff --git a/org.eclipse.photran.intel-feature/feature.properties b/org.eclipse.photran.intel-feature/feature.properties
index d7c4b03d..0db38c2d 100644
--- a/org.eclipse.photran.intel-feature/feature.properties
+++ b/org.eclipse.photran.intel-feature/feature.properties
@@ -20,9 +20,6 @@ featureName=Linux Intel(R) Fortran Compiler Support
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse PTP
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
 # "description" property - description of the feature
 description=This feature packages the plugins required to support\n\
 the Intel(R) Fortran compiler in Photran/FDT.
diff --git a/org.eclipse.photran.intel-feature/feature.xml b/org.eclipse.photran.intel-feature/feature.xml
index 5f16d0d1..4fe1df11 100644
--- a/org.eclipse.photran.intel-feature/feature.xml
+++ b/org.eclipse.photran.intel-feature/feature.xml
@@ -4,8 +4,7 @@
       label="%featureName"
       version="8.0.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.photran.core.intel"
-      >
+      plugin="org.eclipse.photran.core.intel">
 
    <description>
       %description
@@ -19,10 +18,6 @@
       %license
    </license>
 
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/updates/indigo"/>
-   </url>
-
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
diff --git a/org.eclipse.photran.xlf-feature/feature.properties b/org.eclipse.photran.xlf-feature/feature.properties
index 355d197f..81ae2bcf 100644
--- a/org.eclipse.photran.xlf-feature/feature.properties
+++ b/org.eclipse.photran.xlf-feature/feature.properties
@@ -20,9 +20,6 @@ featureName=IBM XL Fortran Compiler Support
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse PTP
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
 # "description" property - description of the feature
 description=Error parser and managed build toolchain for the IBM XL Fortran compiler
 
diff --git a/org.eclipse.photran.xlf-feature/feature.xml b/org.eclipse.photran.xlf-feature/feature.xml
index f3e2fa59..27afa7f9 100644
--- a/org.eclipse.photran.xlf-feature/feature.xml
+++ b/org.eclipse.photran.xlf-feature/feature.xml
@@ -4,8 +4,7 @@
       label="%featureName"
       version="8.0.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.photran.core.xlf"
-      >
+      plugin="org.eclipse.photran.core.xlf">
 
    <description>
       %description
@@ -19,10 +18,6 @@
       %license
    </license>
 
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/updates/indigo"/>
-   </url>
-
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
diff --git a/org.eclipse.rephraserengine-feature/feature.properties b/org.eclipse.rephraserengine-feature/feature.properties
index c49a1c6d..0887a8fd 100644
--- a/org.eclipse.rephraserengine-feature/feature.properties
+++ b/org.eclipse.rephraserengine-feature/feature.properties
@@ -20,9 +20,6 @@ featureName=Rephraser Engine End-User Runtime
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse PTP
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
 # "description" property - description of the feature
 description=Rephraser Engine
 
diff --git a/org.eclipse.rephraserengine-feature/feature.xml b/org.eclipse.rephraserengine-feature/feature.xml
index 6e109ff7..97505233 100644
--- a/org.eclipse.rephraserengine-feature/feature.xml
+++ b/org.eclipse.rephraserengine-feature/feature.xml
@@ -3,8 +3,7 @@
       id="org.eclipse.rephraserengine"
       label="%featureName"
       version="8.0.0.qualifier"
-      provider-name="%providerName"
-      >
+      provider-name="%providerName">
 
    <description url="http://www.eclipse.org/photran">
       %description
@@ -18,10 +17,6 @@
       %license
    </license>
 
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/updates/indigo"/>
-   </url>
-
    <requires>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.jface.text"/>