[140233] Corrected WTP feature versions, names, copyrights, licenses, and update site links.
diff --git a/features/org.eclipse.wst.web_core.feature/feature.properties b/features/org.eclipse.wst.web_core.feature/feature.properties
index 64893f7..62dc396 100644
--- a/features/org.eclipse.wst.web_core.feature/feature.properties
+++ b/features/org.eclipse.wst.web_core.feature/feature.properties
@@ -15,14 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
+featureName=WST Web Core
# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org
# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
# "description" property - description of the feature
+description=Web tools core
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
diff --git a/features/org.eclipse.wst.web_core.feature/feature.xml b/features/org.eclipse.wst.web_core.feature/feature.xml
index 0f27779..212d8f4 100644
--- a/features/org.eclipse.wst.web_core.feature/feature.xml
+++ b/features/org.eclipse.wst.web_core.feature/feature.xml
@@ -1,18 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.web_core.feature"
- label="WDT Web Core Feature"
+ label="%featureName"
version="1.5.0.qualifier"
- provider-name="Eclipse.org">
+ provider-name="%providerName">
<description>
%description
</description>
+ <copyright>
+ %copyright
+ </copyright>
+
<license url="license.html">
%license
</license>
+ <url>
+ <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
+ </url>
+
<requires>
<import feature="org.eclipse.platform" version="3.2" match="equivalent"/>
<import feature="org.eclipse.emf" version="2.2" match="equivalent"/>
diff --git a/features/org.eclipse.wst.web_sdk.feature/build.properties b/features/org.eclipse.wst.web_sdk.feature/build.properties
index 5b386b6..7860612 100644
--- a/features/org.eclipse.wst.web_sdk.feature/build.properties
+++ b/features/org.eclipse.wst.web_sdk.feature/build.properties
@@ -6,7 +6,3 @@
generate.feature@org.eclipse.wst.web_ui.feature.source=org.eclipse.wst.web_ui.feature
-src.includes = eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.xml,\
- license.html
diff --git a/features/org.eclipse.wst.web_sdk.feature/feature.properties b/features/org.eclipse.wst.web_sdk.feature/feature.properties
index 64893f7..1e17429 100644
--- a/features/org.eclipse.wst.web_sdk.feature/feature.properties
+++ b/features/org.eclipse.wst.web_sdk.feature/feature.properties
@@ -15,14 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
+featureName=WST Web Plug-in Developer Resources
# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org
# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
# "description" property - description of the feature
+description=Source code zips for the WST web tools
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2006 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
diff --git a/features/org.eclipse.wst.web_sdk.feature/feature.xml b/features/org.eclipse.wst.web_sdk.feature/feature.xml
index d7496f9..2b9c4c0 100644
--- a/features/org.eclipse.wst.web_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.web_sdk.feature/feature.xml
@@ -1,23 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.web_sdk.feature"
- label="WST Web SDK Feature"
+ label="%featureName"
version="1.5.0.qualifier"
- provider-name="Eclipse.org">
+ provider-name="%providerName">
<description>
%description
</description>
+ <copyright>
+ %copyright
+ </copyright>
+
<license url="license.html">
%license
</license>
<url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
-
<includes
id="org.eclipse.wst.web_ui.feature.source"
version="0.0.0"/>
diff --git a/features/org.eclipse.wst.web_ui.feature/build.properties b/features/org.eclipse.wst.web_ui.feature/build.properties
index d6a4dce..7f47694 100644
--- a/features/org.eclipse.wst.web_ui.feature/build.properties
+++ b/features/org.eclipse.wst.web_ui.feature/build.properties
@@ -3,8 +3,3 @@
epl-v10.html,\
license.html,\
feature.properties
-src.includes = license.html,\
- feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- build.properties
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.properties b/features/org.eclipse.wst.web_ui.feature/feature.properties
index 64893f7..73afe9e 100644
--- a/features/org.eclipse.wst.web_ui.feature/feature.properties
+++ b/features/org.eclipse.wst.web_ui.feature/feature.properties
@@ -15,14 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
+featureName=WST Web UI
# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org
# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
# "description" property - description of the feature
+description=Web UI tools
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.xml b/features/org.eclipse.wst.web_ui.feature/feature.xml
index 2eb5498..7fed22f 100644
--- a/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.web_ui.feature/feature.xml
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.web_ui.feature"
- label="org.eclipse.wst.web_ui.feature"
+ label="%featureName"
version="1.5.0.qualifier"
- provider-name="Eclipse.org">
+ provider-name="%providerName">
<description>
%description
</description>
- <license url="license.html">
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
%license
</license>
<url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
<includes
diff --git a/features/org.eclipse.wst.web_userdoc.feature/build.properties b/features/org.eclipse.wst.web_userdoc.feature/build.properties
index f151d50..7f47694 100644
--- a/features/org.eclipse.wst.web_userdoc.feature/build.properties
+++ b/features/org.eclipse.wst.web_userdoc.feature/build.properties
@@ -3,8 +3,3 @@
epl-v10.html,\
license.html,\
feature.properties
-src.includes = license.html,\
- epl-v10.html,\
- feature.xml,\
- eclipse_update_120.jpg,\
- build.properties
diff --git a/features/org.eclipse.wst.web_userdoc.feature/feature.properties b/features/org.eclipse.wst.web_userdoc.feature/feature.properties
index 64893f7..8d89d3d 100644
--- a/features/org.eclipse.wst.web_userdoc.feature/feature.properties
+++ b/features/org.eclipse.wst.web_userdoc.feature/feature.properties
@@ -15,14 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
+featureName=WST Web User Documentation
# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org
# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
# "description" property - description of the feature
+description=WST Web user documentation
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
diff --git a/features/org.eclipse.wst.web_userdoc.feature/feature.xml b/features/org.eclipse.wst.web_userdoc.feature/feature.xml
index d8d4474..0c1458b 100644
--- a/features/org.eclipse.wst.web_userdoc.feature/feature.xml
+++ b/features/org.eclipse.wst.web_userdoc.feature/feature.xml
@@ -1,24 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.web_userdoc.feature"
- label="WST Web User Doc Feature"
+ label="%featureName"
version="1.5.0.qualifier"
- provider-name="Eclipse.org">
+ provider-name="%providerName">
<description>
%description
</description>
+ <copyright>
+ %copyright
+ </copyright>
+
<license url="license.html">
%license
</license>
<url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
-
-
<plugin
id="org.eclipse.wst.doc.user"
download-size="0"
diff --git a/features/org.eclipse.wst.xml_core.feature/build.properties b/features/org.eclipse.wst.xml_core.feature/build.properties
index d6a4dce..7f47694 100644
--- a/features/org.eclipse.wst.xml_core.feature/build.properties
+++ b/features/org.eclipse.wst.xml_core.feature/build.properties
@@ -3,8 +3,3 @@
epl-v10.html,\
license.html,\
feature.properties
-src.includes = license.html,\
- feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- build.properties
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.properties b/features/org.eclipse.wst.xml_core.feature/feature.properties
index 7a82f0e..e568799 100644
--- a/features/org.eclipse.wst.xml_core.feature/feature.properties
+++ b/features/org.eclipse.wst.xml_core.feature/feature.properties
@@ -15,14 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
+featureName=WST XML Core
# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org
# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools Platform (WTP) Updates
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
# "description" property - description of the feature
+description=WST XML core
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.xml b/features/org.eclipse.wst.xml_core.feature/feature.xml
index 2bbb855..c6d47f6 100644
--- a/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -1,19 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.xml_core.feature"
- label="XML Core Feature"
- version="1.5.0.qualifier">
+ label="%featureName"
+ version="1.5.0.qualifier"
+ provider-name="%providerName">
<description>
%description
</description>
+ <copyright>
+ %copyright
+ </copyright>
+
<license url="license.html">
%license
</license>
-
+
<url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
<requires>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.properties b/features/org.eclipse.wst.xml_sdk.feature/feature.properties
index 7a82f0e..10393f8 100644
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.properties
+++ b/features/org.eclipse.wst.xml_sdk.feature/feature.properties
@@ -15,14 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
+featureName=WST XML Plug-in Developer Resources
# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org
# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools Platform (WTP) Updates
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
# "description" property - description of the feature
+description=Source code zips for the WST XML tools
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2006 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
index ddf1d89..da5b4b2 100644
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
@@ -1,21 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.xml_sdk.feature"
- label="SDK for XML Components"
- version="1.5.0.qualifier">
+ label="%featureName"
+ version="1.5.0.qualifier"
+ provider-name="%providerName">
<description>
%description
</description>
- <license url="license.html">
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
%license
</license>
-
+
<url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
-
+
<includes
id="org.eclipse.wst.xml_ui.feature.source"
version="0.0.0"/>
diff --git a/features/org.eclipse.wst.xml_ui.feature/build.properties b/features/org.eclipse.wst.xml_ui.feature/build.properties
index 5b64d28..27affc5 100644
--- a/features/org.eclipse.wst.xml_ui.feature/build.properties
+++ b/features/org.eclipse.wst.xml_ui.feature/build.properties
@@ -3,8 +3,3 @@
eclipse_update_120.jpg,\
license.html,\
feature.properties
-src.includes = license.html,\
- epl-v10.html,\
- feature.xml,\
- eclipse_update_120.jpg,\
- build.properties
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.properties b/features/org.eclipse.wst.xml_ui.feature/feature.properties
index 8c250e2..4dfda9f 100644
--- a/features/org.eclipse.wst.xml_ui.feature/feature.properties
+++ b/features/org.eclipse.wst.xml_ui.feature/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2006 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -15,16 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=XML UI feature plugins
+featureName=WST XML UI
# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org
# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools Platform (WTP) Updates
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
# "description" property - description of the feature
-description=API documentation and source code zips for Eclipse Java development tools.
+description=Web XML tools
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/feature.xml
index c040fa7..1ff8372 100644
--- a/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_ui.feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.xml_ui.feature"
- label="XML UI Feature"
+ label="%featureName"
version="1.5.0.qualifier"
provider-name="%providerName">
@@ -9,12 +9,16 @@
%description
</description>
+ <copyright>
+ %copyright
+ </copyright>
+
<license url="license.html">
%license
</license>
<url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
<includes
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/build.properties b/features/org.eclipse.wst.xml_userdoc.feature/build.properties
index d6a4dce..7f47694 100644
--- a/features/org.eclipse.wst.xml_userdoc.feature/build.properties
+++ b/features/org.eclipse.wst.xml_userdoc.feature/build.properties
@@ -3,8 +3,3 @@
epl-v10.html,\
license.html,\
feature.properties
-src.includes = license.html,\
- feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- build.properties
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/feature.properties b/features/org.eclipse.wst.xml_userdoc.feature/feature.properties
index 7a82f0e..a4127e3 100644
--- a/features/org.eclipse.wst.xml_userdoc.feature/feature.properties
+++ b/features/org.eclipse.wst.xml_userdoc.feature/feature.properties
@@ -15,14 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
+featureName=WST XML User Documentation
# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org
# "updateSiteName" property - label for the update site
-updateSiteName=Web Tools Platform (WTP) Updates
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
# "description" property - description of the feature
+description=WST XML user documentation
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/feature.xml b/features/org.eclipse.wst.xml_userdoc.feature/feature.xml
index 771c4d2..ca3c72d 100644
--- a/features/org.eclipse.wst.xml_userdoc.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_userdoc.feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.xml_userdoc.feature"
- label="WTP XML User Documentation"
+ label="%featureName"
version="1.5.0.qualifier"
provider-name="%providerName">
@@ -9,12 +9,16 @@
%description
</description>
+ <copyright>
+ %copyright
+ </copyright>
+
<license url="license.html">
%license
</license>
<url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
<plugin
