just change in description text, to fix EOL's.
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties index 07e10a3..4521070 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties +++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
@@ -25,29 +25,29 @@ # "description" property - description of the feature description=\ -A patch for j2ee and j2ee.ui \r\ -This patch fixes problems as described in the bugzillas below.\r\ -\r\ -<h2>org.eclipse.jst.enterprise_ui.feature</h2>\r\ -\r\ -Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=201942 Web App Libraries container causes hang\r\ -Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=202820 too much time spent in DependencyGraphManager.buildDependencyGraph\r\ -Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=204287 optimization for J2EEComponentClasspathUpdater.queueUpdate\r\ -Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=204315 Web Lib projects being added to the EAR\r\ -Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=205602 EAR import not importing manifest file\r\ -Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=206463 Threading issues with WebServicesNode Job\r\ -Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=204833 deadlock caused by WebServiceViewerSynchronization\r\ -\r\ +A patch for j2ee and j2ee.ui \n\ +This patch fixes problems as described in the bugzillas below.\n\ +\n\ +org.eclipse.jst.enterprise_ui.feature\n\ +\n\ +Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=201942 Web App Libraries container causes hang\n\ +Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=202820 too much time spent in DependencyGraphManager.buildDependencyGraph\n\ +Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=204287 optimization for J2EEComponentClasspathUpdater.queueUpdate\n\ +Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=204315 Web Lib projects being added to the EAR\n\ +Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=205602 EAR import not importing manifest file\n\ +Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=206463 Threading issues with WebServicesNode Job\n\ +Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=204833 deadlock caused by WebServiceViewerSynchronization\n\ +\n\ # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2007 IBM Corporation and others.\r\ -All rights reserved. This program and the accompanying materials\r\ -are made available under the terms of the Eclipse Public License v1.0\r\ -which accompanies this distribution, and is available at\r\ -http://www.eclipse.org/legal/epl-v10.html\r\ -\r\ -Contributors:\r\ +Copyright (c) 2007 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 #################################### @@ -58,100 +58,100 @@ # "license" property - text of the "Feature Update License" # should be plain text version of license agreement pointed to be "licenseURL" license=\ -ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\r\ -September 27, 2007\r\ -\r\ -Usage Of Content\r\ -\r\ -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\r\ -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\r\ -USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\r\ -AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\r\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\r\ -AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\r\ -AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\r\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\r\ -TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\r\ -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\r\ -BELOW, THEN YOU MAY NOT USE THE CONTENT.\r\ -\r\ -Applicable Licenses\r\ -\r\ -Unless otherwise indicated, all Content made available by the Eclipse Foundation\r\ -is provided to you under the terms and conditions of the Eclipse Public\r\ -License Version 1.0 ("EPL"). A copy of the EPL is provided with this\r\ -Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\r\ -For purposes of the EPL, "Program" will mean the Content.\r\ -\r\ -Content includes, but is not limited to, source code, object code,\r\ -documentation and other files maintained in the Eclipse.org CVS\r\ -repository ("Repository") in CVS modules ("Modules") and made available\r\ -as downloadable archives ("Downloads").\r\ -\r\ - - Content may be structured and packaged into modules to facilitate delivering,\r\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\r\ - plug-in fragments ("Fragments"), and features ("Features").\r\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\r\ - in a directory named "plugins".\r\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\r\ - Each Feature may be packaged as a sub-directory in a directory named "features".\r\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\r\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\r\ - - Features may also include other Features ("Included Features"). Within a Feature, files\r\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\r\ -\r\ -Features may also include other Features ("Included Features"). Files named\r\ -"feature.xml" may contain a list of the names and version numbers of\r\ -Included Features.\r\ -\r\ -The terms and conditions governing Plug-ins and Fragments should be\r\ -contained in files named "about.html" ("Abouts"). The terms and\r\ -conditions governing Features and Included Features should be contained\r\ -in files named "license.html" ("Feature Licenses"). Abouts and Feature\r\ -Licenses may be located in any directory of a Download or Module\r\ -including, but not limited to the following locations:\r\ -\r\ - - The top-level (root) directory\r\ - - Plug-in and Fragment directories\r\ - - Inside Plug-ins and Fragments packaged as JARs\r\ - - Sub-directories of the directory named "src" of certain Plug-ins\r\ - - Feature directories\r\ -\r\ -Note: if a Feature made available by the Eclipse Foundation is installed using the\r\ -Eclipse Update Manager, you must agree to a license ("Feature Update\r\ -License") during the installation process. If the Feature contains\r\ -Included Features, the Feature Update License should either provide you\r\ -with the terms and conditions governing the Included Features or inform\r\ -you where you can locate them. Feature Update Licenses may be found in\r\ -the "license" property of files named "feature.properties". Such Abouts,\r\ -Feature Licenses and Feature Update Licenses contain the terms and\r\ -conditions (or references to such terms and conditions) that govern your\r\ -use of the associated Content in that directory.\r\ -\r\ -THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\r\ -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\r\ -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\r\ -\r\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\r\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\r\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\r\ - - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\r\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\r\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\r\ -\r\ -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\r\ -TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\r\ -is provided, please contact the Eclipse Foundation to determine what terms and conditions\r\ -govern that particular Content.\r\ -\r\ -Cryptography\r\ -\r\ -Content may contain encryption software. The country in which you are\r\ -currently may have restrictions on the import, possession, and use,\r\ -and/or re-export to another country, of encryption software. BEFORE\r\ -using any encryption software, please check the country's laws,\r\ -regulations and policies concerning the import, possession, or use,\r\ -and re-export of encryption software, to see if this is permitted.\r\ -\r\ +ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ +September 27, 2007\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ +OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ +USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ +AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ +AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ +OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ +\n\ +Applicable Licenses\n\ +\n\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public\n\ +License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ +Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +For purposes of the EPL, "Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code,\n\ +documentation and other files maintained in the Eclipse.org CVS\n\ +repository ("Repository") in CVS modules ("Modules") and made available\n\ +as downloadable archives ("Downloads").\n\ +\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ +\n\ +Features may also include other Features ("Included Features"). Files named\n\ +"feature.xml" may contain a list of the names and version numbers of\n\ +Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be\n\ +contained in files named "about.html" ("Abouts"). The terms and\n\ +conditions governing Features and Included Features should be contained\n\ +in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ +Licenses may be located in any directory of a Download or Module\n\ +including, but not limited to the following locations:\n\ +\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ +Eclipse Update Manager, you must agree to a license ("Feature Update\n\ +License") during the installation process. If the Feature contains\n\ +Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform\n\ +you where you can locate them. Feature Update Licenses may be found in\n\ +the "license" property of files named "feature.properties". Such Abouts,\n\ +Feature Licenses and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your\n\ +use of the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ +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\ + - 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\ + - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ +\n\ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ +TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ +is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ +govern that particular Content.\n\ +\n\ +Cryptography\n\ +\n\ +Content may contain encryption software. The country in which you are\n\ +currently may have restrictions on the import, possession, and use,\n\ +and/or re-export to another country, of encryption software. BEFORE\n\ +using any encryption software, please check the country's laws,\n\ +regulations and policies concerning the import, possession, or use,\n\ +and re-export of encryption software, to see if this is permitted.\n\ +\n\ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n ########### end of license property ##########################################