[140233] Corrected WTP third party feature versions, names, copyrights, licenses, and update site links.
diff --git a/assembly/features/org.apache.axis.feature/build.properties b/assembly/features/org.apache.axis.feature/build.properties
index c243dfe..7edcb80 100644
--- a/assembly/features/org.apache.axis.feature/build.properties
+++ b/assembly/features/org.apache.axis.feature/build.properties
@@ -1,4 +1,3 @@
bin.includes = feature.xml,\
feature.properties,\
LICENSE
-src.includes = build.properties
diff --git a/assembly/features/org.apache.axis.feature/feature.properties b/assembly/features/org.apache.axis.feature/feature.properties
index e63b524..be591e7 100644
--- a/assembly/features/org.apache.axis.feature/feature.properties
+++ b/assembly/features/org.apache.axis.feature/feature.properties
@@ -204,9 +204,41 @@
#
##########################################################################
-description=Apache Axis Feature
+# "featureName" property - name of the feature
+featureName=Apache Axis
+
+# "providerName" property - name of the company that provides the feature
providerName=The Apache Software Foundation
+# "updateSiteName" property - label for the update site
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
+
+# "description" property - description of the feature
+description=Apache Axis runtime
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright 2006 The Apache Software Foundation\n\
+\n\
+ Licensed under the Apache License, Version 2.0 (the "License");\n\
+ you may not use this file except in compliance with the License.\n\
+ You may obtain a copy of the License at\n\
+\n\
+ http://www.apache.org/licenses/LICENSE-2.0\n\
+\n\
+ Unless required by applicable law or agreed to in writing, software\n\
+ distributed under the License is distributed on an "AS IS" BASIS,\n\
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
+ See the License for the specific language governing permissions and\n\
+ limitations under the License.\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
+licenseURL=LICENSE
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
license=\
Apache License\n\
Version 2.0, January 2004\n\
diff --git a/assembly/features/org.apache.axis.feature/feature.xml b/assembly/features/org.apache.axis.feature/feature.xml
index c2607fa..1634e5d 100644
--- a/assembly/features/org.apache.axis.feature/feature.xml
+++ b/assembly/features/org.apache.axis.feature/feature.xml
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.apache.axis.feature"
- label="%description"
- version="1.2.1.qualifier"
+ label="%featureName"
+ version="1.3.0.qualifier"
provider-name="%providerName">
<description>
%description
</description>
- <license url="LICENSE">
+ <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>
<plugin
diff --git a/assembly/features/org.apache.wsil4j.feature/build.properties b/assembly/features/org.apache.wsil4j.feature/build.properties
index c243dfe..7edcb80 100644
--- a/assembly/features/org.apache.wsil4j.feature/build.properties
+++ b/assembly/features/org.apache.wsil4j.feature/build.properties
@@ -1,4 +1,3 @@
bin.includes = feature.xml,\
feature.properties,\
LICENSE
-src.includes = build.properties
diff --git a/assembly/features/org.apache.wsil4j.feature/feature.properties b/assembly/features/org.apache.wsil4j.feature/feature.properties
index d719281..1eccd7a 100644
--- a/assembly/features/org.apache.wsil4j.feature/feature.properties
+++ b/assembly/features/org.apache.wsil4j.feature/feature.properties
@@ -53,9 +53,30 @@
# <http://www.apache.org/>.
##########################################################################
-description=Apache WSIL4J Feature
+# "featureName" property - name of the feature
+featureName=Apache WSIL4J
+
+# "providerName" property - name of the company that provides the feature
providerName=The Apache Software Foundation
+# "updateSiteName" property - label for the update site
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
+
+# "description" property - description of the feature
+description=Apache WSIL4J library
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2002 The Apache Software Foundation. All rights\n\
+reserved.\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
+licenseURL=LICENSE
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
license=\
The Apache Software License, Version 1.1\n\
\n\
diff --git a/assembly/features/org.apache.wsil4j.feature/feature.xml b/assembly/features/org.apache.wsil4j.feature/feature.xml
index 13156da..0faacff 100644
--- a/assembly/features/org.apache.wsil4j.feature/feature.xml
+++ b/assembly/features/org.apache.wsil4j.feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.apache.wsil4j.feature"
- label="%description"
+ label="%featureName"
version="1.0.0.qualifier"
provider-name="%providerName">
@@ -9,12 +9,16 @@
%description
</description>
+ <copyright>
+ %copyright
+ </copyright>
+
<license url="LICENSE">
%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
diff --git a/assembly/features/org.uddi4j.feature/build.properties b/assembly/features/org.uddi4j.feature/build.properties
index 0f1c85f..215c62b 100644
--- a/assembly/features/org.uddi4j.feature/build.properties
+++ b/assembly/features/org.uddi4j.feature/build.properties
@@ -1,4 +1,3 @@
bin.includes = feature.xml,\
feature.properties,\
LICENSE.html
-src.includes = build.properties
diff --git a/assembly/features/org.uddi4j.feature/feature.properties b/assembly/features/org.uddi4j.feature/feature.properties
index cbd7f66..cd32eb9 100644
--- a/assembly/features/org.uddi4j.feature/feature.properties
+++ b/assembly/features/org.uddi4j.feature/feature.properties
@@ -92,9 +92,30 @@
# This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
###########################################################################
-description=UDDI4J 2.0.3 Feature
-providerName=IBM
+# "featureName" property - name of the feature
+featureName=UDDI4J
+# "providerName" property - name of the company that provides the feature
+providerName=International Business Machines Corporation
+
+# "updateSiteName" property - label for the update site
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
+
+# "description" property - description of the feature
+description=UDDI4J library
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006, International Business Machines Corporation and others. All Rights Reserved. \n\
+\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
+licenseURL=LICENSE.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
license=\
IBM Public License Version 1.0 \n\
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS IBM PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. \n\
diff --git a/assembly/features/org.uddi4j.feature/feature.xml b/assembly/features/org.uddi4j.feature/feature.xml
index a595a56..afa279d 100644
--- a/assembly/features/org.uddi4j.feature/feature.xml
+++ b/assembly/features/org.uddi4j.feature/feature.xml
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.uddi4j.feature"
- label="%description"
+ label="%featureName"
version="2.0.3.qualifier"
provider-name="%providerName">
- <description url="https://sourceforge.net/projects/eclipseupdates/">
+ <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/assembly/features/org.wsdl4j.feature/build.properties b/assembly/features/org.wsdl4j.feature/build.properties
index 6be2c0a..52c3cfc 100644
--- a/assembly/features/org.wsdl4j.feature/build.properties
+++ b/assembly/features/org.wsdl4j.feature/build.properties
@@ -1,4 +1,3 @@
bin.includes = feature.xml,\
license.html,\
feature.properties
-src.includes = build.properties
diff --git a/assembly/features/org.wsdl4j.feature/feature.properties b/assembly/features/org.wsdl4j.feature/feature.properties
index e3575bf..5f864f7 100644
--- a/assembly/features/org.wsdl4j.feature/feature.properties
+++ b/assembly/features/org.wsdl4j.feature/feature.properties
@@ -88,10 +88,31 @@
#
# This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
###########################################################################
-
-description=WSDL4J 1.4 Feature
-providerName=IBM
+
+# "featureName" property - name of the feature
+featureName=WSDL4J
+# "providerName" property - name of the company that provides the feature
+providerName=International Business Machines Corporation
+
+# "updateSiteName" property - label for the update site
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
+
+# "description" property - description of the feature
+description=WSDL4J library
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006, International Business Machines Corporation and others. All Rights Reserved. \n\
+\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
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
license=\
Common Public License - v 1.0 \n\
\n\
diff --git a/assembly/features/org.wsdl4j.feature/feature.xml b/assembly/features/org.wsdl4j.feature/feature.xml
index 58715fc..adc753a 100644
--- a/assembly/features/org.wsdl4j.feature/feature.xml
+++ b/assembly/features/org.wsdl4j.feature/feature.xml
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.wsdl4j.feature"
- label="%description"
+ label="%featureName"
version="1.4.0.qualifier"
provider-name="%providerName">
- <description url="https://sourceforge.net/projects/eclipseupdates/">
+ <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