[373416] Remove reference to JBoss
diff --git a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
index 8c7e123..26b925d 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
+++ b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
@@ -4,16 +4,16 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Build" content="Build">
-<title>WTP 3.3.1 Patches</title>
+<title>WTP 3.3.2 Patches</title>
</head>
<body>
-<h1>WTP 3.3.1 Patches</h1>
+<h1>WTP 3.3.2 Patches</h1>
<h2>org.eclipse.wst.common_core.feature</h2>
-<p>Bug <a href='https://bugs.eclipse.org/365135'>365135</a>. [modulecore] Behavior when multiple src dirs are mapped to component root</p>
+<p>Bug <a href='https://bugs.eclipse.org/373416'>373416</a>. Remove reference to JBoss</p>
</body>
</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_core.feature.patch/epl-v10.html b/features/org.eclipse.wst.common_core.feature.patch/epl-v10.html
index abeecc4..fd39122 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/epl-v10.html
+++ b/features/org.eclipse.wst.common_core.feature.patch/epl-v10.html
@@ -41,7 +41,6 @@
<p class="list">a) in the case of the initial Contributor, the initial
code and documentation distributed under this Agreement, and</p>
<p class="list">b) in the case of each subsequent Contributor:</p>
-
<p class="list">i) changes to the Program, and</p>
<p class="list">ii) additions to the Program;</p>
<p class="list">where such changes and/or additions to the Program
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.properties b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
index c850029..5d29c60 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
@@ -27,7 +27,7 @@
description=\
Contains fixes described in the following bugzilla(s):\n\
\n\
-Bug https://bugs.eclipse.org/365135 [modulecore] Behavior when multiple src dirs are mapped to component root\n\
+Bug https://bugs.eclipse.org/373416 Remove reference to JBoss\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
@@ -49,7 +49,7 @@
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -118,6 +118,7 @@
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.xml b/features/org.eclipse.wst.common_core.feature.patch/feature.xml
index 7dc7489..33c8d79 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.xml
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.common_core.feature.patch"
label="%featureName"
- version="3.3.1.qualifier"
+ version="3.3.2.qualifier"
provider-name="%providerName">
<description>
@@ -18,12 +18,12 @@
</license>
<requires>
- <import feature="org.eclipse.wst.common_core.feature" version="3.3.1.v201107190400-7B7DFO5F7RZHOeJ-SxQ1NJ" patch="true"/>
+ <import feature="org.eclipse.wst.common_core.feature" version="3.3.2.v201111030500-7B7DFO9F7RZHOhIjR6Mz-NJ" patch="true"/>
</requires>
<plugin
- id="org.eclipse.wst.common.modulecore"
+ id="org.eclipse.wst.validation"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/features/org.eclipse.wst.common_core.feature.patch/license.html b/features/org.eclipse.wst.common_core.feature.patch/license.html
index c184ca3..f19c483 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/license.html
+++ b/features/org.eclipse.wst.common_core.feature.patch/license.html
@@ -8,7 +8,7 @@
<body lang="EN-US">
<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
+<p>February 1, 2011</p>
<h3>Usage Of Content</h3>
@@ -58,6 +58,7 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/buildnotes_org.eclipse.wst.common_ui.feature.patch.html b/features/org.eclipse.wst.common_ui.feature.patch/buildnotes_org.eclipse.wst.common_ui.feature.patch.html
index 95c27a2..fff3c4e 100644
--- a/features/org.eclipse.wst.common_ui.feature.patch/buildnotes_org.eclipse.wst.common_ui.feature.patch.html
+++ b/features/org.eclipse.wst.common_ui.feature.patch/buildnotes_org.eclipse.wst.common_ui.feature.patch.html
@@ -4,15 +4,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Build" content="Build">
-<title>WTP 3.2.5 Patches</title>
+<title>WTP 3.3.2 Patches</title>
</head>
<body>
-<h1>WTP 3.2.5 Patches</h1>
+<h1>WTP 3.3.2 Patches</h1>
<h2>org.eclipse.wst.common_ui.feature</h2>
-<p>Bug <a href='https://bugs.eclipse.org/366065'>366065</a>. Add a new filter rule to include/exclude based on a target runtime</p>
+<p>Bug <a href='https://bugs.eclipse.org/373416'>373416</a>. Remove reference to JBoss</p>
</body>
</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/epl-v10.html b/features/org.eclipse.wst.common_ui.feature.patch/epl-v10.html
index abeecc4..fd39122 100644
--- a/features/org.eclipse.wst.common_ui.feature.patch/epl-v10.html
+++ b/features/org.eclipse.wst.common_ui.feature.patch/epl-v10.html
@@ -41,7 +41,6 @@
<p class="list">a) in the case of the initial Contributor, the initial
code and documentation distributed under this Agreement, and</p>
<p class="list">b) in the case of each subsequent Contributor:</p>
-
<p class="list">i) changes to the Program, and</p>
<p class="list">ii) additions to the Program;</p>
<p class="list">where such changes and/or additions to the Program
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/feature.properties b/features/org.eclipse.wst.common_ui.feature.patch/feature.properties
index df76344..1b30032 100644
--- a/features/org.eclipse.wst.common_ui.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_ui.feature.patch/feature.properties
@@ -27,7 +27,7 @@
description=\
Contains fixes described in the following bugzilla(s):\n\
\n\
-Bug https://bugs.eclipse.org/366065 Add a new filter rule to include/exclude based on a target runtime\n\
+Bug https://bugs.eclipse.org/373416 Remove reference to JBoss\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
@@ -49,7 +49,7 @@
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -118,6 +118,7 @@
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/feature.xml b/features/org.eclipse.wst.common_ui.feature.patch/feature.xml
index 3ced2ad..431dbdb 100644
--- a/features/org.eclipse.wst.common_ui.feature.patch/feature.xml
+++ b/features/org.eclipse.wst.common_ui.feature.patch/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.common_ui.feature.patch"
label="%featureName"
- version="3.2.5.qualifier"
+ version="3.3.2.qualifier"
provider-name="%providerName">
<description>
@@ -18,7 +18,7 @@
</license>
<requires>
- <import feature="org.eclipse.wst.common_ui.feature" version="3.2.5.v201106210700-7C78FPpEdhO_pXpe8kUjodMvUz-MxOK" patch="true"/>
+ <import feature="org.eclipse.wst.common_ui.feature" version="3.3.2.v201111030500-7C79FVsEdhO_sfog9oNekiJkS7Nz00OK" patch="true"/>
</requires>
<plugin
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/license.html b/features/org.eclipse.wst.common_ui.feature.patch/license.html
index c184ca3..f19c483 100644
--- a/features/org.eclipse.wst.common_ui.feature.patch/license.html
+++ b/features/org.eclipse.wst.common_ui.feature.patch/license.html
@@ -8,7 +8,7 @@
<body lang="EN-US">
<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
+<p>February 1, 2011</p>
<h3>Usage Of Content</h3>
@@ -58,6 +58,7 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
diff --git a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
index e07fade..36fa555 100644
--- a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wst.validation.ui; singleton:=true
-Bundle-Version: 1.2.300.qualifier
+Bundle-Version: 1.2.301.qualifier
Bundle-Activator: org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
index 364d308..dd25b6e 100644
--- a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
+++ b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
@@ -120,7 +120,7 @@
DescProjects=A project nature.
DescFacets=A facet.
DescContentType=A content type, for example the XML content type.
-DescTargetRuntime=A target runtime, for example "JBoss v5.0".
+DescTargetRuntime=A target runtime.
ErrorsWarnings=Errors/Warnings
diff --git a/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
index 29989b2..2d8383f 100644
--- a/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wst.validation; singleton:=true
-Bundle-Version: 1.2.303.qualifier
+Bundle-Version: 1.2.304.qualifier
Bundle-Activator: org.eclipse.wst.validation.internal.plugin.ValidationPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.validation/xsds/exclude.exsd b/plugins/org.eclipse.wst.validation/xsds/exclude.exsd
index 4637c14..c7f57c0 100644
--- a/plugins/org.eclipse.wst.validation/xsds/exclude.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/exclude.exsd
@@ -134,7 +134,7 @@
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
- The target runtime id, for example "org.eclipse.jst.server.generic.runtime.jboss5".
+ The target runtime id.
</documentation>
</annotation>
</attribute>
