This commit was manufactured by cvs2svn to create tag 'R3_4_0'.
diff --git a/features/org.eclipse.wst.xsl_tests.feature/build.properties b/features/org.eclipse.wst.xsl_tests.feature/build.properties
index 01b0213..bd7365d 100644
--- a/features/org.eclipse.wst.xsl_tests.feature/build.properties
+++ b/features/org.eclipse.wst.xsl_tests.feature/build.properties
@@ -1,5 +1,3 @@
bin.includes = feature.xml,\
feature.properties,\
- epl-v10.html,\
eclipse_update_120.jpg,\
- license.html
diff --git a/features/org.eclipse.wst.xsl_tests.feature/epl-v10.html b/features/org.eclipse.wst.xsl_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xsl_tests.feature/feature.properties b/features/org.eclipse.wst.xsl_tests.feature/feature.properties
index 94bac8e..65dcb67 100644
--- a/features/org.eclipse.wst.xsl_tests.feature/feature.properties
+++ b/features/org.eclipse.wst.xsl_tests.feature/feature.properties
@@ -41,131 +41,11 @@
# "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 and licenseURL properties were removed as a result to migrating to new PDE license support.
+# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
# "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\n\
-April 14, 2010\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\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 Foundation source code\n\
-repository ("Repository") in software 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(TM) 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\
-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\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update 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" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
- - 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\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\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, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+# license and licenseURL properties were removed as a result to migrating to new PDE license support.
+# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xsl_tests.feature/feature.xml b/features/org.eclipse.wst.xsl_tests.feature/feature.xml
index faf4f48..22d2939 100644
--- a/features/org.eclipse.wst.xsl_tests.feature/feature.xml
+++ b/features/org.eclipse.wst.xsl_tests.feature/feature.xml
@@ -2,8 +2,10 @@
<feature
id="org.eclipse.wst.xsl_tests.feature"
label="%featureName"
- version="1.1.300.qualifier"
- provider-name="%providerName">
+ version="1.1.400.qualifier"
+ provider-name="%providerName"
+ license-feature="org.eclipse.license"
+ license-feature-version="1.0.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.wst.xsl_tests.feature/license.html b/features/org.eclipse.wst.xsl_tests.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <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>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/build.properties
index f249e9f..be839a7 100644
--- a/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/build.properties
@@ -9,8 +9,6 @@
# IBM Corporation - initial API and implementation
###############################################################################
bin.includes =\
-epl-v10.html,\
eclipse_update_120.jpg,\
feature.xml,\
feature.properties,\
-license.html
diff --git a/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/feature.properties
index b8e57fe..e1874e4 100644
--- a/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/feature.properties
@@ -31,131 +31,11 @@
# "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 and licenseURL properties were removed as a result to migrating to new PDE license support.
+# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
# "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\n\
-April 14, 2010\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\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 Foundation source code\n\
-repository ("Repository") in software 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(TM) 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\
-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\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update 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" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
- - 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\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\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, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+# license and licenseURL properties were removed as a result to migrating to new PDE license support.
+# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <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>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.xsl.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsl.core.tests/META-INF/MANIFEST.MF
index 8e6d61c..5d9c911 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xsl.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.xsl.core.tests
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.300.qualifier
Bundle-Activator: org.eclipse.wst.xsl.core.tests.XSLCoreTestsPlugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
diff --git a/tests/org.eclipse.wst.xsl.core.tests/pom.xml b/tests/org.eclipse.wst.xsl.core.tests/pom.xml
index 1d404bb..fd04b6c 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/pom.xml
+++ b/tests/org.eclipse.wst.xsl.core.tests/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.eclipse.wst.xsl</groupId>
<artifactId>org.eclipse.wst.xsl.core.tests</artifactId>
- <version>1.0.100-SNAPSHOT</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<name>XSLT Core Tests</name>
diff --git a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/exsltfunctionparm.xsl b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/exsltfunctionparm.xsl
new file mode 100644
index 0000000..37cfd88
--- /dev/null
+++ b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/exsltfunctionparm.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <func:function name="my:count-elements">
+ <xsl:param name="param"/>
+ <xsl:for-each select="(//*)[1]">
+ <func:result select="count(//*)" />
+ </xsl:for-each>
+ </func:function>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/npeparam.xsl b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/npeparam.xsl
new file mode 100644
index 0000000..3c515f7
--- /dev/null
+++ b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/npeparam.xsl
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ******************************************************************************
+ * Copyright (c) 2008 Standards for Technology in Automotive Retail and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * David Carver - STAR - bug 335273 - initial API and implementation
+ ******************************************************************************* -->
+<xsl:stylesheet
+ version='1.0'
+ xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
+ xmlns:redirect='http://xml.apache.org/xalan/redirect'
+ extension-element-prefixes='redirect'
+ exclude-result-prefixes='redirect'
+>
+ <xsl:output method="text" />
+
+ <xsl:strip-space elements="*" />
+
+ <xsl:template match="*" />
+
+ <xsl:param name="outputDirectory" />
+ <xsl:param name="parameterPackage"/>
+
+ <xsl:template name="toConstant">
+ <xsl:param name="camelCase" />
+ <xsl:value-of select="translate(substring($camelCase, 1, 1),'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')" /><xsl:call-template name="toConstantInternal"><xsl:with-param name="camelCase" select="substring($camelCase,2)" /></xsl:call-template>
+ </xsl:template>
+
+ <xsl:template name="toConstantChar">
+ <xsl:param name="character" />
+ <xsl:choose>
+ <xsl:when test="contains('ABCDEFGHIJKLMNOPQRSTUVWXYZ', $character)">_<xsl:value-of select="$character" /></xsl:when>
+ <xsl:otherwise><xsl:value-of select="translate($character, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')" /></xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template name="toConstantInternal">
+ <xsl:param name="camelCase" />
+
+ <xsl:choose>
+ <xsl:when test="$camelCase=''"></xsl:when>
+ <xsl:otherwise><xsl:call-template name="toConstantChar"><xsl:with-param name="character" select="substring($camelCase, 1, 1)" /></xsl:call-template><xsl:call-template name="toConstantInternal"><xsl:with-param name="camelCase" select="substring($camelCase, 2)" /></xsl:call-template></xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="/">/*
+ * (C) Copyright 2007-2008 Redwood Technology B.V., Houten, The Netherlands
+ *
+ * This file is generated from redwood/scheduler/model/src/xml/ps-parameters.xml
+ * Using $Id: npeparam.xsl,v 1.1 2011/01/28 15:06:19 dacarver Exp $
+ */
+package <xsl:value-of select="$parameterPackage" />;
+
+public class ParameterConstants
+{<xsl:text />
+ /* Parameter names */
+ <xsl:for-each select="ProcessServerParameters/ProcessServerParameter"><xsl:text />
+ <xsl:variable name="constantName">
+ <xsl:call-template name="toConstant">
+ <xsl:with-param name="camelCase" select="@name" />
+ </xsl:call-template>
+ </xsl:variable>
+ /** <xsl:value-of select="description" /> */
+ public static final String <xsl:value-of select="$constantName" /> = "<xsl:value-of select="@name" />";<xsl:text/>
+ </xsl:for-each>
+
+ /* Variable names for Java */
+ <xsl:for-each select="ProcessServerParameters/Variables/variable"><xsl:text />
+ <xsl:variable name="constantName">
+ <xsl:call-template name="toConstant">
+ <xsl:with-param name="camelCase" select="substring-after(@name, 'var')" />
+ </xsl:call-template>
+ </xsl:variable>
+ /** <xsl:value-of select="description" /> */
+ public static final String VAR_<xsl:value-of select="$constantName" /> = "<xsl:value-of select="substring-after(@name, 'var')" />";
+ </xsl:for-each>
+
+ /* Platform specific default constants for Java */
+ <xsl:for-each select="ProcessServerParameters/ProcessServerParameter/platform[@language='java']"><xsl:text />
+ /** <xsl:value-of select="description" /> */
+ public static final String PAR_DEF_<xsl:value-of select="@constant" /> = "<xsl:value-of select="@value" />";
+ </xsl:for-each>
+}<xsl:text />
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/internal/utils/tests/TestXMLContentType.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/internal/utils/tests/TestXMLContentType.java
index 40dc337..d63405a 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/internal/utils/tests/TestXMLContentType.java
+++ b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/internal/utils/tests/TestXMLContentType.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail and others.
+ * Copyright (c) 2009,2010 Standards for Technology in Automotive Retail and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,15 +11,15 @@
package org.eclipse.wst.xsl.core.internal.utils.tests;
import org.eclipse.wst.xsl.core.internal.util.XMLContentType;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
-public class TestXMLContentType extends TestCase {
- public TestXMLContentType() {
- super();
- }
-
+public class TestXMLContentType {
+
+
+ @Test
public void testGetFileExtensions() {
XMLContentType xmlContentType = new XMLContentType();
String[] exts = xmlContentType.getFileExtensions();
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/tests/XSLCoreTestSuite.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/tests/XSLCoreTestSuite.java
index e7b58db..79637b6 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/tests/XSLCoreTestSuite.java
+++ b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/tests/XSLCoreTestSuite.java
@@ -17,23 +17,14 @@
import org.eclipse.wst.xsl.internal.core.tests.TestXSLCore;
import org.eclipse.wst.xsl.internal.model.tests.TestStylesheet;
import org.eclipse.wst.xsl.internal.model.tests.TestStylesheetModel;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
-public class XSLCoreTestSuite extends TestSuite {
- public static Test suite() {
- return new XSLCoreTestSuite();
- }
- public XSLCoreTestSuite() {
- super("XSL Core Test Suite");
- addTestSuite(TestIncludedTemplates.class);
- addTestSuite(TestXSLCore.class);
- addTestSuite(TestStylesheet.class);
- addTestSuite(TestStylesheetModel.class);
- addTestSuite(TestXMLContentType.class);
- addTestSuite(TestStructuredTextPartitionerForXSL.class);
- }
+@RunWith(Suite.class)
+@Suite.SuiteClasses({TestIncludedTemplates.class, TestXSLCore.class, TestStylesheet.class, TestStylesheetModel.class, TestXMLContentType.class,
+ TestStructuredTextPartitionerForXSL.class})
+public class XSLCoreTestSuite {
+
}
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/AbstractValidationTest.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/AbstractValidationTest.java
index 0f189e6..4f81b4e 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/AbstractValidationTest.java
+++ b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/AbstractValidationTest.java
@@ -12,6 +12,8 @@
package org.eclipse.wst.xsl.internal.core.tests;
import java.io.IOException;
+import static org.junit.Assert.*;
+
import java.io.InputStream;
import java.net.URL;
import java.util.Enumeration;
@@ -23,8 +25,6 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import junit.framework.TestCase;
-
import org.apache.xpath.jaxp.XPathFactoryImpl;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -51,6 +51,7 @@
import org.eclipse.wst.xsl.core.internal.validation.XSLValidator;
import org.eclipse.wst.xsl.core.model.StylesheetModel;
import org.eclipse.wst.xsl.core.tests.XSLCoreTestsPlugin;
+import org.junit.Before;
import org.osgi.framework.Bundle;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -65,14 +66,13 @@
*
* @author Doug Satchwell
*/
-public abstract class AbstractValidationTest extends TestCase {
+public abstract class AbstractValidationTest {
protected static IProject fTestProject;
private static boolean fTestProjectInitialized;
private static final String TEST_PROJECT_NAME = "testproject";
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
if (!fTestProjectInitialized) {
getAndCreateProject();
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestIncludedTemplates.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestIncludedTemplates.java
index ccd6542..8a08ced 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestIncludedTemplates.java
+++ b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestIncludedTemplates.java
@@ -10,10 +10,12 @@
*******************************************************************************/
package org.eclipse.wst.xsl.internal.core.tests;
-public class TestIncludedTemplates extends AbstractValidationTest
-{
- public void test1() throws Exception
- {
+import org.junit.Test;
+
+public class TestIncludedTemplates extends AbstractValidationTest {
+
+ @Test
+ public void test1() throws Exception {
validate(getFile("style1.xsl"));
}
}
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestStructuredTextPartitionerForXSL.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestStructuredTextPartitionerForXSL.java
index 9d92b20..688129e 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestStructuredTextPartitionerForXSL.java
+++ b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestStructuredTextPartitionerForXSL.java
@@ -11,12 +11,13 @@
package org.eclipse.wst.xsl.internal.core.tests;
import org.eclipse.jface.text.IDocumentPartitioner;
+import static org.junit.Assert.*;
import org.eclipse.wst.xsl.core.internal.text.rules.StructuredTextPartitionerForXSL;
+import org.junit.Test;
-import junit.framework.TestCase;
+public class TestStructuredTextPartitionerForXSL {
-public class TestStructuredTextPartitionerForXSL extends TestCase {
-
+ @Test
public void testXSLNewInstance() {
StructuredTextPartitionerForXSL textPartioner = new StructuredTextPartitionerForXSL();
IDocumentPartitioner documentPartitioner = textPartioner.newInstance();
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestXSLCore.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestXSLCore.java
index 4857029..d7400b3 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestXSLCore.java
+++ b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestXSLCore.java
@@ -1,18 +1,14 @@
package org.eclipse.wst.xsl.internal.core.tests;
-import junit.framework.TestCase;
+
import org.eclipse.wst.xsl.core.XSLCore;
+import org.junit.Test;
-public class TestXSLCore extends TestCase {
+import static org.junit.Assert.*;
- public TestXSLCore() {
- super();
- }
+public class TestXSLCore {
- public TestXSLCore(String name) {
- super(name);
- }
-
+ @Test
public void testisXSLNamespaceNullFalse() {
assertFalse(XSLCore.isXSLNamespace(null));
}
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/AbstractModelTest.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/AbstractModelTest.java
index 71f3e67..21a8a22 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/AbstractModelTest.java
+++ b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/AbstractModelTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
+ * Copyright (c) 2008, 2010 Chase Technology Ltd - http://www.chasetechnology.co.uk
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,11 +7,14 @@
*
* Contributors:
* Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ * David Carver (Intalio) - convert to Junit 4 - bug 313510
*******************************************************************************/
package org.eclipse.wst.xsl.internal.model.tests;
import java.io.IOException;
+import static org.junit.Assert.*;
+
import java.io.InputStream;
import java.net.URL;
import java.util.Enumeration;
@@ -23,7 +26,6 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import junit.framework.TestCase;
import org.apache.xpath.jaxp.XPathFactoryImpl;
import org.eclipse.core.resources.IFile;
@@ -52,6 +54,8 @@
import org.eclipse.wst.xsl.core.internal.validation.XSLValidator;
import org.eclipse.wst.xsl.core.model.StylesheetModel;
import org.eclipse.wst.xsl.core.tests.XSLCoreTestsPlugin;
+import org.junit.After;
+import org.junit.Before;
import org.osgi.framework.Bundle;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -64,15 +68,14 @@
*
* @author Doug Satchwell
*/
-public abstract class AbstractModelTest extends TestCase
+public abstract class AbstractModelTest
{
protected static IProject fTestProject;
private static boolean fTestProjectInitialized;
private static final String TEST_PROJECT_NAME = "testproject";
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
if (!fTestProjectInitialized) {
getAndCreateProject();
@@ -108,9 +111,8 @@
}
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
StylesheetBuilder builder = StylesheetBuilder.getInstance();
builder.release();
}
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheet.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheet.java
index c6a37c8..188e91f 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheet.java
+++ b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheet.java
@@ -1,6 +1,8 @@
package org.eclipse.wst.xsl.internal.model.tests;
import java.util.List;
+import static org.junit.Assert.*;
+
import java.util.Map;
import org.eclipse.wst.xsl.core.internal.model.StylesheetBuilder;
@@ -11,6 +13,9 @@
import org.eclipse.wst.xsl.core.model.Template;
import org.eclipse.wst.xsl.core.model.Variable;
import org.eclipse.wst.xsl.core.model.XSLAttribute;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
public class TestStylesheet extends AbstractModelTest {
StylesheetBuilder builder = null;
@@ -19,23 +24,27 @@
// TODO Auto-generated constructor stub
}
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
builder = StylesheetBuilder.getInstance();
}
+ @After
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
builder.release();
}
+ @Test
public void testLoadModel() {
Stylesheet model = builder.getStylesheet(getFile("style1.xsl"), false);
assertNotNull("Model failed to load, returned NULL", model);
}
+ @Test
public void testgetLocalTemplatesTemplates() {
Stylesheet model = builder.getStylesheet(getFile("style1.xsl"), false);
assertNotNull("Model failed to load, returned NULL", model);
@@ -45,6 +54,7 @@
.size());
}
+ @Test
public void testGetIncludes() {
Stylesheet stylesheet = builder.getStylesheet(getFile("style1.xsl"),
false);
@@ -55,6 +65,7 @@
.size());
}
+ @Test
public void testGetImports() {
Stylesheet stylesheet = builder.getStylesheet(getFile("style1.xsl"),
false);
@@ -66,6 +77,7 @@
}
+ @Test
public void testGetGlobalVariables() {
Stylesheet stylesheet = builder.getStylesheet(
getFile("globalVariablesTest.xsl"), false);
@@ -76,6 +88,7 @@
globalVariablesList.size());
}
+ @Test
public void testGetLineNumber() {
Stylesheet stylesheet = builder.getStylesheet(
getFile("globalVariablesTest.xsl"), false);
@@ -84,6 +97,7 @@
assertEquals("Incorrect line number.", 12, stylesheet.getLineNumber());
}
+ @Test
public void testGetColumnNumber() {
Stylesheet stylesheet = builder.getStylesheet(
getFile("globalVariablesTest.xsl"), false);
@@ -93,6 +107,7 @@
.getColumnNumber());
}
+ @Test
public void testGetVersion() {
Stylesheet stylesheet = builder.getStylesheet(
getFile("globalVariablesTest.xsl"), false);
@@ -103,6 +118,7 @@
.getVersion());
}
+ @Test
public void testXSLT2GetVersion() {
Stylesheet stylesheet = builder.getStylesheet(
getFile("XSLT20Test.xsl"), false);
@@ -112,6 +128,7 @@
.getVersion());
}
+ @Test
public void testGetAttributes() {
Stylesheet stylesheet = builder.getStylesheet(
getFile("globalVariablesTest.xsl"), false);
@@ -126,6 +143,7 @@
}
+ @Test
public void testGetFunction() {
Stylesheet stylesheet = builder.getStylesheet(
getFile("XSLT20FunctionTest.xsl"), false);
@@ -136,6 +154,7 @@
functionList.size());
}
+ @Test
public void testGetFunctionFunc1() {
Stylesheet stylesheet = builder.getStylesheet(
getFile("XSLT20FunctionTest.xsl"), false);
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheetModel.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheetModel.java
index bfa9d39..47eace6 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheetModel.java
+++ b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheetModel.java
@@ -8,6 +8,10 @@
import org.eclipse.wst.xsl.core.model.StylesheetModel;
import org.eclipse.wst.xsl.core.model.Template;
import org.eclipse.wst.xsl.core.model.XSLAttribute;
+import org.junit.After;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
public class TestStylesheetModel extends AbstractModelTest {
private StylesheetModel model = null;
@@ -15,14 +19,16 @@
}
+ @After
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
StylesheetBuilder builder = StylesheetBuilder.getInstance();
builder.release();
model = null;
}
-
+
+ @Test
public void testStyleSheetModel() {
model = XSLCore.getInstance().getStylesheet(getFile("globalVariablesTest.xsl"));
@@ -38,6 +44,7 @@
}
+ @Test
public void testFindAvailableTemplateModes() {
ArrayList<String> modes = new ArrayList();
model = XSLCore.getInstance().getStylesheet(getFile("modeTest.xsl"));
@@ -54,15 +61,27 @@
}
assertEquals("Wrong number of mode templates returned.", 3, modes.size());
}
-
+
+ @Test
public void testCircularReference() {
model = XSLCore.getInstance().getStylesheet(getFile("circularref.xsl"));
assertTrue("Undettected circular reference", model.hasCircularReference());
}
+ @Test
public void testNoCircularReference() {
model = XSLCore.getInstance().getStylesheet(getFile("modeTest.xsl"));
assertFalse("Undettected circular reference", model.hasCircularReference());
}
+
+ @Test
+ public void testLoadStylesheetWithEXSLTFuncs() throws Exception {
+ model = XSLCore.getInstance().getStylesheet(getFile("exsltfunctionparm.xsl"));
+ }
+
+ @Test
+ public void testNPEOnParmParsing() throws Exception {
+ model = XSLCore.getInstance().getStylesheet(getFile("exsltfunctionparm.xsl"));
+ }
}
diff --git a/tests/org.eclipse.wst.xsl.exslt.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsl.exslt.core.tests/META-INF/MANIFEST.MF
index 2dc000d..f0222fb 100644
--- a/tests/org.eclipse.wst.xsl.exslt.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xsl.exslt.core.tests/META-INF/MANIFEST.MF
@@ -2,9 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.xsl.exslt.core.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.wst.xsl.exslt.core.tests.EXSLTCoreTestsPlugin
Bundle-Vendor: %providerName
+Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.junit;bundle-version="3.8.2",
org.eclipse.wst.xsl.exslt.core;bundle-version="[1.0.0,2.0.0)",
diff --git a/tests/org.eclipse.wst.xsl.exslt.core.tests/src/org/eclipse/wst/xsl/exslt/core/internal/resolver/tests/EXSLTResolverTest.java b/tests/org.eclipse.wst.xsl.exslt.core.tests/src/org/eclipse/wst/xsl/exslt/core/internal/resolver/tests/EXSLTResolverTest.java
index 5b23fd6..34b7367 100644
--- a/tests/org.eclipse.wst.xsl.exslt.core.tests/src/org/eclipse/wst/xsl/exslt/core/internal/resolver/tests/EXSLTResolverTest.java
+++ b/tests/org.eclipse.wst.xsl.exslt.core.tests/src/org/eclipse/wst/xsl/exslt/core/internal/resolver/tests/EXSLTResolverTest.java
@@ -3,25 +3,32 @@
import org.eclipse.wst.xsl.exslt.core.internal.EXSLTCore;
import org.eclipse.wst.xsl.exslt.core.internal.resolver.EXSLTResolverExtension;
-import junit.framework.TestCase;
+import org.junit.*;
+import static org.junit.Assert.*;
-public class EXSLTResolverTest extends TestCase {
+public class EXSLTResolverTest {
private EXSLTResolverExtension resolver = null;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
resolver = new EXSLTResolverExtension();
}
+ @After
+ public void tearDown() throws Exception {
+ resolver = null;
+ }
+
+ @Test
public void testCommonNamespace() {
String namespace = EXSLTCore.EXSLT_COMMON_NAMESPACE;
String uri = resolver.resolve(null, null, namespace, null);
assertTrue("Did not find http://exslt.org/common", uri.contains("/schemas/common.xsd"));
}
+ @Test
public void testURINotResolved() {
String namespace = "http://www.example.org/";
String uri = resolver.resolve(null, null, namespace, null);
diff --git a/tests/org.eclipse.wst.xsl.exslt.core.tests/src/org/eclipse/wst/xsl/exslt/core/tests/EXSLTCoreTestSuite.java b/tests/org.eclipse.wst.xsl.exslt.core.tests/src/org/eclipse/wst/xsl/exslt/core/tests/EXSLTCoreTestSuite.java
index bc0803e..8b4c823 100644
--- a/tests/org.eclipse.wst.xsl.exslt.core.tests/src/org/eclipse/wst/xsl/exslt/core/tests/EXSLTCoreTestSuite.java
+++ b/tests/org.eclipse.wst.xsl.exslt.core.tests/src/org/eclipse/wst/xsl/exslt/core/tests/EXSLTCoreTestSuite.java
@@ -11,17 +11,13 @@
package org.eclipse.wst.xsl.exslt.core.tests;
import org.eclipse.wst.xsl.exslt.core.internal.resolver.tests.EXSLTResolverTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-public class EXSLTCoreTestSuite extends TestSuite {
- public static Test suite() {
- return new EXSLTCoreTestSuite();
- }
- public EXSLTCoreTestSuite() {
- super("EXSLT Core Test Suite");
- addTestSuite(EXSLTResolverTest.class);
- }
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {EXSLTResolverTest.class })
+public class EXSLTCoreTestSuite{
+
}
diff --git a/tests/org.eclipse.wst.xsl.exslt.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsl.exslt.ui.tests/META-INF/MANIFEST.MF
index 78281ba..a92469a 100644
--- a/tests/org.eclipse.wst.xsl.exslt.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xsl.exslt.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.xsl.exslt.ui.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.wst.xsl.exslt.ui.tests.EXSLTUITestsPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -14,7 +14,10 @@
org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.xsl.exslt.ui;bundle-version="[1.0.0,2.0.0)",
org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
- org.junit;bundle-version="4.8.1"
+ org.junit;bundle-version="4.8.1",
+ org.eclipse.wst.xsd.core;bundle-version="1.1.0",
+ org.eclipse.wst.standard.schemas;bundle-version="1.0.0",
+ org.eclipse.wst.xsd.ui;bundle-version="1.1.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.wst.xsl.exslt.ui.internal.contentassist.test;x-internal:=true,
diff --git a/tests/org.eclipse.wst.xsl.exslt.ui.tests/src/org/eclipse/wst/xsl/exslt/ui/internal/contentassist/test/EXSLTCommonContentAssistTest.java b/tests/org.eclipse.wst.xsl.exslt.ui.tests/src/org/eclipse/wst/xsl/exslt/ui/internal/contentassist/test/EXSLTCommonContentAssistTest.java
index 0c513ed..12f7784 100644
--- a/tests/org.eclipse.wst.xsl.exslt.ui.tests/src/org/eclipse/wst/xsl/exslt/ui/internal/contentassist/test/EXSLTCommonContentAssistTest.java
+++ b/tests/org.eclipse.wst.xsl.exslt.ui.tests/src/org/eclipse/wst/xsl/exslt/ui/internal/contentassist/test/EXSLTCommonContentAssistTest.java
@@ -21,6 +21,7 @@
import org.eclipse.wst.xsl.ui.tests.AbstractSourceViewerTest;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
public class EXSLTCommonContentAssistTest extends AbstractSourceViewerTest {
diff --git a/tests/org.eclipse.wst.xsl.jaxp.debug.test/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsl.jaxp.debug.test/META-INF/MANIFEST.MF
index 7a41868..b43f83a 100644
--- a/tests/org.eclipse.wst.xsl.jaxp.debug.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xsl.jaxp.debug.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.wst.xsl.jaxp.debug.test
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.xsl.jaxp.debug.test.TestJaXPDebugPlugin
+Bundle-Version: 1.1.0.qualifier
+Bundle-Activator: org.eclipse.wst.xsl.jaxp.debug.test.JAXPDebugTestPlugin
Require-Bundle: org.eclipse.core.runtime,
org.apache.xml.resolver;bundle-version="1.1.0",
org.apache.xerces;bundle-version="2.9.0",
org.apache.xalan;bundle-version="2.7.1",
org.eclipse.wst.xsl.jaxp.debug;bundle-version="1.0.100",
- org.junit;bundle-version="3.8.2"
+ org.junit;bundle-version="4.8.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.wst.xsl.jaxp.debug.invoker.test,
diff --git a/tests/org.eclipse.wst.xsl.jaxp.debug.test/pom.xml b/tests/org.eclipse.wst.xsl.jaxp.debug.test/pom.xml
new file mode 100644
index 0000000..ce893b9
--- /dev/null
+++ b/tests/org.eclipse.wst.xsl.jaxp.debug.test/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.wst.xsl</groupId>
+ <artifactId>org.eclipse.wst.xsl-parent</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <relativePath>../../development/athena/org.eclipse.wst.xsl.releng</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.wst.xsl</groupId>
+ <artifactId>org.eclipse.wst.xsl.jaxp.debug.tests</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+ <name>JAXP Debug Tests</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <useUIHarness>true</useUIHarness>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/PipelineDefintionTest.java b/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/PipelineDefintionTest.java
index c4bc7f2..559da6c 100644
--- a/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/PipelineDefintionTest.java
+++ b/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/PipelineDefintionTest.java
@@ -12,28 +12,32 @@
import java.util.List;
-import org.apache.xerces.jaxp.SAXParserImpl.JAXPSAXParser;
+
import org.eclipse.wst.xsl.jaxp.debug.invoker.PipelineDefinition;
import org.eclipse.wst.xsl.jaxp.debug.invoker.TransformDefinition;
import org.eclipse.wst.xsl.jaxp.debug.invoker.TypedValue;
import org.eclipse.wst.xsl.jaxp.debug.invoker.internal.JAXPSAXProcessorInvoker;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
-import junit.framework.TestCase;
-
-public class PipelineDefintionTest extends TestCase {
+public class PipelineDefintionTest {
PipelineDefinition pldef = null;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
pldef = new PipelineDefinition();
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
pldef = null;
}
+ @Test
public void testAddTransformDefinition() throws Exception {
setupTransformDefinition();
List<TransformDefinition> tdefs = pldef.getTransformDefs();
@@ -47,6 +51,7 @@
return tdef;
}
+ @Test
public void testRemoveTransformDefintion() throws Exception {
TransformDefinition tdef = setupTransformDefinition();
assertEquals(1, pldef.getTransformDefs().size());
@@ -54,6 +59,7 @@
assertEquals(0, pldef.getTransformDefs().size());
}
+ @Test
public void testAddAttribute() throws Exception {
setupAttribute();
assertEquals(1, pldef.getAttributes().size());
@@ -65,6 +71,7 @@
return attr;
}
+ @Test
public void testRemoveAttribute() throws Exception {
TypedValue attr = setupAttribute();
pldef.addAttribute(attr);
@@ -73,6 +80,7 @@
assertEquals(0, pldef.getAttributes().size());
}
+ @Test
public void testConfigureInvoker() throws Exception {
JAXPSAXProcessorInvoker invoker = new JAXPSAXProcessorInvoker();
pldef.configure(invoker);
diff --git a/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/TestJAXPProcessorInvoker.java b/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/TestJAXPProcessorInvoker.java
index ce1ff88..dbc8aef 100644
--- a/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/TestJAXPProcessorInvoker.java
+++ b/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/TestJAXPProcessorInvoker.java
@@ -2,27 +2,27 @@
import java.net.URL;
-import javax.xml.transform.Result;
import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.sax.SAXSource;
import org.eclipse.wst.xsl.jaxp.debug.invoker.PipelineDefinition;
import org.eclipse.wst.xsl.jaxp.debug.invoker.TransformDefinition;
import org.eclipse.wst.xsl.jaxp.debug.invoker.internal.JAXPSAXProcessorInvoker;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.Document;
-import org.w3c.dom.Node;
import org.xml.sax.InputSource;
+import static org.junit.Assert.*;
-import junit.framework.TestCase;
-public class TestJAXPProcessorInvoker extends TestCase {
+public class TestJAXPProcessorInvoker {
JAXPSAXProcessorInvoker invoker = null;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
invoker = new JAXPSAXProcessorInvoker();
}
+ @Test
public void testSimpleTransform() throws Exception {
URL surl = TestJAXPProcessorInvoker.class.getResource("1-input.xml");
URL xslt = TestJAXPProcessorInvoker.class.getResource("1-transform.xsl");
diff --git a/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/TransformDefinitonTest.java b/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/TransformDefinitonTest.java
index 30c41da..db2fb86 100644
--- a/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/TransformDefinitonTest.java
+++ b/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/invoker/test/TransformDefinitonTest.java
@@ -16,50 +16,66 @@
import org.eclipse.wst.xsl.jaxp.debug.invoker.TransformDefinition;
import org.eclipse.wst.xsl.jaxp.debug.invoker.TypedValue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
-public class TransformDefinitonTest extends TestCase {
+
+public class TransformDefinitonTest {
TransformDefinition tdef = null;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
tdef = new TransformDefinition();
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
tdef = null;
}
+ private TypedValue setupParameters() {
+ TypedValue param = new TypedValue("param", TypedValue.TYPE_STRING, "test");
+ tdef.addParameter(param);
+ return param;
+ }
+
+ @Test
public void testDefaultResolver() throws Exception {
String resolver = tdef.getResolverClass();
assertEquals("Did not find default resolver", TransformDefinition.DEFAULT_CATALOG_RESOLVER, resolver);
}
+ @Test
public void testChangeResolverFromDefault() throws Exception {
String resolver = "org.eclipse.wst.xml.catalog.URIResolver";
tdef.setResolverClass(resolver);
assertEquals("Problem setting a new resolver", resolver, tdef.getResolverClass());
}
+ @Test
public void testAddParameters() throws Exception {
setupParameters();
assertNotNull("Missing paramerters", tdef.getParameters());
}
+ @Test
public void testGetParameters() throws Exception {
setupParameters();
Set<TypedValue> parmSet = tdef.getParameters();
assertEquals("Incorrect size returned.", 1, parmSet.size());
}
+ @Test
public void testGetParametersAsMap() throws Exception {
setupParameters();
Map<String, Object> parmMap = tdef.getParametersAsMap();
assertNotNull("Missing parmater MAP.", parmMap);
}
+ @Test
public void testStyleSheetSource() throws Exception {
String stylesheet = "http://www.example.org/stylesheet.xsl";
tdef.setStylesheetURL(stylesheet);
@@ -67,6 +83,7 @@
assertEquals("Incorrect stylesheet.", stylesheet, tdef.getStylesheetURL());
}
+ @Test
public void testRemoveParameter() throws Exception {
TypedValue param = setupParameters();
assertTrue(tdef.getParameters().size() > 0);
@@ -74,16 +91,19 @@
assertTrue("Found parameters when there should be zero.", tdef.getParameters().size() == 0);
}
+ @Test
public void testSetOutputProperty() throws Exception {
tdef.setOutputProperty("output", "test");
String value = tdef.getOutputProperties().getProperty("output");
assertEquals("Incorrect value", "test", value);
}
+ @Test
public void testNoOutputProperties() throws Exception {
assertEquals("Found output properties when there should be none.", 0, tdef.getOutputProperties().size());
}
+ @Test
public void testRemoveOutputProperty() throws Exception {
tdef.setOutputProperty("output", "test");
Properties properties = tdef.getOutputProperties();
@@ -91,10 +111,5 @@
tdef.removeOutputProperty("output");
}
- private TypedValue setupParameters() {
- TypedValue param = new TypedValue("param", TypedValue.TYPE_STRING, "test");
- tdef.addParameter(param);
- return param;
- }
}
diff --git a/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/test/AllJAXPDebugTests.java b/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/test/AllJAXPDebugTests.java
index 2cd9dc8..a7ba47c 100644
--- a/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/test/AllJAXPDebugTests.java
+++ b/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/test/AllJAXPDebugTests.java
@@ -3,20 +3,12 @@
import org.eclipse.wst.xsl.jaxp.debug.invoker.test.PipelineDefintionTest;
import org.eclipse.wst.xsl.jaxp.debug.invoker.test.TestJAXPProcessorInvoker;
import org.eclipse.wst.xsl.jaxp.debug.invoker.test.TransformDefinitonTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
+@RunWith(Suite.class)
+@Suite.SuiteClasses( { TransformDefinitonTest.class, PipelineDefintionTest.class, TestJAXPProcessorInvoker.class})
public class AllJAXPDebugTests {
- public static Test suite() {
- TestSuite suite = new TestSuite(AllJAXPDebugTests.class.getName());
- //$JUnit-BEGIN$
- suite.addTestSuite(TransformDefinitonTest.class);
- suite.addTestSuite(PipelineDefintionTest.class);
- suite.addTestSuite(TestJAXPProcessorInvoker.class);
- //$JUnit-END$
- return suite;
- }
}
diff --git a/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/test/TestJaXPDebugPlugin.java b/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/test/JAXPDebugTestPlugin.java
similarity index 83%
rename from tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/test/TestJaXPDebugPlugin.java
rename to tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/test/JAXPDebugTestPlugin.java
index d137be7..4e63aa5 100644
--- a/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/test/TestJaXPDebugPlugin.java
+++ b/tests/org.eclipse.wst.xsl.jaxp.debug.test/src/org/eclipse/wst/xsl/jaxp/debug/test/JAXPDebugTestPlugin.java
@@ -6,18 +6,18 @@
/**
* The activator class controls the plug-in life cycle
*/
-public class TestJaXPDebugPlugin extends Plugin {
+public class JAXPDebugTestPlugin extends Plugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.eclipse.wst.xsl.jaxp.debug.test"; //$NON-NLS-1$
// The shared instance
- private static TestJaXPDebugPlugin plugin;
+ private static JAXPDebugTestPlugin plugin;
/**
* The constructor
*/
- public TestJaXPDebugPlugin() {
+ public JAXPDebugTestPlugin() {
}
/*
@@ -43,7 +43,7 @@
*
* @return the shared instance
*/
- public static TestJaXPDebugPlugin getDefault() {
+ public static JAXPDebugTestPlugin getDefault() {
return plugin;
}
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsl.launching.tests/META-INF/MANIFEST.MF
index ab74317..91d555f 100644
--- a/tests/org.eclipse.wst.xsl.launching.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xsl.launching.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wst.xsl.launching.tests
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.2.0.qualifier
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.junit;bundle-version="3.8.2",
+ org.junit;bundle-version="4.8.1",
+ org.eclipse.wst.xsl.xalan;bundle-version="1.0.0",
org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
org.eclipse.wst.xsl.launching;bundle-version="[1.0.0,2.0.0)",
org.eclipse.wst.xsl.debug.ui;bundle-version="[1.0.0,2.0.0)",
@@ -21,7 +22,12 @@
org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.xml.ui;bundle-version="[1.0.400,2.0.0)",
- org.eclipse.wst.xsl.jaxp.debug.ui;bundle-version="[1.0,2.0.0)"
+ org.eclipse.wst.xsl.jaxp.debug.ui;bundle-version="[1.0,2.0.0)",
+ org.eclipse.jdt.launching;bundle-version="3.5.0",
+ org.eclipse.jdt.debug;bundle-version="3.5.0",
+ org.eclipse.jdt.debug.ui;bundle-version="3.5.0",
+ org.apache.xalan;bundle-version="2.7.1",
+ org.apache.xml.serializer;bundle-version="2.7.1"
Bundle-Activator: org.eclipse.wst.xsl.launching.tests.Activator
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/pom.xml b/tests/org.eclipse.wst.xsl.launching.tests/pom.xml
new file mode 100644
index 0000000..719c357
--- /dev/null
+++ b/tests/org.eclipse.wst.xsl.launching.tests/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.wst.xsl</groupId>
+ <artifactId>org.eclipse.wst.xsl-parent</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <relativePath>../../development/athena/org.eclipse.wst.xsl.releng</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.wst.xsl</groupId>
+ <artifactId>org.eclipse.wst.xsl.launching.tests</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+ <name>XSL Launching Tests</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <useUIHarness>true</useUIHarness>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.ide</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.apache.xalan</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.wst.xsl</groupId>
+ <artifactId>org.eclipse.wst.xsl.core</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.wst.xsl</groupId>
+ <artifactId>org.eclipse.wst.xsl.xalan</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/AbstractLaunchingTest.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/AbstractLaunchingTest.java
index 865b196..ee33691 100644
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/AbstractLaunchingTest.java
+++ b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/AbstractLaunchingTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail and others.
+ * Copyright (c) 2009,2010 Standards for Technology in Automotive Retail and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,11 +7,13 @@
*
* Contributors:
* David Carver (STAR) - bug 262046 - initial API and implementation
+ * David Carver (Intalio)- upgraded to junit 4 during maven3/tycho migration
*******************************************************************************/
package org.eclipse.wst.xsl.launching.tests;
import java.io.*;
+import static org.junit.Assert.*;
import java.net.URL;
import java.util.List;
@@ -24,15 +26,17 @@
import org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationManager;
import org.eclipse.debug.internal.ui.launchConfigurations.LaunchShortcutExtension;
import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
+import org.junit.After;
+import org.junit.Before;
import org.w3c.dom.Document;
import junit.framework.TestCase;
-public abstract class AbstractLaunchingTest extends TestCase {
+public abstract class AbstractLaunchingTest {
private static final String XSL_TEST_PROJECT = "XSLTestProject";
protected static final String XSL_LAUNCH_SHORTCUT_ID = "org.eclipse.wst.xsl.debug.ui.launchshortcut";
protected static final String LAUNCHCONFIGS = "launchConfigs";
- protected TestEnvironment env;
+ protected EnvironmentTestSetup env;
protected IProject testProject;
protected IFolder folder;
@@ -40,20 +44,15 @@
super();
}
- public AbstractLaunchingTest(String name) {
- super(name);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
createProject();
createEmptyLaunchConfigsFolder();
deleteExistingLaunchConfigs();
}
private void createProject() throws CoreException {
- env = new TestEnvironment();
+ env = new EnvironmentTestSetup();
testProject = env.createProject(XSL_TEST_PROJECT);
}
@@ -74,9 +73,8 @@
}
}
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
testProject.delete(true, new NullProgressMonitor());
}
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/TestEnvironment.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/EnvironmentTestSetup.java
similarity index 95%
rename from tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/TestEnvironment.java
rename to tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/EnvironmentTestSetup.java
index d310089..73f1e42 100644
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/TestEnvironment.java
+++ b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/EnvironmentTestSetup.java
@@ -29,14 +29,14 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
-public class TestEnvironment {
+public class EnvironmentTestSetup {
public static final boolean DEBUG = true;
private IWorkspace _workspace;
private HashMap<String, IProject> _projects = new HashMap<String, IProject>(20);
- public TestEnvironment() throws CoreException {
+ public EnvironmentTestSetup() throws CoreException {
_workspace = ResourcesPlugin.getWorkspace();
if (DEBUG){
_workspace.getRoot().delete(true, true, null);
@@ -126,7 +126,7 @@
private IFile createFileFromResource(IPath filePath, String path) throws CoreException {
IFile file = _workspace.getRoot().getFile(filePath);
- InputStream in = TestEnvironment.class.getResourceAsStream(path);
+ InputStream in = EnvironmentTestSetup.class.getResourceAsStream(path);
if (file.exists())file.setContents(in, true, false, null);
else file.create(in, true, null);
return file;
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/LaunchingSuite.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/LaunchingSuite.java
index 1fde7dc..949a63e 100644
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/LaunchingSuite.java
+++ b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/LaunchingSuite.java
@@ -12,42 +12,23 @@
package org.eclipse.wst.xsl.launching.tests;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xsl.launching.tests.testcase.LaunchShortcutTests;
+import org.eclipse.wst.xsl.launching.tests.testcase.LaunchShortcutTest;
import org.eclipse.wst.xsl.launching.tests.testcase.ResultRunnableTest;
-import org.eclipse.wst.xsl.launching.tests.testcase.TestInputFileBlock;
-import org.eclipse.wst.xsl.launching.tests.testcase.XSLLaunchingTests;
+import org.eclipse.wst.xsl.launching.tests.testcase.InputFileBlockTest;
+import org.eclipse.wst.xsl.launching.tests.testcase.XSLLaunchingTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
/**
- * This class does specifies all the classes in this bundle
- * that provide tests. It is primarily for the convenience of
- * the AllTestsSuite.
- *
+ * This class does specifies all the classes in this bundle that provide tests.
+ * It is primarily for the convenience of the AllTestsSuite.
+ *
+ * @since 1.2
*/
-public class LaunchingSuite extends TestSuite {
- public static TestSuite suite() {
- return new LaunchingSuite();
- }
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ XSLLaunchingTest.class, InputFileBlockTest.class,
+ LaunchShortcutTest.class, ResultRunnableTest.class })
+public class LaunchingSuite {
- public LaunchingSuite() {
- super("XSL Launching Test Suite");
- addTest(new TestSuite(XSLLaunchingTests.class));
- addTest(new TestSuite(TestInputFileBlock.class));
- addTest(new TestSuite(LaunchShortcutTests.class));
- addTest(new TestSuite(ResultRunnableTest.class));
- }
-
- public LaunchingSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- public LaunchingSuite(Class theClass) {
- super(theClass);
- }
-
- public LaunchingSuite(String name) {
- super(name);
- }
}
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/TestInputFileBlock.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/InputFileBlockTest.java
similarity index 93%
rename from tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/TestInputFileBlock.java
rename to tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/InputFileBlockTest.java
index 4e470c6..0d918e0 100644
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/TestInputFileBlock.java
+++ b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/InputFileBlockTest.java
@@ -10,11 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.xsl.launching.tests.testcase;
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
-public class TestInputFileBlock extends TestCase {
+public class InputFileBlockTest {
+ @Test
public void testXMLFileExtensions() throws Exception {
MockInputFileBlock fileBlock = new MockInputFileBlock(null);
String[] fileExtensions = fileBlock.getAvailableFileExtensions();
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/LaunchShortcutTests.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/LaunchShortcutTest.java
similarity index 91%
rename from tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/LaunchShortcutTests.java
rename to tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/LaunchShortcutTest.java
index 93af6ae..1a6bcf5 100755
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/LaunchShortcutTests.java
+++ b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/LaunchShortcutTest.java
@@ -11,6 +11,7 @@
package org.eclipse.wst.xsl.launching.tests.testcase;
import java.util.ArrayList;
+
import java.util.List;
import org.eclipse.core.runtime.IPath;
import org.eclipse.debug.internal.ui.launchConfigurations.LaunchShortcutExtension;
@@ -18,33 +19,31 @@
import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
import org.eclipse.wst.xsl.launching.tests.AbstractLaunchingTest;
import org.eclipse.wst.xsl.launching.tests.MockXSLLaunchShortCut;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
/**
* Tests the capabilities of launch shortcuts from the <code>LaunchShortcuts</code> extension point
*
- * @since 1.0
+ * @since 1.2
*/
-public class LaunchShortcutTests extends AbstractLaunchingTest {
+public class LaunchShortcutTest extends AbstractLaunchingTest {
- /**
- * Constructor
- * @param name
- */
- public LaunchShortcutTests(String name) {
- super(name);
- }
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
// TODO Auto-generated method stub
super.setUp();
IPath path = folder.getFullPath();
copyConfigurationToWorkspace(path, "SimpleTransform.launch");
}
+ @After
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
env.dispose();
super.tearDown();
}
@@ -52,11 +51,13 @@
/**
* Tests that the short cut is defined via the extension point.
*/
+ @Test
public void testShortcutExtensionPointConfigured() {
LaunchShortcutExtension ext = getLaunchShortcutExtension(XSL_LAUNCH_SHORTCUT_ID);
assertNotNull("XSLT stylesheet shortcut not found", ext); //$NON-NLS-1$
}
+ @Test
public void testXSLLaunchConfigTypeDefined() {
MockXSLLaunchShortCut shortCut = new MockXSLLaunchShortCut();
@@ -67,6 +68,7 @@
/**
* Tests that the local java app shortcut does not support some fake type id 'foo'
*/
+ @Test
public void testAssociatedConfigurationTypeNotSupported() {
LaunchShortcutExtension ext = getLaunchShortcutExtension(XSL_LAUNCH_SHORTCUT_ID);
assertNotNull("XSLT shortcut not found", ext); //$NON-NLS-1$
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/ResultRunnableTest.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/ResultRunnableTest.java
index 25b240b..2d195f5 100644
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/ResultRunnableTest.java
+++ b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/ResultRunnableTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- *Copyright (c) 2009 Standards for Technology in Automotive Retail and others.
+ *Copyright (c) 2009, 2010 Standards for Technology in Automotive Retail and others.
*All rights reserved. This program and the accompanying materials
*are made available under the terms of the Eclipse Public License v1.0
*which accompanies this distribution, and is available at
@@ -7,41 +7,23 @@
*
*Contributors:
* David Carver (STAR) - initial API and implementation
+ * David Carver (Intalio) - migrate to junit 4 with maven migration
*******************************************************************************/
package org.eclipse.wst.xsl.launching.tests.testcase;
-import java.io.IOException;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
import org.eclipse.wst.xsl.ui.internal.StructuredTextViewerConfigurationXSL;
-import org.eclipse.wst.xsl.jaxp.debug.ui.internal.views.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
/**
* This class is an abstract class for Content Completion Tests. It provides all
@@ -51,8 +33,9 @@
*
* @author David Carver
*
+ * @since 1.2
*/
-public class ResultRunnableTest extends TestCase {
+public class ResultRunnableTest {
protected StructuredTextViewer sourceViewer = null;
protected Shell shell = null;
@@ -79,8 +62,7 @@
sourceViewer = new StructuredTextViewer(parent, null, null, false,
SWT.NONE);
} else {
- Assert
- .fail("Unable to run the test as a display must be available.");
+ fail("Unable to run the test as a display must be available.");
}
configureSourceViewer();
@@ -94,18 +76,18 @@
/**
* Setup the necessary projects, files, and source viewer for the tests.
*/
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
initializeSourceViewer();
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
parent.dispose();
- super.tearDown();
}
+ @Test
public void testNoProcessingInstruction() throws Exception {
String results = "This is some sample text.";
MockResultRunnable runnable = new MockResultRunnable(sourceViewer, results, null);
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/XSLLaunchingTests.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/XSLLaunchingTest.java
similarity index 86%
rename from tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/XSLLaunchingTests.java
rename to tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/XSLLaunchingTest.java
index 4939073..77a41ed 100644
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/XSLLaunchingTests.java
+++ b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/XSLLaunchingTest.java
@@ -13,6 +13,7 @@
package org.eclipse.wst.xsl.launching.tests.testcase;
import java.io.*;
+import static org.junit.Assert.*;
import javax.xml.parsers.*;
import org.eclipse.core.resources.*;
@@ -21,14 +22,19 @@
import org.xml.sax.*;
import org.eclipse.wst.xsl.launching.tests.AbstractLaunchingTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
-public class XSLLaunchingTests extends AbstractLaunchingTest {
+public class XSLLaunchingTest extends AbstractLaunchingTest {
private static final String TRANSFORM_COMMENTS = "TransformComments";
private static final String SIMPLE_TRANSFORM = "SimpleTransform";
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
IPath path = folder.getFullPath();
@@ -41,13 +47,15 @@
}
}
+ @After
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
env.dispose();
super.tearDown();
}
- public synchronized void testSimpleTransformation() throws Exception {
+ @Ignore @Test
+ public void testSimpleTransformation() throws Exception {
IPath folder = testProject.getFullPath();
env.addFileFromResource(folder, "1-input.xml", "1-input.xml");
env.addFileFromResource(folder, "1-transform.xsl", "1-transform.xsl");
@@ -69,7 +77,8 @@
* @throws SAXException
* @throws IOException
*/
- public synchronized void testTransformComments() throws Exception {
+ @Ignore @Test
+ public void testTransformComments() throws Exception {
IPath folder = testProject.getFullPath();
env.addFileFromResource(folder, "testCommentInput.xml",
"testCommentInput.xml");
@@ -87,5 +96,6 @@
assertEquals("Unexpected results:", wanted, result);
}
+
}
diff --git a/tests/org.eclipse.wst.xsl.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsl.tests/META-INF/MANIFEST.MF
index 1aff717..5eeb2e2 100644
--- a/tests/org.eclipse.wst.xsl.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xsl.tests/META-INF/MANIFEST.MF
@@ -2,21 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wst.xsl.tests;singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Localization: plugin
Require-Bundle: org.eclipse.wst.xsl.launching.tests;bundle-version="1.0.0",
org.eclipse.wst.xsl.ui.tests;bundle-version="1.0.0",
org.eclipse.wst.xsl.core.tests;bundle-version="1.0.0",
- org.eclipse.wst.xml.xpath.core.tests;bundle-version="1.0.0",
- org.eclipse.wst.xml.xpath2.processor.tests;bundle-version="1.0.0",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.wst.xsl.exslt.core.tests;bundle-version="1.0.0",
org.eclipse.wst.xsl.exslt.ui.tests;bundle-version="1.0.0",
org.eclipse.wst.xml.xpath.ui.tests;bundle-version="1.0.0",
org.eclipse.wst.xsl.jaxp.debug.test;bundle-version="1.0.0",
- org.junit
+ org.junit;bundle-version="4.8.1"
Export-Package: org.eclipse.wst.xsl.tests
Bundle-ClassPath: .
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.wst.xsl.tests/src/org/eclipse/wst/xsl/tests/AllTestsSuite.java b/tests/org.eclipse.wst.xsl.tests/src/org/eclipse/wst/xsl/tests/AllTestsSuite.java
index f0e4766..60e679f 100644
--- a/tests/org.eclipse.wst.xsl.tests/src/org/eclipse/wst/xsl/tests/AllTestsSuite.java
+++ b/tests/org.eclipse.wst.xsl.tests/src/org/eclipse/wst/xsl/tests/AllTestsSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,56 +7,28 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * David Carver (Intalio) - bug 323510 - convert to junit 4
*******************************************************************************/
package org.eclipse.wst.xsl.tests;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.wst.xml.xpath.core.tests.XPathCoreTests;
-import org.eclipse.wst.xml.xpath.ui.internal.hander.tests.TestXPathProcessorHandler;
-import org.eclipse.wst.xml.xpath2.processor.test.AllPsychoPathTests;
import org.eclipse.wst.xsl.core.tests.XSLCoreTestSuite;
import org.eclipse.wst.xsl.exslt.core.tests.EXSLTCoreTestSuite;
+import org.eclipse.wst.xsl.exslt.ui.tests.EXSLTUITestSuite;
import org.eclipse.wst.xsl.jaxp.debug.test.AllJAXPDebugTests;
import org.eclipse.wst.xsl.launching.tests.LaunchingSuite;
import org.eclipse.wst.xsl.ui.tests.XSLUITestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
/**
* This class specifies all the bundles of this component that provide a test
* suite to run during automated testing.
*/
-public class AllTestsSuite extends TestSuite {
+@RunWith(Suite.class)
+@Suite.SuiteClasses( { XSLUITestSuite.class, XSLCoreTestSuite.class, LaunchingSuite.class,
+ AllJAXPDebugTests.class, EXSLTCoreTestSuite.class, EXSLTUITestSuite.class})
-
- public AllTestsSuite() {
- super("All XSL Test Suites");
- addTest(XSLUITestSuite.suite());
- addTest(XSLCoreTestSuite.suite());
- addTest(XPathCoreTests.suite());
- addTest(LaunchingSuite.suite());
- addTest(AllJAXPDebugTests.suite());
- addTest(AllPsychoPathTests.suite());
- addTest(EXSLTCoreTestSuite.suite());
- addTestSuite(TestXPathProcessorHandler.class);
- // addTest(EXSLTUITestSuite.suite());
- }
-
- /**
- * This is just need to run in a development environment workbench.
- */
- public void testAll() {
- // this method needs to exist, but doesn't really do anything
- // other than to signal to create an instance of this class.
- // The rest it automatic from the tests added in constructor.
-
- }
- /*
- * Added for strict JUnit 4 environment. (Not sure if "testAll" method is still required.
- * See discussion for similar issue in bug 300951.
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=300951
- */
- public static Test suite() {
- return new AllTestsSuite();
- }
+public class AllTestsSuite {
}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsl.ui.tests/META-INF/MANIFEST.MF
index 6715da3..f0fbc8c 100644
--- a/tests/org.eclipse.wst.xsl.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xsl.ui.tests/META-INF/MANIFEST.MF
@@ -17,7 +17,10 @@
org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.xml.ui;bundle-version="[1.0.400,2.0.0)",
org.eclipse.wst.xsl.core;bundle-version="[1.0.0,2.0.0)",
- org.junit;bundle-version="4.8.1"
+ org.junit;bundle-version="4.8.1",
+ org.eclipse.wst.xsd.ui;bundle-version="1.1.0",
+ org.eclipse.wst.standard.schemas;bundle-version="1.0.0",
+ org.eclipse.wst.xsd.core;bundle-version="1.1.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.wst.xsl.ui.internal.validation;x-internal:=true,
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/XSLT20Transform.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/XSLT20Transform.xsl
new file mode 100644
index 0000000..fbfa7ef
--- /dev/null
+++ b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/XSLT20Transform.xsl
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+ <xsl:variable name="var" as="xs:string" select="''" />
+</xsl:transform>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/internal/validation/TestDelegatingSourceValidatorForXSL.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/internal/validation/TestDelegatingSourceValidatorForXSL.java
index 321766c..22cd866 100755
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/internal/validation/TestDelegatingSourceValidatorForXSL.java
+++ b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/internal/validation/TestDelegatingSourceValidatorForXSL.java
@@ -100,6 +100,16 @@
sourceValidator.validate(context, reporter);
assertFalse("Errors reported with XSLT 2.0 with Functions: " + fileName + ".", reporter.isMessageReported());
}
+
+ @Test
+ public void testXSL20Transform() throws Exception {
+ String fileName = "XSLT20Transform.xsl";
+ WorkbenchContext context = setupFile(getxslTestFilesProjectName(), fileName);
+ TestReporter reporter = new TestReporter();
+ sourceValidator.validate(context, reporter);
+ assertFalse("Errors reported with XSLT 2.0 with Transform statement: " + fileName + ".", reporter.isMessageReported());
+ }
+
private class TestReporter implements IReporter {
protected boolean messageReported = false;
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestElementCompletionProposal.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestElementCompletionProposal.java
index cd8d912..8e74d79 100644
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestElementCompletionProposal.java
+++ b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestElementCompletionProposal.java
@@ -43,8 +43,7 @@
assertNotNull("Did not find proposals.", proposals);
}
- @Ignore @Test
- //FIXME: for some reason under Maven this test fails
+ @Test
public void testXSLApplyTemplatesPropsoalAvailable() throws Exception {
fileName = "testElementProposals.xsl";
String xslFilePath = projectName + File.separator + fileName;
@@ -69,8 +68,7 @@
proposalName);
}
- @Ignore @Test
- //FIXME: this test fails when run under maven/tycho
+ @Test
public void testXSLChoosePropsoalAvailable() throws Exception {
fileName = "testElementProposals.xsl";
String xslFilePath = projectName + File.separator + fileName;
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestTemplateModeCompletionProposal.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestTemplateModeCompletionProposal.java
index efaf9d6..fe73c60 100644
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestTemplateModeCompletionProposal.java
+++ b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestTemplateModeCompletionProposal.java
@@ -30,9 +30,7 @@
public TestTemplateModeCompletionProposal() {
}
- @Ignore
@Test
- // FIXME: this test fails under maven/tycho
public void testModeProposals() throws Exception {
fileName = "modeTest.xsl";
String xslFilePath = projectName + File.separator + fileName;
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestXPathXMLCompletionProposal.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestXPathXMLCompletionProposal.java
index 914b5da..4204541 100644
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestXPathXMLCompletionProposal.java
+++ b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestXPathXMLCompletionProposal.java
@@ -26,8 +26,7 @@
*/
public class TestXPathXMLCompletionProposal extends AbstractSourceViewerTest {
- @Ignore @Test
- //FIXME: fails when running under Maven3/Tycho
+ @Test
public void testProposalsIncludeXSD() throws Exception {
fileName = "TestXPathXMLProposals.xsl";
String xslFilePath = projectName + File.separator + fileName;
@@ -44,8 +43,7 @@
fail("Did not find XSD proposals.");
}
- @Ignore @Test
- //FIXME: fails when running under Maven3/Tycho
+ @Test
public void testProposalsIncludeAfterColon() throws Exception {
fileName = "TestXPathXMLProposals.xsl";
String xslFilePath = projectName + File.separator + fileName;
@@ -62,8 +60,7 @@
fail("Did not find XSD proposals.");
}
- @Ignore @Test
- //FIXME: Fails after running under Maven3/Tycho
+ @Test
public void testProposalsIncludeXSDAfterForwardSlash() throws Exception {
fileName = "TestXPathXMLProposals.xsl";
String xslFilePath = projectName + File.separator + fileName;
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/XSLCompletionTest.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/XSLCompletionTest.java
index 0061a6b..9a07e65 100755
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/XSLCompletionTest.java
+++ b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/XSLCompletionTest.java
@@ -121,8 +121,7 @@
assertEquals("Wrong Number of items returned: ", 6, proposals.length);
}
- @Ignore @Test
- //FIXME: Fails when running under Maven3/Tycho
+ @Test
public void testTestAttributeProposalsAvailable() throws Exception {
fileName = "simple.xsl";
String xslFilePath = projectName + File.separator + fileName;
@@ -139,8 +138,7 @@
fail("Did not find disable-output-escaping=\"no\"");
}
- @Ignore @Test
- //FIXME: Fails when running under Maven3/Tycho
+ @Test
public void testXSLElementProposalsAvailable() throws Exception {
fileName = "utils.xsl";
String xslFilePath = projectName + File.separator + fileName;
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/templates/TestTemplateContextTypeXSL.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/templates/TestTemplateContextTypeXSL.java
index 4693e6f..95dfab2 100644
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/templates/TestTemplateContextTypeXSL.java
+++ b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/templates/TestTemplateContextTypeXSL.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Intalio Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * David Carver (Intalio) - bug 325473
+ *******************************************************************************/
package org.eclipse.wst.xsl.ui.tests.templates;
import java.util.Iterator;
@@ -5,154 +15,164 @@
import org.eclipse.jface.text.templates.TemplateVariableResolver;
import org.eclipse.wst.xsl.ui.internal.templates.TemplateContextTypeXSL;
-import junit.framework.TestCase;
+import org.junit.*;
+import static org.junit.Assert.*;
-public class TestTemplateContextTypeXSL extends TestCase {
+public class TestTemplateContextTypeXSL {
+ @Test
public void testXSLTemplateContextType() throws Exception {
TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
}
-
+
+ @Test
public void testCursorVariableAvailable() throws Exception {
TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-
+
while (variables.hasNext()) {
- TemplateVariableResolver resolver = variables.next();
- if (resolver.getType().equals("cursor")) {
- return;
- }
+ TemplateVariableResolver resolver = variables.next();
+ if (resolver.getType().equals("cursor")) {
+ return;
+ }
}
-
+
fail("Cursor variable resolver was not found.");
}
-
+
+ @Test
public void testDateVariableAvailable() throws Exception {
TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-
+
while (variables.hasNext()) {
- TemplateVariableResolver resolver = variables.next();
- if (resolver.getType().equals("date")) {
- return;
- }
+ TemplateVariableResolver resolver = variables.next();
+ if (resolver.getType().equals("date")) {
+ return;
+ }
}
-
+
fail("Date variable resolver was not found.");
}
+ @Test
public void testYearVariableAvailable() throws Exception {
TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-
+
while (variables.hasNext()) {
- TemplateVariableResolver resolver = variables.next();
- if (resolver.getType().equals("year")) {
- return;
- }
+ TemplateVariableResolver resolver = variables.next();
+ if (resolver.getType().equals("year")) {
+ return;
+ }
}
-
+
fail("Year variable resolver was not found.");
}
-
+
+ @Test
public void testTimeVariableAvailable() throws Exception {
TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-
+
while (variables.hasNext()) {
- TemplateVariableResolver resolver = variables.next();
- if (resolver.getType().equals("time")) {
- return;
- }
+ TemplateVariableResolver resolver = variables.next();
+ if (resolver.getType().equals("time")) {
+ return;
+ }
}
-
+
fail("Time variable resolver was not found.");
}
-
+
+ @Test
public void testUserVariableAvailable() throws Exception {
TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-
+
while (variables.hasNext()) {
- TemplateVariableResolver resolver = variables.next();
- if (resolver.getType().equals("user")) {
- return;
- }
+ TemplateVariableResolver resolver = variables.next();
+ if (resolver.getType().equals("user")) {
+ return;
+ }
}
-
+
fail("User variable resolver was not found.");
}
-
+
+ @Test
public void testDollarVariableAvailable() throws Exception {
TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-
+
while (variables.hasNext()) {
- TemplateVariableResolver resolver = variables.next();
- if (resolver.getType().equals("dollar")) {
- return;
- }
+ TemplateVariableResolver resolver = variables.next();
+ if (resolver.getType().equals("dollar")) {
+ return;
+ }
}
-
+
fail("User variable resolver was not found.");
}
-
+
+ @Test
public void testWordSelectionVariableAvailable() throws Exception {
TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-
+
while (variables.hasNext()) {
- TemplateVariableResolver resolver = variables.next();
- if (resolver.getType().equals("word_selection")) {
- return;
- }
+ TemplateVariableResolver resolver = variables.next();
+ if (resolver.getType().equals("word_selection")) {
+ return;
+ }
}
-
+
fail("Word Selection variable resolver was not found.");
}
+ @Test
public void testLineSelectionVariableAvailable() throws Exception {
TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-
+
while (variables.hasNext()) {
- TemplateVariableResolver resolver = variables.next();
- if (resolver.getType().equals("line_selection")) {
- return;
- }
+ TemplateVariableResolver resolver = variables.next();
+ if (resolver.getType().equals("line_selection")) {
+ return;
+ }
}
-
+
fail("Line Selection variable resolver was not found.");
}
-
+
+ @Test
public void testXMLEncodingVariableAvailable() throws Exception {
TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-
+
while (variables.hasNext()) {
- TemplateVariableResolver resolver = variables.next();
- if (resolver.getType().equals("encoding")) {
- return;
- }
+ TemplateVariableResolver resolver = variables.next();
+ if (resolver.getType().equals("encoding")) {
+ return;
+ }
}
-
+
fail("Encoding Selection variable resolver was not found.");
}
-
+
+ @Test
public void testXSLVersionVariableAvailable() throws Exception {
TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-
+
while (variables.hasNext()) {
- TemplateVariableResolver resolver = variables.next();
- if (resolver.getType().equals("xsl_version")) {
- return;
- }
+ TemplateVariableResolver resolver = variables.next();
+ if (resolver.getType().equals("xsl_version")) {
+ return;
+ }
}
-
+
fail("XSL Version variable resolver was not found.");
}
-
-
-
+
}
