[373136] Always separate the Java Output Folder from the Java Source Folder [373210] J2EEFlexProjDeployable.isSingleRootStructure() always returns false for an EAR [373402] NPE in ClasspathDependencyUtil when classpath container returns null for entries
diff --git a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html index a87b261..968bed5 100644 --- a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html +++ b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
@@ -9,12 +9,13 @@ <body> -<h1>WTP 3.3.1 Patches</h1> +<h1>WTP 3.3.2 Patches</h1> <h2>org.eclipse.jst.web_core.feature</h2> -<p>Bug <a href='https://bugs.eclipse.org/364086'>364086</a>. EJB Project wizard doesn't show up and shows an error</p> -<p>Bug <a href='https://bugs.eclipse.org/364981'>364981</a>. Support setting the Java 7 facet when importing a JavaEE archive targeted to a runtime that supports Java 7</p> +<p>Bug <a href='https://bugs.eclipse.org/373136'>373136</a>. Always separate the Java Output Folder from the Java Source Folder</p> +<p>Bug <a href='https://bugs.eclipse.org/373210'>373210</a>. J2EEFlexProjDeployable.isSingleRootStructure() always returns false for an EAR</p> +<p>Bug <a href='https://bugs.eclipse.org/373402'>373402</a>. NPE in ClasspathDependencyUtil when classpath container returns null for entries</p> </body> </html> \ No newline at end of file
diff --git a/features/org.eclipse.jst.web_core.feature.patch/epl-v10.html b/features/org.eclipse.jst.web_core.feature.patch/epl-v10.html index abeecc4..fd39122 100644 --- a/features/org.eclipse.jst.web_core.feature.patch/epl-v10.html +++ b/features/org.eclipse.jst.web_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.jst.web_core.feature.patch/feature.properties b/features/org.eclipse.jst.web_core.feature.patch/feature.properties index 52c6c89..dd6ed7c 100644 --- a/features/org.eclipse.jst.web_core.feature.patch/feature.properties +++ b/features/org.eclipse.jst.web_core.feature.patch/feature.properties
@@ -27,8 +27,9 @@ description=\ The bugs and fixes are described in the following bugzilla entries:\n\ \n\ -Bug https://bugs.eclipse.org/364086 EJB Project wizard doesn't show up and shows an error\n\ -Bug https://bugs.eclipse.org/364981 Support setting the Java 7 facet when importing a JavaEE archive targeted to a runtime that supports Java 7\n\ +Bug https://bugs.eclipse.org/373136 Always separate the Java Output Folder from the Java Source Folder\n\ +Bug https://bugs.eclipse.org/373210 J2EEFlexProjDeployable.isSingleRootStructure() always returns false for an EAR\n\ +Bug https://bugs.eclipse.org/373402 NPE in ClasspathDependencyUtil when classpath container returns null for entries\n\ \n\ # "copyright" property - text of the "Feature Update Copyright" copyright=\ @@ -50,7 +51,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\ @@ -119,6 +120,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.jst.web_core.feature.patch/feature.xml b/features/org.eclipse.jst.web_core.feature.patch/feature.xml index c8dbaaf..1889d96 100644 --- a/features/org.eclipse.jst.web_core.feature.patch/feature.xml +++ b/features/org.eclipse.jst.web_core.feature.patch/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.jst.web_core.feature.patch" label="%featureName" - version="3.3.1.qualifier" + version="3.3.2.qualifier" provider-name="%providerName"> <description> @@ -18,7 +18,7 @@ </license> <requires> - <import feature="org.eclipse.jst.web_core.feature" version="3.3.1.v201108102009-7Q7DGL2FE9LeACEx4cdvNvuitz01z01sRxi3877" patch="true"/> + <import feature="org.eclipse.jst.web_core.feature" version="3.3.2.v201112072049-7Q7DGLAFE9LeAHGQwz0Yz0Nmuitz01z01sRxi387" patch="true"/> </requires> <plugin
diff --git a/features/org.eclipse.jst.web_core.feature.patch/license.html b/features/org.eclipse.jst.web_core.feature.patch/license.html index c184ca3..f19c483 100644 --- a/features/org.eclipse.jst.web_core.feature.patch/license.html +++ b/features/org.eclipse.jst.web_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>