[140233] Corrected WTP feature versions, names, copyrights, licenses, and update site links.
diff --git a/features/org.eclipse.wst.common_core.feature/build.properties b/features/org.eclipse.wst.common_core.feature/build.properties
index d6a4dce..7f47694 100644
--- a/features/org.eclipse.wst.common_core.feature/build.properties
+++ b/features/org.eclipse.wst.common_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.common_core.feature/feature.properties b/features/org.eclipse.wst.common_core.feature/feature.properties
index 64893f7..73beb52 100644
--- a/features/org.eclipse.wst.common_core.feature/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature/feature.properties
@@ -15,14 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
+featureName=WST Common 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=WST common core functionality
+
+# "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.common_core.feature/feature.xml b/features/org.eclipse.wst.common_core.feature/feature.xml
index 440fc8c..29c2946 100644
--- a/features/org.eclipse.wst.common_core.feature/feature.xml
+++ b/features/org.eclipse.wst.common_core.feature/feature.xml
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.common_core.feature"
- label="WST Common 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="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.common_sdk.feature/build.properties b/features/org.eclipse.wst.common_sdk.feature/build.properties
index 84ad202..5391fbd 100644
--- a/features/org.eclipse.wst.common_sdk.feature/build.properties
+++ b/features/org.eclipse.wst.common_sdk.feature/build.properties
@@ -4,8 +4,3 @@
license.html,\
eclipse_update_120.jpg,\
feature.properties
-src.includes = eclipse_update_120.jpg,\
- epl-v10.html,\
- feature.xml,\
- license.html,\
- build.properties
diff --git a/features/org.eclipse.wst.common_sdk.feature/feature.properties b/features/org.eclipse.wst.common_sdk.feature/feature.properties
index 64893f7..d7bdfa2 100644
--- a/features/org.eclipse.wst.common_sdk.feature/feature.properties
+++ b/features/org.eclipse.wst.common_sdk.feature/feature.properties
@@ -15,14 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
+featureName=WST Common 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 WST common 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.common_sdk.feature/feature.xml b/features/org.eclipse.wst.common_sdk.feature/feature.xml
index 9ea0c51..7b09133 100644
--- a/features/org.eclipse.wst.common_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.common_sdk.feature/feature.xml
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.common_sdk.feature"
- label="WST Common Feature SDK"
+ 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
diff --git a/features/org.eclipse.wst.common_ui.feature/build.properties b/features/org.eclipse.wst.common_ui.feature/build.properties
index d6a4dce..7f47694 100644
--- a/features/org.eclipse.wst.common_ui.feature/build.properties
+++ b/features/org.eclipse.wst.common_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.common_ui.feature/feature.properties b/features/org.eclipse.wst.common_ui.feature/feature.properties
index 64893f7..6b589f4 100644
--- a/features/org.eclipse.wst.common_ui.feature/feature.properties
+++ b/features/org.eclipse.wst.common_ui.feature/feature.properties
@@ -15,14 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
+featureName=WST Common 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=WST common UI functionality
+
+# "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.common_ui.feature/feature.xml b/features/org.eclipse.wst.common_ui.feature/feature.xml
index 8382f45..7c2dc43 100644
--- a/features/org.eclipse.wst.common_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.common_ui.feature/feature.xml
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.common_ui.feature"
- label="org.eclipse.wst.common_ui.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
@@ -102,14 +106,14 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.wst.command.env.infopop"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.wst.validation.infopop"
download-size="0"
