This commit was manufactured by cvs2svn to create tag 'v200709122337'.
diff --git a/features/org.eclipse.wst.web_tests.feature/.cvsignore b/features/org.eclipse.wst.web_tests.feature/.cvsignore
deleted file mode 100644
index 62260a4..0000000
--- a/features/org.eclipse.wst.web_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.web_tests.feature_*.zip
diff --git a/features/org.eclipse.wst.web_tests.feature/.project b/features/org.eclipse.wst.web_tests.feature/.project
deleted file mode 100644
index 8d3270d..0000000
--- a/features/org.eclipse.wst.web_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.web_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_tests.feature/build.properties b/features/org.eclipse.wst.web_tests.feature/build.properties
deleted file mode 100644
index 27affc5..0000000
--- a/features/org.eclipse.wst.web_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_tests.feature/epl-v10.html b/features/org.eclipse.wst.web_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.web_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.web_tests.feature/feature.properties b/features/org.eclipse.wst.web_tests.feature/feature.properties
deleted file mode 100644
index 6c7982c..0000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST Web tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_tests.feature/feature.xml b/features/org.eclipse.wst.web_tests.feature/feature.xml
deleted file mode 100644
index 4088e7f..0000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.web_tests.feature"
- label="%featureName"
- version="2.0.1.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.wst.css.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.ui.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.ui.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_tests.feature/license.html b/features/org.eclipse.wst.web_tests.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.web_tests.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</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.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<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>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, 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". 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>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <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>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <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>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>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.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>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></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_tests.feature/.cvsignore b/features/org.eclipse.wst.xml_tests.feature/.cvsignore
deleted file mode 100644
index cac99d0..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.xml_tests.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.xml_tests.feature/.project b/features/org.eclipse.wst.xml_tests.feature/.project
deleted file mode 100644
index 3ff3287..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_tests.feature/build.properties b/features/org.eclipse.wst.xml_tests.feature/build.properties
deleted file mode 100644
index 27affc5..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_tests.feature/epl-v10.html b/features/org.eclipse.wst.xml_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xml_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.xml_tests.feature/feature.properties b/features/org.eclipse.wst.xml_tests.feature/feature.properties
deleted file mode 100644
index bce1c91..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST XML tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.xml b/features/org.eclipse.wst.xml_tests.feature/feature.xml
deleted file mode 100644
index cab3904..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.xml_tests.feature"
- label="%featureName"
- version="2.0.1.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.wst.dtd.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.ui.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.ui.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_tests.feature/license.html b/features/org.eclipse.wst.xml_tests.feature/license.html
deleted file mode 100644
index 303e665..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</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.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<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>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, 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". 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>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <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>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
- <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>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>
-
- <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.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>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></BODY></HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.classpath b/tests/org.eclipse.jst.jsp.core.tests/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore b/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
deleted file mode 100644
index f35525c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-org.eclipse.jst.jsp.core.tests_1.0.0.jar
-jspcoretests.jar
-temp.folder
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.project b/tests/org.eclipse.jst.jsp.core.tests/.project
deleted file mode 100644
index 3e3350f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsp.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index fd90a13..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsp.core.tests
-Bundle-Version: 1.0.101.qualifier
-Bundle-ClassPath: jspcoretests.jar
-Bundle-Activator: org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.core.tests,
- org.eclipse.jst.jsp.core.tests.cleanupformat,
- org.eclipse.jst.jsp.core.tests.cleanupformat.testfiles,
- org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific,
- org.eclipse.jst.jsp.core.tests.dom,
- org.eclipse.jst.jsp.core.tests.model,
- org.eclipse.jst.jsp.core.tests.taglibindex
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.css.core,
- com.ibm.icu,
- org.eclipse.wst.validation,
- org.eclipse.jdt.core,
- org.eclipse.wst.sse.ui
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/about.html b/tests/org.eclipse.jst.jsp.core.tests/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/build.properties b/tests/org.eclipse.jst.jsp.core.tests/build.properties
deleted file mode 100644
index ebcd377..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = test.xml,\
- jspcoretests.jar,\
- META-INF/,\
- about.html,\
- testfiles/,\
- plugin.properties,\
- src/org/eclipse/jst/jsp/css/core/tests/testfiles/
-jars.compile.order = jspcoretests.jar
-source.jspcoretests.jar = src/
-output.jspcoretests.jar = bin/
-src.includes = test.xml,\
- META-INF/,\
- testfiles/,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.jst.jsp.core.tests/plugin.properties b/tests/org.eclipse.jst.jsp.core.tests/plugin.properties
deleted file mode 100644
index 93d3d51..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.jsp.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JSP Core Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java
deleted file mode 100644
index 139f204..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jst.jsp.core.internal.JSPCorePlugin;
-import org.eclipse.jst.jsp.core.internal.encoding.JSPDocumentLoader;
-import org.eclipse.jst.jsp.core.internal.preferences.JSPCorePreferenceNames;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the JSP Source editor
- * preferences. Tests include setting/getting preferences.
- *
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class JSPCorePreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.jst.jsp.core";
-
- // need to start up bundle for default values to be loaded
- Bundle bundle = Platform.getBundle(bundleName);
- try {
- if (bundle != null)
- bundle.start();
- else
- fail("Get preference value failed because could not find bundle: " + bundleName);
- }
- catch (BundleException e) {
- fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
- }
-
- bundleGetPreference(bundleName, JSPCorePreferenceNames.DEFAULT_EXTENSION);
- }
-
- private void bundleGetPreference(String bundleName, String prefKey) {
- String defaultValue = null;
-
- String value = Platform.getPreferencesService().getString(bundleName, prefKey, defaultValue, null);
- assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
- }
-
- /**
- * Tests default values of preferences.
- *
- * NOTE: Expected default values are hard-coded, so if default values do
- * get changed, assertions need to be updated as well
- */
- public void testPluginGetDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode(JSPCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginGetDefaultPreference(node, JSPCorePreferenceNames.VALIDATE_FRAGMENTS, Boolean.toString(true));
- }
-
- private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
- String defaultValue = Long.toString(System.currentTimeMillis()); // random
- // string
-
- String theDefaultValue = node.get(prefKey, defaultValue);
- assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
- }
-
- /**
- * Tests setting preference values by setting preference value to be a
- * certain value, then getting the preference value to verify it was set.
- */
- public void testPluginSetPreferences() {
- IEclipsePreferences node = new InstanceScope().getNode(JSPCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginSetPreferenceBoolean(node, JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- }
-
- private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
- boolean originalValue = false;
- boolean expectedValue = true;
-
- String originalString = node.get(prefKey, "bogus");
- if (!"bogus".equals(originalString)) {
- originalValue = Boolean.valueOf(originalString).booleanValue();
- expectedValue = !originalValue;
- }
- node.putBoolean(prefKey, expectedValue);
- boolean foundValue = node.getBoolean(prefKey, true);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalString))
- node.remove(prefKey);
- else
- node.put(prefKey, originalString);
- }
-
- /**
- * Tests line delimiter preferences by making sure document created
- * follows line delimiter preference.
- */
- public void testDelimiterPreferences() {
- // check if content type preferences match
- String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForJSP.ContentTypeID_JSP);
- Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForJSP.ContentTypeID_JSP);
- String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
- assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
- // set a particular line delimiter
- prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
- // create document
- JSPDocumentLoader loader = new JSPDocumentLoader();
- IEncodedDocument document = loader.createNewStructuredDocument();
- String documentDelimiter = document.getPreferredLineDelimiter();
-
- // verify delimiter in document matches preference
- assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
- // return to original preference
- prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
deleted file mode 100644
index 4cbad67..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-import org.eclipse.jst.jsp.core.tests.contentmodels.TestFixedCMDocuments;
-import org.eclipse.jst.jsp.core.tests.contentmodels.TestTaglibCMTests;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestContentTypeHandlers;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestModelHandlers;
-import org.eclipse.jst.jsp.core.tests.dom.TestImportedNodes;
-import org.eclipse.jst.jsp.core.tests.model.TestModelIncludes;
-import org.eclipse.jst.jsp.core.tests.model.TestModelRelease;
-import org.eclipse.jst.jsp.core.tests.model.TestModelWithNoFile;
-import org.eclipse.jst.jsp.core.tests.source.JSPTokenizerTest;
-import org.eclipse.jst.jsp.core.tests.taglibindex.TestIndex;
-import org.eclipse.jst.jsp.core.tests.translation.JSPJavaTranslatorCoreTest;
-import org.eclipse.jst.jsp.core.tests.validation.JSPActionValidatorTest;
-import org.eclipse.jst.jsp.core.tests.validation.JSPJavaValidatorTest;
-import org.eclipse.jst.jsp.css.core.tests.source.JSPedCSSSourceParserTest;
-
-public class JSPCoreTestSuite extends TestSuite {
- public static Test suite() {
- return new JSPCoreTestSuite();
- }
-
- public JSPCoreTestSuite() {
- super("SSE JSP Core Test Suite");
-
- String noninteractive = System.getProperty("wtp.autotest.noninteractive");
- String wtp_autotest_noninteractive = null;
- if (noninteractive != null)
- wtp_autotest_noninteractive = noninteractive;
- System.setProperty("wtp.autotest.noninteractive", "true");
-
- addTest(TestCeanupFormat.suite());
- addTest(ModelCloneSuite.suite());
- addTest(new TestSuite(TestModelHandlers.class, "TestModelHandlers"));
- addTest(new TestSuite(TestContentTypeHandlers.class, "TestContentTypeHandlers"));
- addTest(new TestSuite(TestModelManager.class, "TestModelManager"));
- addTest(new TestSuite(FormatTester.class, "FormatTester"));
- addTest(new TestSuite(TestModelRelease.class, "JSP Model Tests"));
- addTest(new TestSuite(TestModelWithNoFile.class, "JSP Model with no file Tests"));
- addTest(new TestSuite(TestIndex.class, "TaglibIndex Tests"));
- addTest(new TestSuite(JSPTokenizerTest.class, "Special Parsing Tests"));
- addTest(new TestSuite(JSPJavaTranslatorCoreTest.class));
- addTest(new TestSuite(TestModelIncludes.class));
- addTest(new TestSuite(JSPCorePreferencesTest.class));
- addTest(new TestSuite(JSPedCSSSourceParserTest.class, "Special Parsing Tests for JSP-CSS content"));
- addTest(new TestSuite(JSPJavaValidatorTest.class, "JSP Java Validator Tests"));
- addTest(new TestSuite(TestImportedNodes.class, "Imported Nodes Tests"));
- addTest(new TestSuite(TestFixedCMDocuments.class, "Fixed CMDocument Creation Tests"));
- addTest(new TestSuite(TestTaglibCMTests.class, "Custom Tag Library Content Model Tests"));
- addTest(new TestSuite(JSPActionValidatorTest.class, "JSP Action Validator Tests"));
-
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
deleted file mode 100644
index 10dda5f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPCoreTestsPlugin extends Plugin {
- //The shared instance.
- private static JSPCoreTestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public JSPCoreTestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.jsp.core.tests.TestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSPCoreTestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = JSPCoreTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.core.tests").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- //String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
deleted file mode 100644
index 58eabf6..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static Plugin fPlugin = JSPCoreTestsPlugin.getDefault();
- private static Bundle fBundle = fPlugin.getBundle();
- private static final String fPluginId = fBundle.getSymbolicName();
-
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, fPluginId, severity, message, exception);
- fPlugin.getLog().log(statusObj);
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, fPluginId, IStatus.OK, message, exception);
- fPlugin.getLog().log(statusObj);
- }
- }
-
- /**
- * @return true if the plugin for this logger is debugging
- */
- public static boolean isDebugging() {
- return fPlugin.isDebugging();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(fPluginId + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java
deleted file mode 100644
index 183caf9..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class ModelCloneSuite extends TestSuite {
- public static Test suite() {
- return new ModelCloneSuite();
- }
-
- public ModelCloneSuite() {
- super("ModelCloneSuite");
-
- addTest(new TestSuite(TestStructuredDocumentClone.class, "TestStructuredDocumentClone"));
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
deleted file mode 100644
index 794f832..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullInputStream extends InputStream {
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#mark(int)
- */
- public synchronized void mark(int readlimit) {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#markSupported()
- */
- public boolean markSupported() {
- // we can mark nothing.
- // and, we are using this Null class specifically for
- // a "fake" resettable stream.
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
-
- return -1;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#reset()
- */
- public synchronized void reset() throws IOException {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#skip(long)
- */
- public long skip(long n) throws IOException {
- return 0;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java
deleted file mode 100644
index 7a4df41..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.CleanupTester;
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-
-
-public class TestCeanupFormat extends TestSuite {
- public static Test suite() {
- return new TestCeanupFormat();
- }
-
- public TestCeanupFormat() {
- super("TestCeanupFormat");
-
- addTest(new TestSuite(CleanupTester.class, "CleanupTester"));
- addTest(new TestSuite(FormatTester.class, "FormatTester"));
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
deleted file mode 100644
index c1c838e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-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;
-
-/**
- * This class tests basic creation of IModelManager plugin and the
- * ModelManger.
- *
- * Appropriate for BVT.
- */
-public class TestModelManager extends TestCase {
-
- /**
- * Constructor for TestModelManager.
- *
- * @param name
- */
- public TestModelManager(String name) {
- super(name);
- }
-
- public void testModelManager() throws IOException {
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- assertTrue("modelManager must not be null", modelManager != null);
-
- try {
- model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
- assertTrue("basic XML empty model could not be created", model != null);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- public void testNullArgument() throws UnsupportedEncodingException, IOException {
- IStructuredModel model = null;
- Exception e = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- try {
- model = modelManager.getModelForEdit((String) null, null, null);
- } catch (IllegalArgumentException exception) {
- e = exception;
- assertTrue("illegal argument failed to throw IllegalArgumentException", e instanceof IllegalArgumentException);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
deleted file mode 100644
index 6539f3f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestStructuredDocumentClone extends TestCase {
-
- /**
- * Constructor for TestModelClone.
- */
- public TestStructuredDocumentClone(String name) {
- super(name);
- }
-
- public static Test getTest() {
- return new TestStructuredDocumentClone("testCloneStructuredModelJSPXML");
- }
-
- public void testCloneStructuredDocumentXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of XML structuredDocument is not correct", passed);
-
- }
-
- /**
- * This test is most useful to check breakpoints and dig deep in object
- * to check clones values
- */
- public void testCloneStructuredDocumentJSP() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", (InputStream) null, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of JSP structuredDocument is not correct", passed);
-
- }
-
- /**
- * This test is most useful to check breakpoints and dig deep in object
- * to check clones values
- */
- public void testCloneStructuredDocumentJSPXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- String testContent = "<@! page contentType=\"text/xml\" @>";
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", testContent, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of JSPXML structuredDocument is not correct", passed);
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
deleted file mode 100644
index db70cfa..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
-
-public class CleanupTester extends TestCase {
- private static final boolean PRINT_FAILED_FORMAT_TESTS = false;
- protected IModelManager fModelManager = null;
- protected CleanupProcessorXML fCleanupProcessor = null;
- protected HTMLCleanupProcessorImpl fHTMLCleanupProcessor = null;
-
- public CleanupTester(String name) {
- super(name);
- // get model manager
- fModelManager = StructuredModelManager.getModelManager();
-
- // get cleanup processor
- fCleanupProcessor = new CleanupProcessorXML();
-
- // get HTML cleanup processor
- fHTMLCleanupProcessor = new HTMLCleanupProcessorImpl();
- }
-
- public void testCleanupInsertTagsQuoteAttrs() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("invoice.xml");
-
- // use for debugging
-// String precleaned = structuredModel.getStructuredDocument().get();
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "invoice.afterCleanupInsertTagsQuoteAttrs.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupInsertTags() throws IOException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("invoice.xml");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(false);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "invoice.afterCleanupInsertTags.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupCompressEmptyElementTags() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setCompressEmptyElementTags(true);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(false);
- cleanupPreferences.setQuoteAttrValues(false);
- cleanupPreferences.setFormatSource(true);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterCompressEmptyElementTags.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupHTML() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("cleanup.html");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setTagNameCase(HTMLCorePreferenceNames.UPPER);
- cleanupPreferences.setAttrNameCase(HTMLCorePreferenceNames.LOWER);
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
- fHTMLCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "cleanup.afterCleanup.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupHTMLtwice() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("cleanup.afterCleanup.html");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setTagNameCase(HTMLCorePreferenceNames.UPPER);
- cleanupPreferences.setAttrNameCase(HTMLCorePreferenceNames.LOWER);
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
- fHTMLCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "cleanup.afterCleanup.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
-// public void testCleanupJSPEmptyTags1() throws UnsupportedEncodingException, IOException {
-// // get model
-// IStructuredModel structuredModel = getModel("login.jsp");
-//
-// // init CleanupPreferences
-// IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-// cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
-// cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
-// cleanupPreferences.setCompressEmptyElementTags(false);
-// cleanupPreferences.setInsertRequiredAttrs(false);
-// cleanupPreferences.setInsertMissingTags(true);
-// cleanupPreferences.setQuoteAttrValues(true);
-// cleanupPreferences.setFormatSource(true);
-// cleanupPreferences.setConvertEOLCodes(false);
-//
-// // cleanup
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-// fHTMLCleanupProcessor.cleanupModel(structuredModel);
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-//
-// // compare
-// String cleaned = structuredModel.getStructuredDocument().get();
-// String expectedFileName = "login.afterCleanup.jsp";
-// String expected = getFile(expectedFileName);
-// compare(expectedFileName, expected, cleaned);
-//
-// // release model
-// structuredModel.releaseFromRead();
-// }
-//
-// public void testCleanupJSPEmptyTags2() throws UnsupportedEncodingException, IOException {
-// // get model
-// IStructuredModel structuredModel = getModel("subscription.jsp");
-//
-// // init CleanupPreferences
-// IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-// cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
-// cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
-// cleanupPreferences.setCompressEmptyElementTags(false);
-// cleanupPreferences.setInsertRequiredAttrs(false);
-// cleanupPreferences.setInsertMissingTags(true);
-// cleanupPreferences.setQuoteAttrValues(true);
-// cleanupPreferences.setFormatSource(true);
-// cleanupPreferences.setConvertEOLCodes(false);
-//
-// // cleanup
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-// fHTMLCleanupProcessor.cleanupModel(structuredModel);
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-//
-// // compare
-// String cleaned = structuredModel.getStructuredDocument().get();
-// String expectedFileName = "subscription.afterCleanup.jsp";
-// String expected = getFile(expectedFileName);
-// compare(expectedFileName, expected, cleaned);
-//
-// // release model
-// structuredModel.releaseFromRead();
-// }
-
- protected String readFile(String fileName) throws IOException {
- String inputString = null;
- InputStream fileInputStream = null;
-
- try {
- fileInputStream = getClass().getResourceAsStream(fileName);
-
- byte[] inputBuffer = new byte[2048];
- inputString = new String();
- int bytesRead = -1;
-
- while (true) {
- bytesRead = fileInputStream.read(inputBuffer);
- if (bytesRead == -1)
- break;
- String bufferString = new String(inputBuffer, 0, bytesRead);
- //bufferString = bufferString.substring(0, bytesRead);
- inputString = inputString.concat(bufferString);
- }
- }
- finally {
- if (fileInputStream != null)
- fileInputStream.close();
- }
-
- return inputString;
- }
-
- protected static void printException(Exception exception) {
- exception.printStackTrace();
- }
-
- protected IStructuredModel getModel(String fileName) throws UnsupportedEncodingException, IOException {
- IStructuredModel structuredModel = null;
- InputStream inputStream = null;
-
- try {
- String input = getFile(fileName);
- inputStream = new ByteArrayInputStream(input.getBytes("UTF-8"));
- String id = inputStream.toString().concat(fileName);
- structuredModel = fModelManager.getModelForRead(id, inputStream, null);
- }
- // since in test code, no need to catch this
- // catch (Exception exception) {
- // Logger.logException(exception);
- // }
- finally {
- try {
- inputStream.close();
- }
- catch (Exception exception) {
- // hopeless
- }
- }
-
- return structuredModel;
- }
-
- protected String getFile(String fileName) throws IOException {
- return readFile("testfiles/".concat(fileName));
- }
-
- protected void compare(String testcaseName, String expected, String cleaned) {
- if (cleaned.compareTo(expected) != 0) {
- if (PRINT_FAILED_FORMAT_TESTS) {
- System.out.println();
- System.out.println(testcaseName + " failed");
- System.out.println("========== expected file ==========");
- System.out.println(expected);
- System.out.println("========== cleaned file ==========");
- System.out.println(cleaned);
- System.out.println("========== expected file ==========");
- String expectedString = StringUtils.replace(expected, "\r", "\\r");
- expectedString = StringUtils.replace(expectedString, "\n", "\\n");
- expectedString = StringUtils.replace(expectedString, "\t", "\\t");
- System.out.println(expectedString);
- System.out.println("========== cleaned file ==========");
- String cleanedString = StringUtils.replace(cleaned, "\r", "\\r");
- cleanedString = StringUtils.replace(cleanedString, "\n", "\\n");
- cleanedString = StringUtils.replace(cleanedString, "\t", "\\t");
- System.out.println(cleanedString);
- System.out.println("=======================================");
- }
- assertTrue(false);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
deleted file mode 100644
index b226517..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML;
-
-public class FormatTester extends TestCase {
- private static final boolean PRINT_FAILED_FORMAT_TESTS = false;
- protected IModelManager fModelManager = null;
- protected FormatProcessorXML fFormatProcessor = null;
- protected HTMLFormatProcessorImpl fHTMLFormatProcessor = null;
-
- public FormatTester(String name) {
- super(name);
-
- // get model manager
- fModelManager = StructuredModelManager.getModelManager();
-
- // get format processor
- fFormatProcessor = new FormatProcessorXML();
-
- // get HTML format processor
- fHTMLFormatProcessor = new HTMLFormatProcessorImpl();
- }
-
- public void testFormat261968() {
- // get model
- IStructuredModel structuredModel = getModel("261968.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "261968.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTagOpen() {
- // get model
- IStructuredModel structuredModel = getModel("tagOpen.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tagOpen.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTagOpenTagClose() {
- // get model
- IStructuredModel structuredModel = getModel("tagOpenTagClose.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tagOpenTagClose.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTags() {
- // get model
- IStructuredModel structuredModel = getModel("tags.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tags.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatEmpty() {
- // get model
- IStructuredModel structuredModel = getModel("empty.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatOneSpace() {
- // get model
- IStructuredModel structuredModel = getModel("oneSpace.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatOneChar() {
- // get model
- IStructuredModel structuredModel = getModel("oneChar.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "oneChar.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSpaces() {
- // get model
- IStructuredModel structuredModel = getModel("spaces.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatChars() {
- // get model
- IStructuredModel structuredModel = getModel("chars.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "chars.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSpacesAndChars() {
- // get model
- IStructuredModel structuredModel = getModel("spacesAndChars.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "chars.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormat() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSplitLinesSplitMultiAttrs() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterSplitLinesSplitMultiAttrsFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSplitLines() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterSplitLinesFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatBlockComments() {
- // get model
- IStructuredModel structuredModel = getModel("blockComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "blockComments.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatInlineComments() {
- // get model
- IStructuredModel structuredModel = getModel("inlineComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "inlineComments.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatInlineCommentsSplitLinesSplitMultiAttrs() {
- // get model
- IStructuredModel structuredModel = getModel("inlineComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testHTMLFormat() {
- // get model
- IStructuredModel structuredModel = getModel("HitCounterIntro.html");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fHTMLFormatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = false;
- fHTMLFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "HitCounterIntro.afterDefaultFormat.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- protected String readFile(String fileName) {
- String inputString = null;
- InputStream fileInputStream = null;
-
- try {
- fileInputStream = getClass().getResourceAsStream(fileName);
-
- byte[] inputBuffer = new byte[1024];
- inputString = new String();
- int bytesRead = -1;
-
- while (true) {
- bytesRead = fileInputStream.read(inputBuffer);
- if (bytesRead == -1)
- break;
- String bufferString = new String(inputBuffer);
- bufferString = bufferString.substring(0, bytesRead);
- inputString = inputString.concat(bufferString);
- }
-
- if (fileInputStream != null)
- fileInputStream.close();
- }
- catch (IOException exception) {
- printException(exception);
- }
-
- return inputString;
- }
-
- protected static void printException(Exception exception) {
- exception.printStackTrace();
- }
-
- protected IStructuredModel getModel(String fileName) {
- IStructuredModel structuredModel = null;
- InputStream inputStream = null;
-
- try {
- String input = getFile(fileName);
- inputStream = new ByteArrayInputStream(input.getBytes("UTF8"));
- String id = inputStream.toString().concat(fileName);
- structuredModel = fModelManager.getModelForRead(id, inputStream, null);
- }
- catch (Exception exception) {
- exception.printStackTrace();
- }
- finally {
- try {
- inputStream.close();
- }
- catch (Exception exception) {
- // hopeless
- }
- }
-
- return structuredModel;
- }
-
- protected String getFile(String fileName) {
- return readFile("testfiles/".concat(fileName));
- }
-
- protected void compare(String testcaseName, String expected, String formatted) {
- if (formatted.compareTo(expected) != 0) {
- if (PRINT_FAILED_FORMAT_TESTS) {
- System.out.println();
- System.out.println(testcaseName + " failed");
- System.out.println("========== expected file ==========");
- System.out.println(expected);
- System.out.println("========== formatted file ==========");
- System.out.println(formatted);
- System.out.println("========== expected file ==========");
- String expectedString = StringUtils.replace(expected, "\r", "\\r");
- expectedString = StringUtils.replace(expectedString, "\n", "\\n");
- expectedString = StringUtils.replace(expectedString, "\t", "\\t");
- System.out.println(expectedString);
- System.out.println("========== formatted file ==========");
- String formattedString = StringUtils.replace(formatted, "\r", "\\r");
- formattedString = StringUtils.replace(formattedString, "\n", "\\n");
- formattedString = StringUtils.replace(formattedString, "\t", "\\t");
- System.out.println(formattedString);
- System.out.println("=======================================");
- }
- assertTrue(false);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
deleted file mode 100644
index 0483882..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<tag>
- <t1></t1>
- <t2></t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2>
- /t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- t2>
- </t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- t3>
- </t3>
-</tag>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
deleted file mode 100644
index b9981e9..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<tag>
- <t1></t1>
- <t2></t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2>/t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- t2></t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 > <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 ><t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 >t3></t3>
-</tag>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
deleted file mode 100644
index cbace4d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name="myForm" method="post"
- action="../Controllers/SampleController">
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD colspan="2"><IMG src="../images/clearPixel.gif" width="1"
- height="25" alt=""></TD>
- </TR>
- <TR>
- <TD rowspan="2" align="LEFT" width="220" height="300"><IMG
- src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
- <TD align="LEFT" width="380">
- <P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
- </TD>
- </TR>
- <TR>
- <TD align="LEFT" valign="TOP">
- <P><FONT size="-1">This sample shows you how to use a Java
- servlet to count how many times a page was visited.</FONT></P>
- <P><FONT size="-1">This sample requires a database to
- store the counter. If you have not already installed and configured
- your database for the WebSphere samples, refer to <A
- href="../Configuration/DBConfig.html">Database Configuration</A> for
- instructions. </FONT></P>
- <P><FONT size="-1"><A
- href="javascript:document.myForm.submit()" target="_self"> <B>Run
- this sample</B></A> </FONT></P>
- <INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT
- name="db_region" type="hidden" value="true" /></TD>
- </TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">How this sample works:</FONT>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">This sample has:</FONT></P>
- <UL>
- <LI><FONT size="-1">A Java servlet that increments a
- counter every time it is invoked </FONT>
- <UL>
- <LI><FONT size="-1">A Java Server Page (JSP) that
- invokes the servlet and displays the counter </FONT>
- <LI><FONT size="-1">A .servlet file that provides
- information about the servlet to the WebSphere Application
- Server </FONT>
- </UL>
- </UL>
- <P><FONT size="-1">The Application Server processes
- .jsp files with its JSP 1.0 processor servlet. It handles the
- <jsp:include ... /> tag as a server-side include, replacing
- the tag with the variable data generated by the servlet.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0"
- cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0"
- cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0"
- width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1"> How to use this sample on your
- web page:</FONT></B></P>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">You can add this exact tag to any
- HTML page you have on your site. Rename the HTML file with a .jsp
- file extension, put the Java .class and .servlet files in the
- classes folder, publish.... and you're ready to go.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
deleted file mode 100644
index cccca18..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
- <HEAD>
-<META http-equiv
-=
-"Content-Type"
-content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name = "myForm" method="post" action="../Controllers/SampleController">
- <TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD colspan="2">
- <IMG src="../images/clearPixel.gif" width="1" height="25" alt=""></TD>
- </TR>
- <TR>
- <TD rowspan="2" align="LEFT" width="220" height="300"><IMG src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
- <TD align="LEFT" width="380">
- <P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
- </TD>
- </TR>
- <TR>
- <TD align="LEFT" valign="TOP">
- <P><FONT size="-1">This sample shows you how to use a Java servlet to count how many times a page was visited.</FONT></P>
- <P><FONT size="-1">This sample requires a database to store the counter. If you have not already installed and configured your database for the WebSphere samples, refer to <A href="../Configuration/DBConfig.html">Database Configuration</A> for instructions. </FONT></P>
- <P><FONT size="-1"><A href="javascript:document.myForm.submit()" target="_self"> <B>Run this sample</B></A> </FONT></P>
- <INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT name="db_region" type="hidden" value="true" /></TD>
- </TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">How this sample works:</FONT>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">This sample has:</FONT></P>
- <UL>
- <LI><FONT size="-1">A Java servlet that increments a counter every time it is invoked </FONT>
-<UL>
- <LI><FONT size="-1">A Java Server Page (JSP) that invokes the servlet and displays the counter </FONT>
- <LI><FONT size="-1">A .servlet file that provides information about the servlet to the WebSphere Application Server </FONT>
-</UL>
- </UL>
- <P><FONT size="-1">The Application Server processes .jsp files with its JSP 1.0 processor servlet. It handles the <jsp:include ... /> tag as a server-side include, replacing the tag with the variable data generated by the servlet.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">
-How to use this sample on your web page:</FONT></B></P>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">You can add this exact tag to any HTML page you have on your site. Rename the HTML file with a .jsp file extension, put the Java .class and .servlet files in the classes folder, publish.... and you're ready to go.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
deleted file mode 100644
index d7b8413..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- comment on a new line -->
-<menu date="11/30/2000"><!-- inline comment after tag -->
- <rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <item type="appetizer">
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- </item>
- <!-- comment on a new line -->
- <!-- comment on a new line -->
- <!--comment on a new line with no space-->
- <!--
- No space
- -->
- <!--
- OneSpace
- -->
- <!--
- One tab
- -->
- <!--
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.-->
- <!--
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
- This is a long paragraph.
-
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
- This is a long paragraph.
-
-
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
-
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
-
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
-
- -->
- <!--
-
-
-
- This is a long paragraph.
-
-
-
- The text
- in this paragraph should NOT be re-flowed.
-
-
-
- -->
- <item type="appetizer">
- <!-- a
- b-->
- <!-- a
- b -->
- <!--
- a
- b-->
- <!--
- a
- b -->
- <!--
- a
- b
- -->
- <!-- a
- b
- -->
- <!--
-
-
-
- a
-
-
-
- b
-
-
-
- -->
- <desc>Prosciutto ham with melon</desc>
- <!-- this block comment should line up with the sibilings
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <price units="usd">7.95</price>
- <!-- comment before missing end tag -->
-</menu>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
deleted file mode 100644
index 2969878..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
- <!-- comment on a new line -->
- <menu date="11/30/2000"><!-- inline comment after tag -->
- <rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
--->
- <item type="appetizer">
- <desc>Warmed leek salad</desc><!-- inline comment after tag --><price units="usd">6.95<!-- inline comment after text --></price><price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- </item>
- <!-- comment on a new line -->
- <!-- comment on a new line -->
- <!--comment on a new line with no space-->
-<!--
-No space
--->
-<!--
- OneSpace
--->
-<!--
- One tab
--->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.-->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
-
--->
-<!--
-
-
-
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
-
-
-
--->
- <item type="appetizer">
-<!-- a
- b-->
-<!-- a
- b -->
-<!--
-a
- b-->
-<!--
-a
- b -->
-<!--
-a
- b
--->
-<!-- a
- b
- -->
-<!--
-
-
-
-a
-
-
-
-b
-
-
-
--->
- <desc>Prosciutto ham with melon</desc>
-<!-- this block comment should line up with the sibilings
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
--->
- <price units="usd">7.95</price>
- <!-- comment before missing end tag -->
-</menu>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
deleted file mode 100644
index f2ba8f8..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
+++ /dev/null
@@ -1 +0,0 @@
-abc
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
deleted file mode 100644
index 847d8d7..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<HTML>
-<HEAD>
- <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages. Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c
- </I></A>
-
-<BR><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter: </I> </A>
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters. For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion. This guy was whipped up in Perl.
-<BR><BR>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes: </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.
-<BR><BR>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix. It is written in good ol' C.
-
-<BR ><BR >
-</LI><LI>
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list. This is written in Lisp, of all things. There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.
-It relies heavily on recursion, so it takes a different
-mindset to program in this language. But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR ><BR >
-
-</LI><LI>
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I> This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program. This works for any programming
-language as you can supply the comment character on the command line. This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
- an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.
-Peruse (peruse, mind you. I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c
- </I></A>
-<BR abc = "def"><BR abc = "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B>
-A math class written in Java using Object Oriented design principles. The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values. Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" >
-<I> RegressionCalc.java </I> </A> This is the main class that does the
-calculations. It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" >
-<I> MathClass.java </I> </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers. This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" >
-<I> Regression.java </I> </A> This is basically the main routine, or where the
-program starts. It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be: <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC. The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay. Really. If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk.
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt">
-<I> Lost LILO? Recover.</I> </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO. I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux. Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL><BODY></BODY>
-</HTML><HTML>
-</HTML>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
deleted file mode 100644
index 0b97a00..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<html>
-<HEAD>
- <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages. Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c
- </I></A>
-
-<br><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter: </I> </A>
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters. For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion. This guy was whipped up in Perl.
-<BR><br>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes: </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.
-<br><br>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix. It is written in good ol' C.
-
-<BR ><BR >
-</LI><LI>
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list. This is written in Lisp, of all things. There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.
-It relies heavily on recursion, so it takes a different
-mindset to program in this language. But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR ><BR >
-
-</LI><LI>
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I> This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program. This works for any programming
-language as you can supply the comment character on the command line. This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
- an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.
-Peruse (peruse, mind you. I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c
- </I></A>
-<BR abc = "def"><BR abc = "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B>
-A math class written in Java using Object Oriented design principles. The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values. Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" >
-<I> RegressionCalc.java </I> </A> This is the main class that does the
-calculations. It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" >
-<I> MathClass.java </I> </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers. This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" >
-<I> Regression.java </I> </A> This is basically the main routine, or where the
-program starts. It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be: <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC. The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay. Really. If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk.
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt">
-<I> Lost LILO? Recover.</I> </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO. I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux. Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL></body>
-<html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
deleted file mode 100644
index 9322d4b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<root>
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <desc>Warmed leek salad</desc><!-- inline comment after text -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->
- dollars
- </price>
- <price units="usd" units="usd">
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number />
- <!-- comment on a new line -->
- <unit />
- </price>
- <price><!-- inline comment --></price>
- <th>
- <b>Fahrenheit<!-- testing --></b>
- </th>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index 7fddaf5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<root>
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <desc>Warmed leek salad</desc><!-- inline comment after text -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price
- units="usd"
- units="usd">
- 6.95<!-- inline comment after text -->
- </price>
- <price
- units="usd"
- units="usd">
- 6.95<!-- inline comment after text and followed by text -->
- dollars
- </price>
- <price
- units="usd"
- units="usd">
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number />
- <!-- comment on a new line -->
- <unit />
- </price>
- <price><!-- inline comment --></price>
- <th>
- <b>Fahrenheit<!-- testing --></b>
- </th>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
deleted file mode 100644
index 71a11bc..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<root><desc>Warmed leek salad</desc><!-- inline comment after tag -->
-<desc>Warmed leek salad</desc> <!-- inline comment after text -->
-<price units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd"><number/><!-- inline comment after tag --></price>
-<price units="usd"><number/> <!-- inline comment after tag --></price>
-<price units="usd"> <number/><!-- inline comment after tag --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->dollars</price>
-<price units="usd" units="usd"><number/><!-- inline comment after tag --><unit/></price>
-<price><number/><!-- inline comment after tag --><unit/></price>
-<price><number/>
-<!-- comment on a new line --><unit/></price>
-<price><!-- inline comment --></price>
-<th><b>Fahrenheit <!-- testing --></b></th>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
deleted file mode 100644
index 012c982..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber=12345>
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Year></Date>
- <BillTo custNumber=/>
- <BillTo custNumber= />
- <BillTo custNumber =/>
- <BillTo custNumber = />
- <BillTo custNumber name=Craig phone = 416-448-4414 />
- <BillTo custNumber = X5739 name phone = 416-448-4414 />
- <BillTo custNumber = X5739 name = Craig phone/>
- <BillTo custNumber name phone/>
- <BillTo custNumber = X5739 name="Craig Salter" phone=416-448-4414>
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </country></Address></BillTo></Header>
- <Item discount=promotion price=57>
- <description>A wedding ring</description></Item></Invoice>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
deleted file mode 100644
index 557812d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Year></Date>
- <BillTo custNumber="custNumber"/>
- <BillTo custNumber= "custNumber"/>
- <BillTo custNumber ="custNumber"/>
- <BillTo custNumber = "custNumber"/>
- <BillTo custNumber="custNumber" name="Craig" phone = "416-448-4414" />
- <BillTo custNumber = "X5739" name="name" phone = "416-448-4414" />
- <BillTo custNumber = "X5739" name = "Craig" phone="phone"/>
- <BillTo custNumber="custNumber" name="name" phone="phone"/>
- <BillTo custNumber = "X5739" name="Craig Salter" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </country></Address></BillTo></Header>
- <Item discount="promotion" price="57">
- <description>A wedding ring</description></Item></Invoice>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
deleted file mode 100644
index 88a26b5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber=12345>
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Date>
- <BillTo custNumber=/>
- <BillTo custNumber= />
- <BillTo custNumber =/>
- <BillTo custNumber = />
- <BillTo custNumber name=Craig phone = 416-448-4414 />
- <BillTo custNumber = X5739 name phone = 416-448-4414 />
- <BillTo custNumber = X5739 name = Craig phone/>
- <BillTo custNumber name phone/>
- <BillTo custNumber = X5739 name="Craig Salter" phone=416-448-4414>
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </Header>
- <Item discount=promotion price=57>
- <description>A wedding ring
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
deleted file mode 100644
index 7e906c9..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
- function submitForm(dest){
- document.myForm.action = dest
- document.myForm.submit()
- }
- </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username & password to connect to the database.<BR>
-This username & password should be the one used while creating the
-database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<% session.removeAttribute("error_message");
- } %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT
- type="hidden" name="command"
- value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden"
- name="previous_page" value="Login/Login.jsp"> <A
- href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD><FONT color="#993333"> username: </FONT></TD>
- <TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> password: </FONT></TD>
- <TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> drivername: </FONT></TD>
- <TD><INPUT name="driver" type="text" size="30" maxlength="40"
- value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> url: </FONT></TD>
- <TD><INPUT name="url" type="text" size="30" maxlength="40"
- value="jdbc:db2:WSSAMPLE"></TD>
- </TR>
- </TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
deleted file mode 100644
index 439a67b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
- function submitForm(dest){
- document.myForm.action = dest
- document.myForm.submit()
- }
- </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username & password to connect to the database.<BR>
-This username & password should be the one used while creating the database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<% session.removeAttribute("error_message");
- } %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT type="hidden" name="command" value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden" name="previous_page" value="Login/Login.jsp"> <A href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD><FONT color="#993333"> username: </FONT></TD>
- <TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> password: </FONT></TD>
- <TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> drivername: </FONT></TD>
- <TD><INPUT name="driver" type="text" size="30" maxlength="40" value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> url: </FONT></TD>
- <TD><INPUT name="url" type="text" size="30" maxlength="40" value="jdbc:db2:WSSAMPLE"></TD>
- </TR>
- </TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
deleted file mode 100644
index 2e65efe..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
+++ /dev/null
@@ -1 +0,0 @@
-a
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
deleted file mode 100644
index 0519ecb..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
deleted file mode 100644
index bba9c7f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
deleted file mode 100644
index 4d66ba3..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>ejb</Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name" v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
deleted file mode 100644
index a708f6e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index ee5bbf2..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI
- xmi.version="1.0"
- timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel
- xmi.name="UML"
- xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package
- xmi.id="_1"
- xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension
- xmi.extender="IXT"
- xmi.extenderID="">
- <ixts s="IDL">
- <ixttv
- t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv
- t="quid"
- v="3780E272032D" />
- <ixttv
- t="is_unit"
- v="TRUE" />
- <ixttv
- t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv
- t="is_loaded"
- v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv
- t="charSet"
- v="0" />
- <ixttv
- t="version"
- v="43" />
- <ixttv
- t="_written"
- v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
deleted file mode 100644
index 6295d5c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>
- XMI Toolkit
- </XMI.exporter>
-
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"> 1.05 </XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"> 1.05 </XMI.exporterVersion> </XMI.documentation>
- <XMI.metamodel xmi.name = "UML" xmi.version
- =
- "1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package
- xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>ejb </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public"/>
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1"
- />
- </ixts>
- <ixts s="Rose">
- <ixttv
- t="quid"
- v="3780E272032D"
- />
- <ixttv
- t="is_unit"
- v="TRUE"
- />
- <ixttv t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat""
- />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" /></ixts></XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
deleted file mode 100644
index 01ad2f9..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
deleted file mode 100644
index 9c04eb5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
+++ /dev/null
@@ -1 +0,0 @@
- abc
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
deleted file mode 100644
index 8c57fd0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
+++ /dev/null
@@ -1,112 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java"%>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app"%>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
-<app:checkLogon />
-
-<%-- In real life, these would be loaded from a database --%>
-<%
- java.util.ArrayList list = new java.util.ArrayList();
- list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
- list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
- pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<HEAD>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Create">
- <TITLE><bean:message key="subscription.title.create" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Delete">
- <TITLE><bean:message key="subscription.title.delete" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Edit">
- <TITLE><bean:message key="subscription.title.edit" /></TITLE>
-</logic:equal>
-<html:base />
-</HEAD>
-<BODY bgcolor="white">
-
-<html:errors />
-
-<html:form action="/saveSubscription" focus="host">
- <html:hidden property="action" />
- <TABLE border="0" width="100%">
-
- <TR>
- <TH align="right"><bean:message key="prompt.username" />:</TH>
- <TD align="left"><bean:write name="user" property="username"
- filter="true" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailHostname" />:</TH>
- <TD align="left"><logic:equal name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:text property="host" size="50" />
- </logic:equal> <logic:notEqual name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:hidden property="host" write="true" />
- </logic:notEqual></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailUsername" />:</TH>
- <TD align="left"><html:text property="username" size="50" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailPassword" />:</TH>
- <TD align="left"><html:password property="password" size="50" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailServerType" />:</TH>
- <TD align="left"><html:select property="type">
- <html:options collection="serverTypes" property="value"
- labelProperty="label" />
- </html:select></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.autoConnect" />:</TH>
- <TD align="left"><html:checkbox property="autoConnect" /></TD>
- </TR>
-
- <TR>
- <TD align="right"><logic:equal name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:submit>
- <bean:message key="button.save" />
- </html:submit>
- </logic:equal> <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:submit>
- <bean:message key="button.confirm" />
- </html:submit>
- </logic:equal> <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <html:submit>
- <bean:message key="button.save" />
- </html:submit>
- </logic:equal></TD>
- <TD align="left"><logic:notEqual name="subscriptionForm"
- property="action" scope="request" value="Delete">
- <html:reset>
- <bean:message key="button.reset" />
- </html:reset>
- </logic:notEqual> <html:cancel>
- <bean:message key="button.cancel" />
- </html:cancel></TD>
- </TR>
-
- </TABLE>
-
-</html:form>
-
-</BODY>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
deleted file mode 100644
index 20bf3ea..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
+++ /dev/null
@@ -1,144 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<app:checkLogon/>
-
-<%-- In real life, these would be loaded from a database --%>
-<%
- java.util.ArrayList list = new java.util.ArrayList();
- list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
- list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
- pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<head>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <title><bean:message key="subscription.title.create"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <title><bean:message key="subscription.title.delete"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <title><bean:message key="subscription.title.edit"/></title>
-</logic:equal>
-<html:base/>
-</head>
-<body bgcolor="white">
-
-<html:errors/>
-
-<html:form action="/saveSubscription" focus="host">
-<html:hidden property="action"/>
-<table border="0" width="100%">
-
- <tr>
- <th align="right">
- <bean:message key="prompt.username"/>:
- </th>
- <td align="left">
- <bean:write name="user" property="username" filter="true"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailHostname"/>:
- </th>
- <td align="left">
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:text property="host" size="50"/>
- </logic:equal>
- <logic:notEqual name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:hidden property="host" write="true"/>
- </logic:notEqual>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailUsername"/>:
- </th>
- <td align="left">
- <html:text property="username" size="50"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailPassword"/>:
- </th>
- <td align="left">
- <html:password property="password" size="50"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailServerType"/>:
- </th>
- <td align="left">
- <html:select property="type">
- <html:options collection="serverTypes" property="value"
- labelProperty="label"/>
- </html:select>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.autoConnect"/>:
- </th>
- <td align="left">
- <html:checkbox property="autoConnect"/>
- </td>
- </tr>
-
- <tr>
- <td align="right">
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:submit>
- <bean:message key="button.save"/>
- </html:submit>
- </logic:equal>
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:submit>
- <bean:message key="button.confirm"/>
- </html:submit>
- </logic:equal>
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <html:submit>
- <bean:message key="button.save"/>
- </html:submit>
- </logic:equal>
- </td>
- <td align="left">
- <logic:notEqual name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:reset>
- <bean:message key="button.reset"/>
- </html:reset>
- </logic:notEqual>
-
- <html:cancel>
- <bean:message key="button.cancel"/>
- </html:cancel>
- </td>
- </tr>
-
-</table>
-
-</html:form>
-
-</body>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
deleted file mode 100644
index c5fa784..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-<
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
deleted file mode 100644
index 6787e48..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
+++ /dev/null
@@ -1 +0,0 @@
-<>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
deleted file mode 100644
index 069235d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
deleted file mode 100644
index 2fa949b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
-<tag></tag>
-<tag></tag >
-<tag> </tag>
-<tag> </tag >
-<tag >
-<tag ></tag>
-<tag ></tag >
-<tag > </tag>
-<tag > </tag >
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestFixedCMDocuments.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestFixedCMDocuments.java
deleted file mode 100644
index c8c4fbd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestFixedCMDocuments.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.contentmodels;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contentmodel.JSPCMDocumentFactory;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType;
-
-public class TestFixedCMDocuments extends TestCase {
- public TestFixedCMDocuments(String name) {
- super(name);
- }
-
- public TestFixedCMDocuments() {
- super();
- }
-
- public static Test suite() {
- return new TestFixedCMDocuments();
- }
-
- public void testCHTMLdocument() {
- checkDocument(CMDocType.CHTML_DOC_TYPE);
- }
-
- private void checkDocument(Object documentKey) {
- CMDocument document = JSPCMDocumentFactory.getCMDocument(documentKey.toString());
- assertNotNull("missing doc:" + documentKey.toString(), document);
- CMNamedNodeMap elements = document.getElements();
- for (int i = 0; i < elements.getLength(); i++) {
- CMNode item = elements.item(i);
- verifyElementDeclarationHasName(item);
- }
- }
-
- private void verifyElementDeclarationHasName(CMNode item) {
- assertTrue(item.getNodeType() == CMNode.ELEMENT_DECLARATION);
- assertNotNull("no name on an element declaration", item.getNodeName());
- CMNamedNodeMap attrs = ((CMElementDeclaration) item).getAttributes();
- for (int i = 0; i < attrs.getLength(); i++) {
- CMNode attr = attrs.item(i);
- verifyAttributeDeclaration(((CMElementDeclaration) item), attr);
- }
- }
-
- private void verifyAttributeDeclaration(CMElementDeclaration elemDecl, CMNode attr) {
- assertTrue(attr.getNodeType() == CMNode.ATTRIBUTE_DECLARATION);
- assertNotNull("no name on an attribute declaration", attr.getNodeName());
- CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) attr;
- assertNotNull("no attribute 'type' on an attribute declaration " + elemDecl.getNodeName() + "/" + attr.getNodeName(), attrDecl.getAttrType());
- }
-
- public void testHTML4document() {
- checkDocument(CMDocType.HTML_DOC_TYPE);
- }
-
- public void testJSP11document() {
- checkDocument(CMDocType.JSP11_DOC_TYPE);
-
- }
-
- public void testJSP12document() {
- checkDocument(CMDocType.JSP12_DOC_TYPE);
-
- }
-
- public void testJSP20document() {
- checkDocument(CMDocType.JSP20_DOC_TYPE);
-
- }
-
- public void testTag20document() {
- checkDocument(CMDocType.TAG20_DOC_TYPE);
-
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java
deleted file mode 100644
index a98174b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.contentmodels;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class TestTaglibCMTests extends TestCase {
- private static final String TESTFILES_PATHSTRING = "/testfiles/";
- private static final String PROJECT_NAME = "testLoadTaglibs";
- private static final String TAG_NAME = "logic:empty";
-
- public TestTaglibCMTests(String name) {
- super(name);
- }
-
- public TestTaglibCMTests() {
- super();
- }
-
- public static Test suite() {
- return new TestTaglibCMTests();
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
- if (!project.exists()) {
- // Create new project
- project = BundleResourceUtil.createSimpleProject(PROJECT_NAME, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace(TESTFILES_PATHSTRING + PROJECT_NAME, Path.ROOT.append(PROJECT_NAME).toString());
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", Path.ROOT.append(PROJECT_NAME).append("web stuff/WEB-INF/lib/struts.jar").toString());
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- project.build(IncrementalProjectBuilder.FULL_BUILD, null);
- }
- assertTrue(project.isAccessible());
- }
-
- public void testLoadCustomTagsThroughJSPSyntax() throws IOException, CoreException {
- IFile jspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(Path.ROOT.append(PROJECT_NAME).append("web stuff/test1.jsp"));
-
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(jspFile);
- NodeList presents = model.getDocument().getElementsByTagName(TAG_NAME);
- assertNotNull(TAG_NAME + " was missing from document", presents.item(0));
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) presents.item(0)).getAdapterFor(ModelQueryAdapter.class);
- CMElementDeclaration declaration = modelQueryAdapter.getModelQuery().getCMElementDeclaration((Element) presents.item(0));
- assertNotNull("no CMElementDelcaration for " + TAG_NAME, declaration);
- assertEquals("qualified name from element declaration was different", declaration.getNodeName(), TAG_NAME);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testLoadCustomTagsThroughXMLSyntax() throws IOException, CoreException {
- IFile jspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(Path.ROOT.append(PROJECT_NAME).append("web stuff/testX.jsp"));
-
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(jspFile);
- NodeList presents = model.getDocument().getElementsByTagName(TAG_NAME);
- assertNotNull(TAG_NAME + " was missing from document", presents.item(0));
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) presents.item(0)).getAdapterFor(ModelQueryAdapter.class);
- CMElementDeclaration declaration = modelQueryAdapter.getModelQuery().getCMElementDeclaration((Element) presents.item(0));
- assertNotNull("no CMElementDelcaration for " + TAG_NAME, declaration);
- assertEquals("qualified name from element declaration was different", declaration.getNodeName(), TAG_NAME);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
deleted file mode 100644
index ac16f83..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullStream extends InputStream {
-
- /* (non-Javadoc)
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
- return -1;
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
deleted file mode 100644
index ff92ba2..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-/**
- * This class is to test very basics of content type handlers.
- *
- * It tests that
- *
- * BVT: content registry can be / is created 5 expected contentTypeIdentifiers
- * can be created/found based on id. there is one and only one default content
- * type handler.
- *
- *
- *
- *
- */
-public class TestContentTypeHandlers extends TestCase {
- private static final boolean DEBUG = false;
-
- public TestContentTypeHandlers(String name) {
- super(name);
- }
-
- private static IContentTypeManager getContentTypeRegistry() {
- IContentTypeManager registry = Platform.getContentTypeManager();
- return registry;
- }
-
- public void testCreation() {
- IContentTypeManager registry = getContentTypeRegistry();
- assertTrue("content type identifer registry must exist", registry != null);
- if (DEBUG) {
- IContentType[] allTypes = registry.getAllContentTypes();
- for (int i = 0; i < allTypes.length; i++) {
- System.out.println(allTypes[i]);
-
- }
- }
- }
-
- public void testXMLExists() {
- String id = ContentTypeIdForXML.ContentTypeID_SSEXML;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have custom XML type ", identifier != null);
- }
-
- public void testHTMLExists() {
- String id = ContentTypeIdForHTML.ContentTypeID_HTML;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have HTML type ", identifier != null);
- }
-
- public void testJSPExists() {
- String id = ContentTypeIdForJSP.ContentTypeID_JSP;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have JSP type ", identifier != null);
- }
-
- public void testCSSExists() {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have CSS type ", identifier != null);
- }
-
- public void testDTDExists() {
- String id = "org.eclipse.wst.dtd.core.dtdsource";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have DTD type ", identifier != null);
- }
-
- public void testXMLExistsByFileExtension() throws IOException {
- String filename = "test.xml";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have XML type ", identifier != null);
- }
-
- public void testHTMLExistsByFileExtension() throws IOException {
- String filename = "test.html";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have HTML type ", identifier != null);
- }
-
- public void testJSPExistsByFileExtension() throws IOException {
- String filename = "test.jsp";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have JSP type ", identifier != null);
- }
-
- public void testCSSExistsByFileExtension() throws IOException {
- String filename = "test.css";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have CSS type ", identifier != null);
- }
-
- public void testDTDExistsByFileExtension() throws IOException {
- String filename = "test.dtd";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have DTD type ", identifier != null);
- }
-
- public void testMultipleDefinitions() throws IOException {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- String filename = "test.css";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier1 = registry.getContentType(id);
- IContentType identifier2 = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("mulitple content type identifiers need to be equal (but not same instance) ", identifier1.equals(identifier2));
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
deleted file mode 100644
index 97a8702..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-public class TestModelHandlers extends TestCase {
- private static ModelHandlerRegistry getModelHandlerRegistry() {
- ModelHandlerRegistry registry = ModelHandlerRegistry.getInstance();
- return registry;
- }
-
- public TestModelHandlers() {
- super();
- }
-
- public void testCreation() {
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- assertTrue("model handler registry must exist", registry != null);
- }
-
- public void testCSSExists() {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testCSSExistsFromFilename() throws IOException {
- String filename = "test.css";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForCSS.ContentTypeID_CSS));
- }
-
- public void testDTDExists() {
- String id = "org.eclipse.wst.dtd.core.dtdsource";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testDTDExistsFromFilename() throws IOException {
- String filename = "test.dtd";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals("org.eclipse.wst.dtd.core.dtdsource"));
- }
-
- public void testHTMLExists() {
- String id = ContentTypeIdForHTML.ContentTypeID_HTML;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testHTMLExistsFromFilename() throws IOException {
- String filename = "test.html";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForHTML.ContentTypeID_HTML));
- }
-
- public void testJSPExists() {
- String id = ContentTypeIdForJSP.ContentTypeID_JSP;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testJSPExistsFromFilename() throws IOException {
- String filename = "test.jsp";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForJSP.ContentTypeID_JSP));
- }
-
- public void testXMLExists() {
- String id = ContentTypeIdForXML.ContentTypeID_XML;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertEquals("model handler registry does not have XML type ", id, handler.getAssociatedContentTypeId());
- }
-
- public void testXMLExistsFromFilename() throws IOException {
- String filename = "test.xml";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertEquals("model handler registry does not have XML type ", ContentTypeIdForXML.ContentTypeID_XML, handler.getAssociatedContentTypeId());
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java
deleted file mode 100644
index 74e69ee..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-
-public class TestImportedNodes extends TestCase {
-
-
- public void testImportedComments() {
- IDOMModel orgModel = (IDOMModel) StructuredModelManager.getModelManager().
-
- createUnManagedStructuredModelFor("org.eclipse.jst.jsp.core.jspsource");
- IDOMModel foreignModel = (IDOMModel) StructuredModelManager.getModelManager().
-
- createUnManagedStructuredModelFor("org.eclipse.jst.jsp.core.jspsource");
- foreignModel.getStructuredDocument().set("<%-- abc --%>");
- Node child = foreignModel.getDocument().getLastChild();
- // import comment node
- child = orgModel.getDocument().importNode(child, true);
- orgModel.getDocument().appendChild(child);
- // create text node and insert it after comment node
- child = orgModel.getDocument().createTextNode("abc");
- orgModel.getDocument().appendChild(child);
- String text = orgModel.getStructuredDocument().get();
- assertEquals("document text was not expected", "<%-- abc --%>abc", text);
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
deleted file mode 100644
index 71105b5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.tests.Logger;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * This test will cause a "region management error" to be thrown in DOM parser
- * (and its subsequent 'handleRefresh' to be called). This is "normal" in this
- * error case, of appending an jsp element to an html document. This
- * error/exception is not normally printed out, but is if 'debug' is turned on.
- */
-
-public class TestOrphan extends TestCase {
-
- private static final String fCategory = "unittests";
-
- public TestOrphan(String name) {
-
- super(name);
- }
-
- private Document getJSPDoc() {
- IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- Document doc = structuredModel.getDocument();
- return doc;
- }
-
- private Document getHTMLDoc() {
-
- IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- Document doc = structuredModel.getDocument();
- return doc;
- }
-
- private Element makeElement(Document document) {
-
- Element element = document.createElement("IMG");
- element.setAttribute("src", "<bean:message />");
- return element;
- }
-
- public void testNonOrphanInHTMLDoc() {
-
- Logger.trace(fCategory, "testNonOrphanInHTMLDoc");
- Document doc = getHTMLDoc();
- Element element = makeElement(doc);
- AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- doc.appendChild(element);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- }
-
- public void testNonOrphanInJSPDoc() {
-
- Logger.trace(fCategory, "testNonOrphanInJSPDoc");
- Document doc = getJSPDoc();
- Element element = makeElement(doc);
- AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- doc.appendChild(element);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- }
-
- public void testNonOrphanInBoth() {
-
- Logger.trace(fCategory, "testNonOrphanInBoth");
- Document jspDoc = getJSPDoc();
- Element commonElement = makeElement(jspDoc);
- AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- jspDoc.appendChild(commonElement);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- Document htmlDoc = getHTMLDoc();
- // this test will cause a "region management error" to be
- // thrown in parser (and its subsequent 'handleRefresh').
- // this is "normal" in this error case, of appending an jsp
- // element to an html document. This error/exception is not
- // normally printed out, but is if 'debug' is turned on.
- htmlDoc.appendChild(commonElement);
- isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- }
-
- public void testNonOrphanInBothReversedOrder() {
-
- Logger.trace(fCategory, "testNonOrphanInBothReversedOrder");
- Document htmlDoc = getHTMLDoc();
- Element commonElement = makeElement(htmlDoc);
- AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- htmlDoc.appendChild(commonElement);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- Document jspDoc = getJSPDoc();
- // this little test shows its important to
- // actually create the element with the right kind of
- // document, not just append.
- // (and, append is needed too, as can be seen by
- // commenting out one or the other of the following
- // two lines.
- commonElement = makeElement(jspDoc);
- jspDoc.appendChild(commonElement);
- //
- attr = (AttrImpl) commonElement.getAttributeNode("src");
- attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- }
-
- public void doBothTests() {
-
- testNonOrphanInHTMLDoc();
- testNonOrphanInJSPDoc();
- testNonOrphanInBoth();
- testNonOrphanInBothReversedOrder();
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java
deleted file mode 100644
index 0377392..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.model;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-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.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-
-/**
- * @deprecated - we don't have INodeAdapters directly on our models and this
- * is not part of the usual test suite (test.xml)
- */
-public class TestModelAdapters extends TestCase {
-
-
-
- public void testJSPModel() throws IOException {
- IModelManager modelManager = getModelManager();
- IDOMModel structuredModel = (IDOMModel) modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- try {
- boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
- assertTrue(test);
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) structuredModel.getAdapter(ModelQueryAdapter.class);
- assertNotNull("initial modelQueryAdapter should not be null", modelQueryAdapter);
- IStructuredModel newModel = structuredModel.newInstance();
- // IDOMDocument newDocument = ((IDOMModel)
- // newModel).getDocument();
- // INodeNotifier notifier = newDocument;
- ModelQueryAdapter result = (ModelQueryAdapter) newModel.getAdapter(ModelQueryAdapter.class);
- assertNotNull("newInstance modelQueryAdapter should not be null", result);
-
- }
- finally {
- // even though model is unmanaged, release still required, since
- // adapter factories, etc., may be depending on it.
- structuredModel.releaseFromEdit();
- // if above complete's normally (with no exceptions)
- // consider passed.
- assertTrue(true);
- }
- }
-
- private IModelManager getModelManager() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- return modelManager;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java
deleted file mode 100644
index a908c51..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-
-/**
- * Tests for JSP include directives
- */
-public class TestModelIncludes extends TestCase {
- String wtp_autotest_noninteractive = null;
-
- protected void setUp() throws Exception {
- super.setUp();
- String noninteractive = System.getProperty("wtp.autotest.noninteractive");
- if (noninteractive != null)
- wtp_autotest_noninteractive = noninteractive;
- System.setProperty("wtp.autotest.noninteractive", "true");
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- }
-
- /**
- * Tests the custom tag content model when single line fragments are used
- * without trailing white space
- *
- * @throws Exception
- */
- public void testContentModelSingleLineIncludedFileWithNoSpacesButWithTaglibInInclude() throws Exception {
- String projectName = "prj119576_a";
-
- BundleResourceUtil.createSimpleProject(projectName, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/prj119576_a/WebContent/body2.jsp"));
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
- assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
- Element element = (Element) model.getIndexedRegion(75);
- CMElementDeclaration ed = ModelQueryUtil.getModelQuery(model).getCMElementDeclaration(element);
- assertNotNull("no (TLD) element declaration found for " + element.getNodeName(), ed);
- assertTrue("not a wrapping content model element declaration: " + ed.getNodeName(), ed instanceof CMNodeWrapper);
- assertTrue("not a taglib content model element declaration: " + ed.getNodeName(), ((CMNodeWrapper) ed).getOriginNode() instanceof TLDElementDeclaration);
- String tagClassName = ((TLDElementDeclaration) ((CMNodeWrapper) ed).getOriginNode()).getTagclass();
- assertNotNull("no tag class name found", tagClassName);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Verify included files are translated properly when they contain a
- * multiple lines
- *
- * @throws Exception
- */
- public void testTranslateMultiLineIncludedFileWithSpacesAndScriptletInInclude() throws Exception {
- String projectName = "prj119576_c";
-
- BundleResourceUtil.createSimpleProject(projectName, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/" + projectName + "/WebContent/body3.jsp"));
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
- assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
- JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
- model.getFactoryRegistry().addFactory(factory);
-
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- String source = adapter.getJSPTranslation().getJavaText();
- assertTrue("scriptlet with variable declaration not found\n" + source, source.indexOf("java.util.Date headerDate") > -1);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Verify included files are translated properly when they contain a
- * single line and document region and no trailing white space.
- *
- * @throws Exception
- */
- public void testTranslateSingleLineIncludedFileWithNoSpacesButScriptletInInclude() throws Exception {
- String projectName = "prj119576_b";
-
- BundleResourceUtil.createSimpleProject(projectName, null, null);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/" + projectName + "/WebContent/body3.jsp"));
- IDOMModel model = null;
- try {
- model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
- assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
- JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
- model.getFactoryRegistry().addFactory(factory);
-
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- String source = adapter.getJSPTranslation().getJavaText();
- assertTrue("scriptlet with variable declaration not found", source.indexOf("java.util.Date headerDate") > -1);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java
deleted file mode 100644
index 76f539c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class TestModelRelease extends TestCase {
-
-
-
- public void testJSPModel() {
- IModelManager modelManager = getModelManager();
- IDOMModel structuredModel = (IDOMModel) modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
- assertTrue(test);
- // even though model is unmanaged, release still required, since
- // adapter factories, etc., may be depending on it.
- structuredModel.releaseFromEdit();
- // if above complete's normally (with no exceptions)
- // consider passed.
- assertTrue(true);
- }
-
- private IModelManager getModelManager() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- return modelManager;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java
deleted file mode 100644
index 04aec40..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-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.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-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.xml.core.internal.provisional.document.IDOMModel;
-
-public class TestModelWithNoFile extends TestCase {
-
- public void testJSPModel() {
- IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
- assertTrue(test);
- structuredModel.releaseFromEdit();
- assertTrue(true);
- }
-
- public void testBug116066_1() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = null;
-
- // Create new project
- IProject project = createSimpleProject("bug116066_1", null, null);
-
- IFile testFile = project.getFile("nonExistant.jsp");
- assertFalse("nonExistant.jsp test file already exists (not a clean workspace)?", testFile.exists());
-
- // Get the model and set a reference to that tag library into it
- try {
- model = modelManager.getNewModelForEdit(testFile, false);
- assertNotNull("couldn't get new model for " + testFile.getFullPath(), model);
- model.getStructuredDocument().set("<%@taglib prefix=\"tagdependent\" uri=\"tagdependent\">\n<tagdependent:code> <<< </tagdependent:code>");
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testBug116066_2() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = null;
-
- // Create new project
- IProject project = createSimpleProject("bug116066_2", null, null);
- // Copy a TLD into the project
- IFile tld = copyBundleEntryIntoWorkspace("/testfiles/116066/tagdep.tld", "/bug116066_2/tagdep.tld");
- assertNotNull("TLD entry was not copied properly", tld);
- assertTrue("TLD IFile does not exist", tld.exists());
-
- IFile testFile = project.getFile("nonExistant.jsp");
- assertFalse("nonExistant.jsp test file already exists (not a clean workspace)?", testFile.exists());
-
- // Get the model and set a reference to that tag library into it
- try {
- model = modelManager.getNewModelForEdit(testFile, false);
- assertNotNull("couldn't get new model for " + testFile.getFullPath(), model);
- model.getStructuredDocument().set("<%@taglib prefix=\"tagdependent\" uri=\"tagdependent\">\n<tagdependent:code> <<< </tagdependent:code>");
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- private IFile copyBundleEntryIntoWorkspace(String entryname, String fullPath) {
- IFile file = null;
- URL entry = JSPCoreTestsPlugin.getDefault().getBundle().getEntry(entryname);
- if (entry != null) {
- try {
- byte[] b = new byte[2048];
- InputStream input = entry.openStream();
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- int i = -1;
- while ((i = input.read(b)) > -1) {
- output.write(b, 0, i);
- }
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));
- if (file != null) {
- file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
- }
- }
- catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- return file;
- }
-
- private IProject createSimpleProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- assertTrue(project.exists());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java
deleted file mode 100644
index 7fc624d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.source;
-
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.parser.internal.JSPTokenizer;
-
-public class JSPTokenizerTest extends TestCase {
- private JSPTokenizer tokenizer = null;
-
- private void reset(Reader in) {
- tokenizer.reset(in);
- }
-
- private void reset(String filename) {
- Reader fileReader = null;
- try {
- fileReader = new InputStreamReader(getClass().getResourceAsStream(filename), "utf8");
- }
- catch (IOException e) {
- }
- if (fileReader == null) {
- fail();
- }
- BufferedReader reader = new BufferedReader(fileReader);
- reset(reader);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- tokenizer = new JSPTokenizer();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- tokenizer = null;
- }
-
- public void test144807_AttrName() {
- String input = "";
- for (int i = 0; i < 400; i++) {
- input = input += "<a ";
- }
- try {
- reset(new StringReader(input));
- assertTrue("empty input", tokenizer.getNextToken() != null);
- while (tokenizer.getNextToken() != null) {
- // really, we just want to loop
- }
- }
- catch (IOException e) {
- fail(e.getMessage());
- }
- }
-
- public void test144807_AttrValue() {
- String input = "<a b=";
- for (int i = 0; i < 400; i++) {
- input = input += "<a ";
- }
- try {
- reset(new StringReader(input));
- assertTrue("empty input", tokenizer.getNextToken() != null);
- while (tokenizer.getNextToken() != null) {
- // really, we just want to loop
- }
- }
- catch (IOException e) {
- fail(e.getMessage());
- }
- }
-
- public void test144807_Equals() {
- String input = "<a b";
- for (int i = 0; i < 400; i++) {
- input = input += "<a ";
- }
- try {
- reset(new StringReader(input));
- assertTrue("empty input", tokenizer.getNextToken() != null);
- while (tokenizer.getNextToken() != null) {
- // really, we just want to loop
- }
- }
- catch (IOException e) {
- fail(e.getMessage());
- }
- }
-
- public void testInsertComment() {
- reset("jspcomment01.jsp");
- try {
- assertTrue("empty input", tokenizer.getNextToken() != null);
- while (tokenizer.getNextToken() != null) {
- // really, we just want to loop
- }
- }
- catch (IOException e) {
- }
- catch (StackOverflowError e) {
- fail(e.getMessage());
- return;
- }
- // success if StackOverFlowError does not occur with tokenizer.
- assertTrue(true);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/jspcomment01.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/jspcomment01.jsp
deleted file mode 100644
index 71a8c05..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/jspcomment01.jsp
+++ /dev/null
@@ -1,222 +0,0 @@
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java
deleted file mode 100644
index aed8eff..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.taglibindex;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-
-public class BundleResourceUtil {
-
- public static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
- Enumeration entries = JSPCoreTestsPlugin.getDefault().getBundle().getEntryPaths(rootEntry);
- while (entries != null && entries.hasMoreElements()) {
- String entryPath = entries.nextElement().toString();
- String targetPath = new Path(fullTargetPath + "/" + entryPath.substring(rootEntry.length())).toString();
- if (entryPath.endsWith("/")) {
- IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(targetPath));
- if (!folder.exists()) {
- folder.create(true, true, new NullProgressMonitor());
- }
- _copyBundleEntriesIntoWorkspace(entryPath, targetPath);
- }
- else {
- _copyBundleEntryIntoWorkspace(entryPath, targetPath);
- }
- // System.out.println(entryPath + " -> " + targetPath);
- }
- }
-
- public static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {
- IFile file = null;
- URL entry = JSPCoreTestsPlugin.getDefault().getBundle().getEntry(entryname);
- if (entry != null) {
- IPath path = new Path(fullPath);
-// for (int j = 1; j <= path.segmentCount() - 2; j++) {
-// IPath folderPath = path.removeLastSegments(path.segmentCount() - j);
-// IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(folderPath);
-// if (!folder.exists()) {
-// folder.create(true, true, null);
-// }
-// }
- try {
- byte[] b = new byte[2048];
- InputStream input = entry.openStream();
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- int i = -1;
- while ((i = input.read(b)) > -1) {
- output.write(b, 0, i);
- }
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- if (file != null) {
- if (!file.exists()) {
- file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
- }
- else {
- file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());
- }
- }
- }
- catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- else {
- System.err.println("can't find " + entryname);
- }
- return file;
- }
-
- public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- _copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
-
- public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) throws CoreException {
- final IFile file[] = new IFile[1];
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- return file[0];
- }
-
- /**
- * Creates a simple project.
- *
- * @param name -
- * the name of the project
- * @param location -
- * the location of the project, or null if the default of
- * "/name" within the workspace is to be used
- * @param natureIds -
- * an array of natures IDs to set on the project, null if none
- * should be set
- * @return
- */
- public static IProject createSimpleProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-
- public static final String JAVA_NATURE_ID = "org.eclipse.jdt.core.javanature";
-
- /**
- * Add a library entry (like a jar) to the classpath of a project. The jar
- * must be in your poject. You can copy the jar into your workspace using
- * copyBundleEntryIntoWorkspace(String entryname, String fullPath)
- *
- * @param proj
- * assumed it has java nature
- * @param pathToJar
- * project relative, no leading slash
- */
- public static void addLibraryEntry(IProject proj, String pathToJar) {
-
- IPath projLocation = proj.getLocation();
- IPath absJarPath = projLocation.append(pathToJar);
-
- IJavaProject jProj = JavaCore.create(proj);
-
- IClasspathEntry strutsJarEntry = JavaCore.newLibraryEntry(absJarPath, null, null);
- try {
- IClasspathEntry[] currentEntries = jProj.getRawClasspath();
-
- List l = new ArrayList();
- l.addAll(Arrays.asList(currentEntries));
- l.add(strutsJarEntry);
-
- IClasspathEntry[] newEntries = (IClasspathEntry[]) l.toArray(new IClasspathEntry[l.size()]);
- jProj.setRawClasspath(newEntries, new NullProgressMonitor());
- }
- catch (JavaModelException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java
deleted file mode 100644
index 7b2ffef..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.taglibindex;
-
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.core.ClasspathEntry;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration;
-import org.eclipse.jst.jsp.core.taglib.IJarRecord;
-import org.eclipse.jst.jsp.core.taglib.ITaglibRecord;
-import org.eclipse.jst.jsp.core.taglib.IURLRecord;
-import org.eclipse.jst.jsp.core.taglib.TaglibIndex;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-/**
- * Tests for the TaglibIndex.
- */
-public class TestIndex extends TestCase {
- String wtp_autotest_noninteractive = null;
-
- protected void setUp() throws Exception {
- super.setUp();
- String noninteractive = System.getProperty("wtp.autotest.noninteractive");
- if (noninteractive != null)
- wtp_autotest_noninteractive = noninteractive;
- System.setProperty("wtp.autotest.noninteractive", "true");
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- }
-
- public void testAvailableAfterAddingJARToBuildPath() throws Exception {
- String url = "http://example.com/sample2_for_118251-e";
-
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("bug_118251-e", null, null);
- assertTrue(project.exists());
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e"));
- assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-e", "/bug_118251-e");
- // bug_118251-e/WebContent/WEB-INF/web.xml
- // bug_118251-e/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
- // bug_118251-e/WebContent/META-INF/MANIFEST.MF
- // bug_118251-e/WebContent/test1.jsp
- // bug_118251-e/.classpath
- // bug_118251-e/.project
- ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-e/WebContent/test1.jsp", url, false);
- assertNull("unexpected record found for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e/WebContent/"));
- assertEquals("wrong number of taglib records found after unpacking but before copying", 2, records.length);
-
- /*
- * increase by <b>one</b> for the URL to the TLD in the jar (one
- * implicit for the TLD in the jar as a resource and another implicit
- * overwriting it with the same URL to the TLD in the jar on the
- * classpath)
- */
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-e/WebContent/WEB-INF/sample_tld.jar");
-
- url = "http://example.com/sample-taglib";
- taglibRecord = TaglibIndex.resolve("/bug_118251-e/WebContent/test1.jsp", url, false);
- assertNotNull("expected record missing for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e/WebContent/"));
- assertEquals("wrong number of taglib records found after copying", 3, records.length);
- }
-
- public void testAvailableAfterCopyingJARIntoProject() throws Exception {
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("bug_118251-f", null, null);
- assertTrue(project.exists());
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f"));
- assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-f", "/bug_118251-f");
- // bug_118251-f/WebContent/WEB-INF/web.xml
- // bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
- // bug_118251-f/WebContent/META-INF/MANIFEST.MF
- // bug_118251-f/WebContent/test1.jsp
- // bug_118251-f/.classpath
- // bug_118251-f/.project
- String url = "http://example.com/sample-taglib";
- ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-f/WebContent/test1.jsp", url, false);
- assertNull("unexpected record found for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/"));
- assertEquals("wrong number of taglib records found after unpacking but before copying", 3, records.length);
-
- /*
- * increase by <b>one</b> for the URL to the TLD in the jar (one
- * implicit for the TLD in the jar as a resource and another implicit
- * overwriting it with the same URL to the TLD in the jar on the
- * classpath)
- */
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-f/WebContent/WEB-INF/lib/sample_tld.jar");
-
- taglibRecord = TaglibIndex.resolve("/bug_118251-f/WebContent/test1.jsp", url, false);
- assertNotNull("no record found for " + url, taglibRecord);
- assertTrue("record found was wrong type", taglibRecord instanceof IURLRecord);
- assertNotNull("record has no base location", ((IURLRecord) taglibRecord).getBaseLocation());
- assertEquals("record has wrong short name", "sample", ((IURLRecord) taglibRecord).getShortName());
- assertEquals("record has wrong URI", url, ((IURLRecord) taglibRecord).getDescriptor().getURI());
- URL recordURL = ((IURLRecord) taglibRecord).getURL();
- assertNotNull("record has no URL", recordURL);
- assertTrue("record has wrong URL", recordURL.toString().length() > 4);
- assertEquals("record has wrong URL protocol", "jar:", recordURL.toString().substring(0, 4));
- assertEquals("record has wrong URL", "/bug_118251-f/WebContent/WEB-INF/lib/sample_tld.jar!/folder/sample_for_118251.tld", recordURL.toString().substring(recordURL.toString().length() - 81));
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/WEB-INF"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/WEB-INF/web.xml"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- }
-
- public void testAvailableAfterCopyingJARIntoProject2() throws Exception {
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("bug_118251-g", null, null);
- assertTrue(project.exists());
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g"));
- assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-g", "/bug_118251-g");
- // bug_118251-g/Web Content/WEB-INF/web.xml
- // bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
- // bug_118251-g/Web Content/META-INF/MANIFEST.MF
- // bug_118251-g/Web Content/test1.jsp
- // bug_118251-g/.classpath
- // bug_118251-g/.project
- String url = "http://example.com/sample-taglib";
- ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-g/Web Content/test1.jsp", url, false);
- assertNull("unexpected record found for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/"));
- assertEquals("wrong number of taglib records found after unpacking but before copying", 3, records.length);
-
- /*
- * increase by <b>one</b> for the URL to the TLD in the jar (one
- * implicit for the TLD in the jar as a resource and another implicit
- * overwriting it with the same URL to the TLD in the jar on the
- * classpath)
- */
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-g/Web Content/WEB-INF/lib/sample_tld.jar");
-
- taglibRecord = TaglibIndex.resolve("/bug_118251-g/Web Content/test1.jsp", url, false);
- assertNotNull("no record found for " + url, taglibRecord);
- assertTrue("record found was wrong type", taglibRecord instanceof IURLRecord);
- assertNotNull("record has no base location", ((IURLRecord) taglibRecord).getBaseLocation());
- assertEquals("record has wrong short name", "sample", ((IURLRecord) taglibRecord).getShortName());
- assertEquals("record has wrong URI", url, ((IURLRecord) taglibRecord).getDescriptor().getURI());
- URL recordURL = ((IURLRecord) taglibRecord).getURL();
- assertNotNull("record has no URL", recordURL);
- assertTrue("record has wrong URL", recordURL.toString().length() > 4);
- assertEquals("record has wrong URL protocol", "jar:", recordURL.toString().substring(0, 4));
- assertEquals("record has wrong URL", "/bug_118251-g/Web Content/WEB-INF/lib/sample_tld.jar!/folder/sample_for_118251.tld", recordURL.toString().substring(recordURL.toString().length() - 82));
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/WEB-INF"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/WEB-INF/web.xml"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- }
-
- public void testUtilityProjectSupport() throws Exception {
- // Create project 1
- IProject project = BundleResourceUtil.createSimpleProject("test-jar", null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug183756/test-jar", "/test-jar");
-
- // Create project 2
- IProject project2 = BundleResourceUtil.createSimpleProject("test-war", null, null);
- assertTrue(project2.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug183756/test-war", "/test-war");
-
- IFile testFile = project2.getFile(new Path("src/main/webapp/test.jsp"));
- assertTrue("missing test JSP file!", testFile.isAccessible());
-
- IDOMModel jspModel = null;
- try {
- jspModel = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(testFile);
- NodeList tests = jspModel.getDocument().getElementsByTagName("test:test");
- assertTrue("test:test element not found", tests.getLength() > 0);
- CMElementDeclaration elementDecl = ModelQueryUtil.getModelQuery(jspModel).getCMElementDeclaration(((Element) tests.item(0)));
- assertNotNull("No element declaration was found for test:test at runtime", elementDecl);
- assertTrue("element declaration was not the expected kind", elementDecl instanceof CMNodeWrapper);
- CMNode originNode = ((CMNodeWrapper) elementDecl).getOriginNode();
- assertTrue("element declaration was not from a tag library", originNode instanceof TLDElementDeclaration);
- assertEquals("element declaration was not from expected tag library", "http://foo.com/testtags", ((TLDDocument) ((TLDElementDeclaration) originNode).getOwnerDocument()).getUri());
- }
- finally {
- if (jspModel != null) {
- jspModel.releaseFromRead();
- }
- }
- }
-
- public void testWebXMLTaglibMappingsToJARs() throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("bug_148717");
- if (!project.exists()) {
- // Create new project
- project = BundleResourceUtil.createSimpleProject("bug_148717", null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_148717", "/bug_148717");
- }
-
- IFile file = project.getFile("/WebContent/WEB-INF/lib/internal.jar");
- assertTrue(file.exists());
-
- String uri = "http://example.com/external-uri";
- ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_148717/WebContent/", uri, false);
- assertNotNull("record not found for " + uri, taglibRecord);
- assertEquals(ITaglibRecord.JAR, taglibRecord.getRecordType());
- assertEquals(uri, ((IJarRecord) taglibRecord).getDescriptor().getURI());
-
- ITaglibRecord taglibRecord2 = null;
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_148717/WebContent/"));
- for (int i = 0; i < records.length; i++) {
- int type = records[i].getRecordType();
- switch (type) {
- case ITaglibRecord.JAR : {
- taglibRecord2 = records[i];
- }
- break;
- }
- }
- assertNotNull("record not returned for " + uri, taglibRecord2);
- assertEquals(ITaglibRecord.JAR, taglibRecord2.getRecordType());
- assertEquals(uri, ((IJarRecord) taglibRecord2).getDescriptor().getURI());
- }
-
- /**
- * test caching from session-to-session
- */
- public void testRecordCacheCountBetweenSessions() throws Exception {
- TaglibIndex.shutdown();
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("testcache1", null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testcache1", "/testcache1");
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/testcache1/WebContent/WEB-INF/lib/sample_tld.jar");
- TaglibIndex.startup();
-
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match", 5, records.length);
-
- TaglibIndex.shutdown();
- TaglibIndex.startup();
- ITaglibRecord[] records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (1st restart)", records.length, records2.length);
- TaglibIndex.shutdown();
- TaglibIndex.startup();
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (2nd restart)", records.length, records2.length);
- TaglibIndex.shutdown();
- TaglibIndex.startup();
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (3rd restart)", records.length, records2.length);
- }
-
- /**
- * test caching from session-to-session with an addition in one session
- */
- public void testCachingWithAddingLibrary() throws Exception {
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("testcache2", null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testcache2", "/testcache2");
-
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
- TaglibIndex.shutdown();
-
- TaglibIndex.startup();
- ITaglibRecord[] records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (1st restart)", records.length, records2.length);
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/testcache2/WebContent/WEB-INF/lib/sample_tld.jar");
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (1st restart, added jar file)", records.length + 1, records2.length);
- TaglibIndex.shutdown();
-
- TaglibIndex.startup();
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (2nd restart)", records.length + 1, records2.length);
- BundleResourceUtil.addLibraryEntry(project, "WebContent/WEB-INF/lib/sample_tld.jar");
- TaglibIndex.shutdown();
-
- TaglibIndex.startup();
- assertEquals("total ITaglibRecord count doesn't match (3nd restart)", records.length + 1, records2.length);
- TaglibIndex.shutdown();
-
- TaglibIndex.startup();
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match changed value (4th restart, add jar to build path)", records.length + 2, records2.length);
- }
-
- public void testAvailableFromExportedOnBuildpathFromAnotherProject() throws Exception {
- TaglibIndex.shutdown();
-
- // Create project 1
- IProject project = BundleResourceUtil.createSimpleProject("testavailable1", null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testavailable1", "/testavailable1");
-
- // Create project 2
- IProject project2 = BundleResourceUtil.createSimpleProject("testavailable2", null, null);
- assertTrue(project2.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testavailable2", "/testavailable2");
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar");
-
- TaglibIndex.startup();
-
- // make sure project 1 sees no taglibs
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable1/WebContent"));
- assertEquals("ITaglibRecords were found", 0, records.length);
- // make sure project 2 sees two taglibs
- ITaglibRecord[] records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
- if (records2.length != 2) {
- for (int i = 0; i < records2.length; i++) {
- System.err.println(records2[i]);
- }
- }
- assertEquals("total ITaglibRecord count doesn't match", 2, records2.length);
-
- TaglibIndex.shutdown();
- TaglibIndex.startup();
-
-
- records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match after restart", 2, records2.length);
-
- IJavaProject created = JavaCore.create(project2);
- assertTrue("/availabletest2 not a Java project", created.exists());
-
- // export the jar from project 2
- IClasspathEntry[] entries = created.getRawClasspath();
- boolean found = false;
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
- if (entry.getPath().equals(new Path("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar"))) {
- found = true;
- assertFalse("was exported", entry.isExported());
- ((ClasspathEntry) entry).isExported = true;
- }
- }
- assertTrue("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar was not found in build path", found);
- IClasspathEntry[] entries2 = new IClasspathEntry[entries.length];
- System.arraycopy(entries, 1, entries2, 0, entries.length - 1);
- entries2[entries.length - 1] = entries[0];
- created.setRawClasspath(entries2, new NullProgressMonitor());
-
- entries = created.getRawClasspath();
- found = false;
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
- if (entry.getPath().equals(new Path("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar"))) {
- found = true;
- assertTrue("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar was not exported", ((ClasspathEntry) entry).isExported);
- }
- }
- assertTrue("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar was not found in build path", found);
-
- // project 2 should still have just two taglibs
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (after exporting jar)", 2, records.length);
-
- // now one taglib should be visible from project 1
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (after exporting jar)", 1, records.length);
-
- TaglibIndex.shutdown();
- TaglibIndex.startup();
-
- // project 2 should still have just two taglibs
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (after exporting jar and restarting)", 2, records.length);
-
- // and one taglib should still be visible from project 1
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable1/WebContent"));
- assertEquals("total ITaglibRecord count doesn't match (after exporting jar and restarting)", 1, records.length);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
deleted file mode 100644
index b9705b7..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.translation;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.jsp.core.internal.JSPCorePlugin;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.core.internal.preferences.JSPCorePreferenceNames;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class JSPJavaTranslatorCoreTest extends TestCase {
-
- static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";
-
- public JSPJavaTranslatorCoreTest() {
- }
-
- public JSPJavaTranslatorCoreTest(String name) {
- super(name);
- }
-
- String wtp_autotest_noninteractive = null;
-
- protected void setUp() throws Exception {
- super.setUp();
- String noninteractive = System.getProperty(WTP_AUTOTEST_NONINTERACTIVE);
- if (noninteractive != null)
- wtp_autotest_noninteractive = noninteractive;
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, "true");
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, wtp_autotest_noninteractive);
- }
-
- public void test_107338() throws Exception {
- String projectName = "bug_107338";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(projectName, null, null);
- assertTrue(project.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
- IFile file = project.getFile("WebContent/test107338.jsp");
- assertTrue(file.exists());
-
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(file);
- IDOMModel jspModel = (IDOMModel) model;
-
- String jspSource = model.getStructuredDocument().get();
-
- assertTrue("line delimiters have been converted to Windows [CRLF]", jspSource.indexOf("\r\n") < 0);
- assertTrue("line delimiters have been converted to Mac [CR]", jspSource.indexOf("\r") < 0);
-
- if (model.getFactoryRegistry().getFactoryFor(IJSPTranslation.class) == null) {
- JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
- model.getFactoryRegistry().addFactory(factory);
- }
- IDOMDocument xmlDoc = jspModel.getDocument();
- JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) xmlDoc.getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = translationAdapter.getJSPTranslation();
- // System.err.print(translation.getJavaText());
-
- assertTrue("new-line beginning scriptlet missing from translation", translation.getJavaText().indexOf("int i = 0;") >= 0);
-
- model.releaseFromRead();
- }
-
- // public void testMangling() {
- // assertEquals("simple_tag", JSP2ServletNameUtil.mangle("simple.tag"));
- // assertEquals("simple_jspf", JSP2ServletNameUtil.mangle("simple.jspf"));
- // assertEquals("sim_005f_005fple_tagx",
- // JSP2ServletNameUtil.mangle("sim__ple.tagx"));
- // assertEquals(new Path("Project.folder.simple_tag"),
- // JSP2ServletNameUtil.mangle(new Path("/Project/folder/simple.tag")));
- // assertEquals(new Path("Project.fold_005fer.simple_jspx"),
- // JSP2ServletNameUtil.mangle(new Path("/Project/fold_er/simple.jspx")));
- // }
- //
- // public void testUnmangling() {
- // assertEquals("simple.tag", JSP2ServletNameUtil.unmangle("simple_tag"));
- // assertEquals("simple.jspf",
- // JSP2ServletNameUtil.unmangle("simple_jspf"));
- // assertEquals("sim__ple.tagx",
- // JSP2ServletNameUtil.unmangle("sim_005f_005fple_tagx"));
- // assertEquals(new Path("/Project/folder/simple.tag"),
- // JSP2ServletNameUtil.unmangle(new Path("Project.folder.simple_tag")));
- // assertEquals(new Path("/Project/fold_er/simple.jspx"),
- // JSP2ServletNameUtil.unmangle(new
- // Path("Project.fold_005fer.simple_jspx")));
- // }
- public void test_174042() throws Exception {
- boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- String testName = "bug_174042";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(testName, null, null);
- assertTrue(project.exists());
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/struts.jar");
- waitForBuildAndValidation(project);
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
- IFile main = project.getFile("main.jsp");
- IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
- StringBuffer s = new StringBuffer();
- for (int i = 0; i < markers.length; i++) {
- s.append("\nproblem marker on line " + markers[i].getAttribute(IMarker.LINE_NUMBER) + ": \"" + markers[i].getAttribute(IMarker.MESSAGE) + "\" ");
- }
- assertEquals("problem markers found, " + s.toString(), 0, markers.length);
- }
-
- private void waitForBuildAndValidation(IProject project) throws CoreException {
- project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
- project.build(IncrementalProjectBuilder.FULL_BUILD, "org.eclipse.wst.validation.validationbuilder", null, new NullProgressMonitor());
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- try {
- ResourcesPlugin.getWorkspace().checkpoint(true);
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());
- Job.getJobManager().join(ResourcesPlugin.FAMILY_MANUAL_BUILD, new NullProgressMonitor());
- Job.getJobManager().join(ValidatorManager.VALIDATOR_JOB_FAMILY, new NullProgressMonitor());
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());
- Job.getJobManager().beginRule(ResourcesPlugin.getWorkspace().getRoot(), null);
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- catch (OperationCanceledException e) {
- e.printStackTrace();
- }
- finally {
- Job.getJobManager().endRule(ResourcesPlugin.getWorkspace().getRoot());
- }
- }
-
- public void test_178443() throws Exception {
- boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- String testName = "bug_178443";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(testName, Platform.getStateLocation(JSPCoreTestsPlugin.getDefault().getBundle()).append(testName), null);
- assertTrue(project.exists());
- /*
- * Should be set to false. A referenced class in an included segment
- * does not exist.
- */
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/struts.jar");
-
- waitForBuildAndValidation(project);
-
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
- IFile main = project.getFile("main.jsp");
- IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
-
- StringBuffer s = new StringBuffer();
- for (int i = 0; i < markers.length; i++) {
- s.append("\nproblem on line " + markers[i].getAttribute(IMarker.LINE_NUMBER) + ": " + markers[i].getAttribute(IMarker.MESSAGE));
- }
- assertEquals("problem markers found" + s.toString(), 0, markers.length);
- }
-
- public void test_109721() throws Exception {
- boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- String testName = "bug_109721";
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject(testName, Platform.getStateLocation(JSPCoreTestsPlugin.getDefault().getBundle()).append(testName), null);
- assertTrue(project.exists());
- /*
- * Should be set to false. A referenced class in an included segment
- * does not exist.
- */
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/WebContent/WEB-INF/lib/struts.jar");
-
- waitForBuildAndValidation(project);
-
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
- IFile main = project.getFile("WebContent/main.jsp");
- IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
-
- StringBuffer s = new StringBuffer();
- for (int i = 0; i < markers.length; i++) {
- s.append("\nproblem on line " + markers[i].getAttribute(IMarker.LINE_NUMBER) + ": " + markers[i].getAttribute(IMarker.MESSAGE));
- }
- assertEquals("problem markers found" + s.toString(), 0, markers.length);
- }
- public void test_181057a() throws Exception {
- boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
- String testName = "bug_181057";
- // Create new project
- IProject j = BundleResourceUtil.createSimpleProject("j", null, null);
- assertTrue(j.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/j", "/j");
- IProject k = BundleResourceUtil.createSimpleProject("k", null, null);
- assertTrue(k.exists());
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/k", "/k");
-
- IProject project = BundleResourceUtil.createSimpleProject(testName, Platform.getStateLocation(JSPCoreTestsPlugin.getDefault().getBundle()).append(testName), null);
- assertTrue(project.exists());
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/struts.jar");
-
- waitForBuildAndValidation(project);
-
- JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
- /*
- * main.jsp contains numerous references to tags in struts.jar, which
- * is at the end of the build path
- */
- IFile main = project.getFile("main.jsp");
- IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
- StringBuffer s = new StringBuffer();
- for (int i = 0; i < markers.length; i++) {
- s.append("\n" + markers[i].getAttribute(IMarker.LINE_NUMBER) + ":" + markers[i].getAttribute(IMarker.MESSAGE));
- }
- assertEquals("problem markers found" + s.toString(), 0, markers.length);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java
deleted file mode 100644
index 31302a4..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.validation;
-
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsp.core.internal.JSPCoreMessages;
-import org.eclipse.jst.jsp.core.internal.validation.JSPActionValidator;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JSPActionValidatorTest extends TestCase {
- String wtp_autotest_noninteractive = null;
- private static final String PROJECT_NAME = "testvalidatejspactions";
- private static final String UNDEFINED_ATTR_IDONT = "idont";
- private static final String REQUIRED_ATTR_NAME = "name";
-
- protected void setUp() throws Exception {
- super.setUp();
- String noninteractive = System.getProperty("wtp.autotest.noninteractive");
- if (noninteractive != null)
- wtp_autotest_noninteractive = noninteractive;
- System.setProperty("wtp.autotest.noninteractive", "true");
-
- if (!ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists()) {
- BundleResourceUtil.createSimpleProject(PROJECT_NAME, null, new String[]{JavaCore.NATURE_ID});
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
- }
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists());
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- }
-
- /**
- * Tests if unknown attributes are detected
- *
- * @throws Exception
- */
- public void testUknownAttribute() throws Exception {
- JSPActionValidator validator = new JSPActionValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/undefinedattribute.jsp";
- assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
- helper.setURI(filePath);
- validator.validate(helper, reporter);
-
- boolean foundError1 = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_6, UNDEFINED_ATTR_IDONT), 4);
- if (foundError1)
- foundError1 = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_6, UNDEFINED_ATTR_IDONT), 12);
- if (foundError1)
- foundError1 = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_6, UNDEFINED_ATTR_IDONT), 13);
-
- assertTrue("jsp action validator did not detect undefined attributes", foundError1);
- }
-
- /**
- * Tests if missing required attributes are detected
- *
- * @throws Exception
- */
- public void testMissingRequiredAttribute() throws Exception {
- JSPActionValidator validator = new JSPActionValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/norequiredattribute.jsp";
- assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
-
- helper.setURI(filePath);
- validator.validate(helper, reporter);
-
- boolean foundError = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_5, REQUIRED_ATTR_NAME), 11);
- if (foundError)
- foundError = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_5, REQUIRED_ATTR_NAME), 12);
-
- assertTrue("jsp action validator did not detect missing required attributes", foundError);
- }
-
- private boolean errorMessageFound(IReporter reporter, String errorMessage, int errorLineNumber) {
- boolean foundError = false;
- List messages = reporter.getMessages();
- Iterator iter = messages.iterator();
- while (iter.hasNext() && !foundError) {
- IMessage message = (IMessage) iter.next();
- int lineNumber = message.getLineNumber();
- String messageText = message.getText();
-
- if (lineNumber == errorLineNumber && messageText.startsWith(errorMessage))
- foundError = true;
- }
- return foundError;
- }
-
- /**
- * Tests if missing required attributes are detected
- *
- * @throws Exception
- */
- public void testAttributesCorrect() throws Exception {
- JSPActionValidator validator = new JSPActionValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/worksfine.jsp";
- assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
-
- helper.setURI(filePath);
- validator.validate(helper, reporter);
-
- assertTrue("jsp action validator found errors when it should not have", reporter.getMessages().isEmpty());
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPJavaValidatorTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPJavaValidatorTest.java
deleted file mode 100644
index 622071d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPJavaValidatorTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.validation;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsp.core.internal.contentproperties.JSPFContentProperties;
-import org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPValidator;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Tests JSP Java Validator
- */
-public class JSPJavaValidatorTest extends TestCase {
- String wtp_autotest_noninteractive = null;
- private static final String PROJECT_NAME = "bug_87351";
-
- protected void setUp() throws Exception {
- super.setUp();
- String noninteractive = System.getProperty("wtp.autotest.noninteractive");
- if (noninteractive != null)
- wtp_autotest_noninteractive = noninteractive;
- System.setProperty("wtp.autotest.noninteractive", "true");
-
- if (!ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists()) {
- BundleResourceUtil.createSimpleProject(PROJECT_NAME, null, new String[]{JavaCore.NATURE_ID});
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
- }
- assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists());
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- }
-
- /**
- * Tests if jsp fragments are validated when preference is set to true
- *
- * @throws Exception
- */
- public void testValidatingFragments() throws Exception {
- JSPValidator validator = new JSPJavaValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/WebContent/ihaveerrors.jspf";
- helper.setURI(filePath);
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
- String validate = JSPFContentProperties.getProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, false);
- JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, Boolean.toString(true));
- validator.validate(helper, reporter);
-
- if (validate != null) {
- JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, validate);
- }
- assertTrue("jspf was not validated when it should have been", !reporter.getMessages().isEmpty());
- }
-
- /**
- * Tests if jsp fragments are not validated when preference is set to
- * false
- *
- * @throws Exception
- */
- public void testNoValidatingFragments() throws Exception {
- JSPValidator validator = new JSPValidator();
- IReporter reporter = new ReporterForTest();
- ValidationContextForTest helper = new ValidationContextForTest();
- String filePath = "/" + PROJECT_NAME + "/ihaveerrors.jspf";
- helper.setURI(filePath);
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
- String validate = JSPFContentProperties.getProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, false);
- JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, Boolean.toString(false));
- validator.validate(helper, reporter);
-
- if (validate != null) {
- JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, validate);
- }
- assertTrue("jspf was validated when it should not have been", reporter.getMessages().isEmpty());
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ReporterForTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ReporterForTest.java
deleted file mode 100644
index 557768c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ReporterForTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.validation.internal.core.IMessageAccess;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-class ReporterForTest implements IReporter {
- List list = new ArrayList();
-
- public ReporterForTest() {
- super();
- }
-
- public void addMessage(IValidator origin, IMessage message) {
- list.add(message);
- }
-
- public void displaySubtask(IValidator validator, IMessage message) {
- /* do not need to implement */
- }
-
- public IMessageAccess getMessageAccess() {
- return null;
- }
-
- public boolean isCancelled() {
- return false;
- }
-
- public void removeAllMessages(IValidator origin, Object object) { // do
- /* do not need to implement */
- }
-
- public void removeAllMessages(IValidator origin) {
- /* do not need to implement */
- }
-
- public void removeMessageSubset(IValidator validator, Object obj, String groupName) {// do
- /* do not need to implement */
- }
-
- public List getMessages() {
- return list;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ValidationContextForTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ValidationContextForTest.java
deleted file mode 100644
index 34956c0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ValidationContextForTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.validation;
-
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-class ValidationContextForTest implements IValidationContext {
- private String fURI = null;
-
- public void setURI(String uri) {
- fURI = uri;
- }
-
- public String[] getURIs() {
- if (fURI != null)
- return new String[]{fURI};
- return new String[0];
- }
-
- public Object loadModel(String symbolicName) {
- return null;
- }
-
- public Object loadModel(String symbolicName, Object[] parms) {
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/source/JSPedCSSSourceParserTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/source/JSPedCSSSourceParserTest.java
deleted file mode 100644
index ffc975d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/source/JSPedCSSSourceParserTest.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.css.core.tests.source;
-
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jst.jsp.core.tests.NullInputStream;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-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.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.osgi.framework.Bundle;
-
-/**
- *
- */
-public class JSPedCSSSourceParserTest extends TestCase {
- private static final String FILES_DIR = "src/org/eclipse/jst/jsp/css/core/tests/testfiles"; //$NON-NLS-1$
- private static final String RESULTS_DIR = "src/org/eclipse/jst/jsp/css/core/tests/testfiles/results"; //$NON-NLS-1$
- private static final String MODE_OPEN = "MODE_OPEN"; //$NON-NLS-1$
- private static final String MODE_APPEND = "MODE_APPEND"; //$NON-NLS-1$
- private static final String MODE_INSERT = "MODE_INSERT"; //$NON-NLS-1$
- private static final String commonEOL = "\r\n";//$NON-NLS-1$
-
- public void testSourceOpen1() throws IOException {
- sourceParserTest("sample01.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend1() throws IOException {
- sourceParserTest("sample01.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert1() throws IOException {
- sourceParserTest("sample01.jsp", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceOpen2() throws IOException {
- sourceParserTest("sample02.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend2() throws IOException {
- sourceParserTest("sample02.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceOpen3() throws IOException {
- sourceParserTest("sample03.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend3() throws IOException {
- sourceParserTest("sample03.jsp", MODE_APPEND); //$NON-NLS-1$
- }
- /*
- * The following test case fails with WTP 1.5 RC2, but, ignore this release.
- *
- public void testSourceInsert2() throws IOException {
- sourceParserTest("sample02.jsp", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceInsert3() throws IOException {
- sourceParserTest("sample03.jsp", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceInsert6() throws IOException {
- sourceParserTest("sample06.jsp", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceInsert8() throws IOException {
- sourceParserTest("sample02.jspf", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceInsert9() throws IOException {
- sourceParserTest("sample03.jspf", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceInsert12() throws IOException {
- sourceParserTest("sample06.jspf", MODE_INSERT); //$NON-NLS-1$
- }
- *
- */
- public void testSourceOpen4() throws IOException {
- sourceParserTest("sample04.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend4() throws IOException {
- sourceParserTest("sample04.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert4() throws IOException {
- sourceParserTest("sample04.jsp", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceOpen5() throws IOException {
- sourceParserTest("sample05.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend5() throws IOException {
- sourceParserTest("sample05.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert5() throws IOException {
- sourceParserTest("sample05.jsp", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceOpen6() throws IOException {
- sourceParserTest("sample06.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend6() throws IOException {
- sourceParserTest("sample06.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceOpen7() throws IOException {
- sourceParserTest("sample01.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend7() throws IOException {
- sourceParserTest("sample01.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert7() throws IOException {
- sourceParserTest("sample01.jspf", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceOpen8() throws IOException {
- sourceParserTest("sample02.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend8() throws IOException {
- sourceParserTest("sample02.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceOpen9() throws IOException {
- sourceParserTest("sample03.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend9() throws IOException {
- sourceParserTest("sample03.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceOpen10() throws IOException {
- sourceParserTest("sample04.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend10() throws IOException {
- sourceParserTest("sample04.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert10() throws IOException {
- sourceParserTest("sample04.jspf", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceOpen11() throws IOException {
- sourceParserTest("sample05.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend11() throws IOException {
- sourceParserTest("sample05.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert11() throws IOException {
- sourceParserTest("sample05.jspf", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceOpen12() throws IOException {
- sourceParserTest("sample06.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend12() throws IOException {
- sourceParserTest("sample06.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceOpen13() throws IOException {
- sourceParserTest("sample07.jspf", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend13() throws IOException {
- sourceParserTest("sample07.jspf", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert13() throws IOException {
- sourceParserTest("sample07.jspf", MODE_INSERT); //$NON-NLS-1$
- }
- public void testSourceOpen14() throws IOException {
- sourceParserTest("sample07.jsp", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend14() throws IOException {
- sourceParserTest("sample07.jsp", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert14() throws IOException {
- sourceParserTest("sample07.jsp", MODE_INSERT); //$NON-NLS-1$
- }
-
- protected void setUp() throws Exception {
- // set cssjsptestX.jsp(f) file as css jsp.
- IContentType ct = Platform.getContentTypeManager().getContentType("org.eclipse.jst.jsp.core.cssjspsource");
- ct.addFileSpec("cssjsptest0.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest1.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest2.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest3.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest4.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest5.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest6.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest7.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest8.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest9.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest10.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest11.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest12.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest13.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest14.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest15.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest16.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest17.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest18.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest19.jsp", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest20.jsp", IContentType.FILE_NAME_SPEC);
- ct = Platform.getContentTypeManager().getContentType("org.eclipse.jst.jsp.core.cssjspfragmentsource");
- ct.addFileSpec("cssjsptest0.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest1.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest2.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest3.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest4.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest5.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest6.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest7.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest8.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest9.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest10.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest11.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest12.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest13.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest14.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest15.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest16.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest17.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest18.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest19.jspf", IContentType.FILE_NAME_SPEC);
- ct.addFileSpec("cssjsptest20.jspf", IContentType.FILE_NAME_SPEC);
- }
-
- static int index_jsp = 0;
- static int index_jspf = 0;
- private ICSSModel createModel(boolean isFragment) {
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- model = !isFragment ? modelManager.getModelForEdit("cssjsptest" + index_jsp++ + ".jsp", new NullInputStream(), null) : //$NON-NLS-1$
- modelManager.getModelForEdit("cssjsptest" + index_jspf++ + ".jspf", new NullInputStream(), null); //$NON-NLS-1$
- model.getStructuredDocument().setLineDelimiter(commonEOL);//$NON-NLS-1$
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- return (ICSSModel) model;
-
- }
- private File createFile(String directory, String filename) throws IOException {
- Bundle bundle = Platform.getBundle("org.eclipse.jst.jsp.core.tests"); //$NON-NLS-1$
- URL url = bundle.getEntry("/"); //$NON-NLS-1$
- URL localURL = FileLocator.toFileURL(url);
- String installPath = localURL.getPath();
- String totalDirectory = installPath + directory;
- String totalPath = totalDirectory + "/" + filename; //$NON-NLS-1$
- URL totalURL = new URL(url, totalPath);
- String finalFile = totalURL.getFile();
- File file = new File(finalFile);
- return file;
- }
-
- private String createString(String directory, String filename) throws FileNotFoundException, IOException {
- StringBuffer buf = new StringBuffer();
- Reader fileReader = new FileReader(createFile(directory, filename));
- BufferedReader reader = new BufferedReader(fileReader);
- String line;
- while ((line = reader.readLine()) != null) {
- buf.append(line);
- buf.append(commonEOL);
- }
- return buf.toString();
- }
-
- private void sourceParserTest(String filename, String mode) throws IOException {
- ICSSModel model = null;
- if (mode.equals(MODE_OPEN)) {
- model = readModelOpen(filename);
- }
- else if (mode.equals(MODE_APPEND)) {
- model = readModelAppend(filename);
- }
- else if (mode.equals(MODE_INSERT)) {
- model = readModelInsert(filename);
- }
- String result = dumpRegions(model.getStructuredDocument());
- compareResult(result, "JSPedCSSSourceParserTest-" + filename); //$NON-NLS-1$
- closeModel(model);
- }
-
- private ICSSModel readModelOpen(String filename) throws IOException {
- String source = createString(FILES_DIR, filename);
- ICSSModel model = createModel(filename.endsWith("jspf"));//$NON-NLS-1$
- IStructuredDocument document = model.getStructuredDocument();
- document.replaceText(null, 0, 0, source);
-
- return model;
- }
-
- private ICSSModel readModelAppend(String filename) throws IOException {
- String source = createString(FILES_DIR, filename);
- ICSSModel model = createModel(filename.endsWith("jspf"));//$NON-NLS-1$
- IStructuredDocument document = model.getStructuredDocument();
- for (int i = 0; i < source.length(); i++) {
- document.replaceText(null, i, 0, source.substring(i, i + 1));
- }
-
- return model;
- }
-
- private ICSSModel readModelInsert(String filename) throws IOException {
- String source = createString(FILES_DIR, filename);
- ICSSModel model = createModel(filename.endsWith("jspf"));//$NON-NLS-1$
- IStructuredDocument document = model.getStructuredDocument();
- for (int i = 0; i < source.length(); i++) {
- int textIndex = source.length() - i - 1;
- document.replaceText(null, 0, 0, source.substring(textIndex, textIndex + 1));
- }
-
- return model;
- }
-
- private void closeModel(ICSSModel model) {
- model.releaseFromEdit();
- }
-
- private String dumpRegions(IStructuredDocument document) {
- StringBuffer buf = new StringBuffer();
- buf.append(dumpRegions(document.getFirstStructuredDocumentRegion()));
- return buf.toString();
- }
-
- private String dumpRegions(IStructuredDocumentRegion region) {
- StringBuffer buf = new StringBuffer();
- while (region != null){
- buf.append(dumpOneRegion(region));
- region = region.getNext();
- }
-
- buf.append(commonEOL + "-------" + commonEOL); //$NON-NLS-1$
-
- return buf.toString();
- }
-
- private String dumpOneRegion(IStructuredDocumentRegion documentRegion) {
- StringBuffer buf = new StringBuffer();
-
- buf.append(documentRegion.toString());
- buf.append(commonEOL + " "); //$NON-NLS-1$
-
- ITextRegionList regionList = documentRegion.getRegions();
- Iterator i = regionList.iterator();
- while (i.hasNext()) {
- ITextRegion textRegion = (ITextRegion) i.next();
- buf.append(textRegion.toString());
- buf.append(", "); //$NON-NLS-1$
- }
- buf.append(commonEOL); //$NON-NLS-1$
- return buf.toString();
- }
-
- private void compareResult(String actual, String filename) throws IOException {
- String result = createString(RESULTS_DIR, filename);
- assertEquals(result, actual);
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jsp
deleted file mode 100644
index 1c4b700..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73,
-[73, 143] (<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-66/70,
-[143, 188] (<%@ include file="./cssjspfragment.jspf" %>
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-43/45,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jspf
deleted file mode 100644
index 49ab4db..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jspf
+++ /dev/null
@@ -1,9 +0,0 @@
-[0, 70] (<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-66/70,
-[70, 115] (<%@ include file="./cssjspfragment.jspf" %>
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-43/45,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jsp
deleted file mode 100644
index 06f5e7c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73,
-[73, 79] (.hoge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[79, 83] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[83, 97] (float : ${XXX})
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14,
-[97, 98] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[98, 101] (
- )
- ContextRegion--> S: 0-3,
-[101, 120] (border-${XXX}-color)
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13, ContextRegion--> UNKNOWN: 13-19,
-[120, 126] ( : red)
- ContextRegion--> S: 0-1, ContextRegion--> DECLARATION_SEPARATOR: 1-2/3, ContextRegion--> DECLARATION_VALUE_IDENT: 3-6,
-[126, 127] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[127, 129] (
-)
- ContextRegion--> S: 0-2,
-[129, 130] (})
- ContextRegion--> RBRACE: 0-1,
-[130, 132] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jspf
deleted file mode 100644
index 6e4a6ec..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jspf
+++ /dev/null
@@ -1,32 +0,0 @@
-[0, 4] (
-
-)
- ContextRegion--> S: 0-4,
-[4, 10] (.hoge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[10, 14] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[14, 28] (float : ${XXX})
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14,
-[28, 29] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[29, 32] (
- )
- ContextRegion--> S: 0-3,
-[32, 51] (border-${XXX}-color)
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13, ContextRegion--> UNKNOWN: 13-19,
-[51, 57] ( : red)
- ContextRegion--> S: 0-1, ContextRegion--> DECLARATION_SEPARATOR: 1-2/3, ContextRegion--> DECLARATION_VALUE_IDENT: 3-6,
-[57, 58] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[58, 60] (
-)
- ContextRegion--> S: 0-2,
-[60, 61] (})
- ContextRegion--> RBRACE: 0-1,
-[61, 63] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jsp
deleted file mode 100644
index f36aaa3..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73,
-[73, 79] (.hoge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[79, 83] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[83, 97] (color : ${XXX})
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14,
-[97, 98] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[98, 101] (
- )
- ContextRegion--> S: 0-3,
-[101, 126] (border-color : <%= YYY %>)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> CSS_JSP_EXP: 15-25,
-[126, 127] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[127, 129] (
-)
- ContextRegion--> S: 0-2,
-[129, 130] (})
- ContextRegion--> RBRACE: 0-1,
-[130, 132] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jspf
deleted file mode 100644
index 29b6482..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jspf
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 4] (
-
-)
- ContextRegion--> S: 0-4,
-[4, 10] (.hoge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[10, 14] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[14, 28] (color : ${XXX})
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14,
-[28, 29] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[29, 32] (
- )
- ContextRegion--> S: 0-3,
-[32, 57] (border-color : <%= YYY %>)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> CSS_JSP_EXP: 15-25,
-[57, 58] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[58, 60] (
-)
- ContextRegion--> S: 0-2,
-[60, 61] (})
- ContextRegion--> RBRACE: 0-1,
-[61, 63] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jsp
deleted file mode 100644
index cf760e6..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73,
-[73, 79] (.puge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[79, 83] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[83, 89] (${XXX})
- ContextRegion--> FOREIGN_ELEMENT: 0-6,
-[89, 90] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[90, 93] (
- )
- ContextRegion--> S: 0-3,
-[93, 111] (border-color : red)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-18,
-[111, 112] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[112, 114] (
-)
- ContextRegion--> S: 0-2,
-[114, 115] (})
- ContextRegion--> RBRACE: 0-1,
-[115, 117] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jspf
deleted file mode 100644
index 1d40579..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jspf
+++ /dev/null
@@ -1,26 +0,0 @@
-[0, 6] (.puge )
- ContextRegion--> SELECTOR_CLASS: 0-5/6,
-[6, 10] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[10, 16] (${XXX})
- ContextRegion--> FOREIGN_ELEMENT: 0-6,
-[16, 17] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[17, 20] (
- )
- ContextRegion--> S: 0-3,
-[20, 38] (border-color : red)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-18,
-[38, 39] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[39, 41] (
-)
- ContextRegion--> S: 0-2,
-[41, 42] (})
- ContextRegion--> RBRACE: 0-1,
-[42, 44] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jsp
deleted file mode 100644
index ddd9993..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-[0, 71] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/71,
-[71, 100] (<%--
-jsp
-comment
---%>
-)
- ContextRegion--> COMMENT: 0-27/29,
-[100, 103] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[103, 107] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[107, 130] (background-color : blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_IDENT: 19-23,
-[130, 131] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[131, 133] (
-)
- ContextRegion--> S: 0-2,
-[133, 134] (})
- ContextRegion--> RBRACE: 0-1,
-[134, 136] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jspf
deleted file mode 100644
index 83fff30..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jspf
+++ /dev/null
@@ -1,26 +0,0 @@
-[0, 31] (
-<%--
-jsp
-comment
---%>
-)
- ContextRegion--> S: 0-2, ContextRegion--> COMMENT: 2-29/31,
-[31, 34] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[34, 38] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[38, 61] (background-color : blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_IDENT: 19-23,
-[61, 62] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[62, 64] (
-)
- ContextRegion--> S: 0-2,
-[64, 65] (})
- ContextRegion--> RBRACE: 0-1,
-[65, 67] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jsp
deleted file mode 100644
index 23ac7c0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
- ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73,
-[73, 76] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[76, 80] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[80, 111] (border-${XXX} : 0px, solid, red)
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_IDENT: 21-26, ContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, ContextRegion--> DECLARATION_VALUE_IDENT: 28-31,
-[111, 112] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[112, 114] (
-)
- ContextRegion--> S: 0-2,
-[114, 115] (})
- ContextRegion--> RBRACE: 0-1,
-[115, 117] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jspf
deleted file mode 100644
index 671d71d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jspf
+++ /dev/null
@@ -1,23 +0,0 @@
-[0, 4] (
-
-)
- ContextRegion--> S: 0-4,
-[4, 7] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[7, 11] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[11, 42] (border-${XXX} : 0px, solid, red)
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_IDENT: 21-26, ContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, ContextRegion--> DECLARATION_VALUE_IDENT: 28-31,
-[42, 43] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[43, 45] (
-)
- ContextRegion--> S: 0-2,
-[45, 46] (})
- ContextRegion--> RBRACE: 0-1,
-[46, 48] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jsp
deleted file mode 100644
index c2678fb..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jspf
deleted file mode 100644
index de5f2ac..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jspf
+++ /dev/null
@@ -1,2 +0,0 @@
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jsp
deleted file mode 100644
index 19723c5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-<%@ include file="./cssjspfragment.jspf" %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jspf
deleted file mode 100644
index a86aee5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jspf
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-<%@ include file="./cssjspfragment.jspf" %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jsp
deleted file mode 100644
index b00d5b4..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-.hoge {
- float : ${XXX};
- border-${XXX}-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jspf
deleted file mode 100644
index 238ad9e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jspf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-.hoge {
- float : ${XXX};
- border-${XXX}-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jsp
deleted file mode 100644
index 38ddb8c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-.hoge {
- color : ${XXX};
- border-color : <%= YYY %>;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jspf
deleted file mode 100644
index 5e63836..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jspf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-.hoge {
- color : ${XXX};
- border-color : <%= YYY %>;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jsp
deleted file mode 100644
index 18709a8..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-.puge {
- ${XXX};
- border-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jspf
deleted file mode 100644
index 4f03d5a..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jspf
+++ /dev/null
@@ -1,4 +0,0 @@
-.puge {
- ${XXX};
- border-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jsp
deleted file mode 100644
index 2e39e57..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-<%--
-jsp
-comment
---%>
-H1 {
- background-color : blue;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jspf
deleted file mode 100644
index e98a251..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jspf
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<%--
-jsp
-comment
---%>
-H1 {
- background-color : blue;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jsp
deleted file mode 100644
index 01b344e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-H1 {
- border-${XXX} : 0px, solid, red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jspf
deleted file mode 100644
index 0216ce5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jspf
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-H1 {
- border-${XXX} : 0px, solid, red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jsp
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jspf
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jspf
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/test.xml b/tests/org.eclipse.jst.jsp.core.tests/test.xml
deleted file mode 100644
index 99c4331..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.jst.jsp.core.tests" />
- <property
- name="classname"
- value="org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld
deleted file mode 100644
index bfdd673..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version = "1.0" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglib_1_2.dtd">
-<taglib>
- <tlib-version>1.1</tlib-version>
- <jsp-version>1.1</jsp-version>
- <uri>tagdependent</uri>
- <short-name>tagdependent</short-name>
- <description>
- This tag library demonstrates tagdependent tag handling
- using its "code" tag.
- </description>
- <tag>
- <name>code</name>
- <tag-class>com.example.tagdep.CodeTag</tag-class>
- <body-content>tagdependent</body-content>
- <attribute>
- <name>fontName</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <name>bold</name>
- <type>boolean</type>
- </attribute>
- <attribute>
- <name>italic</name>
- <type>boolean</type>
- </attribute>
- </tag>
- <small-icon>browser_editor.gif</small-icon>
-</taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.classpath
deleted file mode 100644
index d5aec8f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Tomcat 5.5.9"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.project
deleted file mode 100644
index 80341f8..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>test-jar</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 167796c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Apr 24 11:16:26 BST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 0bb9d17..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="test-jar">
- <wb-resource deploy-path="/" source-path="/src"/>
-<property name="ear_libraries_processed" value="true"/>
- </wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index fd534a9..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <fixed facet="jst.utility"/>
- <fixed facet="jst.java"/>
- <installed facet="jst.java" version="6.0"/>
- <installed facet="jst.utility" version="1.0"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/taglib.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/taglib.tld
deleted file mode 100644
index af3a82b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/taglib.tld
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
-<taglib>
- <tlib-version>1.0</tlib-version>
- <jsp-version>1.2</jsp-version>
- <short-name>test</short-name>
- <uri>http://foo.com/testtags</uri>
- <description>Test Tag Library</description>
-
-
- <tag>
- <name>test</name>
- <tag-class>com.foo.TestTag</tag-class>
- <body-content>empty</body-content>
- <description>
- test
- </description>
- </tag>
-
-</taglib>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/com/foo/TestTag.class b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/com/foo/TestTag.class
deleted file mode 100644
index 7cf9d88..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/com/foo/TestTag.class
+++ /dev/null
@@ -1,15 +0,0 @@
-Êþº¾???2?,??com/foo/TestTag??#javax/servlet/jsp/tagext/TagSupport?<init>?()V?Code
-?? ???LineNumberTable?LocalVariableTable?this?Lcom/foo/TestTag;?
-doStartTag?()I?
-Exceptions?? javax/servlet/jsp/JspException ?? ??? pageContext? Ljavax/servlet/jsp/PageContext;
-???? javax/servlet/jsp/PageContext ?? ?getOut? ()Ljavax/servlet/jsp/JspWriter;? ?
-TAG WORKED
-? ?"?!?javax/servlet/jsp/JspWriter ?#?$?write?(Ljava/lang/String;)V
-??& ???(?java/lang/Exception?
-StackMapTable?
-SourceFile? TestTag.java?!???????????????/?????*·?±????
-???????? ??? ????? ?
-????????????????\?????*´?¶? ¶? §?L*·?%¬???? ??'??
-???????
-?? ??? ??? ????? ?
-???)????O?'???*????+
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/taglib.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/taglib.tld
deleted file mode 100644
index af3a82b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/taglib.tld
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
-<taglib>
- <tlib-version>1.0</tlib-version>
- <jsp-version>1.2</jsp-version>
- <short-name>test</short-name>
- <uri>http://foo.com/testtags</uri>
- <description>Test Tag Library</description>
-
-
- <tag>
- <name>test</name>
- <tag-class>com.foo.TestTag</tag-class>
- <body-content>empty</body-content>
- <description>
- test
- </description>
- </tag>
-
-</taglib>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/com/foo/TestTag.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/com/foo/TestTag.java
deleted file mode 100644
index 951882c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/com/foo/TestTag.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.foo;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-public class TestTag extends TagSupport {
-
- public int doStartTag() throws JspException {
- try {
- pageContext.getOut().write("TAG WORKED");
- } catch (Exception e) {
-
- }
- return super.doStartTag();
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.classpath
deleted file mode 100644
index edb36ca..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.project
deleted file mode 100644
index eb59416..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>test-war</name>
- <comment></comment>
- <projects>
- <project>test-jar</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 84f2b19..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Apr 24 11:08:40 BST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index 43db39a..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Apr 24 11:08:46 BST 2007
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.6.0_01/owners=jst.java\:6.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v4.1/owners=jst.web\:2.3
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 2c1da55..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="test-war">
- <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
- <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/test-jar/test-jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <property name="context-root" value="test-war"/>
- <property name="java-output-path" value="build/classes"/>
-<property name="web_app_libraries_processed" value="true"/>
-<property name="ear_libraries_processed" value="true"/>
- </wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index dd3b084..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v4.1"/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <installed facet="jst.java" version="6.0"/>
- <installed facet="jst.web" version="2.3"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 47cea3c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app id="WebApp_ID">
- <display-name>test-war</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/test.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/test.jsp
deleted file mode 100644
index d3f9436..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/test.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://foo.com/testtags" prefix="test" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Test</title>
-</head>
-<body>
-Before Tag
-<test:test/>
-After Tag
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.classpath
deleted file mode 100644
index 5ec3b3b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.project
deleted file mode 100644
index a375624..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_107338</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/web.xml
deleted file mode 100644
index d03194c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>107338</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/test107338.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/test107338.jsp
deleted file mode 100644
index 060f5d1..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/test107338.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-<%
- int i = 0;
-%><%=i%><%
-
-%>
-</script>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/build/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.classpath
deleted file mode 100644
index 4600e2b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.classpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/struts.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_08"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.project
deleted file mode 100644
index 770dfe4..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_109721</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 34906a0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- TagTest</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
- <jsp-config>
- <jsp-property-group>
- <url-pattern>*.jsp</url-pattern>
- <include-prelude>/header.jspf</include-prelude>
- </jsp-property-group></jsp-config>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/header.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/header.jspf
deleted file mode 100644
index 4dc2f5b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/header.jspf
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib prefix="logic" uri="http://jakarta.apache.org/struts/tags-logic"%>
-<%! int alpha = 5; %>
-<%@ taglib prefix="bean" uri="http://jakarta.apache.org/struts/tags-bean"%>
-
-<% %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/main.jsp
deleted file mode 100644
index 5d094dc..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/main.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-<!-- note: the directive for bean exists in header.jspf as specified in the web.xml file -->
-<bean:define id="foo" ></bean:define>
-<%=alpha%>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath
deleted file mode 100644
index 5ec3b3b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project
deleted file mode 100644
index 2a08dba..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_118251-e</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/libtags.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/libtags.tld
deleted file mode 100644
index fbabe44..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/libtags.tld
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<taglib>
- <tlibversion>1.2</tlibversion>
- <jspversion>1.1</jspversion>
- <shortname>libtags</shortname>
- <uri>http://nothing.com/libtags</uri>
- <tag>
- <name>ihaveattrs</name>
- <tagclass>nothing.taglib.ihaveattrs</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>name</name>
- <required>false</required>
- </attribute>
- <attribute>
- <name>scope</name>
- <required>false</required>
- </attribute>
- </tag>
- <tag>
- <name>ireqattrs</name>
- <tagclass>nothing.taglib.ireqattrs</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>name</name>
- <required>true</required>
- </attribute>
- <attribute>
- <name>scope</name>
- <required>false</required>
- </attribute>
- </tag>
- <tag>
- <name>emptyme</name>
- <tagclass>nothing.taglib.emptyme</tagclass>
- <bodycontent>JSP</bodycontent>
- </tag>
-</taglib>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 62ebcc8..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>testvalidatejspactions</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/norequiredattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/norequiredattribute.jsp
deleted file mode 100644
index 91f4f01..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/norequiredattribute.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:ireqattrs></libtags:ireqattrs>
-<jsp:attribute></jsp:attribute>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/undefinedattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/undefinedattribute.jsp
deleted file mode 100644
index 10e7250..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/undefinedattribute.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<%@ page idont="work" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme idont="work"></libtags:emptyme>
-<jsp:body idont="work"></jsp:body>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/worksfine.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/worksfine.jsp
deleted file mode 100644
index 1ddfd8f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/worksfine.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme></libtags:emptyme>
-<jsp:attribute name="named"></jsp:attribute>
-<libtags:ireqattrs name="<%= "named"%>" scope="<%= "expression" %>"></libtags:ireqattrs>
-<libtags:ihaveattrs name="boo"></libtags:ihaveattrs>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath
deleted file mode 100644
index 0a9f2ba..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project
deleted file mode 100644
index 22e550e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_118251-f</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
- <tlibversion>0.0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>sample</shortname>
- <uri>http://example.com/sample2_for_118251-e</uri>
- <info>
- This tag library contains just one tag. Ha ha!
- </info>
-
- <tag>
- <name>code</name>
- <tagclass>sample.taglib.CodeTag</tagclass>
- <bodycontent>tagdependent</bodycontent>
- <attribute>
- <name>fontAttributes</name>
- </attribute>
- <attribute>
- <name>commentColor</name>
- </attribute>
- <attribute>
- <name>stringColor</name>
- </attribute>
- </tag>
- </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- test1</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath
deleted file mode 100644
index 1d5f5d4..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="Web Content/WEB-INF/lib/sample_tld.jar"/>
- <classpathentry kind="output" path="Web Content/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project
deleted file mode 100644
index 5041b27..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_118251-g</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
- <tlibversion>0.0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>sample</shortname>
- <uri>http://example.com/sample2_for_118251-e</uri>
- <info>
- This tag library contains just one tag. Ha ha!
- </info>
-
- <tag>
- <name>code</name>
- <tagclass>sample.taglib.CodeTag</tagclass>
- <bodycontent>tagdependent</bodycontent>
- <attribute>
- <name>fontAttributes</name>
- </attribute>
- <attribute>
- <name>commentColor</name>
- </attribute>
- <attribute>
- <name>stringColor</name>
- </attribute>
- </tag>
- </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- test1</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp
deleted file mode 100644
index 2be00cd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar
deleted file mode 100644
index 1a98c41..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt
deleted file mode 100644
index 4803032..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The accompanying jar contains a TLD with a URI specified in
-it as well as a big long file that should slow down the
-taglib indexing.
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath
deleted file mode 100644
index cc2ae42..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project
deleted file mode 100644
index ac7bfe4..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_148717</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc0129..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 76ed56f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="bug_148717">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="bug_148717"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index eead6ed..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v5.5.9"/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <installed facet="jst.java" version="1.4"/>
- <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jar
deleted file mode 100644
index ebad27b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 1853669..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_c" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>prj119576_c</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
- <taglib>
- <taglib-uri>http://example.com/external-uri</taglib-uri>
- <taglib-location>/WEB-INF/lib/internal.jar</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.classpath
deleted file mode 100644
index b63ab41..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="lib" path="struts.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.project
deleted file mode 100644
index 1db7a00..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_174042</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/bin/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/includeme.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/includeme.jspf
deleted file mode 100644
index 3638108..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/includeme.jspf
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib prefix="logic" uri="http://jakarta.apache.org/struts/tags-logic"%>
-<%! int alpha = 5; %>
-<%@ taglib prefix="bean" uri="http://jakarta.apache.org/struts/tags-bean"%>
-<bean:define id="id3" type="com.nitin.TestBean"></bean:define>
-<% %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/main.jsp
deleted file mode 100644
index 6935c88..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/main.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ include file="includeme.jspf"%>
- <%= id3 + alpha %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/com/nitin/TestBean.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/com/nitin/TestBean.java
deleted file mode 100644
index 24a759b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/com/nitin/TestBean.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package com.nitin;
-
-public class TestBean {
-
- public TestBean() {
- }
-
- String dummyProperty = null;
-
- public String getDummyProperty() {
- return dummyProperty;
- }
-
- public void setDummyProperty(String dummyProperty) {
- this.dummyProperty = dummyProperty;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.classpath
deleted file mode 100644
index b63ab41..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="lib" path="struts.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.project
deleted file mode 100644
index 30509bf..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_178443</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/bin/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/includeme.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/includeme.jspf
deleted file mode 100644
index 4292126..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/includeme.jspf
+++ /dev/null
@@ -1,7 +0,0 @@
-<%@ taglib prefix="logic" uri="http://jakarta.apache.org/struts/tags-logic"%>
-<%! int alpha = 5; %>
-<%@ taglib prefix="bean" uri="http://jakarta.apache.org/struts/tags-bean"%>
-
-
-<bean:define id="id3" type="com.nitin.TestBean"></bean:define>
-<% %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/main.jsp
deleted file mode 100644
index bdda8a5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/main.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ include file="includeme.jspf"%>
-<% %>
-
-<bean:define id="beta"/>
-
- <%= alpha + beta %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/com/nitin/TestBean.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/com/nitin/TestBean.java
deleted file mode 100644
index 24a759b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/com/nitin/TestBean.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package com.nitin;
-
-public class TestBean {
-
- public TestBean() {
- }
-
- String dummyProperty = null;
-
- public String getDummyProperty() {
- return dummyProperty;
- }
-
- public void setDummyProperty(String dummyProperty) {
- this.dummyProperty = dummyProperty;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.classpath
deleted file mode 100644
index add958d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry combineaccessrules="false" kind="src" path="/j"/>
- <classpathentry combineaccessrules="false" kind="src" path="/k"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="struts.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.project
deleted file mode 100644
index 30509bf..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_178443</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/bin/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/main.jsp
deleted file mode 100644
index 57efa60..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/main.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@ taglib prefix="logic" uri="http://jakarta.apache.org/struts/tags-logic"%>
-<%! int alpha = 5; %>
-<%@ taglib prefix="bean" uri="http://jakarta.apache.org/struts/tags-bean"%>
-<% %>
-
-<bean:define id="beta"/>
-
- <%= alpha + beta %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath
deleted file mode 100644
index 5ec3b3b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project
deleted file mode 100644
index e3720e7..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_87351</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml
deleted file mode 100644
index bf80a5b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>bug_87351</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf
deleted file mode 100644
index 3baff4b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<% String this is broken %>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.classpath
deleted file mode 100644
index 233be1d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path=""/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path=""/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.project
deleted file mode 100644
index 63bc5f5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>j</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath
deleted file mode 100644
index 233be1d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path=""/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path=""/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.project
deleted file mode 100644
index 304ac0b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>k</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.classpath
deleted file mode 100644
index cc2ae42..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project
deleted file mode 100644
index 6225fab..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>prj119576_a</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc0129..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v5.5.9"/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <installed facet="jst.java" version="5.0"/>
- <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c41..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml
deleted file mode 100644
index af23273..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_a" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>prj119576_a</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp
deleted file mode 100644
index 379a44c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "header.jsp" %>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp
deleted file mode 100644
index 55549b4..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "taglib.jspf" %>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp
deleted file mode 100644
index 58db5bd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ include file = "body.jsp" %>
-<%@ include file = "body1.jsp" %>
-<sample:code/>
-<% java.util.Date bodyDate = headerDate; %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp
deleted file mode 100644
index a539fd6..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<% java.util.Date headerDate = null; %>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf
deleted file mode 100644
index 6c2d86f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp
deleted file mode 100644
index 4cdb542..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-<%="Hello, World!"%>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath
deleted file mode 100644
index cc2ae42..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project
deleted file mode 100644
index 6225fab..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>prj119576_a</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc0129..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v5.5.9"/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <installed facet="jst.java" version="5.0"/>
- <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c41..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 0ba8bed..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_b" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>prj119576_b</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp
deleted file mode 100644
index 379a44c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "header.jsp" %>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp
deleted file mode 100644
index 828d240..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@include file = "body1.jsp" %>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp
deleted file mode 100644
index eecf27e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %>
-<% java.util.Date headerDate = null; %>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath
deleted file mode 100644
index cc2ae42..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project
deleted file mode 100644
index 349f4b2..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>prj119576_c</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc0129..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v5.5.9"/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <installed facet="jst.java" version="5.0"/>
- <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c41..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 73560f8..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_c" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>prj119576_c</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp
deleted file mode 100644
index 6aa2289..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ include file = "header.jsp" %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp
deleted file mode 100644
index 71c73cf..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@include file = "body1.jsp" %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp
deleted file mode 100644
index 503c7a0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %>
-<% java.util.Date headerDate = null; %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/struts.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/struts.jar
deleted file mode 100644
index db32f9f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/struts.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.classpath
deleted file mode 100644
index f363448..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="web stuff/WEB-INF/lib/struts.jar"/>
- <classpathentry kind="output" path="web stuff/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.project
deleted file mode 100644
index 45399cd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testLoadTaglibs</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/web.xml
deleted file mode 100644
index e8d3327..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>testLoadTaglibs</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/test1.jsp
deleted file mode 100644
index 29650a4..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/test1.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic"%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
- <logic:empty/>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/testX.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/testX.jsp
deleted file mode 100644
index e73f832..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/testX.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
-xmlns:logic="http://jakarta.apache.org/struts/tags-logic">
-
-<logic:empty/>
-
-</jsp:root>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath
deleted file mode 100644
index 8d5f4fb..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" exported="false" kind="src" path="/testavailable2"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project
deleted file mode 100644
index 5baaadd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testavailable1</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- test1</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath
deleted file mode 100644
index 0a9f2ba..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project
deleted file mode 100644
index 5baaadd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testavailable1</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- test1</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath
deleted file mode 100644
index 0a9f2ba..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project
deleted file mode 100644
index a335f6a..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testcache1</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
- <tlibversion>0.0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>sample</shortname>
- <uri>http://example.com/sample2_for_118251-e</uri>
- <info>
- This tag library contains just one tag. Ha ha!
- </info>
-
- <tag>
- <name>code</name>
- <tagclass>sample.taglib.CodeTag</tagclass>
- <bodycontent>tagdependent</bodycontent>
- <attribute>
- <name>fontAttributes</name>
- </attribute>
- <attribute>
- <name>commentColor</name>
- </attribute>
- <attribute>
- <name>stringColor</name>
- </attribute>
- </tag>
- </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- test1</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath
deleted file mode 100644
index 5ec3b3b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project
deleted file mode 100644
index 274293f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testcache2</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
- <tlibversion>0.0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>sample</shortname>
- <uri>http://example.com/sample2_for_118251-e</uri>
- <info>
- This tag library contains just one tag. Ha ha!
- </info>
-
- <tag>
- <name>code</name>
- <tagclass>sample.taglib.CodeTag</tagclass>
- <bodycontent>tagdependent</bodycontent>
- <attribute>
- <name>fontAttributes</name>
- </attribute>
- <attribute>
- <name>commentColor</name>
- </attribute>
- <attribute>
- <name>stringColor</name>
- </attribute>
- </tag>
- </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- test1</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/.project
deleted file mode 100644
index 5f2075a..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testvalidatejspactions</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/tld/libtags.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/tld/libtags.tld
deleted file mode 100644
index fbabe44..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/tld/libtags.tld
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<taglib>
- <tlibversion>1.2</tlibversion>
- <jspversion>1.1</jspversion>
- <shortname>libtags</shortname>
- <uri>http://nothing.com/libtags</uri>
- <tag>
- <name>ihaveattrs</name>
- <tagclass>nothing.taglib.ihaveattrs</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>name</name>
- <required>false</required>
- </attribute>
- <attribute>
- <name>scope</name>
- <required>false</required>
- </attribute>
- </tag>
- <tag>
- <name>ireqattrs</name>
- <tagclass>nothing.taglib.ireqattrs</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>name</name>
- <required>true</required>
- </attribute>
- <attribute>
- <name>scope</name>
- <required>false</required>
- </attribute>
- </tag>
- <tag>
- <name>emptyme</name>
- <tagclass>nothing.taglib.emptyme</tagclass>
- <bodycontent>JSP</bodycontent>
- </tag>
-</taglib>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 62ebcc8..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>testvalidatejspactions</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/norequiredattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/norequiredattribute.jsp
deleted file mode 100644
index 91f4f01..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/norequiredattribute.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:ireqattrs></libtags:ireqattrs>
-<jsp:attribute></jsp:attribute>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/undefinedattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/undefinedattribute.jsp
deleted file mode 100644
index 10e7250..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/undefinedattribute.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<%@ page idont="work" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme idont="work"></libtags:emptyme>
-<jsp:body idont="work"></jsp:body>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/worksfine.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/worksfine.jsp
deleted file mode 100644
index 1ddfd8f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/worksfine.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme></libtags:emptyme>
-<jsp:attribute name="named"></jsp:attribute>
-<libtags:ireqattrs name="<%= "named"%>" scope="<%= "expression" %>"></libtags:ireqattrs>
-<libtags:ihaveattrs name="boo"></libtags:ihaveattrs>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/src/.keepme
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.wst.html.ui.tests/.classpath b/tests/org.eclipse.wst.html.ui.tests/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.html.ui.tests/.cvsignore b/tests/org.eclipse.wst.html.ui.tests/.cvsignore
deleted file mode 100644
index ec1ea60..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-bin.project
-build.xml
-htmluitests.jar
-temp.folder
diff --git a/tests/org.eclipse.wst.html.ui.tests/.project b/tests/org.eclipse.wst.html.ui.tests/.project
deleted file mode 100644
index a9f401f..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.html.ui.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index e247780..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.html.ui.tests; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: htmluitests.jar
-Bundle-Activator: org.eclipse.wst.html.ui.tests.HTMLUITestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.html.ui.tests,
- org.eclipse.wst.html.ui.tests.viewer
-Require-Bundle: org.eclipse.ui,
- org.eclipse.jface.text,
- org.eclipse.wst.html.ui,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.ui.workbench.texteditor,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.ui.views,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- com.ibm.icu
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.html.ui.tests/about.html b/tests/org.eclipse.wst.html.ui.tests/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.ui.tests/build.properties b/tests/org.eclipse.wst.html.ui.tests/build.properties
deleted file mode 100644
index 5610d30..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- htmluitests.jar,\
- META-INF/,\
- about.html,\
- icons/
-jars.compile.order = htmluitests.jar
-source.htmluitests.jar = src/
-output.htmluitests.jar = bin/
diff --git a/tests/org.eclipse.wst.html.ui.tests/icons/sourceEditor.gif b/tests/org.eclipse.wst.html.ui.tests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb8..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/icons/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.html.ui.tests/plugin.properties b/tests/org.eclipse.wst.html.ui.tests/plugin.properties
deleted file mode 100644
index ed966bb..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.html.ui.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Structured Source Editor for HTML Tests
-view.name.0 = Embedded HTML Structured Text Viewer
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/plugin.xml b/tests/org.eclipse.wst.html.ui.tests/plugin.xml
deleted file mode 100644
index ff9dcb3..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension point="org.eclipse.ui.views">
- <view
- name="%view.name.0"
- icon="$nl$/icons/sourceEditor.gif"
- category="org.eclipse.wst.sse.ui.tests"
- class="org.eclipse.wst.html.ui.tests.viewer.ViewerTestHTML"
- id="org.eclipse.wst.html.ui.tests.viewer.ViewerTestHTML">
- </view>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java
deleted file mode 100644
index ad8564f..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests;
-
-import org.eclipse.wst.html.ui.tests.viewer.TestViewerConfigurationHTML;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-
-public class HTMLUITestSuite extends junit.framework.TestSuite {
- public static Test suite() {
- return new HTMLUITestSuite();
- }
-
- public HTMLUITestSuite() {
- super("HTML UI TestSuite");
- addTest(new TestSuite(VerifyEditorPlugin.class));
- addTest(new TestSuite(HTMLUIPreferencesTest.class));
- addTest(new TestSuite(TestViewerConfigurationHTML.class));
- addTest(new TestSuite(TestEditorConfigurationHTML.class));
- // addTest(new SSEModelTestSuite());
-
- }
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestsPlugin.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestsPlugin.java
deleted file mode 100644
index cecaec3..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestsPlugin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class HTMLUITestsPlugin extends Plugin {
- //The shared instance.
- private static HTMLUITestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public HTMLUITestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.html.ui.tests.SSEForHTMLTestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static HTMLUITestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = HTMLUITestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java
deleted file mode 100644
index ddf14df..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.wst.html.ui.tests"; //$NON-NLS-1$
-
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
- }
-
- /**
- * @return true if the platform is debugging
- */
- public static boolean isDebugging() {
- return Platform.inDebugMode();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java
deleted file mode 100644
index 3881762..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
-import org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-import org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration;
-
-/**
- * Tests retrieving editor contributions for html content type
- */
-public class TestEditorConfigurationHTML extends TestCase {
- public void testGetSourceViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
- assertNotNull("no source viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected source viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), StructuredTextViewerConfigurationHTML.class);
- }
-
- public void testGetContentOutlineViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
- assertNotNull("no content outline viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected content outline viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), HTMLContentOutlineConfiguration.class);
- }
-
- public void testGetPropertySheetConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.PROPERTYSHEETCONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
- assertNotNull("no property sheet configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected property sheet configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), XMLPropertySheetConfiguration.class);
- }
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java
deleted file mode 100644
index 5c7b94b..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.html.ui.internal.HTMLUIPlugin;
-
-
-public class VerifyEditorPlugin extends TestCase {
-
- public void testPluginExists() {
- // TODO: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=81527
- assertTrue(true);
- Plugin plugin = null;
- try {
- plugin = HTMLUIPlugin.getInstance();
- }
- catch (Exception e) {
- plugin = null;
- }
- assertNotNull("editor plugin could not be instantiated", plugin);
- }
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java
deleted file mode 100644
index 2473bad..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.IAnnotationHover;
-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.PlatformUI;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
-import org.eclipse.wst.html.ui.tests.Logger;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-/**
- * @author pavery
- */
-public class TestViewerConfigurationHTML extends TestCase {
-
- private StructuredTextViewerConfigurationHTML fConfig = null;
- private boolean fDisplayExists = true;
- private StructuredTextViewer fViewer = null;
- private boolean isSetup = false;
-
- public TestViewerConfigurationHTML() {
- super("TestViewerConfigurationHTML");
- }
- protected void setUp() throws Exception {
-
- super.setUp();
- if(!this.isSetup){
- setUpViewerConfiguration();
- this.isSetup = true;
- }
- }
-
- private void setUpViewerConfiguration() {
-
- if(Display.getCurrent() != null) {
-
- Shell shell = null;
- Composite parent = null;
-
- if(PlatformUI.isWorkbenchRunning()) {
- shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
- else {
- shell = new Shell(Display.getCurrent());
- }
- parent = new Composite(shell, SWT.NONE);
-
- // dummy viewer
- fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationHTML();
- }
- else {
- fDisplayExists = false;
- Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
- }
- }
-
- /**
- * Not necessary
- */
- public void testGetAnnotationHover() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IAnnotationHover hover = fConfig.getAnnotationHover(fViewer);
- assertNotNull("AnnotationHover is null", hover);
- }
-
- public void testGetAutoEditStrategies() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IHTMLPartitions.HTML_DEFAULT);
- assertNotNull(strategies);
- assertTrue("there are no auto edit strategies", strategies.length>0);
- }
-
- public void testGetConfiguredContentTypes() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
- assertNotNull(configuredContentTypes);
- assertTrue("there are no configured content types", configuredContentTypes.length > 1);
- }
-
- /**
- * Not necessary
- */
- public void testGetContentAssistant() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IContentAssistant ca = fConfig.getContentAssistant(fViewer);
- assertNotNull("there is no content assistant", ca);
- }
-
- public void testGetContentFormatter() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IContentFormatter cf = fConfig.getContentFormatter(fViewer);
- assertNotNull("there is no content formatter", cf);
- }
-
- public void testGetDoubleClickStrategy() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
- if(strategy != null) {
- return;
- }
- }
- assertTrue("there are no configured double click strategies", false);
- }
-
- public void testGetHyperlinkDetectors() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
- assertNotNull("there are no hyperlink detectors", detectors);
- assertTrue("there are no hyperlink detectors", detectors.length > 1);
- }
-
- public void testGetIndentPrefixes() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- String prefixes[] = fConfig.getIndentPrefixes(fViewer, contentTypes[i]);
- if(prefixes != null) {
- return;
- }
- }
- assertTrue("there are no configured indent prefixes", false);
- }
-
- /**
- * Not necessary
- */
- public void testGetInformationControlCreator() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- IInformationControlCreator infoCreator = fConfig.getInformationControlCreator(fViewer);
- assertNotNull("InformationControlCreator is null", infoCreator);
- }
-
- /**
- * Not necessary
- */
- public void testGetInformationPresenter() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
- assertNotNull("InformationPresenter is null", presenter);
- }
-
- public void testGetLineStyleProviders() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
- if(providers != null) {
- return;
- }
- }
- assertTrue("there are no configured line style providers", false);
- }
-
- /**
- * Not necessary
- */
- public void testGetReconciler() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IReconciler r = fConfig.getReconciler(fViewer);
- assertNotNull("Reconciler is null", r);
- }
-
- public void testGetTextHover() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] hoverPartitions = new String[]{IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT};
- for (int i = 0; i < hoverPartitions.length; i++) {
- ITextHover hover = fConfig.getTextHover(fViewer, hoverPartitions[i], SWT.NONE);
- assertNotNull("hover was null for partition: " + hoverPartitions[i], hover);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java
deleted file mode 100644
index 4ab2114..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests.viewer;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.w3c.dom.Attr;
-
-public class ViewerTestHTML extends ViewPart {
- private final String SSE_EDITOR_FONT = "org.eclipse.wst.sse.ui.textfont";
- private final String DEFAULT_VIEWER_CONTENTS = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<HTML>\n <HEAD>\n <META http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">\n <TITLE>place title here</TITLE>\n </HEAD>\n <BODY>\n place content here \n<script>\n\"text\";\n</SCRIPT>\n</BODY>\n</HTML>";
-
- private StructuredTextViewer fSourceViewer = null;
- private StructuredTextViewerConfiguration fConfig = null;
- private IContentOutlinePage fContentOutlinePage = null;
- private ISelectionChangedListener fHighlightRangeListener = null;
-
- /**
- * Sets the viewer's highlighting text range to the text range indicated
- * by the selected Nodes.
- */
- protected class NodeRangeSelectionListener implements ISelectionChangedListener {
- public void selectionChanged(SelectionChangedEvent event) {
- if (!event.getSelection().isEmpty() && event.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- IndexedRegion startNode = (IndexedRegion) selection.getFirstElement();
- IndexedRegion endNode = (IndexedRegion) selection.toArray()[selection.size() - 1];
-
- if (startNode instanceof Attr)
- startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
- if (endNode instanceof Attr)
- endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
- int start = startNode.getStartOffset();
- int end = endNode.getEndOffset();
-
- fSourceViewer.resetVisibleRegion();
- fSourceViewer.setVisibleRegion(start, end - start);
- fSourceViewer.setSelectedRange(start, 0);
- }
- else {
- fSourceViewer.resetVisibleRegion();
- }
- }
- }
-
- protected class NumberInputDialog extends Dialog {
- public NumberInputDialog(Shell shell) {
- super(shell);
- }
-
- public Text start;
- int startValue;
- public Text length;
- int lengthValue;
-
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
- Composite container = new Composite(composite, SWT.NULL);
- container.setLayoutData(new GridData(GridData.FILL_BOTH));
- container.setLayout(new GridLayout(2, true));
- setShellStyle(getShell().getStyle() | SWT.RESIZE);
-
- Label label = new Label(container, SWT.NULL);
- label.setText("Start");
- label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- label = new Label(container, SWT.NULL);
- label.setText("Length");
- label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- start = new Text(container, SWT.BORDER);
- startValue = fSourceViewer.getVisibleRegion().getOffset();
- start.setText("" + startValue);
- start.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- length = new Text(container, SWT.BORDER);
- lengthValue = fSourceViewer.getVisibleRegion().getLength();
- length.setText("" + lengthValue);
- length.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- // start.addModifyListener(new ModifyListener() {
- // public void modifyText(ModifyEvent e) {
- // if (e.widget == start) {
- // try {
- // startValue = Integer.decode(start.getText()).intValue();
- // }
- // catch (NumberFormatException e2) {
- // startValue = 0;
- // }
- // }
- // }
- // });
- // length.addModifyListener(new ModifyListener() {
- // public void modifyText(ModifyEvent e) {
- // if (e.widget == length) {
- // try {
- // lengthValue = Integer.decode(length.getText()).intValue();
- // }
- // catch (NumberFormatException e2) {
- // lengthValue = 0;
- // }
- // }
- // }
- // });
-
- return composite;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#okPressed()
- */
- protected void okPressed() {
- try {
- startValue = Integer.decode(start.getText()).intValue();
- }
- catch (NumberFormatException e2) {
- startValue = 0;
- }
- try {
- lengthValue = Integer.decode(length.getText()).intValue();
- }
- catch (NumberFormatException e2) {
- lengthValue = 0;
- }
- super.okPressed();
- }
- }
-
- protected void addActions(IContributionManager mgr) {
- if (mgr != null) {
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "New HTML";
- }
-
- public void run() {
- super.run();
- BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
- public void run() {
- setupViewerForNew();
- fSourceViewer.setEditable(true);
- }
- });
- }
- });
- mgr.add(new Separator());
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Change Visibility";
- }
-
- public void run() {
- super.run();
- NumberInputDialog dlg = new NumberInputDialog(fSourceViewer.getControl().getShell());
- int proceed = dlg.open();
- if (proceed == Window.CANCEL)
- return;
- fSourceViewer.resetVisibleRegion();
- fSourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Show All";
- }
-
- public void run() {
- super.run();
- fSourceViewer.resetVisibleRegion();
- }
- });
- mgr.add(new Separator());
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Change Visibility in Editor";
- }
-
- public void run() {
- super.run();
- StructuredTextViewer sourceViewer = null;
- IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (part != null && part instanceof StructuredTextEditor) {
- sourceViewer = ((StructuredTextEditor) part).getTextViewer();
- }
- if (sourceViewer != null) {
- NumberInputDialog dlg = new NumberInputDialog(sourceViewer.getControl().getShell());
- int proceed = dlg.open();
- if (proceed == Window.CANCEL)
- return;
- sourceViewer.resetVisibleRegion();
- sourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
- }
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Show All in Editor";
- }
-
- public void run() {
- super.run();
- StructuredTextViewer sourceViewer = null;
- IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (part != null && part instanceof StructuredTextEditor) {
- sourceViewer = ((StructuredTextEditor) part).getTextViewer();
- }
- if (sourceViewer != null) {
- sourceViewer.resetVisibleRegion();
- }
- }
- });
- mgr.add(new Separator());
- // no longer able to set input to NULL
- // mgr.add(new Action() {
- // public String getText() {
- // return getToolTipText();
- // }
- //
- // public String getToolTipText() {
- // return "Set Input to NULL";
- // }
- // public void run() {
- // super.run();
- // viewer.setInput(null);
- // }
- // });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input from Active Editor";
- }
-
- public void run() {
- super.run();
- ITextEditor textEditor = getActiveEditor();
- if (textEditor != null) {
- setupViewerForEditor(textEditor);
- fSourceViewer.setEditable(true);
- }
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input and Follow Selection";
- }
-
- public void run() {
- super.run();
- followSelection();
- fSourceViewer.setEditable(true);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input and Follow Selection As ReadOnly";
- }
-
- public void run() {
- super.run();
- followSelection();
- fSourceViewer.setEditable(false);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Stop Following Selection";
- }
-
- public void run() {
- super.run();
- stopFollowSelection();
- }
- });
- }
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
- */
- public void createPartControl(Composite parent) {
- IContributionManager mgr = getViewSite().getActionBars().getMenuManager();
- addActions(mgr);
-
- // create source viewer & its content type-specific viewer
- // configuration
- fSourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationHTML();
-
- // set up the viewer with a document & viewer config
- setupViewerForNew();
-
- setupViewerPreferences();
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#dispose()
- */
- public void dispose() {
- stopFollowSelection();
- fSourceViewer.unconfigure();
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#setFocus()
- */
- public void setFocus() {
- if (fSourceViewer.getControl() != null && !fSourceViewer.getControl().isDisposed())
- fSourceViewer.getControl().setFocus();
- }
-
- /**
- * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
- */
- public void init(IViewSite site, IMemento memento) throws PartInitException {
- super.init(site, memento);
- }
-
- /**
- * Set up source viewer with any additional preferences it should have Ex:
- * font, tab width
- */
- private void setupViewerPreferences() {
- fSourceViewer.getTextWidget().setFont(JFaceResources.getFont(SSE_EDITOR_FONT));
- }
-
- /**
- * Set up source viewer with a new document & configure it
- */
- private void setupViewerForNew() {
- stopFollowSelection(); // if was following selection, stop
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IDocument doc = modelManager.createStructuredDocumentFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- doc.set(DEFAULT_VIEWER_CONTENTS);
-
- fSourceViewer.setDocument(doc);
- // need to reconfigure after set document just so highlighter works
- fSourceViewer.configure(fConfig);
- }
-
- /**
- * Returns the current active text editor if possible
- *
- * @return ITextEditor
- */
- private ITextEditor getActiveEditor() {
- ITextEditor editor = null;
- IEditorPart editorPart = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (editorPart instanceof ITextEditor)
- editor = (ITextEditor) editorPart;
- if (editor == null && editorPart != null)
- editor = (ITextEditor) editorPart.getAdapter(ITextEditor.class);
- return editor;
- }
-
- /**
- * Sets up the viewer with the same document/input as the given editor
- *
- * @param ITextEditor
- * editor - the editor to use *cannot to be null*
- */
- private void setupViewerForEditor(ITextEditor editor) {
- stopFollowSelection(); // if was following selection, stop
- IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
- fSourceViewer.setDocument(doc);
-
- // need to reconfigure after set document just so highlighter works
- fSourceViewer.configure(new StructuredTextViewerConfigurationHTML());
- }
-
- /**
- * Hooks up the viewer to follow the selection made in the active editor
- */
- private void followSelection() {
- ITextEditor editor = getActiveEditor();
- if (editor != null) {
- setupViewerForEditor(editor);
- if (fHighlightRangeListener == null)
- fHighlightRangeListener = new NodeRangeSelectionListener();
-
- fContentOutlinePage = ((IContentOutlinePage) editor.getAdapter(IContentOutlinePage.class));
- if (fContentOutlinePage != null) {
- fContentOutlinePage.addSelectionChangedListener(fHighlightRangeListener);
-
- if (!fContentOutlinePage.getSelection().isEmpty() && fContentOutlinePage.getSelection() instanceof IStructuredSelection) {
- fSourceViewer.resetVisibleRegion();
-
- Object[] nodes = ((IStructuredSelection) fContentOutlinePage.getSelection()).toArray();
- IndexedRegion startNode = (IndexedRegion) nodes[0];
- IndexedRegion endNode = (IndexedRegion) nodes[nodes.length - 1];
-
- if (startNode instanceof Attr)
- startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
- if (endNode instanceof Attr)
- endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
- int start = startNode.getStartOffset();
- int end = endNode.getEndOffset();
-
- fSourceViewer.setVisibleRegion(start, end - start);
- fSourceViewer.setSelectedRange(start, 0);
- }
- }
- }
- }
-
- /**
- * Cease following the selection made in the editor
- */
- private void stopFollowSelection() {
- if (fContentOutlinePage != null) {
- fContentOutlinePage.removeSelectionChangedListener(fHighlightRangeListener);
- fSourceViewer.resetVisibleRegion();
- fContentOutlinePage = null;
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/test.xml b/tests/org.eclipse.wst.html.ui.tests/test.xml
deleted file mode 100644
index 2ba6ac2..0000000
--- a/tests/org.eclipse.wst.html.ui.tests/test.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
- <property
- name="plugin-name"
- value="org.eclipse.wst.html.ui.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.html.ui.tests.HTMLUITestSuite" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/.classpath b/tests/org.eclipse.wst.xml.core.tests/.classpath
deleted file mode 100644
index e2bdc16..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.cvsignore b/tests/org.eclipse.wst.xml.core.tests/.cvsignore
deleted file mode 100644
index 45bf546..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-ssemodelxmltests.jar
-javaCompiler.ssemodelxmltests.jar.args
diff --git a/tests/org.eclipse.wst.xml.core.tests/.project b/tests/org.eclipse.wst.xml.core.tests/.project
deleted file mode 100644
index 89ffba5..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.core.tests</name>
- <comment></comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 5dbc09c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xml.core.tests; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: ssemodelxmltests.jar
-Bundle-Activator: org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.core.internal.document.test;x-internal:=true,
- org.eclipse.wst.xml.core.tests,
- org.eclipse.wst.xml.core.tests.contentmodel,
- org.eclipse.wst.xml.core.tests.document,
- org.eclipse.wst.xml.core.tests.dom,
- org.eclipse.wst.xml.core.tests.format,
- org.eclipse.wst.xml.core.tests.format.testfiles.xml,
- org.eclipse.wst.xml.core.tests.model,
- org.eclipse.wst.xml.core.tests.text,
- org.eclipse.wst.xml.core.tests.text.testfiles.xml,
- org.eclipse.wst.xml.core.tests.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.xml.core,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.filebuffers,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.text,
- org.eclipse.wst.sse.core,
- com.ibm.icu
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.xml.core.tests/about.html b/tests/org.eclipse.wst.xml.core.tests/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.core.tests/build.properties b/tests/org.eclipse.wst.xml.core.tests/build.properties
deleted file mode 100644
index 9ff12d8..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.ssemodelxmltests.jar = src/
-output.ssemodelxmltests.jar = bin/
-bin.includes = plugin.xml,\
- ssemodelxmltests.jar,\
- test.xml,\
- testfiles.zip,\
- projecttestfiles/,\
- META-INF/,\
- about.html
-src.includes = build.properties
diff --git a/tests/org.eclipse.wst.xml.core.tests/plugin.properties b/tests/org.eclipse.wst.xml.core.tests/plugin.properties
deleted file mode 100644
index c0f1799..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xml.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = SSE Model XML Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/plugin.xml b/tests/org.eclipse.wst.xml.core.tests/plugin.xml
deleted file mode 100644
index 03f1a8c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension point="org.eclipse.core.runtime.contentTypes">
- <!-- associate .fragx files with the XML content type -->
- <file-association
- content-type="org.eclipse.core.runtime.xml"
- file-extensions="fragx" />
- </extension>
-
- <extension
- id="Test"
- point="org.eclipse.core.runtime.applications">
- <application>
- <run
- class="org.eclipse.wst.xml.core.tests.contentmodel.CMVisitorTest" />
- </application>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip b/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip
deleted file mode 100644
index 683ad6c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java
deleted file mode 100644
index e47dccf..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006
- * 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:
- * Balazs Banfai: Bug 154737 getUserData/setUserData support for Node
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=154737
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.core.internal.document.test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.document.NodeImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.UserDataHandler;
-
-
-public class NodeImplTestCase extends TestCase {
- /**
- * Casts to implementation classes because the interface methods being
- * there isn't the interesting part, just whether our behavior with those
- * methods is correct.
- */
-
- NodeImpl element;
- AttrImpl attribute;
- NodeImpl destinationNode;
- Document document;
-
- Element elementToImport;
-
- private static final String KEY="key";
- private static final String VALUE="value";
- private static final String KEY2="key2";
- private static final String VALUE2="value2";
-
-
- /**
- * Sets up the test fixture.
- * (Called before every test case method.)
- */
- protected void setUp() {
-
- DOMModelImpl model = new DOMModelImpl();
- document = model.getDocument();
- element = (NodeImpl)document.createElement("testelement");
- attribute = (AttrImpl)document.createAttribute("attribute");
- }
-
- /*
- * Test for null;
- */
- public void testGetUserData0() {
- assertEquals(null, element.getUserData(KEY));
- assertEquals(null, element.getUserData(null));
- }
-
- /*
- * Test for one key/value
- */
- public void testGetUserData1() {
- element.setUserData(KEY, VALUE, null);
- assertEquals(VALUE,element.getUserData(KEY));
- assertEquals(null, attribute.getUserData(KEY));
- }
-
- /*
- * Test for multiple nodes
- */
- public void testGetUserData2() {
- element.setUserData(KEY, VALUE, null);
- assertEquals(VALUE,element.getUserData(KEY));
- attribute.setUserData(KEY2, VALUE2, null);
- assertEquals(VALUE2,attribute.getUserData(KEY2));
- }
-
- /*
- * Test for multiple keys
- */
- public void testGetUserData3() {
- element.setUserData(KEY, VALUE, null);
- element.setUserData(KEY2, VALUE2, null);
- assertEquals(VALUE,element.getUserData(KEY));
- assertEquals(VALUE2,element.getUserData(KEY2));
- }
-
- /*
- * Test for null key
- */
- public void testSetUserData1() {
- assertEquals(null, element.setUserData(null, VALUE, null));
- }
-
- /*
- * Test for null data with no previous value
- */
- public void testSetUserData2() {
- assertEquals(null, element.setUserData(KEY, null, null));
- }
-
- /*
- * Test for overwriting
- */
- public void testSetUserData3() {
- element.setUserData(KEY, VALUE, null);
- element.setUserData(KEY, VALUE2, null);
- assertEquals(VALUE2, element.getUserData(KEY));
- }
-
- /*
- * Test for deleting
- */
- public void testSetUserData4() {
- element.setUserData(KEY, VALUE, null);
- assertEquals(VALUE, element.getUserData(KEY));
- element.setUserData(KEY, null, null);
- assertEquals(null, element.getUserData(KEY));
- }
-
- /*
- * Test for notifying the UserDataHandler=null
- */
- public void testNotifyUserDataHandler0() {
-
- attribute.setUserData(KEY, VALUE, null);
- destinationNode=(NodeImpl)attribute.cloneNode(true);
- }
-
- /*
- * Test for notifying the UserDataHandler when cloning an attribute
- */
- public void testNotifyUserDataHandler1() {
-
- attribute.setUserData(KEY, VALUE, new UserDataHandler(){
-
- public void handle(short operation, String key, Object data, Node src, Node dst) {
- assertEquals(UserDataHandler.NODE_CLONED, operation);
- assertEquals(VALUE, data);
- assertEquals(KEY, key);
- assertEquals(src, attribute);
-
- System.out.println("Operation: "+operation+" Key:"+ key
- + " Object:"+data+" SourceNode:"+src.getLocalName()+" DestinationNode:"+dst.getLocalName());
-
- }
- });
- //event occurs before the destinationNode returns....
- destinationNode=(AttrImpl)attribute.cloneNode(true);
- }
-
- /*
- * Test for notifying the UserDataHandler when importing
- */
- public void testNotifyUserDataHandler2() {
- elementToImport = document.createElement("ElementToImport");
- ((NodeImpl)elementToImport).setUserData(KEY, VALUE, new UserDataHandler(){
-
- public void handle(short operation, String key, Object data, Node src, Node dst) {
-
- //see if NODE.IMPORTED notification occurs with the right
- //parameters
- if (operation==UserDataHandler.NODE_IMPORTED) {
- assertEquals(VALUE, data);
- assertEquals(KEY, key);
- assertEquals(src, elementToImport);
- assertEquals(dst, null);
- System.out.println("Operation: "+operation+" Key:"+ key
- + " Object:"+data+" SourceNode:"+src.getLocalName()+" DestinationNode:"+dst);
- }
- }
- });
- document.importNode(elementToImport, true);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java
deleted file mode 100644
index d360697..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.wst.xml.core.tests"; //$NON-NLS-1$
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
-
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
-
- }
- }
-
- /**
- * @return true if the platform is debugging
- */
- public static boolean isDebugging() {
- return Platform.inDebugMode();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java
deleted file mode 100644
index a157cac..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.core.internal.document.test.NodeImplTestCase;
-import org.eclipse.wst.xml.core.tests.contentmodel.TestCatalogRetrivalAndModelCreation;
-import org.eclipse.wst.xml.core.tests.document.GetDocumentRegionsTest;
-import org.eclipse.wst.xml.core.tests.document.TestStructuredDocument;
-import org.eclipse.wst.xml.core.tests.document.TestXMLDocumentLoader;
-import org.eclipse.wst.xml.core.tests.document.TransitionTests;
-import org.eclipse.wst.xml.core.tests.dom.NameValidatorTests;
-import org.eclipse.wst.xml.core.tests.format.TestFormatProcessorXML;
-import org.eclipse.wst.xml.core.tests.model.TestModelManager;
-import org.eclipse.wst.xml.core.tests.model.TestModelsFromFiles;
-import org.eclipse.wst.xml.core.tests.model.TestStructuredModel;
-import org.eclipse.wst.xml.core.tests.model.TestXMLModelLoader;
-import org.eclipse.wst.xml.core.tests.text.TestStructuredPartitionerXML;
-
-
-
-public class SSEModelXMLTestSuite extends TestSuite {
- public static Test suite() {
- return new SSEModelXMLTestSuite();
- }
-
- public SSEModelXMLTestSuite() {
- super("Test Suite for org.eclipse.wst.xml.core.tests");
- addTest(new TestSuite(TestModelsFromFiles.class));
- addTest(new TestSuite(TestXMLModelLoader.class));
- addTest(new TestSuite(TestXMLDocumentLoader.class));
- addTest(new TestSuite(TestStructuredDocument.class));
-
- addTest(new TestSuite(TestModelManager.class));
- addTest(new TestSuite(TestStructuredModel.class));
- addTest(new TestSuite(TestStructuredPartitionerXML.class));
- addTest(new TestSuite(NameValidatorTests.class));
- addTest(new TestSuite(TransitionTests.class));
- addTest(new TestSuite(XMLCorePreferencesTest.class));
- addTest(new TestSuite(TestCatalogRetrivalAndModelCreation.class));
-
- addTest(new TestSuite(GetDocumentRegionsTest.class));
- addTest(new TestSuite(NodeImplTestCase.class));
-
- addTest(new TestSuite(TestFormatProcessorXML.class));
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java
deleted file mode 100644
index 32f1dfa..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class SSEModelXMLTestsPlugin extends Plugin {
- //The shared instance.
- private static SSEModelXMLTestsPlugin plugin;
-
- /**
- * The constructor.
- */
- public SSEModelXMLTestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static SSEModelXMLTestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- return key;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.wst.xml.core.tests").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- //String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java
deleted file mode 100644
index 323201a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the XML Source editor
- * preferences. Tests include setting/getting preferences.
- *
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class XMLCorePreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.xml.core";
-
- // need to start up bundle for default values to be loaded
- Bundle bundle = Platform.getBundle(bundleName);
- try {
- if (bundle != null)
- bundle.start();
- else
- fail("Get preference value failed because could not find bundle: " + bundleName);
- }
- catch (BundleException e) {
- fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
- }
-
- bundleGetPreference(bundleName, XMLCorePreferenceNames.INDENTATION_SIZE);
- bundleGetPreference(bundleName, XMLCorePreferenceNames.LINE_WIDTH);
- }
-
- private void bundleGetPreference(String bundleName, String prefKey) {
- int defaultValue = -1;
-
- int value = Platform.getPreferencesService().getInt(bundleName, prefKey, defaultValue, null);
- assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
- }
-
- /**
- * Tests default values of preferences.
- *
- * NOTE: Expected default values are hard-coded, so if default values do
- * get changed, assertions need to be updated as well
- */
- public void testPluginGetDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode(XMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginGetDefaultPreference(node, XMLCorePreferenceNames.SPLIT_MULTI_ATTRS, Boolean.toString(false));
- pluginGetDefaultPreference(node, XMLCorePreferenceNames.INDENTATION_CHAR, XMLCorePreferenceNames.TAB);
- }
-
- private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
- String defaultValue = Long.toString(System.currentTimeMillis()); // random
- // string
-
- String theDefaultValue = node.get(prefKey, defaultValue);
- assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
- }
-
- /**
- * Tests setting preference values by setting preference value to be a
- * certain value, then getting the preference value to verify it was set.
- */
- public void testPluginSetPreferences() {
- IEclipsePreferences node = new InstanceScope().getNode(XMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginSetPreferenceBoolean(node, XMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
- pluginSetPreferenceString(node, XMLCorePreferenceNames.INDENTATION_CHAR);
- }
-
- private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
- boolean originalValue = false;
- boolean expectedValue = true;
-
- String originalString = node.get(prefKey, "bogus");
- if (!"bogus".equals(originalString)) {
- originalValue = Boolean.valueOf(originalString).booleanValue();
- expectedValue = !originalValue;
- }
- node.putBoolean(prefKey, expectedValue);
- boolean foundValue = node.getBoolean(prefKey, true);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalString))
- node.remove(prefKey);
- else
- node.put(prefKey, originalString);
- }
-
- private void pluginSetPreferenceString(IEclipsePreferences node, String prefKey) {
- String originalValue = node.get(prefKey, "bogus");
- String expectedValue = Long.toString(System.currentTimeMillis()); // random
- // string
- node.put(prefKey, expectedValue);
- String foundValue = node.get(prefKey, "");
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalValue))
- node.remove(prefKey);
- else
- node.put(prefKey, originalValue);
- }
-
- /**
- * Tests line delimiter preferences by making sure document created
- * follows line delimiter preference.
- */
- public void testDelimiterPreferences() {
- // check if content type preferences match
- String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForXML.ContentTypeID_XML);
- Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForXML.ContentTypeID_XML);
- String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
- assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
- // set a particular line delimiter
- prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
- // create document
- XMLDocumentLoader loader = new XMLDocumentLoader();
- IEncodedDocument document = loader.createNewStructuredDocument();
- String documentDelimiter = document.getPreferredLineDelimiter();
-
- // verify delimiter in document matches preference
- assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
- // return to original preference
- prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java
deleted file mode 100644
index 41bff4c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMEntityDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-
-
-public class CMPrinter extends CMVisitor
-{
- protected StringBuffer fStringBuffer = new StringBuffer();
- protected Vector visitedElements = new Vector();
-
- /****** formatting ******/
- protected String indent = ""; //$NON-NLS-1$
-
- protected void incrementIndent()
- {
- indent = indent + " "; //$NON-NLS-1$
- }
-
- protected void decrementIndent()
- {
- indent = indent.substring(0, indent.length()-2);
- }
-
-
- public void printCMNode(String filename, CMNode cmnode)
- {
- visitCMNode(cmnode);
- try
- {
- FileOutputStream fileStream = new FileOutputStream(filename);
- OutputStreamWriter writer = new OutputStreamWriter(fileStream);
- writer.write(fStringBuffer.toString());
- writer.flush();
- fileStream.close();
- }
- catch (IOException e) {
- Logger.logException("PMPrinter Debug: ", e);
- }
- }
-
- public void visitCMAnyElement(CMAnyElement anyElement)
- {
- fStringBuffer.append(indent + "<CMAnyElement"); //$NON-NLS-1$
- printAttributes(fStringBuffer, anyElement);
- fStringBuffer.append(">/n"); //$NON-NLS-1$
- incrementIndent();
- printProperties(fStringBuffer, anyElement);
- decrementIndent();
- fStringBuffer.append(indent + "</CMAnyElement>/n"); //$NON-NLS-1$
- }
-
- public void visitCMAttributeDeclaration(CMAttributeDeclaration ad)
- {
- fStringBuffer.append(indent + "<CMAttributeDeclaration"); //$NON-NLS-1$
- printAttributes(fStringBuffer, ad);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
- printProperties(fStringBuffer, ad);
- decrementIndent();
- visitCMNode(ad.getAttrType());
- fStringBuffer.append(indent + "</CMAttributeDeclaration>\n"); //$NON-NLS-1$
- }
-
- public void visitCMDataType(CMDataType dataType)
- {
- fStringBuffer.append(indent + "<CMDataType"); //$NON-NLS-1$
- printAttributes(fStringBuffer, dataType);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
- fStringBuffer.append(indent + "<ImpliedValue kind=\"" + dataType.getImpliedValueKind() + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
- fStringBuffer.append(dataType.getImpliedValue() + "</ImpliedValue>\n"); //$NON-NLS-1$
- printEnumeration(fStringBuffer, dataType.getEnumeratedValues());
- decrementIndent();
- fStringBuffer.append(indent + "</CMDataType>\n"); //$NON-NLS-1$
- }
-
- public void visitCMDocument(CMDocument document)
- {
- fStringBuffer.append(indent + "<CMDocument"); //$NON-NLS-1$
- printAttributes(fStringBuffer, document);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
-
- // printEntities(sb, document.getEntities());
- printProperties(fStringBuffer, document);
-
- CMNamedNodeMap map = document.getElements();
- int size = map.getLength();
- for (int i = 0; i < size; i++)
- {
- visitCMNode(map.item(i));
- }
-
- decrementIndent();
- fStringBuffer.append(indent + "</CMDocument>\n"); //$NON-NLS-1$
- }
-
- public void visitCMGroup(CMGroup group)
- {
- fStringBuffer.append(indent + "<CMGroup"); //$NON-NLS-1$
- printAttributes(fStringBuffer, group);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
-
- CMNodeList nodeList = group.getChildNodes();
- int size = nodeList.getLength();
- for (int i = 0; i < size; i++)
- {
- visitCMNode(nodeList.item(i));
- }
-
- decrementIndent();
- fStringBuffer.append(indent + "</CMGroup>\n"); //$NON-NLS-1$
- }
-
- public void visitCMElementDeclaration(CMElementDeclaration ed)
- {
- if (!visitedElements.contains(ed))
- {
- visitedElements.add(ed);
- fStringBuffer.append(indent + "<CMElementDeclaration"); //$NON-NLS-1$
- printAttributes(fStringBuffer, ed);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
- printProperties(fStringBuffer, ed);
-
- CMNamedNodeMap nodeMap = ed.getAttributes();
- int size = nodeMap.getLength();
- for (int i = 0; i < size; i++)
- {
- visitCMNode(nodeMap.item(i));
- }
-
- visitCMNode(ed.getContent());
-
- CMDataType dataType = ed.getDataType();
- if (dataType != null)
- visitCMNode(dataType);
-
- decrementIndent();
- fStringBuffer.append(indent + "</CMElementDeclaration>\n"); //$NON-NLS-1$
- }
- }
-
-
- public void printEnumeration(StringBuffer sb, String[] values)
- {
- if ((values != null) && (values.length > 0))
- {
- sb.append(indent + "<Enumeration>\n"); //$NON-NLS-1$
- incrementIndent();
-
- for (int i=0; i<values.length; i++)
- {
- sb.append(indent + "<Value>" + values[i] + "</Values>\n"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- decrementIndent();
- sb.append(indent + "</Enumeration>\n"); //$NON-NLS-1$
- }
- }
-
-
- public void printAttributes(StringBuffer sb, CMNode cmnode)
- {
- if (cmnode != null)
- {
- sb.append(" nodeName=\"" + cmnode.getNodeName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- sb.append(" nodeType=\"" + cmnode.getNodeType() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-
- if (cmnode instanceof CMContent)
- {
- sb.append(" minOccur=\"" + ((CMContent)cmnode).getMinOccur() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- sb.append(" maxOccur=\"" + ((CMContent)cmnode).getMaxOccur() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMAnyElement)
- {
- sb.append(" namespaceURI=\"" + ((CMAnyElement)cmnode).getNamespaceURI() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMAttributeDeclaration)
- {
- sb.append(" uasage=\"" + ((CMAttributeDeclaration)cmnode).getUsage() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- sb.append(" defaultValue=\"" + ((CMAttributeDeclaration)cmnode).getDefaultValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMDataType)
- {
- sb.append(" instanceValue=\"" + ((CMDataType)cmnode).generateInstanceValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMEntityDeclaration)
- {
- String value = ((CMEntityDeclaration)cmnode).getValue();
- if (value.indexOf("\"") == -1) sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- else sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMGroup)
- {
- sb.append(" operator=\"" + ((CMGroup)cmnode).getOperator() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMElementDeclaration)
- {
- sb.append(" contentType=\"" + ((CMElementDeclaration)cmnode).getContentType() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- }
-
-
- public void printEntities(StringBuffer sb, CMNamedNodeMap entities)
- {
- if ((entities != null) && (entities.getLength()>0))
- {
- sb.append(indent + "<Entities>\n"); //$NON-NLS-1$
- incrementIndent();
-
- for (Iterator i = entities.iterator(); i.hasNext();)
- {
- CMEntityDeclaration entity = (CMEntityDeclaration)i.next();
- sb.append(indent + "<Entity"); //$NON-NLS-1$
- printAttributes(sb, entity);
- sb.append("/>\n"); //$NON-NLS-1$
- }
-
- decrementIndent();
- sb.append(indent + "</Entities>\n"); //$NON-NLS-1$
- }
- }
-
- public void printProperties(StringBuffer sb, CMNode cmnode)
- {
- List properties = getProperties(cmnode);
- sb.append(indent + "<Properties>\n"); //$NON-NLS-1$
- incrementIndent();
-
- for (int i=0; i<properties.size(); i++)
- {
- String property = (String)properties.get(i);
- sb.append(indent + "<Property name=\"" + property + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-
- if (cmnode.supports(property))
- {
- sb.append(" supports=\"true\""); //$NON-NLS-1$
- }
- else
- {
- sb.append(" supports=\"false\""); //$NON-NLS-1$
- }
- Object value = cmnode.getProperty(property);
- if (value instanceof String) sb.append(" value=\"" + (String)value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- else if (value instanceof Boolean) sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- else if (value != null) sb.append(" value=\"" + value.getClass() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- else sb.append(" value=\"null\""); //$NON-NLS-1$
- sb.append("/>\n"); //$NON-NLS-1$
- }
-
- decrementIndent();
- sb.append(indent + "</Properties>\n"); //$NON-NLS-1$
- }
-
- public List getProperties(CMNode cmnode)
- {
- List properties = new Vector();
-
- if (cmnode != null)
- {
- properties.add("CMDocument"); //$NON-NLS-1$
- properties.add("documentation"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/usesLocalElementDeclarations"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/isNameSpaceAware"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/nsPrefixQualification"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/nillable"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/mofNotifier"); //$NON-NLS-1$
- properties.add("spec"); //$NON-NLS-1$
-
- if (cmnode instanceof CMElementDeclaration)
- {
- properties.add("http://org.eclipse.wst/cm/properties/definitionInfo"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/definition"); //$NON-NLS-1$
- properties.add("XSITypes"); //$NON-NLS-1$
- properties.add("DerivedElementDeclaration"); //$NON-NLS-1$
- // properties.add("SubstitutionGroup"); Currrently broken for nexted xsd files
- properties.add("Abstract"); //$NON-NLS-1$
- }
- if (cmnode instanceof CMDocument)
- {
- properties.add("http://org.eclipse.wst/cm/properties/targetNamespaceURI"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/importedNamespaceInfo"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/namespaceInfo"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/elementFormDefault"); //$NON-NLS-1$
- properties.add("annotationMap"); //$NON-NLS-1$
- }
- }
- return properties;
- }
-
-}
-
-
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java
deleted file mode 100644
index 98e669d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-
-
-public class CMUtility
-{
- /**
- * return true if the child or any of its ancestor group nodes are repeatable
- */
- public static boolean isNodeOrAncestorGroupRepeatable(CMContent content, CMNode child)
- {
- // since we can't walk up the CMNode tree (why you ask? ... its a long story)
- // we walk down the tree to consider the child's parent node's
- //
- boolean result = isRepeatable(child);
- if (!result)
- {
- CanRepeatVisitor visitor = new CanRepeatVisitor(content, child);
- visitor.visitCMNode(content);
- result = visitor.getResult();
- }
- return result;
- }
-
- /**
- * return true if the child is repeatable
- */
- public static boolean isNodeRepeatable(CMContent content, CMNode child)
- {
- // since we can't walk up the CMNode tree (why you ask? ... its a long story)
- // we walk down the tree to consider the child's parent node's
- //
- boolean result = isRepeatable(child);
- if (!result)
- {
- IsRepeatableVisitor visitor = new IsRepeatableVisitor(content, child);
- visitor.visitCMNode(content);
- result = visitor.getResult();
- }
- return result;
- }
-
- public static boolean isRepeatable(CMNode child)
- {
- boolean result = false;
- if (child instanceof CMContent)
- {
- CMContent content = (CMContent)child;
- result = content.getMaxOccur() > 1 || content.getMaxOccur() == -1;
- }
- return result;
- }
-
-
- protected static class CanRepeatVisitor extends CMVisitor
- {
- public boolean result;
- protected boolean isWithinRepeatableGroup;
-
- protected CMNode root;
- protected CMNode target;
-
- public CanRepeatVisitor(CMNode root, CMNode target)
- {
- this.root = root;
- this.target = target;
- }
-
- public void visitCMGroup(CMGroup group)
- {
- boolean oldIsWithinRepeatableGroup = isWithinRepeatableGroup;
-
- isWithinRepeatableGroup = isRepeatable(group);
-
- super.visitCMGroup(group);
-
- isWithinRepeatableGroup = oldIsWithinRepeatableGroup;
- }
-
- public void visitCMElementDeclaration(CMElementDeclaration cmelement)
- {
- if (cmelement == target)
- {
- result = isWithinRepeatableGroup;
- }
- }
-
- public boolean getResult()
- {
- return result;
- }
- }
-
-
- protected static class IsRepeatableVisitor extends CMVisitor
- {
- public boolean result = false;
- protected CMGroup currentGroup;
-
- protected CMNode root;
- protected CMNode target;
-
- public IsRepeatableVisitor(CMNode root, CMNode target)
- {
- this.root = root;
- this.target = target;
- }
-
- public void visitCMGroup(CMGroup group)
- {
- CMGroup previousGroup = currentGroup;
- currentGroup = group;
- super.visitCMGroup(group);
- currentGroup = previousGroup;
- }
-
- public void visitCMElementDeclaration(CMElementDeclaration cmelement)
- {
- if (cmelement == target)
- {
- if (currentGroup != null)
- {
- result = ((currentGroup.getOperator() == CMGroup.CHOICE) &&
- (isRepeatable(currentGroup)));
- }
- }
- }
-
- public boolean getResult()
- {
- return result;
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java
deleted file mode 100644
index f52cc18..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator.ElementPathRecordingResult;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator.StringElementContentComparator;
-
-public class CMValidatorTest
-{
- public static void main(String arg[])
- {
- if (arg.length > 1)
- {
- try
- {
- //CMDocumentFactoryRegistry.getInstance().registerCMDocumentBuilderWithClassName("org.eclipse.wst.xml.core.internal.contentmodel.mofimpl.CMDocumentBuilderImpl");
-
- String grammarFileName = arg[0];
- String elementName = arg[1];
-
- CMDocument cmDocument = ContentModelManager.getInstance().createCMDocument(grammarFileName, null);
-
- CMNamedNodeMap elementMap = cmDocument.getElements();
- CMElementDeclaration element = (CMElementDeclaration)elementMap.getNamedItem(elementName);
- if (element != null)
- { /*
- println("found element [" + elementName + "] contentType = " + element.getContentType());
- GraphNode graphNode = createGraph(element);
- printGraph(graphNode);
- */
- println("-------------- begin validate ---------------"); //$NON-NLS-1$
-
- StringElementContentComparator comparator = new StringElementContentComparator();
- CMValidator validator = new CMValidator();
- ElementPathRecordingResult result = new ElementPathRecordingResult();
- validator.getOriginArray(element, CMValidator.createStringList(arg, 2), comparator, result);
- if (result.isValid)
- {
- CMNode[] nodeMapping = result.getOriginArray();
- println("Validation Success!"); //$NON-NLS-1$
- print(" "); //$NON-NLS-1$
- for (int i = 0; i < nodeMapping.length; i++)
- {
- String name = nodeMapping[i] != null ? nodeMapping[i].getNodeName() : "null"; //$NON-NLS-1$
- print("[" + name + "]"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- println(""); //$NON-NLS-1$
- }
- else
- {
- println("Validation Failed! "); //$NON-NLS-1$
- if (result.errorMessage != null)
- {
- println(" " + result.errorMessage); //$NON-NLS-1$
- }
- }
- println("-------------- end validate ---------------"); //$NON-NLS-1$
- }
- else
- {
- println("element [" + elementName + "] can not be found"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- catch (Exception e)
- {
- println("CMValidator error"); //$NON-NLS-1$
- e.printStackTrace();
- }
- }
- else
- {
- println("2 args required... only " + arg.length + " provided"); //$NON-NLS-1$ //$NON-NLS-2$
- println("usage java org.eclipse.wst.newxml.util.XMLUtil grammarFileName rootElementName pattern"); //$NON-NLS-1$
- }
- }
-
- public static void print(String string)
- {
- }
-
- public static void println(String string)
- {
- }
-
- public static void printlnIndented(int indent, String string)
- {
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java
deleted file mode 100644
index 579b990..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.XMLAssociationProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class CMVisitorTest implements IPlatformRunnable {
- public Object run(Object a) {
- String args[] = (String[]) a;
- if (args.length > 0) {
- test(args[0]);
- }
- else {
- System.out.println("xml file name argument required"); //$NON-NLS-1$
- }
- return null;
- }
-
- protected void test(String fileName) {
-
- ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
- try {
- XMLAssociationProvider provider = new XMLAssociationProvider(new CMDocumentCache()) {
- };
-
- ModelQuery mq = new ModelQueryImpl(provider);
-
- Thread.currentThread().setContextClassLoader(CMVisitorTest.class.getClassLoader());
- DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document document = builder.parse(fileName);
-
- /*
- * ClassLoader prevClassLoader =
- * Thread.currentThread().getContextClassLoader();
- * Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- * Class theClass =
- * Class.forName("org.apache.xerces.parsers.DOMParser"); DOMParser
- * parser = (DOMParser)theClass.newInstance();
- * Thread.currentThread().setContextClassLoader(prevClassLoader);
- * parser.parse(new InputSource(fileName)); Document document =
- * parser.getDocument();
- */
- visitNode(document, mq, 0);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- finally {
- Thread.currentThread().setContextClassLoader(originalClassLoader);
- }
- }
-
- protected void visitNode(Node node, ModelQuery mq, int indent) {
- CMNode cmnode = mq.getCMNode(node);
- printlnIndented(indent, "node :" + node.getNodeName() + " cmnode : " + (cmnode != null ? cmnode.getNodeName() : "null")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- NamedNodeMap map = node.getAttributes();
- if (map != null) {
- indent += 2;
- int mapLength = map.getLength();
- for (int i = 0; i < mapLength; i++) {
- visitNode(map.item(i), mq, indent);
- }
- indent -= 2;
- }
- indent += 4;
- NodeList list = node.getChildNodes();
- int listLength = list.getLength();
- for (int i = 0; i < listLength; i++) {
- visitNode(list.item(i), mq, indent);
- }
- indent -= 4;
- }
-
- public static void printlnIndented(int indent, String string) {
- for (int i = 0; i < indent; i++) {
- System.out.print(" "); //$NON-NLS-1$
- }
- System.out.println(string);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java
deleted file mode 100644
index 8099d71..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.modelquery.XMLCatalogIdResolver;
-
-public class TestCatalogRetrivalAndModelCreation extends TestCase {
-
- /**
- * Test that a known error case returns null.
- *
- * @throws MalformedURLException
- * @throws IOException
- */
- public void testKnownNotExist() throws MalformedURLException, IOException {
- String JUNK_STRING = "doesNotExistTest";
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolvePublic(JUNK_STRING, null);
- assertNull("expected no match for " + JUNK_STRING, resolved);
- }
-
- public void removedtestWAPFORUM() throws MalformedURLException, IOException {
- doTest("-//WAPFORUM//DTD WML 1.1//EN");
- }
-
- public void testXHTML10() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.0 Strict//EN");
- }
-
- public void testXHTML10T() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.0 Transitional//EN");
- }
-
- public void testXHTML10F() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.0 Frameset//EN");
- }
-
- public void testXHTML10B() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML Basic 1.0//EN");
- }
-
- public void testXHTML11() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.1//EN");
- }
-
- /**
- * We expect the XMLCatalogResolver and XMLCatalogIdResolver
- * to resolve to the same URI given a public id in our catalog.
- *
- * @throws MalformedURLException
- * @throws IOException
- */
- public void testXHTML11_xmlresolver() throws MalformedURLException, IOException {
- String EXPECTED_PUBLICID = "-//W3C//DTD XHTML 1.1//EN";
-
- // bug 117424, here ewe make up a base location to satisfy the resolver API
- // that expects a non-null base location
- String baseLocation = "http://www.example.org/testXHTML11.xml";
- XMLCatalogIdResolver resolver = new XMLCatalogIdResolver(baseLocation, null);
- String resolvedXML_Id = resolver.resolve(baseLocation, EXPECTED_PUBLICID, null);
-
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolvedXL_Cat = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
- assertEquals(resolvedXL_Cat, resolvedXML_Id);
- }
-
- public void testCMXHTML11() throws MalformedURLException, IOException {
- doCMTest("-//W3C//DTD XHTML 1.1//EN");
- }
- public void removedtestXHTML10M() throws MalformedURLException, IOException {
- doTest("-//WAPFORUM//DTD XHTML Mobile 1.0//EN");
- }
-
- public void removedtestWAP13() throws MalformedURLException, IOException {
- doTest("-//WAPFORUM//DTD WML 1.3//EN");
- }
-
- public void test2001Schema() throws MalformedURLException, IOException {
- doURITest("http://www.w3.org/2001/XMLSchema");
- }
-
- /**
- * Tests if dtd NOT in our catalog can have a content model
- * created.
- *
- * @throws MalformedURLException
- * @throws IOException
- */
- public void testExternalDTD() throws MalformedURLException, IOException {
- doCM_directURITest("http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd");
- }
-// Bug 123547 - temporarily comment these tests out.
-// public void test2001SchemaCMDirect() throws MalformedURLException, IOException {
-// doCM_directURITest("http://www.w3.org/2001/XMLSchema.xsd");
-// }
-//
-// public void test2001SchemaCMCatalog() throws MalformedURLException, IOException {
-// doURI_CMTest("http://www.w3.org/2001/XMLSchema");
-// }
-
- public void testInvoiceRemote() throws MalformedURLException, IOException {
- doCM_directURITest_checkElementCount("http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/Invoice.dtd", 18);
- }
-
- public void testInvoiceRemoteIndirect() throws MalformedURLException, IOException {
- doCM_directURITest_checkElementCount("http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/IndirectInvoice.dtd", 18);
- }
-
- private void doTest(String EXPECTED_PUBLICID) throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
- assertNotNull("expected to find " + EXPECTED_PUBLICID, resolved);
- }
-
- private void doCMTest(String EXPECTED_PUBLICID) throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(resolved, null);
- assertNotNull("expected to create content model for " + EXPECTED_PUBLICID, contentModel);
- }
-
- private void doCM_directURITest(String EXPECTED_URI) throws MalformedURLException, IOException {
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(EXPECTED_URI, null);
- assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
- }
-
- private void doCM_directURITest_checkElementCount(String EXPECTED_URI, int count) throws MalformedURLException, IOException {
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(EXPECTED_URI, null);
- assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
- int actualCount = contentModel.getElements().getLength();
- assertEquals("count of element declarations found for content model create from " + EXPECTED_URI, contentModel.getElements().getLength(), actualCount);
- }
-
- private void doURITest(String EXPECTED_URI) throws MalformedURLException, IOException {
-
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolveURI(EXPECTED_URI);
- assertNotNull("expected to find " + EXPECTED_URI, resolved);
-
- }
- void doURI_CMTest(String EXPECTED_URI) throws MalformedURLException, IOException {
-
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolveURI(EXPECTED_URI);
- assertNotNull("expected to find " + EXPECTED_URI, resolved);
-
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(resolved, null);
- assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
-
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java
deleted file mode 100644
index 8dd104d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-
-
-public class FileBufferDocumentTester extends UnzippedProjectTester {
-
- private void doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException, IOException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Test Case in error. Could not find file " + filePath, file);
- IPath locationPath = file.getLocation();
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- bufferManager.connect(locationPath, null);
- ITextFileBuffer buffer = bufferManager.getTextFileBuffer(locationPath);
- IDocument document = buffer.getDocument();
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(document.getDocumentPartitioner()));
- bufferManager.disconnect(locationPath, null);
-
-// doTestCreateWithFacade(file, expectedDocumentClass, expectedPartioner);
-
- }
-
- /**
- * @param file
- * @param expectedDocumentClass
- * @param expectedPartioner
- * @throws CoreException
- * @throws IOException
- */
-// private void doTestCreateWithFacade(IFile file, Class expectedDocumentClass, Class expectedPartioner) throws IOException, CoreException {
-// DocumentLoaderForXML documentLoaderForXML = new DocumentLoaderForXML();
-// IDocument document = documentLoaderForXML.createNewStructuredDocument(file, null);
-// Assert.assertNotNull(document);
-// }
-
- private void doTestCreateCreateEmpty(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertTrue("Test Case in error. Non-existent file existed! " + filePath, file == null);
- IPath locationPath = new Path(filePath);
- IFile nonExistingFile = fTestProject.getFile(locationPath);
- locationPath = nonExistingFile.getFullPath();
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- // can not "connect" to non-existant location
- //bufferManager.connect(locationPath, null);
- IDocument document = bufferManager.createEmptyDocument(locationPath);
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- assertTrue("wrong partitioner in document", expectedPartioner.isInstance(document.getDocumentPartitioner()));
- bufferManager.disconnect(locationPath, null);
-
- }
-
-
-
- public void testFile103() throws CoreException, IOException {
- doTestCreate("testfiles/xml/EmptyFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile104() throws CoreException, IOException {
- doTestCreate("testfiles/xml/eucjp.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile105() throws CoreException, IOException {
- doTestCreate("testfiles/xml/IllformedNormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile106() throws CoreException, IOException {
- doTestCreate("testfiles/xml/MalformedNoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile107() throws CoreException, IOException {
- doTestCreate("testfiles/xml/MalformedNoEncoding.xsl", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile108() throws CoreException, IOException {
- doTestCreate("testfiles/xml/NoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile109() throws CoreException, IOException {
- doTestCreate("testfiles/xml/NormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile110() throws CoreException, IOException {
- doTestCreate("testfiles/xml/shiftjis.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile111() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testExtraJunk.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile112() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testExtraValidStuff.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile113() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile114() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile115() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed3.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile116() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed4.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile117() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testMultiLine.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile118() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoEncodingValue.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile119() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile120() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDecl.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile121() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDeclAtFirst.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile122() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDeclInLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile123() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testUTF16.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile124() throws CoreException, IOException {
- doTestCreate("testfiles/xml/UTF16LEAtStartOfLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile125() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile126() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile127() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16WithJapaneseChars.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile128() throws CoreException, IOException {
- doTestCreate("testfiles/xml/UTF8With3ByteBOM.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXML() throws CoreException {
- doTestCreateCreateEmpty("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testSimpleCase() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- /*
- public void testFile1() throws CoreException, IOException {
- doTestCreate("testfiles/css/emptyFile.css", BasicStructuredDocument.class, StructuredTextPartitionerForCSS.class);
- }
-
-
-
- public void testFile70() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/MalformedNoEncodingXSL.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile81() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testBrokenLine.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testDefaultEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile83() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testDefaultEncodingWithJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile84() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testExtraJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testExtraValidStuff.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testIllFormed.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testIllFormed2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoEncodingValue.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirective.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile90() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirectiveAtFirst.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile91() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNormalCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testUTF16.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16WithJapaneseChars.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/UTF8With3ByteBOM.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/WellFormedNormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile99() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile100() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile101() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile102() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect229667/audi.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
-
- public void testFile71() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/noEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile72() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NoEncodinginXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile74() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile76() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile77() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile79() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalPageCaseNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile80() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-*/
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java
deleted file mode 100644
index f0c1d44..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.document;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-public class GetDocumentRegionsTest extends TestCase {
-
- private boolean fAlreadySetup = false;
- private IStructuredDocument fDoc = null;
- private String fText = null;
-
- protected void setUp() throws Exception {
- super.setUp();
- if(!fAlreadySetup) {
- IStructuredModel sModel = createModel(ContentTypeIdForXML.ContentTypeID_XML);
- fDoc = sModel.getStructuredDocument();
- fText = "<html><head></head><body> text </body></html>";
- fDoc.set(fText);
- fAlreadySetup = true;
- }
- }
-
- public void testGetAllRegions() {
-
- // all regions
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions();
- checkRegions(regions, 7, "<html>", "</html>");
- }
-
- public void testExcludeEnds() {
-
- // leave off the end regions
- // <html>[<head><body> text </body>]</html>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(6,fText.length() - (6+7));
- checkRegions(regions, 5, "<head>", "</body>");
- }
-
- public void testIncludeEnds() {
-
- // include end regions
- // <ht[ml><head></head><body> text </body></ht]ml>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(3,fText.length()- (3+3));
- assertEquals(7, regions.length);
- }
-
- public void testFirstTwo() {
- // first 2 regions
- // <h[tml><h]ead></head>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(2,6);
- checkRegions(regions, 2, "<html>", "<head>");
- }
-
- public void testRightSeam() {
- // right seam
- // [<html><head>]</head>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(0,12);
- checkRegions(regions, 2, "<html>", "<head>");
- }
-
- public void testLeftSeam() {
- // left seam
- // </body>[</html>]
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(fText.length()-7, 7);
- checkRegions(regions, 1, "</html>", "</html>");
- }
-
- public void testGetLast() {
- // last region only
- // </body></html>|
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(fText.length(), 0);
- checkRegions(regions, 1, "</html>", "</html>");
- }
-
- public void testGetFirst() {
- // first region only
- // |<html><head>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(0,0);
- checkRegions(regions, 1, "<html>", "<html>");
- }
-
- private void checkRegions(IStructuredDocumentRegion[] regions, int expectedLength, String firstText, String lastText) {
-
- //for (int i = 0; i < regions.length; i++)
- // System.out.println(regions[i].getText());
-
- assertEquals(expectedLength, regions.length);
-
- String text = regions[0].getText();
- assertEquals(text, firstText);
-
- text = regions[regions.length-1].getText();
- assertEquals(text, lastText);
- }
-
- private IStructuredModel createModel(String contentTypeID) {
- // create an empty model with its default factories
- IStructuredModel model = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID);
- return model;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java
deleted file mode 100644
index aff7578..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.Position;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-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.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestStructuredDocument extends TestCase {
-
- class TestListener implements IStructuredDocumentListener {
-
- boolean newModelCalled = false;
- boolean noChangeCalled = false;
- boolean nodesReplacedCalled = false;
- boolean regionChangedCalled = false;
- boolean regionsReplacedCalled = false;
-
- public void newModel(NewDocumentEvent structuredDocumentEvent) {
- newModelCalled = true;
- }
-
- public void noChange(NoChangeEvent structuredDocumentEvent) {
- noChangeCalled = true;
- }
-
- public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
- nodesReplacedCalled = true;
- }
-
- public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
- regionChangedCalled = true;
- }
-
- public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
- regionsReplacedCalled = true;
- }
- }
-
- private boolean isSetup = false;
-
-
- private final String fProjectName = "DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- public TestStructuredDocument() {
- super("TestStructuredDocument");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
-
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- /**
- * Be sure to release any models obtained from this method.
- *
- */
- IStructuredModel getTestModel() throws IOException, CoreException {
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(fProjectName);
- IFile iFile = (IFile) project.findMember("/files/simple.xml");
- // fProjectName + "/files/simple.xml"
-
-
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit(iFile);
-
-
- return model;
-
- }
-
-
-
- public void testDocumentChangingListener() throws BadLocationException, IOException, CoreException {
- // TODO: may need to fake events to really tests this
-
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
-
- TestListener listener = new TestListener();
-
- sDoc.addDocumentChangingListener(listener);
- String text = sDoc.get();
- sDoc.replace(0, text.length(), text);
-
- sDoc.removeDocumentChangingListener(listener);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testReadOnly() throws IOException, CoreException {
-
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- String text = sDoc.get();
-
- sDoc.clearReadOnly(0, text.length());
- assertFalse(sDoc.containsReadOnly(0, text.length()));
-
- sDoc.makeReadOnly(0, 10);
- assertTrue(sDoc.containsReadOnly(9, 1));
- assertTrue(sDoc.containsReadOnly(0, text.length()));
-
- sDoc.clearReadOnly(0, text.length());
- assertFalse(sDoc.containsReadOnly(0, text.length()));
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetRegionAtCharacterOffset() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- IStructuredDocumentRegion r = sDoc.getRegionAtCharacterOffset(0);
- assertNotNull("couldn't get region at offset: 0", r);
-
- r = sDoc.getRegionAtCharacterOffset(sDoc.getLength());
- assertNotNull("couldn't get region at offset: " + sDoc.getLength(), r);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
-
- }
- }
-
- public void testGetRegionList() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- IStructuredDocumentRegionList regions = sDoc.getRegionList();
- assertNotNull("couldn't get region list", regions);
- assertEquals(17, regions.getLength());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetText() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- String text = sDoc.getText();
- String expectedText = "<?xml version=\"1.0\"?>\r\n<list>\r\n\t<item1 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\">\r\n\t\tone\r\n\t</item1>\r\n\t<item2 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\" >\r\n\t\ttwo\r\n\t</item2>\r\n\t<item3 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\">\r\n\t\tthree\r\n\t</item3>\r\n</list>";
- assertEquals(expectedText, text);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testNewInstance() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- IStructuredDocument newDoc = sDoc.newInstance();
- assertNotSame("document instances should be different", sDoc, newDoc);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testReplaceText() throws BadLocationException, IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- sDoc.replace(0, sDoc.getLength(), "replaced");
-
- String text = sDoc.getText();
- assertEquals("replaced", text);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testOverrideReadOnlyReplaceText() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- sDoc.makeReadOnly(0, 1);
- sDoc.replaceText(this, 0, sDoc.getLength(), "replaced");
- assertNotSame("text should not have been replacable (read only)", "replaced", sDoc.getText());
-
- sDoc.replaceText(this, 0, sDoc.getLength(), "replaced", true);
- assertEquals("text should have been forced replaced", "replaced", sDoc.getText());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSetText() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- sDoc.setText(this, "set text");
-
- assertEquals("set text failed", "set text", sDoc.getText());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetEncodingMemento() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = null;
- sDoc = model.getStructuredDocument();
- EncodingMemento memento = sDoc.getEncodingMemento();
- assertNotNull("couldn't get encoding memento", memento);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetDetectedLineDelimiter() throws IOException, CoreException {
- String platformDelimiter = System.getProperty("line.separator");
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- String delim = sDoc.getLineDelimiter();
- assertEquals("wrong preferred line delmiter", platformDelimiter, delim);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSetEncodingMemento() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- EncodingMemento memento = new EncodingMemento();
- sDoc.setEncodingMemento(memento);
- EncodingMemento gottenMemento = sDoc.getEncodingMemento();
- assertEquals("mementos don't match", memento, gottenMemento);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- void setDetectedLineDelimiter() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- sDoc.setPreferredLineDelimiter("\n");
- String delim = sDoc.getPreferredLineDelimiter();
- assertEquals("set line delimiter failed", "\n", delim);
-
- sDoc.setPreferredLineDelimiter("\r\n");
- delim = sDoc.getPreferredLineDelimiter();
- assertEquals("set line delimiter failed", "\r\n", delim);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testStringMatches() {
- // TODO: will need a test when this API is created
- // IStructuredModel model = getTestModel();
- // IStructuredDocument sDoc = model.getStructuredDocument();
- }
-
- public void testCreatePosition() throws BadPositionCategoryException, BadLocationException, IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- Position p = new Position(0, 10);
- String[] categories = sDoc.getPositionCategories();
- for (int i = 0; i < categories.length; i++) {
- sDoc.addPosition(categories[i], p);
- }
- int found = 0;
- for (int i = 0; i < categories.length; i++) {
- Position[] positions = sDoc.getPositions(categories[i]);
- for (int j = 0; j < positions.length; j++) {
- if (positions[j] == p) {
- found++;
- }
- }
- }
- assertEquals("wrong number of positions", categories.length, found);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java
deleted file mode 100644
index e57a089..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestXMLDocumentLoader extends TestCase {
-
- private boolean isSetup = false;
- private final String fProjectName ="DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- protected void setUp() throws Exception {
- super.setUp();
- if (!this.isSetup) {
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
-
- public void testCreateNewEmptyStructuredDocument() {
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
-
- document = xmlDocumentLoader.createNewStructuredDocument();
- assertNotNull("failed to create Empty document", document);
- }
-
- public void testCreateNewStructuredDocumentFromFile() {
- // from a file
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
- try {
- document = xmlDocumentLoader.createNewStructuredDocument(file);
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- assertNotNull("failed to create document from IFile", document);
- }
-
- public void testCreateNewStructuredDocumentFromInputStream() {
- String fileLocation = "/files/simple.xml";
- String absoluteFileLocation = Platform.getInstanceLocation() + fProjectName + fileLocation;
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
-
- try {
- document = xmlDocumentLoader.createNewStructuredDocument(absoluteFileLocation, file.getContents());
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- assertNotNull("failed to create document from InputStream", document);
- }
-
- public void testCreateNewDocumentFromReaderWithEncodingRule() {
-
- String fileLocation = "/files/simple.xml";
- String absoluteFileLocation = Platform.getInstanceLocation().getURL().getPath().toString() + fProjectName + fileLocation;
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
-
- try {
- document = xmlDocumentLoader.createNewStructuredDocument(absoluteFileLocation, file.getContents());
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- assertNotNull("failed to create document from InputStream with EncodingRule", document);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java
deleted file mode 100644
index 555e1b7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-/**
- * @author nsd
- *
- */
-public class TransitionTests extends UnzippedProjectTester {
-
- /**
- *
- */
- public TransitionTests() {
- super();
- }
-
-
- public void testSoftRevert() throws CoreException, IOException {
- String filePath = "testfiles/xml/EmptyFile.xml"; //$NON-NLS-1$
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Test Case in error. Could not find file " + filePath, file); //$NON-NLS-1$
- IPath locationPath = file.getLocation();
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- bufferManager.connect(locationPath, null);
- ITextFileBuffer buffer = bufferManager.getTextFileBuffer(locationPath);
- IDocument document = buffer.getDocument();
- assertNotNull(document);
- assertTrue("wrong class of document", document instanceof BasicStructuredDocument); //$NON-NLS-1$
- assertTrue("wrong partitioner in document.", ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING) instanceof StructuredTextPartitionerForXML); //$NON-NLS-1$
-
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit((IStructuredDocument) document);
- try {
- try {
- document.replace(0, 0, "__"); //$NON-NLS-1$
- document.replace(2, 0, "<a"); //$NON-NLS-1$
- document.replace(4, 0, ">"); //$NON-NLS-1$
- document.replace(5, 0, " "); //$NON-NLS-1$
- }
- catch (BadLocationException e) {
- assertNull(e);
- }
- document.set(""); //$NON-NLS-1$
- }
- finally {
- model.releaseFromEdit();
-
- bufferManager.disconnect(locationPath, null);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java
deleted file mode 100644
index d47ca29..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-
-/*
- * Made abstract, so won't be automatically picked up as test (since intended to be subclassed).
- */
-public abstract class UnzippedProjectTester extends TestCase {
-
- protected static IProject fTestProject;
- private static boolean fTestProjectInitialized;
- private static int nSetups = 0;
- private static final String TEST_PROJECT_NAME = "org.eclipse.wst.sse.core.internal.encoding.newtests";
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = SSEModelXMLTestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
- // Display display = PlatformUI.getWorkbench().getDisplay();
- // display.asyncExec(new Runnable() {
- // public void run() {
- // ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- // IProject proj = fTestProject;
- // fTestProject = null;
- // try {
- // projUtil.deleteProject(proj);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // });
- }
- }
- }
-
- private static final boolean DEBUG = false;
-
- private static void getAndCreateProject() throws CoreException {
- //TestsPlugin testsPlugin = (TestsPlugin)
- // Platform.getPlugin("org.eclipse.wst.sse.core.internal.encoding.tests");
- IWorkspace workspace = getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- //createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- // IContainer dotestFiles = testProject.getFolder("dotestFiles");
- // assertTrue(dotestFiles.exists());
- // IResource[] allFolders = dotestFiles.members();
- // assertNotNull(allFolders);
- }
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java
deleted file mode 100644
index d650753..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.provisional.NameValidator;
-
-public class NameValidatorTests extends TestCase {
-
- private int nTrials = 100;
-
- public NameValidatorTests(String name) {
- super(name);
- }
-
- private void doTest(int testNumber, String testString, Boolean expectedValidity) {
- boolean isValid = NameValidator.isValid(testString);
- assertEquals("testNumber: " + testNumber, expectedValidity.booleanValue(), isValid);
- }
-
- public void testIsValid() {
- Object[][] testees = new Object[][]{
- {"initial",Boolean.TRUE},
- {"foo",Boolean.TRUE},
- {"4",Boolean.FALSE},
- {"9999", Boolean.FALSE},
- {"f9999", Boolean.TRUE},
- {"", Boolean.FALSE},
- {"got space", Boolean.FALSE},
- {" spacebefore", Boolean.FALSE},
- {"spaceafter ", Boolean.FALSE},
- {"ns:namespace", Boolean.TRUE},
- {":funnyns", Boolean.TRUE},
- /* ISSUE: is "endns:" really valid name */
- {"endns:", Boolean.TRUE},
- {"us_underscore", Boolean.TRUE},
- {"_underscore", Boolean.TRUE},
- {"underscore_", Boolean.TRUE},
- {"averylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersize", Boolean.TRUE},
- };
- for (int i = 0; i < testees.length; i++) {
- for (int j = 0; j < nTrials; j++) {
- doTest(i, (String)testees[i][0], (Boolean) testees[i][1]);
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java
deleted file mode 100644
index 6bb58da..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 Eclipse Foundation
- * 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:
- * Jesper Steen Møller - jesper@selskabet.org
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-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.util.URIResolver;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML;
-import org.eclipse.wst.xml.core.tests.util.StringCompareUtil;
-
-public class TestFormatProcessorXML extends TestCase {
-
- private static final boolean SPLIT_MULTI_ATTRS = false;
-
- private static final String INDENT = "\t";
-
- private static final boolean CLEAR_ALL_BLANK_LINES = false;
-
- private static final int MAX_LINE_WIDTH = 72;
-
- private static final String UTF_8 = "UTF-8";
-
- private StringCompareUtil fStringCompareUtil;
-
- public TestFormatProcessorXML(String name) {
- super(name);
- }
-
- private FormatProcessorXML formatProcessor;
-
- protected void setUp() throws Exception {
- formatProcessor = new FormatProcessorXML();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestStructuredPartitioner)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, new URIResolver() {
-
- String fBase = baseFile;
-
- public String getFileBaseLocation() {
- return fBase;
- }
-
- public String getLocationByURI(String uri) {
- return getLocationByURI(uri, fBase);
- }
-
- public String getLocationByURI(String uri, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri);
- }
-
- public String getLocationByURI(String uri, String baseReference) {
- int lastSlash = baseReference.lastIndexOf("/");
- if (lastSlash > 0)
- return baseReference.substring(0, lastSlash + 1) + uri;
- return baseReference;
- }
-
- public String getLocationByURI(String uri, String baseReference, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri, baseReference);
- }
-
- public IProject getProject() {
- return null;
- }
-
- public IContainer getRootLocation() {
- return null;
- }
-
- public InputStream getURIStream(String uri) {
- return getClass().getResourceAsStream(getLocationByURI(uri));
- }
-
- public void setFileBaseLocation(String newLocation) {
- this.fBase = newLocation;
- }
-
- public void setProject(IProject newProject) {
- }
- });
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- protected void formatAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals(beforePath, afterPath, true);
- }
-
- private void formatAndAssertEquals(String beforePath, String afterPath, boolean resetPreferences) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- if (resetPreferences)
- resetPreferencesToDefault();
-
- ((AbstractStructuredFormatProcessor) formatProcessor).refreshFormatPreferences = false;
- formatProcessor.formatModel(beforeModel);
- ((AbstractStructuredFormatProcessor) formatProcessor).refreshFormatPreferences = true;
-
- ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
- beforeModel.save(formattedBytes); // "beforeModel" should now be
- // after the formatter
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String expectedContents = new String(afterBytes.toByteArray(), UTF_8);
- String actualContents = new String(formattedBytes.toByteArray(), UTF_8);
- assertTrue("Formatted document differs from the expected.\nExpected Contents:\n" + expectedContents + "\nActual Contents:\n" + actualContents, fStringCompareUtil.equalsIgnoreLineSeperator(expectedContents, actualContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- private void resetPreferencesToDefault() {
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- formatPreferences.setLineWidth(MAX_LINE_WIDTH);
- formatPreferences.setClearAllBlankLines(CLEAR_ALL_BLANK_LINES);
- formatPreferences.setIndent(INDENT);
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(SPLIT_MULTI_ATTRS);
- }
-
- public void testSimpleXml() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/simple-standalone.xml", "testfiles/xml/simple-standalone-fmt.xml");
- }
-
- public void testPreserveFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/xml-space-preserve-standalone.xml", "testfiles/xml/xml-space-preserve-standalone-fmt.xml");
- }
-
- public void testPreserveFormatDTD() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/xml-space-preserve-dtd.xml", "testfiles/xml/xml-space-preserve-dtd-fmt.xml");
- }
-
- public void testOneLineFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG115716
- formatAndAssertEquals("testfiles/xml/oneline.xml", "testfiles/xml/oneline-fmt.xml");
- }
-
- public void testOneLineTextNodeFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG166441
- formatAndAssertEquals("testfiles/xml/onelineTextNode.xml", "testfiles/xml/onelineTextNode-fmt.xml");
- }
-
- public void testEmptyContentNodeFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG174243
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- formatAndAssertEquals("testfiles/xml/usetagswithemptycontent.xml", "testfiles/xml/usetagswithemptycontent-fmt.xml", false);
- }
-
- public void testXSLFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG108074
- formatAndAssertEquals("testfiles/xml/xslattributetext.xsl", "testfiles/xml/xslattributetext-fmt.xsl");
- }
-
- public void testEntityFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG102076
- formatAndAssertEquals("testfiles/xml/entities.xml", "testfiles/xml/entities-fmt.xml");
- }
-
- public void testPreservePCDATAFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG84688
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setPreservePCDATAContent(true);
- formatAndAssertEquals("testfiles/xml/xml-preservepcdata.xml", "testfiles/xml/xml-preservepcdata-yes-fmt.xml", false);
-
- ((StructuredFormatPreferencesXML) formatPreferences).setPreservePCDATAContent(false);
- formatAndAssertEquals("testfiles/xml/xml-preservepcdata.xml", "testfiles/xml/xml-preservepcdata-no-fmt.xml", false);
- }
-
- public void testPreserveCDATAFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG161330
- formatAndAssertEquals("testfiles/xml/usecdata.xml", "testfiles/xml/usecdata-fmt.xml");
- formatAndAssertEquals("testfiles/xml/usecdata2.xml", "testfiles/xml/usecdata2-fmt.xml");
- }
-
- public void testSplitAttributesFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG113584
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(false);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-yessplit-noalign-fmt.xml", false);
-
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(false);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-nosplit-noalign-fmt.xml", false);
-
- }
-
- public void testAlignEndBracketFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG113584
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(true);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml", false);
-
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(true);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml", false);
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-fmt.xml
deleted file mode 100644
index 9c2e657..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-fmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE document [
-<!ENTITY EII "<emph>element information item</emph>">
-]>
-<document>
- This document contains no child
- &EII;s. It does contain a non&EII;.
-</document>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities.xml
deleted file mode 100644
index 15bdedc..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE document [
-<!ENTITY EII "<emph>element information item</emph>">
-]>
-<document>
-This document contains no child &EII;s. It does contain a non&EII;.
-</document>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-noalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-noalign-fmt.xml
deleted file mode 100644
index 6d1390e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-noalign-fmt.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally rad="dude" intense="man" crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa">
- </totally>
- <like fer="sure" no="way">
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml
deleted file mode 100644
index 9e897c3..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally rad="dude" intense="man" crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"
- >
- </totally>
- <like fer="sure" no="way">
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-noalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-noalign-fmt.xml
deleted file mode 100644
index d757592..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-noalign-fmt.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally
- rad="dude"
- intense="man"
- crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa">
- </totally>
- <like
- fer="sure"
- no="way">
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously
- no="joke"
- for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml
deleted file mode 100644
index c7be96e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally
- rad="dude"
- intense="man"
- crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"
- >
- </totally>
- <like
- fer="sure"
- no="way"
- >
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously
- no="joke"
- for="reals"
- />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes.xml
deleted file mode 100644
index 0de9b4d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
-<totally rad="dude" intense="man" crazy="and insane" scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"></totally>
-<like fer="sure" no="way">yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee</like>
-<seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline-fmt.xml
deleted file mode 100644
index 72aa19d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline-fmt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<one>
- <two></two>
- <three>
- <four></four>
- </three>
-</one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline.xml
deleted file mode 100644
index 1723240..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><one><two></two><three><four></four></three></one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-fmt.xml
deleted file mode 100644
index 2709548..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-fmt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<one attr="1" attr2="2">
- <two></two>
- <three>
- <four></four>
- </three>
-</one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode.xml
deleted file mode 100644
index b513f6a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><one attr="1" attr2="2"> <two></two><three><four> </four></three></one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-fmt.xml
deleted file mode 100644
index c5bb621..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-fmt.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<main>
- This is just a simple test
-
- of the formatter
-
- which should be easy to pass.
- <data-stuff attr1="short-value" a0="" a1=' ' a2=" " a3=' '
- a4=" " a5=' ' a6=" " attr2="short-value"
- attr-which-is-really-really-oh-so-horribly-long-yes-sir-1="also quite fantastically long value which mustn't be broken"
- attr3="short-value">
-
- <cdata>
- <![CDATA[
- Daa, daa, da, da - da, da - da, da
-
- Can't touch this!
- (spaces here)
- (tab here)
- ]]>
- </cdata>
- <a>
- <b>b</b>
- <b>b</b>
- <b>b</b><!-- Comment here don't twiddle with spaces in them -->
- <b>b</b>
- <b>b</b>
- <b>b</b>
- </a>
- <?target why am I here
- ?>
- </data-stuff>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone.xml
deleted file mode 100644
index 823ef32..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<main>
- This is just a simple test
-
- of the formatter
-
-which should be easy to pass.
-<data-stuff attr1="short-value" a0="" a1=' ' a2=" " a3=' ' a4=" " a5=' ' a6=" " attr2="short-value" attr-which-is-really-really-oh-so-horribly-long-yes-sir-1="also quite fantastically long value which mustn't be broken" attr3="short-value"
- >
-
- <cdata>
- <![CDATA[
- Daa, daa, da, da - da, da - da, da
-
- Can't touch this!
- (spaces here)
- (tab here)
- ]]>
- </cdata>
- <a>
- <b>b</b>
- <b>b </b>
- <b> b</b> <!-- Comment here don't twiddle with spaces in them --> <b> b </b>
- <b>
- b
- </b>
- <b>b</b>
- </a><?target why am I here
- ?>
-</data-stuff>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/tagswithemptycontent.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/tagswithemptycontent.dtd
deleted file mode 100644
index 67217a5..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/tagswithemptycontent.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT topmost (empty,emptywithattribute)>
-<!ELEMENT empty EMPTY>
-<!ELEMENT emptywithattribute EMPTY>
-<!ATTLIST emptywithattribute
- myattribute1 CDATA #IMPLIED
- myattribute2 CDATA #IMPLIED>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata-fmt.xml
deleted file mode 100644
index dfe43e1..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata-fmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<manytags>
- <sometag someattr="someattrvalue"><![CDATA[
- blah blah blah
- nothing
- changes
- in
-here
-]]></sometag>
-</manytags>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata.xml
deleted file mode 100644
index ebc176a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manytags> <sometag someattr="someattrvalue"><![CDATA[
- blah blah blah
- nothing
- changes
- in
-here
-]]></sometag>
-</manytags>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2-fmt.xml
deleted file mode 100644
index 9a4a3a2..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2-fmt.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
- nospacebetweenmeandcdata<![CDATA[
-function matchwo(a,b)
-{
-if (a < b && a < 0) then
- {
- return 1
- }
-else
- {
- return 0
- }
-}
-]]>nospacebetweenmeandcdata
-</script>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2.xml
deleted file mode 100644
index bab4ec9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
-nospacebetweenmeandcdata<![CDATA[
-function matchwo(a,b)
-{
-if (a < b && a < 0) then
- {
- return 1
- }
-else
- {
- return 0
- }
-}
-]]>nospacebetweenmeandcdata
-</script>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent-fmt.xml
deleted file mode 100644
index 5ac2eef..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent-fmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE topmost SYSTEM "tagswithemptycontent.dtd" >
-<topmost>
- <empty></empty>
- <emptywithattribute
- myattribute1=""
- myattribute2=""></emptywithattribute>
-</topmost>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent.xml
deleted file mode 100644
index 7299cd5..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE topmost SYSTEM "tagswithemptycontent.dtd" >
-<topmost>
- <empty></empty>
- <emptywithattribute myattribute1="" myattribute2=""></emptywithattribute>
-</topmost>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-fmt.xml
deleted file mode 100644
index 60683f9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-fmt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pcdatalicious SYSTEM "xml-preservepcdata.dtd" >
-<pcdatalicious>
- <ihavepcdata>i have pcdata</ihavepcdata>
- <ihavepcdata>
- i have
-
-
-
- spaces
- </ihavepcdata>
- <idont />
- <neitherdoi>do i have pcdata? i'm not sure. boo hoo.</neitherdoi>
-</pcdatalicious>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-yes-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-yes-fmt.xml
deleted file mode 100644
index 5109c8f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-yes-fmt.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pcdatalicious SYSTEM "xml-preservepcdata.dtd" >
-<pcdatalicious>
- <ihavepcdata>i have pcdata</ihavepcdata>
- <ihavepcdata> i have
-
-
-
- spaces </ihavepcdata>
- <idont />
- <neitherdoi>do i have pcdata? i'm not sure. boo hoo.</neitherdoi>
-</pcdatalicious>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.dtd
deleted file mode 100644
index fd086dc..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT pcdatalicious (ihavepcdata*,idont*,neitherdoi*)>
-<!ELEMENT ihavepcdata (#PCDATA)>
-<!ELEMENT idont EMPTY>
-<!ELEMENT neitherdoi ANY>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.xml
deleted file mode 100644
index 2874f87..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pcdatalicious SYSTEM "xml-preservepcdata.dtd" >
-<pcdatalicious>
- <ihavepcdata>i have pcdata</ihavepcdata>
- <ihavepcdata> i have
-
-
-
- spaces </ihavepcdata>
- <idont/>
- <neitherdoi>do i have pcdata? i'm not sure. boo hoo.</neitherdoi>
-</pcdatalicious>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-actual.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-actual.xml
deleted file mode 100644
index f30c047..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-actual.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE main SYSTEM "xml-space-preserve.dtd">
-<main>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-<preserve>
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter.
- <preserve xml:space="default">
- This particular text can
-
- and should be reformatted.
- </preserve>
-
-<preserve>
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default>
- No man
-
- is an
-
- island, .
- .
- .
- but this section is, really, so clean it up please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <preserve2>
-This particular
- text may
-
-not reformatted.</preserve2> <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-</main>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-fmt.xml
deleted file mode 100644
index 271e6f2..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-fmt.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE main SYSTEM "xml-space-preserve.dtd">
-<main>
- <nothing>this is not a target, strip spaces as you please</nothing>
- <preserve>
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter.
- <preserve xml:space="default">
- This particular text can
-
- and should be reformatted.
- </preserve>
-
- <preserve>
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default>
- No man
-
- is an
-
- island, . . . but this section is, really, so clean it up
- please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <preserve2>
-This particular
- text may
-
-not reformatted.</preserve2>
- <nothing>this is not a target, strip spaces as you please</nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd.xml
deleted file mode 100644
index 28a2b72..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE main SYSTEM "xml-space-preserve.dtd">
-<main>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-<preserve >
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter.
- <preserve xml:space="default">
-This particular text can
-
-and should be reformatted.</preserve>
-
-<preserve >
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default >
- No man
-
- is an
-
- island, .
- .
- .
- but this section is, really, so clean it up please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <preserve2>
-This particular
- text may
-
-not reformatted.</preserve2> <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-fmt.xml
deleted file mode 100644
index 551193e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-fmt.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<main>
- <nothing>this is not a target, strip spaces as you please</nothing>
- <preserve xml:space="preserve" but-attr-clean-up="true">
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter
- <preserve xml:space="preserve" but-attr-clean-up="true">
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default
- xml:space="default">
- No man
-
- is an
-
- island, . . . but this section is, really, so clean it up
- please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <nothing>this is not a target, strip spaces as you please</nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone.xml
deleted file mode 100644
index 7b18757..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<main>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-<preserve xml:space="preserve" but-attr-clean-up = "true">
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter
-<preserve xml:space="preserve" but-attr-clean-up = "true">
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default xml:space="default">
- No man
-
- is an
-
- island, .
- .
- .
- but this section is, really, so clean it up please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve.dtd
deleted file mode 100644
index ce567bf..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve.dtd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml encoding="US-ASCII"?>
-
-<!ELEMENT main (#PCDATA | nothing | preserve | preserve2)* >
-
-<!ELEMENT preserve (#PCDATA | nothing | space-default)* >
-<!ATTLIST preserve xml:space (default|preserve) 'preserve'>
-
-<!ELEMENT preserve2 (#PCDATA | nothing | space-default)* >
-<!ATTLIST preserve2 xml:space NMTOKEN #FIXED "preserve">
-
-<!ELEMENT space-default (#PCDATA| nothing | preserve)*>
-<!ATTLIST space-default xml:space (default|preserve) 'default'>
-
-<!ELEMENT nothing (#PCDATA) >
-
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext-fmt.xsl b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext-fmt.xsl
deleted file mode 100644
index b75426e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext-fmt.xsl
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:template match="/">
- <html>
- <body>
- <h2>Space Checking</h2>
- <p>
- <xsl:attribute name="align">center</xsl:attribute>
- Check:
- <xsl:for-each select="text/item">
- <xsl:value-of select="something" />
- <xsl:if test="position()=last()-1">
- <xsl:text>trailing spaces </xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()-1">
- <xsl:text> leading spaces</xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()">
- <xsl:text>nospace</xsl:text>
- </xsl:if>
- </xsl:for-each>
- </p>
- </body>
- </html>
- </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext.xsl b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext.xsl
deleted file mode 100644
index e87e387..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:template match="/">
-<html>
- <body>
- <h2>Space Checking</h2>
- <p><xsl:attribute name="align">center</xsl:attribute>Check:<xsl:for-each select="text/item"><xsl:value-of select="something"/>
- <xsl:if test="position()=last()-1">
- <xsl:text>trailing spaces </xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()-1">
- <xsl:text> leading spaces</xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()">
- <xsl:text>nospace</xsl:text>
- </xsl:if>
- </xsl:for-each>
- </p>
- </body>
- </html>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java
deleted file mode 100644
index 995f5ae..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-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;
-
-
-
-public class TestFragFile extends TestCase {
-
- public void testFrag() throws UnsupportedEncodingException, IOException {
- IStructuredModel model = null;
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- String testString1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n" + "<!--This is an internally generated file - manual changes to it will be ignored and overwritten.-->\r\n" + "<Fragment parent=\"/ejb-jar/enterprise-beans<description,display-name,small-icon,large-icon\" destination=\"ejb-jar.xml\" type=\"xml\" xmlid=\"id,xmi:id\" tagSet=\"ejb\">\r\n" + "<session id=\"ejbs.TestBean\">\r\n" + "<ejb-name>Test</ejb-name>\r\n" + "<home>ejbs.TestHome</home>\r\n" + "<remote>ejbs.Test</remote>\r\n" + "<ejb-class>ejbs.TestBean</ejb-class>\r\n" + "<session-type>Stateless</session-type>\r\n" + "<transaction-type>Container</transaction-type>\r\n" + "</session>\r\n" + "</Fragment>";
-
-
- InputStream inputStream = new ByteArrayInputStream(testString1.getBytes("utf8"));
-
- model = modelManager.getModelForRead("test.frag", inputStream, null); //$NON-NLS-1$
-
- System.out.println(model);
- System.out.println(model.getStructuredDocument().get());
- }
-
- public void testFragX() throws UnsupportedEncodingException, IOException {
- IStructuredModel model = null;
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- String testString = "<!--This is an internally generated file - manual changes to it will be ignored and overwritten.-->\r\n" + "<Fragment parent=\"/ejb-jar/enterprise-beans<description,display-name,small-icon,large-icon\" destination=\"ejb-jar.xml\" type=\"xml\" xmlid=\"id,xmi:id\" tagSet=\"ejb\">\r\n" + "<session id=\"ejbs.TestBean\">\r\n" + "<ejb-name>Test</ejb-name>\r\n" + "<home>ejbs.TestHome</home>\r\n" + "<remote>ejbs.Test</remote>\r\n" + "<ejb-class>ejbs.TestBean</ejb-class>\r\n" + "<session-type>Stateless</session-type>\r\n" + "<transaction-type>Container</transaction-type>\r\n" + "</session>\r\n" + "</Fragment>";
-
-
- InputStream inputStream = new StringBufferInputStream(testString);
-
- model = modelManager.getModelForRead("test.fragx", inputStream, null); //$NON-NLS-1$
-
- System.out.println(model);
- System.out.println(model.getStructuredDocument().get());
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java
deleted file mode 100644
index f090d0f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-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.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestModelManager extends TestCase {
-
- private boolean isSetup = false;
-
- private final String fProjectName = "DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- public TestModelManager() {
- super("TestModelManager");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- /**
- * must release after use!
- *
- * @return
- */
- private IStructuredModel getStructuredModelForEdit() {
- // from a file
- IFile f = getFile();
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForEdit(f);
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return model;
- }
-
- private IFile getFile() {
- return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
- }
-
- private IModelManager getMM() {
- return StructuredModelManager.getModelManager();
- }
-
- public void testCopyModel() {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- try {
- IStructuredModel modelCopy = getMM().copyModelForEdit(model.getId(), "newId");
- assertNotNull("copied model was null", modelCopy);
- }
- catch (ResourceInUse e) {
- e.printStackTrace();
- }
-
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testCreateNewInstance() throws IOException {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- IStructuredModel newInstance = getMM().createNewInstance(model);
- assertTrue("failed to create new instance of: " + model, model != newInstance);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testCreateNewStructuredDocumentFor() throws IOException, CoreException {
- IStructuredModel model = null;
- try {
- IFile file = getFile();
- // ensure model already exists
- model = getStructuredModelForEdit();
- boolean resourceExists = false;
- try {
- getMM().createNewStructuredDocumentFor(file);
- }
- catch(ResourceAlreadyExists ex) {
- resourceExists = true;
- }
- assertTrue("should have gotten ResourceAlreadyExits exception", resourceExists);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testCreateStructuredDocumentFor() throws IOException, ResourceAlreadyExists, CoreException {
- IStructuredModel model = null;
- try {
- IFile file = getFile();
- IStructuredDocument sDoc = getMM().createStructuredDocumentFor(file);
- assertNotNull("failed to create structured document", sDoc);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetExistingModelFromFile() throws IOException, CoreException {
- IFile f = getFile();
- IStructuredModel model = null;
- IStructuredModel existingModel = null;
- try {
- model = getStructuredModelForEdit();
- existingModel = StructuredModelManager.getModelManager().getExistingModelForEdit(f);
- assertNotNull("failed to get existing model", existingModel);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (existingModel != null)
- existingModel.releaseFromEdit();
-
- }
- }
-
- public void testGetExistingModelFromDocument() {
- IStructuredModel model = null;
- IStructuredModel gottenModel = null;
- try {
- model = getStructuredModelForEdit();
- IStructuredDocument doc = model.getStructuredDocument();
- gottenModel = getMM().getExistingModelForEdit(doc);
- assertTrue("models should be the same instance", model == gottenModel);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (gottenModel != null)
- gottenModel.releaseFromEdit();
- }
- }
-
- public void testGetModelFromFile() throws IOException, CoreException {
- IFile f = getFile();
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForEdit(f);
- assertNotNull("failed to get model", model);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetModelFromDocument() {
- IStructuredModel model = null;
- IStructuredModel gottenModel = null;
- try {
- model = getStructuredModelForEdit();
- IStructuredDocument doc = model.getStructuredDocument();
- gottenModel = getMM().getModelForEdit(doc);
- assertTrue("models should be the same instance", model == gottenModel);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (gottenModel != null)
- gottenModel.releaseFromEdit();
- }
- }
-
- public void testIsShared() {
- IStructuredModel model = null;
- IStructuredModel model2 = null;
- try {
- model = getStructuredModelForEdit();
- model2 = getStructuredModelForEdit();
- // TODO: will change when API added to MM
- boolean isShared = getMM().isShared(model.getId());
- assertTrue("model should be shared", isShared);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (model2 != null)
- model2.releaseFromEdit();
- }
- }
-
- public void testReinitialize() throws IOException {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- getMM().reinitialize(model);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testReleaseModel() throws IOException {
- // TODO: will need to implement when MM has this function
- }
-
- public void testSaveModel() throws UnsupportedEncodingException, CoreException, IOException {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- // TODO: will need to change when MM has this function
- model.save();
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testSaveModelIfNotShared() {
- // TODO: will need to implement when MM has this function
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java
deleted file mode 100644
index 7e5a48d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.model;
-
-import java.io.IOException;
-import java.io.StringBufferInputStream;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-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.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-import org.eclipse.wst.xml.core.tests.document.UnzippedProjectTester;
-
-
-
-public class TestModelsFromFiles extends UnzippedProjectTester {
- private static final String NONEXISTENT_FILENAME1 = "testfiles/xml/testnonexistent1.xml";
- private static final String NONEXISTENT_FILENAME2 = "testfiles/xml/testnonexistent2.xml";
- private static final String NONEXISTENT_FILENAME3 = "testfiles/xml/testnonexistent3.xml";
- private static final String EXISTENT_FILENAME1 = "testfiles/xml/testNormalCase.xml";
- private final static boolean DEBUG = false;
-
- public void testNonExistentFileWithBuffer() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreateBuffer(NONEXISTENT_FILENAME1, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate(NONEXISTENT_FILENAME2, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXMLIDs() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreateIDs(NONEXISTENT_FILENAME3, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testSimpleCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate(EXISTENT_FILENAME1, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- private void addContentsAndCreateFile(IFile file) throws CoreException {
- StringBufferInputStream stringStream = new StringBufferInputStream("testing testing testing");
- file.create(stringStream, false, null);
- }
-
- /**
- * @param string
- * @param class1
- * @param class2
- * @throws CoreException
- * @throws IOException
- * @throws ResourceInUse
- * @throws ResourceAlreadyExists
- */
- private void doTestCreate(String filePath, Class class1, Class class2) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, true);
- try {
- // count as success if gets to heer without exception
- assertTrue(true);
- String fileLocation = model.getBaseLocation();
- String id = model.getId();
- if (DEBUG) {
- System.out.println("fileLocation: " + fileLocation);
- System.out.println("id: " + id);
- }
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- private void doTestCreateBuffer(String filePath, Class class1, Class class2) throws CoreException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
-
- ITextFileBuffer fileBufferBeforeExists = getTextBuffer(file);
-
- addContentsAndCreateFile(file);
-
- ITextFileBuffer fileBufferAfterExists = getTextBuffer(file);
-
- boolean buffersIdentical = fileBufferBeforeExists == fileBufferAfterExists;
- assertTrue(buffersIdentical);
- if (DEBUG) {
- System.out.println(fileBufferBeforeExists.getLocation());
- System.out.println(fileBufferAfterExists.getLocation());
- }
-
-
-
- }
-
- private void doTestCreateIDs(String filePath, Class class1, Class class2) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, true);
-
- try {
- assertNotNull(model);
- if (DEBUG) {
- System.out.println("ID: " + model.getId());
- System.out.println("BaseLocation" + model.getBaseLocation());
- }
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- private ITextFileBuffer getTextBuffer(IFile file) throws CoreException {
- ITextFileBufferManager fileBufferManager = FileBuffers.getTextFileBufferManager();
- IPath fileIPath = file.getFullPath();
- IPath normalizedPath = FileBuffers.normalizeLocation(fileIPath);
- fileBufferManager.connect(normalizedPath, null);
- ITextFileBuffer buffer = fileBufferManager.getTextFileBuffer(normalizedPath);
- return buffer;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java
deleted file mode 100644
index a66d915..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.model;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestStructuredModel extends TestCase {
-
- private boolean isSetup = false;
-
-
- private final String fProjectName = "DOCUMENT-LOADER";
- // is it a problem to unzip the same project in
- // different tests?
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- public TestStructuredModel() {
- super("TestStructuredModel");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
-
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- public void testAboutToChangeModel() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- model.aboutToChangeModel();
- assertTrue(true);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testAddRemoveModelStateListener() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IModelStateListener listener = new IModelStateListener() {
-
- public void modelAboutToBeChanged(IStructuredModel model) {
- //
- }
-
- public void modelChanged(IStructuredModel model) {
- //
- }
-
- public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty) {
- //
- }
-
- public void modelResourceDeleted(IStructuredModel model) {
- //
- }
-
- public void modelResourceMoved(IStructuredModel oldModel, IStructuredModel newModel) {
- //
- }
-
- public void modelAboutToBeReinitialized(IStructuredModel structuredModel) {
- //
- }
-
- public void modelReinitialized(IStructuredModel structuredModel) {
- //
- }
- };
-
- model.aboutToChangeModel();
-
- model.removeModelStateListener(listener);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
-
- /**
- * Test expectes an exception since only a changedModel sent, without
- * beginning 'aboutToChangeModel'
- *
- * @throws CoreException
- * @throws IOException
- *
- */
- public void testChangedModel() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- try {
- model.changedModel();
- }
- catch (Exception e) {
- assertTrue(e instanceof IllegalStateException);
- }
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetContentType() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- String ct = model.getContentTypeIdentifier();
- assertTrue("model has wrong content type:" + ct + " != " + ContentTypeIdForXML.ContentTypeID_XML, ct.equals(ContentTypeIdForXML.ContentTypeID_XML));
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetBaseLocation() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- String location = model.getBaseLocation();
- assertTrue("wrong base location", location.equals("/" + fProjectName + "/files/simple.xml"));
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
-
- public void testGetFactoryRegistry() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- model.getFactoryRegistry();
- assertTrue(true);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetIndexedRegion() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- model.getIndexedRegion(0);
- assertTrue(true);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetIndexedRegions() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- // not implemented yet...
- // model.getIndexedRegions();
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- public void testGetStructuredDocument() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument doc = model.getStructuredDocument();
- assertNotNull("document is null", doc);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsDirty() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("model should not be dirty", model.isDirty());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsModelStateChanging() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("model should not be changing", model.isModelStateChanging());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsNew() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- // this API seems strange
- // assertFalse("new model check failed", model.isNew());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsReinitializationNeeded() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("reinitialization should not be needed", model.isReinitializationNeeded());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
-
- public void testIsSaveNeeded() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("save should not be needed", model.isSaveNeeded());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testNewInstance() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredModel newInstance = null;
- try {
- newInstance = model.newInstance();
- }
- catch (IOException e) {
- assertTrue("IOException during model new instance", false);
- }
- assertNotNull("new instance is null", newInstance);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- /**
- * Be sure to release any models obtained from this method.
- *
- */
- IStructuredModel getTestModel() throws IOException, CoreException {
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(fProjectName);
- IFile iFile = (IFile) project.findMember("/files/simple.xml");
- // fProjectName + "/files/simple.xml"
-
-
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit(iFile);
-
-
- return model;
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java
deleted file mode 100644
index f468324..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.eclipse.wst.xml.core.tests.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.modelhandler.XMLModelLoader;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-/**
- *
- *
- */
-public class TestXMLModelLoader extends TestCase {
-
- private boolean isSetup = false;
- private XMLModelLoader fLoader = null;
-
- private final String fProjectName ="DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
-
- public TestXMLModelLoader() {
- super("TestModelLoader");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if(!this.isSetup){
- fLoader = new XMLModelLoader();
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- public void testCreateEmptyModel() {
- IStructuredModel model = fLoader.createModel();
- assertNotNull("model is null", model);
- }
-
- public void testCreateModelWithDocument() {
- IStructuredModel emptyModel = fLoader.createModel();
- IStructuredDocument sDoc = emptyModel.getStructuredDocument();
- sDoc.set("<?xml version=\"1.0\"?>\n<test>\n<item attr=\"val\" /></test>\n");
-
- // null handlder is normally not valid, including only for this test.
- IStructuredModel modelFromDoc = fLoader.createModel(sDoc, "/test", null);
- assertNotNull("model from doc is null", modelFromDoc);
- }
-
- public void testCreateModelWithModel() {
- IStructuredModel emptyModel = fLoader.createModel();
- IStructuredDocument sDoc = emptyModel.getStructuredDocument();
- sDoc.set("<?xml version=\"1.0\"?>\n<test>\n<item attr=\"val\" /></test>\n");
- // TODO: need an existing full model
- //IStructuredModel modelFromModel = fLoader.createModel(emptyModel);
- //assertNotNull("model from model is null", modelFromModel);
- }
-
- public void testGetAdapterFactories() {
- List factories = fLoader.getAdapterFactories();
- assertTrue("there were no adapter factories for XML", factories.size() > 0);
- }
-
- public void testLoad() {
- // from a file
- IFile f = getFile();
-
- try {
- IStructuredModel model = fLoader.createModel();
- fLoader.load(f, model);
- String text = model.getStructuredDocument().get();
- assertTrue("failed to load", text.length() > 0);
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- public void testLoadFromStream() {
- // need to fix this test
- // unless the API is going away...
-// IFile f = getFile();
-//
-// try {
-// IStructuredModel model = fLoader.createModel();
-// fLoader.load(f.getContents(), model, EncodingRule.FORCE_DEFAULT);
-// String text = model.getStructuredDocument().get();
-// assertTrue("failed to load", text.length() > 0);
-// }
-// catch (IOException e) {
-// e.printStackTrace();
-// }
-// catch (CoreException e) {
-// e.printStackTrace();
-// }
- }
-
-
- private IFile getFile() {
- return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/NullStream.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/NullStream.java
deleted file mode 100644
index 28f66ed..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/NullStream.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.text;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullStream extends InputStream {
-
- /* (non-Javadoc)
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
- return -1;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java
deleted file mode 100644
index ada17ef..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.text;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.ITypedRegion;
-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.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextPartitioner;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-import com.ibm.icu.text.DecimalFormat;
-
-public class TestStructuredPartitionerXML extends TestCase {
-
- private boolean DEBUG_PRINT_RESULT = false;
- protected ITypedRegion[] partitions = null;
-
- private boolean useFormatter = true;
- protected DecimalFormat formatter;
-
- public TestStructuredPartitionerXML(String name) {
- super(name);
- if (DEBUG_PRINT_RESULT && useFormatter)
- formatter = new DecimalFormat();
- }
-
- /**
- * must release model (from edit) after
- * @param filename relative to this class (TestStructuredPartitioner)
- */
- private IStructuredModel getModelForEdit(String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new NullStream();
- model = modelManager.getModelForEdit(filename, inStream, null);
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- public void testDisconnectConnect() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/xml/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("partitioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- assertNotNull("partitioner was null for sDoc:" + sDoc, partitioner);
- try {
- stp.disconnect();
- }
- catch(Exception e) {
- assertTrue("problem disconnecting w/:" +sDoc + "/n" + e, false);
- }
- try {
- stp.connect(sDoc);
- }
- catch(Exception e) {
- assertTrue("problem connecting w/:" + sDoc + "/n" + e, false);
- }
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetDefaultPartitionType() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/xml/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("partitioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- String defaultPartitionType = stp.getDefaultPartitionType();
- assertTrue("wrong default partition type was: [" + defaultPartitionType + "] should be: [" + IXMLPartitions.XML_DEFAULT + "]", defaultPartitionType.equals(IXMLPartitions.XML_DEFAULT));
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetPartitionType() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/xml/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("paritioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- String defaultPartitionType = stp.getDefaultPartitionType();
- assertTrue("wrong default partition type was: [" + defaultPartitionType + "] should be: [" + IXMLPartitions.XML_DEFAULT + "]", defaultPartitionType.equals(IXMLPartitions.XML_DEFAULT));
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testXML1() throws IOException, BadLocationException {
- int expectedPartitions = 6;
- int nPartitions = doComputePartitioningTest("testfiles/xml/example01.xml");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_PI, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_DECLARATION, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_COMMENT, IXMLPartitions.XML_DEFAULT});
- }
-
- public void testEmpty() throws IOException, BadLocationException {
- int expectedPartitions = 1;
- int nPartitions = doComputePartitioningTest("testfiles/xml/empty.xml");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_DEFAULT});
- }
-
- public void testPerfXML() throws IOException, BadLocationException {
- int expectedPartitions = 6;
- int nPartitions = doTimedComputePartitioningTest("testfiles/xml/company300k.xml");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_PI, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_DECLARATION, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_COMMENT, IXMLPartitions.XML_DEFAULT});
- }
-
- /**
- * Ensure that the current list of partitions are all adjacent to one another
- */
- protected void checkSeams() {
- if (partitions == null)
- return;
- int offset = 0;
- for (int i = 0; i < partitions.length; i++) {
- assertEquals("partitions are not contiguous!", offset, partitions[i].getOffset());
- offset = partitions[i].getOffset() + partitions[i].getLength();
- }
- }
-
- /**
- * Compute the partitions for the given filename using the default partitioner
- * for that file type.
- *
- * @param filename
- * @return int
- * @throws IOException
- * @throws BadLocationException
- */
- protected int doComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new NullStream();
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- if (DEBUG_PRINT_RESULT && useFormatter) {
- double baseTen = Math.log(10);
- formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
- formatter.setGroupingUsed(false);
- }
-
- partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- for (int i = 0; i < partitions.length; i++) {
- try {
- contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- if (useFormatter)
- System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
- else
- System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
- }
- }
- checkSeams();
- model.releaseFromEdit();
- inStream.close();
-
- if (partitions == null)
- return -1;
- return partitions.length;
- }
-
- /**
- * Retrieves the single partition at the given offset for the given file, using the
- * default partitioner for that file type. This test allows for verifying the zero-length
- * partitioning behavior.
- *
- * @param filename
- * @param offset
- * @return ITypedRegion
- * @throws IOException
- * @throws BadLocationException
- */
- protected ITypedRegion getPartitionTest(String filename, int offset) throws IOException, BadLocationException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- partitions = null;
- ITypedRegion partition = structuredDocument.getPartition(offset);
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- try {
- contents = structuredDocument.get(partition.getOffset(), partition.getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- System.out.println(partition + " [" + StringUtils.escape(contents) + "]");
- }
- model.releaseFromEdit();
- inStream.close();
-
- return partition;
- }
-
- /**
- * Verifies that the given partitions are of the given partition types
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionTypes(ITypedRegion actualTypedRegions[], String expectedTypes[]) {
- for (int i = 0; i < expectedTypes.length; i++)
- assertEquals("partition type mismatched", expectedTypes[i], actualTypedRegions[i].getType());
- }
-
- /**
- * Verifies that the given partitions begin at the given offsets
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionRegions(ITypedRegion typedRegions[], int offsets[]) {
- for (int i = 0; i < offsets.length; i++) {
- assertEquals("offset mismatched", typedRegions[i].getOffset(), offsets[i]);
- if (i > 0) {
- assertEquals("lengths misaligned", typedRegions[i].getOffset(), typedRegions[i - 1].getOffset() + typedRegions[i - 1].getLength());
- }
- }
- }
-
- /**
- * Compute the partitions for the given filename using the default partitioner
- * for that file type.
- *
- * @param filename
- * @return int
- * @throws IOException
- * @throws BadLocationException
- */
- protected int doTimedComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new NullStream();
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- if (DEBUG_PRINT_RESULT && useFormatter) {
- double baseTen = Math.log(10);
- formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
- formatter.setGroupingUsed(false);
- }
- long startTime = System.currentTimeMillis();
- partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
- long endTime = System.currentTimeMillis();
- if (DEBUG_PRINT_RESULT) {
-
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- System.out.println("Time to compute " + partitions.length + ": " + (endTime-startTime) + " (msecs)");
- for (int i = 0; i < partitions.length; i++) {
- try {
- contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- if (useFormatter)
- System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
- else
- System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
- }
- }
- checkSeams();
- model.releaseFromEdit();
- inStream.close();
-
- if (partitions == null)
- return -1;
- return partitions.length;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/company300k.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/company300k.xml
deleted file mode 100644
index e2ba556..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/company300k.xml
+++ /dev/null
@@ -1,8100 +0,0 @@
-<?xml version="1.0"?>
-<!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>
- <title>The Ultimate A Company</title>
- </head>
- <body>
- <p>
- <img src="banner.gif" height="51" width="659" alt="" />
- </p>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <!-- comment added to tests 6 partitions -->
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <p>
- <img src="footer.gif" height="25" width="659" alt="" />
- </p>
- </body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/empty.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/empty.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/example01.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/example01.xml
deleted file mode 100644
index f46ccee..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/example01.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testcase SYSTEM "testcase.dtd">
-<!-- this document will not validate -->
-<testcase></testcase>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/testcase.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/testcase.dtd
deleted file mode 100644
index 6d44097..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/testcase.dtd
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml encoding="US-ASCII"?>
-<!-- ====================== Entities ==================================-->
-<!ENTITY % EdtPageSubCat "OutlineView | PropertySheet | SourceView">
-<!ENTITY % WebSubCat "Accessability | AnimGIFDesigner | AppServerConfig | CSSEditor | DBWizard | FTPImport | FTPExport | HTTPImport | JavaBeanWizard | LinkStyleConvWizard | LinksView | Miscellaneous | HTMLFileWizard | JSPFileWizard | ServletFileWizard | WebProjWizard | NLS | Samples | WebAppDeployDesc">
-<!ENTITY % HTMLSubCat "PageDesigner | DesignView | %EdtPageSubCat; | Preview">
-<!ENTITY % XMLSubCat "%EdtPageSubCat;">
-<!ENTITY % SubCat "(%WebSubCat; | %HTMLSubCat; | %XMLSubCat;)">
-<!ENTITY % Cat "(webtool | html | xml)">
-
-<!ENTITY % State "(Undefined | UnderConstruction | UnderReview | ReviewCompleted | Approved | Ready | Complete | Obsolete)">
-<!ENTITY % Bucket "(ComponentTest | ProductTest | IntegrationTest | TranslationTest | UnitTest)">
-<!ENTITY % Platform "(All | Win2000 | WinME | WinNT | Win98 | LinuxRedHat | Caldera | SuSe | TurboLinux)">
-
-<!-- ====================== Elements ================================-->
-<!ELEMENT testcase
- ((header, summary, definition, execution*),variation*)>
-<!ELEMENT variation
- (header, summary, definition, execution*)>
-
-<!ELEMENT header (subject, author, coauthor*, creation_date)>
-<!ELEMENT subject (#PCDATA)>
-<!ELEMENT author (#PCDATA)>
-<!ELEMENT coauthor (#PCDATA)>
-<!ELEMENT creation_date (#PCDATA)>
-
-<!-- Example of having more than one attribute list defined for a given element -->
-<!ATTLIST header
- number ID #REQUIRED
- state %State; "UnderConstruction"
->
-<!ATTLIST header
- category %Cat; #REQUIRED
- subCategory %SubCat; #REQUIRED
- subSubCateogory CDATA #IMPLIED
- >
-
-<!ELEMENT summary (testBucket+, platform+, part*, release+)>
-<!ELEMENT testBucket EMPTY>
-<!ATTLIST testBucket
- type %Bucket; #REQUIRED
->
-<!ELEMENT platform EMPTY>
-<!ATTLIST platform
- type %Platform; #REQUIRED
->
-<!ELEMENT part (#PCDATA)>
-<!ELEMENT release (#PCDATA)>
-
-
-<!ELEMENT definition (purpose, prerequisite*, procedure, expected_results)>
-<!ELEMENT purpose (#PCDATA)>
-<!ELEMENT prerequisite EMPTY>
-<!ATTLIST prerequisite
- number IDREF #REQUIRED
->
-<!ELEMENT procedure (#PCDATA)>
-<!ELEMENT expected_results (#PCDATA)>
-
-<!ELEMENT execution ANY>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/CommonXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/CommonXML.java
deleted file mode 100644
index 5a779d9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/CommonXML.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.wst.xml.core.tests.Logger;
-import org.w3c.dom.Document;
-
-
-
-/**
- */
-public class CommonXML {
-
- public synchronized static DocumentBuilder getDocumentBuilder() {
- DocumentBuilder result = null;
- try {
- result = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- }
- catch (ParserConfigurationException e) {
- Logger.logException(e);
- }
- return result;
- }
-
- public synchronized static DocumentBuilder getDocumentBuilder(boolean validating) {
- DocumentBuilder result = null;
- try {
- DocumentBuilderFactory instance = DocumentBuilderFactory.newInstance();
- instance.setValidating(validating);
- result = instance.newDocumentBuilder();
- }
- catch (ParserConfigurationException e) {
- Logger.logException(e);
- }
- return result;
- }
-
- public static void serialize(Document document, OutputStream ostream) throws IOException {
- Source domSource = new DOMSource(document);
- try {
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- try {
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
- serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-16");
- }
- catch (IllegalArgumentException e) {
- // unsupported properties
- }
- serializer.transform(domSource, new StreamResult(ostream));
- }
- catch (TransformerConfigurationException e) {
- throw new IOException(e.getMessage());
- }
- catch (TransformerFactoryConfigurationError e) {
- throw new IOException(e.getMessage());
- }
- catch (TransformerException e) {
- throw new IOException(e.getMessage());
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java
deleted file mode 100644
index 61d885e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DateUtil {
-
- /**
- * Constructor for AllTests.
- * @param name
- */
- private static String now = null;
-
-
- public static String now() {
- // just calculate once, so whole run as same timestamp
- if (DateUtil.now == null) {
- DateFormat format = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
- Calendar calendar = Calendar.getInstance();
- Date today = calendar.getTime();
- DateUtil.now = format.format(today);
- }
- return DateUtil.now;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java
deleted file mode 100644
index cc3d4cd..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-/**
- * @author davidw
- *
- */
-public class FileUtil {
- public static String fLineSeparator = System.getProperty("line.separator");
- public static String fPathSeparator = System.getProperty("path.separator");
- public static String fFileSeparator = System.getProperty("file.separator");
- public static String XML_CORE_TESTS_PLUGIN_ID = "org.eclipse.wst.xml.core.tests";
-
- static File previousResultsDirectory = null;
- static private String logSubDirectoryPath;
-
- private static boolean notTriedYet = true;
-
- public static class DirFilenameFilter implements FilenameFilter {
- String startOfAcceptableNames;
-
- public DirFilenameFilter(String startOfDirName) {
- startOfAcceptableNames = startOfDirName;
- }
-
- /**
- * @see java.io.FileFilter#accept(File)
- */
- public boolean accept(File pathname, String filename) {
- // we'll just assume if it starts with right key, it is a directory ... for now
- return filename.startsWith(startOfAcceptableNames);
- }
-
- }
-
- public static File getPreviousResultsDirectory(String directoryRootName) throws IOException {
- if (previousResultsDirectory == null && notTriedYet) {
- Bundle bundle = Platform.getBundle(XML_CORE_TESTS_PLUGIN_ID);
- URL url = bundle.getEntry("/");
- //String installPath = url.getPath();
- // add known file so URL method below can be used
- // (doesn't seem to work for directory?)
- URL totalURL = new URL(url, "plugin.xml");
- URL finalurl = FileLocator.toFileURL(totalURL);
- String finalFile = finalurl.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File pluginHomeDir = new File(finalPath);
- FilenameFilter dirFilter = new DirFilenameFilter(directoryRootName);
- File[] allDirs = pluginHomeDir.listFiles(dirFilter);
-
- // assume first in list is newest, then start looking with the
- // second item ... just to avoid "null" case checking
- if (allDirs.length > 0) {
- File currentNewest = allDirs[0];
- for (int i = 1; i < allDirs.length; i++) {
- File current = allDirs[i];
- // NOTE: we go by modified date, not by the actual time stamp in name.
- // This should work for all normal cases, but may not if someone does some
- // "funny" copying, or updating from repository.
- if (current.lastModified() > currentNewest.lastModified()) {
- currentNewest = current;
- }
- }
- previousResultsDirectory = currentNewest;
- }
- notTriedYet = false;
- }
- return previousResultsDirectory;
- }
-
- public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
- Bundle bundle = Platform.getBundle(XML_CORE_TESTS_PLUGIN_ID);
- URL url = bundle.getEntry("/");
- URL localURL = FileLocator.toFileURL(url);
- String installPath = localURL.getPath();
- String totalDirectory = installPath + directory;
- String totalPath = totalDirectory + "/" + filename;
- URL totalURL = new URL(url, totalPath);
- //URL finalurl = Platform.asLocalURL(totalURL);
- String finalFile = totalURL.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File dir = new File(finalPath);
- if (!dir.exists()) {
- // a little safety net, be sure the previous newest directory
- // is initialized, just in case no one else has done so
- if (testResultsDirectoryPrefix != null && testResultsDirectoryPrefix.length() > 0) {
- FileUtil.getPreviousResultsDirectory(testResultsDirectoryPrefix);
- }
- // now its "safe" to make the new one
- dir.mkdirs();
- }
- return file;
- }
-
- /**
- * Just a general utility method
- * @param filename
- * @return String
- */
- public static String getExtension(String filename) {
- String extension = null;
- int dotPostion = filename.lastIndexOf('.');
- if (dotPostion > -1) {
- extension = filename.substring(dotPostion + 1);
- }
- else {
- extension = new String();
- }
- return extension;
- }
-
- /**
- * General purpose utility method to ensure the log
- * directory exists, and returns the name.
- */
- public static String getLogDirectory() {
- if (logSubDirectoryPath == null) {
- String mainDirectory = "/logs";
- File dir = new File(mainDirectory);
- ensureExists(dir);
- String subDirectory = TimestampUtil.timestamp();
- logSubDirectoryPath = mainDirectory + "/" + subDirectory;
- File subdir = new File(logSubDirectoryPath);
- ensureExists(subdir);
- }
- return logSubDirectoryPath;
- }
-
- public static void ensureExists(File dir) {
- if (!dir.exists()) {
- dir.mkdirs();
- }
- }
-
- public static String getPerformanceOutputLogName() {
- String result = null;
- String directoryName = FileUtil.getLogDirectory();
- String extension = ".out";
- String baseName = "sedTests";
- long now = System.currentTimeMillis();
- String nowStr = String.valueOf(now);
- result = directoryName + FileUtil.fFileSeparator + baseName + nowStr + extension;
- return result;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/ProjectUnzipUtility.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/ProjectUnzipUtility.java
deleted file mode 100644
index 28105a7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/ProjectUnzipUtility.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-/**
- * Imports zipped files into the test workspace. Deletes all projects in
- * workspace.
- *
- * @author pavery
- */
-public class ProjectUnzipUtility {
- class WorkspaceProgressMonitor implements IProgressMonitor {
- private boolean finished = false;
-
- public void beginTask(String name, int totalWork) {
- // noop
- }
-
- public void done() {
- finished = true;
- }
-
- public boolean isFinished() {
- return finished;
- }
-
- public void internalWorked(double work) {
- // noop
- }
-
- public boolean isCanceled() {
- return finished;
- }
-
- public void setCanceled(boolean value) {
- if (value == true)
- finished = true;
- }
-
- public void setTaskName(String name) {
- // noop
- }
-
- public void subTask(String name) {
- // noop
- }
-
- public void worked(int work) {
- // noop
- }
- }
-
- class MyOverwriteQuery implements IOverwriteQuery {
- public String queryOverwrite(String pathString) {
- return ALL;
- }
- }
-
- public final static String PROJECT_ZIPS_FOLDER = "projecttestfiles";
- private List fCreatedProjects = null;
-
- public ProjectUnzipUtility() {
- // for deletion later
- fCreatedProjects = new ArrayList();
- }
-
- /**
- * @param fileToImport
- * the file you wish to import
- * @param folderPath
- * the container path within the workspace
- */
- public void importFile(File fileToImport, String folderPath) {
- WorkspaceProgressMonitor importProgress = new WorkspaceProgressMonitor();
- try {
- if (fileToImport.exists()) {
- IPath containerPath = new Path(folderPath);
- //fCreatedProjects.add(folderPath);
- IImportStructureProvider provider = FileSystemStructureProvider.INSTANCE;
- IOverwriteQuery overwriteImplementor = new MyOverwriteQuery();
- File[] filesToImport = {fileToImport};
- ImportOperation importOp = new ImportOperation(containerPath, null, provider, overwriteImplementor, Arrays.asList(filesToImport));
- importOp.setCreateContainerStructure(false);
- importOp.setOverwriteResources(true);
- importOp.run(importProgress);
- }
- else {
- System.out.println("handle source doesn't exist");
- }
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
- finally {
- importProgress.done();
- }
- }
-
- /**
- * the following is logic from
- * http://www.devshed.com/c/a/Java/Zip-Meets-Java/2/
- */
- // specify buffer size for extraction
- static final int BUFFER = 2048;
-
- public void unzipAndImport(File inFile, String destinationDirectory) {
- try {
- // Specify file to decompress
- String inFileName = inFile.getAbsolutePath(); //"c:/example.zip";
- // Specify destination where file will be unzipped
- //String destinationDirectory =
- // "d:/eclipsedev/M5_SSE_TESTS_WORKSPACE/"; //"c:/temp/";
- File sourceZipFile = new File(inFileName);
- File unzipDestinationDirectory = new File(destinationDirectory);
- // Open Zip file for reading
- ZipFile zipFile = new ZipFile(sourceZipFile, ZipFile.OPEN_READ);
- // Create an enumeration of the entries in the zip file
- Enumeration zipFileEntries = zipFile.entries();
- String projectFolderName = null;
- IProject currentProject = null;
- // Process each entry
- while (zipFileEntries.hasMoreElements()) {
- // grab a zip file entry
- ZipEntry entry = (ZipEntry) zipFileEntries.nextElement();
- String currentEntry = entry.getName();
- //System.out.println("Extracting: " + entry);
- File destFile = new File(unzipDestinationDirectory, currentEntry);
- // grab file's parent directory structure
- File destinationParent = destFile.getParentFile();
- // create the parent directory structure if needed
- destinationParent.mkdirs();
- // extract file if not a directory
- if (!entry.isDirectory()) {
- BufferedInputStream is = new BufferedInputStream(zipFile.getInputStream(entry));
- int currentByte;
- // establish buffer for writing file
- byte data[] = new byte[BUFFER];
- // write the current file to disk
- FileOutputStream fos = new FileOutputStream(destFile);
- BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER);
- // read and write until last byte is encountered
- while ((currentByte = is.read(data, 0, BUFFER)) != -1) {
- dest.write(data, 0, currentByte);
- }
- dest.flush();
- dest.close();
- is.close();
- if (projectFolderName != null)
- importFile(destFile, projectFolderName);
- }
- else {
- // need handle to the main project folder to create
- // containerPath
- // unlike version in sse.tests, we don't create project
- // for
- // every directory
- // if(projectFolderName == null) {
- // projectFolderName = destFile.getName();
- // fCreatedProjects.add(projectFolderName);
- //
- // currentProject =
- // ResourcesPlugin.getWorkspace().getRoot().getProject(projectFolderName);
- // }
- }
- }
- zipFile.close();
- // fixes workspace metadata for the project
- // for clean startup next run
- if (currentProject != null) {
- try {
- Path projectLocation = new Path(Platform.getLocation().toOSString());
- createProject(currentProject, projectLocation, new WorkspaceProgressMonitor());
- }
- catch (CoreException cex) {
- cex.printStackTrace();
- }
- }
- }
- catch (IOException ioe) {
- ioe.printStackTrace();
- }
- }
-
- /**
- *
- */
- public void refreshWorkspace() throws CoreException {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = wsRoot.getProjects();
- for (int i = 0; i < projects.length; i++) {
- projects[i].refreshLocal(IResource.DEPTH_INFINITE, null);
- }
- wsRoot.refreshLocal(IResource.DEPTH_INFINITE, null);
- }
-
- /**
- * Delete projects created (unzipped and imported) by this utility
- *
- * @throws Exception
- */
- public void deleteProjects() throws Exception {
- final IProject[] projects = getCreatedProjects();
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation() {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- for (int i = 0; i < projects.length; i++) {
- projects[i].clearHistory(null);
- projects[i].close(null);
- projects[i].delete(true, true, null);
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- public void deleteProject(String projectName) throws Exception {
- final String name = projectName;
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- final IProject proj = wsRoot.getProject(name);
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- //proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- try {
- proj.delete(true, true, null);
- }
- catch (Exception e) {
- // just try again (not sure why they are not being
- // deleted)
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- }
- //proj = null;
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- /**
- * @return IProjects that were unzipped and imported into the workspace by
- * this utility
- */
- public IProject[] getCreatedProjects() {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- String[] projectNames = (String[]) fCreatedProjects.toArray(new String[fCreatedProjects.size()]);
- IProject[] projects = new IProject[projectNames.length];
- for (int i = 0; i < projectNames.length; i++) {
- projects[i] = wsRoot.getProject(projectNames[i]);
- }
- return projects;
- }
-
- public void initJavaProject(String projName) throws CoreException {
- // resynch
- refreshWorkspace();
- //change prereqs to get this functionality back in
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- if (!proj.exists()) {
- proj.create(new NullProgressMonitor());
- }
- // need to add java nature, or else project won't "exist()" in the
- // java
- // element sense
- String[] natureIds = {"org.eclipse.jdt.core.javanature"};
- if (!proj.isOpen()) {
- proj.open(null);
- }
- IProjectDescription desc = proj.getDescription();
- desc.setNatureIds(natureIds);
- proj.setDescription(desc, new NullProgressMonitor());
- }
-
- private void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new WorkspaceProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- public void deleteProject(IProject fProject) throws InvocationTargetException, InterruptedException {
- final IProject proj = fProject;
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- //proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- //proj = null;
- }
- refreshWorkspace();
- }
- };
- //WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(null);
- // saves the new workspace metadata
- //ResourcesPlugin.getWorkspace().save(true, null);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/StringCompareUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/StringCompareUtil.java
deleted file mode 100644
index eb59c82..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/StringCompareUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
- public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
- if (string1 == null)
- return false;
- if (string2 == null)
- return false;
-
- StringReader s1Reader = new StringReader(string1);
- StringReader s2Reader = new StringReader(string2);
-
- // assume true unless find evidence to the contrary
- boolean result = true;
- int s1Char = -1;
- int s2Char = -1;
- do {
-
- s1Char = getNextChar(s1Reader);
-
- s2Char = getNextChar(s2Reader);
-
- if (s1Char != s2Char) {
- result = false;
- break;
- }
- }
- while (s1Char != -1 && s2Char != -1);
-
- return result;
- }
-
- /**
- * Method getNextChar.
- * @param s1Reader
- * @return char
- */
- private int getNextChar(StringReader reader) {
- int nextChar = -1;
- try {
- nextChar = reader.read();
- while (isEOL(nextChar)) {
- nextChar = reader.read();
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- return nextChar;
- }
-
- private boolean isEOL(int aChar) {
- return (aChar == '\n' || aChar == '\r');
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java
deleted file mode 100644
index 8a471da..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * @author davidw
- *
- * This class provides one timestamp per VM run.
- * (Technically, per class loading.)
- */
-public class TimestampUtil {
-
- private static Date timestamp = null;
- private static DateFormat shortFormat = new SimpleDateFormat("yyyy'-'MM'-'dd");
- // private static DateFormat longFormat = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
-
- private static String nowShort = null;
-
- public static String timestamp() {
-
- if (TimestampUtil.nowShort == null) {
- TimestampUtil.nowShort = shortFormat.format(ensureTimestamp());
- }
- return TimestampUtil.nowShort;
- }
-
- protected static Date ensureTimestamp() {
- // just calculate 'timestamp' once per class loading,
- // so this 'timestamp' remains the same during
- // entire run.
- if (TimestampUtil.timestamp == null) {
- Calendar calendar = Calendar.getInstance();
- TimestampUtil.timestamp = calendar.getTime();
- }
- return TimestampUtil.timestamp;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/test.xml b/tests/org.eclipse.wst.xml.core.tests/test.xml
deleted file mode 100644
index d021aae..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xml.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xml.core.tests.SSEModelXMLTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/testfiles.zip b/tests/org.eclipse.wst.xml.core.tests/testfiles.zip
deleted file mode 100644
index 084f332..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/testfiles.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.classpath b/tests/org.eclipse.wst.xml.ui.tests/.classpath
deleted file mode 100644
index e2bdc16..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.cvsignore b/tests/org.eclipse.wst.xml.ui.tests/.cvsignore
deleted file mode 100644
index 7c7ccdb..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-
-build.xml
-temp.folder
-xmluitests.jar
-javaCompiler.xmluitests.jar.args
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.project b/tests/org.eclipse.wst.xml.ui.tests/.project
deleted file mode 100644
index 3f3e68f..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.ui.tests</name>
- <comment></comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index a7b46a6..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xml.ui.tests; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: xmluitests.jar
-Bundle-Activator: org.eclipse.wst.xml.ui.tests.XMLUITestsPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.ui.internal.validation;x-internal:=true,
- org.eclipse.wst.xml.ui.tests,
- org.eclipse.wst.xml.ui.tests.breakpoints,
- org.eclipse.wst.xml.ui.tests.viewer
-Require-Bundle: org.eclipse.ui,
- org.eclipse.jface.text,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.sse.core,
- org.eclipse.ui.views,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.validation,
- com.ibm.icu
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.xml.ui.tests/about.html b/tests/org.eclipse.wst.xml.ui.tests/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/build.properties b/tests/org.eclipse.wst.xml.ui.tests/build.properties
deleted file mode 100644
index 4d50253..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- xmluitests.jar,\
- META-INF/,\
- plugin.properties,\
- about.html,\
- testresources/,\
- icons/
-jars.compile.order = xmluitests.jar
-source.xmluitests.jar = src/
-output.xmluitests.jar = bin/
diff --git a/tests/org.eclipse.wst.xml.ui.tests/icons/brkp_obj.gif b/tests/org.eclipse.wst.xml.ui.tests/icons/brkp_obj.gif
deleted file mode 100644
index a831fe7..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/icons/brkp_obj.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/icons/sourceEditor.gif b/tests/org.eclipse.wst.xml.ui.tests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb8..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/icons/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/plugin.properties b/tests/org.eclipse.wst.xml.ui.tests/plugin.properties
deleted file mode 100644
index 6053dd5..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-providerName=Eclipse.org
-
-Bundle-Name.0 = XML UI Tests
-view.name.0 = Embedded XML Structured Text Viewer
-
-contentTypeTestXML99.ct=Test XML sub-content-type
-contentTypeTestXML99.editor=Test XML sub-content-type editor
diff --git a/tests/org.eclipse.wst.xml.ui.tests/plugin.xml b/tests/org.eclipse.wst.xml.ui.tests/plugin.xml
deleted file mode 100644
index f0ba56e..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/plugin.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension point="org.eclipse.ui.views">
-
- <view
- name="%view.name.0"
- icon="$nl$/icons/sourceEditor.gif"
- category="org.eclipse.wst.sse.ui.tests"
- class="org.eclipse.wst.xml.ui.tests.viewer.ViewerTestXML"
- id="org.eclipse.wst.xml.ui.tests.viewer.ViewerTestXML">
- </view>
- </extension>
-
- <!-- test for breakpoint error handling -->
- <extension
- point="org.eclipse.wst.sse.ui.breakpoint">
- <breakpointContribution
- id="org.eclipse.wst.xml.ui.providers.test">
- <provider
- contentTypes="org.eclipse.wst.xml.core.xmlsource,org.eclipse.core.runtime.xml"
- class="org.eclipse.wst.xml.ui.tests.breakpoints.BreakpointErrorProvider"
- id="org.eclipse.wst.xml.ui.tests.breakpoints.BreakpointErrorProvider">
- </provider>
- </breakpointContribution>
- </extension>
-
- <extension point="org.eclipse.wst.sse.ui.extendedEditorActions">
- <editorContribution
- targetID="org.eclipse.wst.sse.ui.StructuredTextEditor"
- id="org.eclipse.wst.xml.ui.tests.actions">
- <action
- popupmenuPath="group.editor"
- class="org.eclipse.wst.xml.ui.tests.breakpoints.EnableWarningAction"
- menubarPath="edit/MenuAdditions"
- icon="icons/brkp_obj.gif"
- id="org.eclipse.wst.xml.ui.tests.breakpoints.EnableWarningAction">
- </action>
- </editorContribution>
- </extension>
- <extension
- id="xml.ui.tests1"
- name="%Bundle-Name.0"
- point="org.eclipse.ui.editors">
- <editor
- class="org.eclipse.wst.xml.ui.tests.TestSourceValidationFramework$TestStructuredTextEditor"
- contributorClass="org.eclipse.wst.xml.ui.internal.actions.ActionContributorXML"
- default="false"
- filenames="*.xml99"
- icon="icons/sourceEditor.gif"
- id="org.eclipse.wst.xml.ui.tests.TestSourceValidationFramework$TestStructuredTextEditor"
- name="%contentTypeTestXML99.editor"
- symbolicFontName="org.eclipse.wst.sse.ui.textfont">
- </editor>
- </extension>
- <extension
- point="org.eclipse.core.runtime.contentTypes">
- <content-type
- file-extensions="xml99"
- priority="low"
- name="%contentTypeTestXML99.ct"
- id="xml99source"
- base-type="org.eclipse.core.runtime.xml">
- </content-type>
- </extension>
-</plugin>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/basicXHTML.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/basicXHTML.jpg
deleted file mode 100644
index 52cbee5..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/basicXHTML.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/conv2XHTML.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/conv2XHTML.jpg
deleted file mode 100644
index 525c6b1..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/conv2XHTML.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/identifyDTD.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/identifyDTD.jpg
deleted file mode 100644
index 53c864d..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/identifyDTD.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/importDTD.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/importDTD.jpg
deleted file mode 100644
index c815d6b..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/importDTD.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/outline1.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/outline1.jpg
deleted file mode 100644
index 29d21b5..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/outline1.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/outline2.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/outline2.jpg
deleted file mode 100644
index 12453f7..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/outline2.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/setupFiles/Wireless.xml b/tests/org.eclipse.wst.xml.ui.tests/smoke/setupFiles/Wireless.xml
deleted file mode 100644
index 86e6a3a..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/setupFiles/Wireless.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/strictXHTML.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/strictXHTML.jpg
deleted file mode 100644
index 74cd0ea..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/strictXHTML.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_files/JobDescERROR.xml b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_files/JobDescERROR.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_files/JobDescERROR.xml
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_after_paste.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_after_paste.jpg
deleted file mode 100644
index c4bf549..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_after_paste.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_before_paste.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_before_paste.jpg
deleted file mode 100644
index 65f1eb2..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_before_paste.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/invalid_dtd.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/invalid_dtd.jpg
deleted file mode 100644
index 400bb01..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/invalid_dtd.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_multi_error.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_multi_error.jpg
deleted file mode 100644
index cea036f..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_multi_error.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_unknown_element.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_unknown_element.jpg
deleted file mode 100644
index c43acc9..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_unknown_element.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/w_doctype.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/w_doctype.jpg
deleted file mode 100644
index aa28866..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/w_doctype.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wout_doctype.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wout_doctype.jpg
deleted file mode 100644
index d637222..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wout_doctype.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wrong_dtd.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wrong_dtd.jpg
deleted file mode 100644
index 93d241b..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wrong_dtd.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/u011ani.gif b/tests/org.eclipse.wst.xml.ui.tests/smoke/u011ani.gif
deleted file mode 100644
index 8063afb..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/u011ani.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/smoke/wireless.jpg b/tests/org.eclipse.wst.xml.ui.tests/smoke/wireless.jpg
deleted file mode 100644
index e0fccad..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/smoke/wireless.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestDelegatingSourceValidatorForXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestDelegatingSourceValidatorForXML.java
deleted file mode 100644
index e4215ab..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestDelegatingSourceValidatorForXML.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.FileLocator;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.ui.tests.XMLUITestsPlugin;
-
-/**
- * Test the XML delegating source validator.
- *
- */
-public class TestDelegatingSourceValidatorForXML extends TestCase
-{
- DelegatingSourceValidatorForXML sourceValidator = new DelegatingSourceValidatorForXML();
-
- /**
- * Test that files that contain non-8bit chars are validated
- * correctly. i.e. Do not produce incorrect validation messages.
- */
- public void testNon8BitChars()
- {
- String projName = "Project";
- String fileName1 = "international-instance.xml";
- String fileName2 = "international.xsd";
-
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(projName + "/" + fileName1));
- if (file != null && !file.exists()) {
- try {
- file.create(FileLocator.openStream(XMLUITestsPlugin.getDefault().getBundle(), new Path("/testresources/Non8BitChars/international-instance.xml"), false), true, new NullProgressMonitor());
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(projName + "/" + fileName2));
- if (file != null && !file.exists()) {
- try {
- file.create(FileLocator.openStream(XMLUITestsPlugin.getDefault().getBundle(), new Path("/testresources/Non8BitChars/international.xsd"), false), true, new NullProgressMonitor());
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
- WorkbenchContext context = new WorkbenchContext();
- List fileList = new ArrayList();
- fileList.add("/" + projName + "/" + fileName1);
- context.setValidationFileURIs(fileList);
- TestReporter reporter = new TestReporter();
- try{
- sourceValidator.validate(context, reporter);
- }
- catch(ValidationException e){
- e.printStackTrace();
- }
-
- assertFalse("Messages were reported on valid file 1.", reporter.isMessageReported());
-
- WorkbenchContext context2 = new WorkbenchContext();
- List fileList2 = new ArrayList();
- fileList2.add("/" + projName + "/" + fileName2);
- context2.setValidationFileURIs(fileList2);
- TestReporter reporter2 = new TestReporter();
- try{
- sourceValidator.validate(context2, reporter2);
- }
- catch(ValidationException e){
- e.printStackTrace();
- }
-
- assertFalse("Messages were reported on valid file 2.", reporter2.isMessageReported());
- }
-
- private class TestReporter implements IReporter
- {
- protected boolean messageReported = false;
-
- public TestReporter(){
-
- }
-
- public void addMessage(IValidator origin, IMessage message) {
- messageReported = true;
-
- }
-
- public boolean isMessageReported()
- {
- return messageReported;
- }
-
- public void displaySubtask(IValidator validator, IMessage message) {
- // TODO Auto-generated method stub
-
- }
-
- public List getMessages() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean isCancelled() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void removeAllMessages(IValidator origin, Object object) {
- // TODO Auto-generated method stub
-
- }
-
- public void removeAllMessages(IValidator origin) {
- // TODO Auto-generated method stub
-
- }
-
- public void removeMessageSubset(IValidator validator, Object obj, String groupName) {
- // TODO Auto-generated method stub
-
- }
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestMarkupValidator.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestMarkupValidator.java
deleted file mode 100644
index 8ce609d..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/internal/validation/TestMarkupValidator.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.validation;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.reconcile.validator.IncrementalReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Tests MarkupValidator
- */
-public class TestMarkupValidator extends TestCase {
- private MarkupValidator fValidator;
- private IReporter fReporter;
- private IStructuredDocument fDocument;
-
- /**
- * Validates document
- *
- * @param contents
- * contents to set in document
- * @return true if there was a validation error false otherwise
- */
- private boolean validateError(String contents) {
- fDocument.set(contents);
- fValidator.validate(new Region(0, fDocument.getLength()), null, fReporter);
- return fReporter.getMessages().isEmpty();
- }
-
- protected void setUp() throws Exception {
- // just create once
- if (fValidator == null)
- fValidator = new MarkupValidator();
- if (fReporter == null)
- fReporter = new IncrementalReporter(null);
- if (fDocument == null)
- fDocument = StructuredModelManager.getModelManager().createStructuredDocumentFor("onfire.xml", "", null);
-
- fValidator.connect(fDocument);
- }
-
- protected void tearDown() throws Exception {
- fValidator.disconnect(fDocument);
- }
-
- public void testAttributesInEndTag() {
- // test for error
- assertTrue("Should get attributes in end tag error", !validateError("<stop></stop drop=\"roll\">"));
-
- // test for no error
- assertTrue("Should not get attributes in end tag error", validateError("<stop></stop>"));
- }
-
- public void testClosingBracket() {
- // test for error
- assertTrue("Should get closing bracket error", !validateError("<stop </stop>"));
-
- // test for no error
- assertTrue("Should not get closing bracket error", validateError("<stop></stop>"));
- }
-
- public void testEmptyTag() {
- // test for error
- assertTrue("Should get empty tag error", !validateError("<>"));
-
- // test for no error
- assertTrue("Should not get empty tag error", validateError("<stop></stop>"));
- }
-
- public void testAttributeValue() {
- // test for error
- assertTrue("Should get attribute has no value error", !validateError("<stop drop></stop>"));
- assertTrue("Should get attribute missing value error", !validateError("<stop drop=></stop>"));
-
- // test for no error
- assertTrue("Should not get attribute missing value error", validateError("<stop drop=\"roll\"></stop>"));
- }
-
- public void testSpaceBeforeName() {
- // test for error
- assertTrue("Should get tag has space before name error", !validateError("< stop></stop>"));
-
- // test for no error
- assertTrue("Should not get tag has space before name error", validateError("<stop></stop>"));
- }
-
- public void testQuotesForAttributeValues() {
- // test for error
- assertTrue("Should get missing end quote error", !validateError("<stop drop=\"></stop>"));
- assertTrue("Should get missing end quote error", !validateError("<stop drop=\"roll></stop>"));
- assertTrue("Should get missing end quote error", !validateError("<stop drop=\'></stop>"));
- assertTrue("Should get missing quotes error", !validateError("<stop drop=roll></stop>"));
-
- // test for no error
- assertTrue("Should not get missing end quote error", validateError("<stop drop=\"\"></stop>"));
- assertTrue("Should not get missing end quote error", validateError("<stop drop=\"roll\"></stop>"));
- assertTrue("Should not get missing end quote error", validateError("<stop drop=\'\'></stop>"));
- assertTrue("Should not get missing quotes error", validateError("<stop drop=\'roll\'></stop>"));
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/Logger.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/Logger.java
deleted file mode 100644
index 2871e3a..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/Logger.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.wst.xml.ui.tests"; //$NON-NLS-1$
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
- }
-
- /**
- * @return true if the platform is debugging
- */
- public static boolean isDebugging() {
- return Platform.inDebugMode();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(PLUGIN_ID
- + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java
deleted file mode 100644
index 259d6aa..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.eclipse.wst.xml.ui.views.contentoutline.XMLContentOutlineConfiguration;
-import org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration;
-
-/**
- * Tests retrieving editor contributions for xml content type
- */
-public class TestEditorConfigurationXML extends TestCase {
- public void testGetSourceViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForXML.ContentTypeID_XML);
- assertNotNull("no source viewer configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected source viewer configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o.getClass(), StructuredTextViewerConfigurationXML.class);
- }
-
- public void testGetContentOutlineViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForXML.ContentTypeID_XML);
- assertNotNull("no content outline viewer configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected content outline viewer configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o.getClass(), XMLContentOutlineConfiguration.class);
- }
-
- public void testGetPropertySheetConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.PROPERTYSHEETCONFIGURATION, ContentTypeIdForXML.ContentTypeID_XML);
- assertNotNull("no property sheet configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o);
- // check for over-qualified subclasses
- assertEquals("unexpected property sheet configuration for " + ContentTypeIdForXML.ContentTypeID_XML, o.getClass(), XMLPropertySheetConfiguration.class);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java
deleted file mode 100644
index 4175fde..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import java.io.ByteArrayInputStream;
-
-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.IDocument;
-import org.eclipse.jface.text.IDocumentExtension4;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart;
-import org.w3c.dom.NodeList;
-
-/**
- * Test misc editor functions with an open xml editor.
- */
-public class TestOpenEditorXML extends TestCase {
- private final String PROJECT_NAME = "TestOpenEditorXML";
- private final String FILE_NAME = "testStructuredTextEditorXML.xml";
-
- private static IEditorPart fEditor;
- private static IFile fFile;
- private static boolean fIsSetup = false;
-
- public TestOpenEditorXML() {
- super("TestStructredTextEditorXML");
- }
-
- protected void setUp() throws Exception {
- // only create project and file once
- if (!fIsSetup) {
- // create project
- createProject(PROJECT_NAME);
- fFile = getOrCreateFile(PROJECT_NAME + "/" + FILE_NAME);
- fIsSetup = true;
- }
-
- // editor is opened each time
- if (fIsSetup && fEditor == null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- fEditor = IDE.openEditor(page, fFile, true, true);
- if (!((fEditor instanceof XMLMultiPageEditorPart) || (fEditor instanceof StructuredTextEditor)))
- assertTrue("Unable to open structured text editor", false);
- }
- }
-
- protected void tearDown() throws Exception {
- // editor is closed each time
- if (fEditor != null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- page.closeEditor(fEditor, false);
- assertTrue("Unable to close editor", true);
- fEditor = null;
- }
- }
-
- private void createProject(String projName) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- private IFile getOrCreateFile(String filePath) {
- IFile blankFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- if (blankFile != null && !blankFile.exists()) {
- try {
- blankFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return blankFile;
- }
-
- /**
- * Test setting text in document of open editor.
- */
- public void testSetDocument() {
- IDocument document = (IDocument) fEditor.getAdapter(IDocument.class);
- try {
- document.set("<hello></hello>");
- }
- catch (Exception e) {
- assertTrue("Unable to set text in editor: " + e, false);
- }
- }
-
- /**
- * Test structured document is reloaded on resource change
- *
- */
- public void testBug151069() {
- IDocument doc = (IDocument) fEditor.getAdapter(IDocument.class);
- doc.set("<html><body><h1>Title</h1></body></html>");
- // set h1 to readonly
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IDOMModel model = null;
- try {
- model = (IDOMModel) modelManager.getExistingModelForEdit(doc);
- if (model != null) {
- NodeList nl = model.getDocument().getElementsByTagName("h1");
- IDOMElement h1 = (IDOMElement) nl.item(0);
- h1.setEditable(false, true);
- }
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
-
- String newContent = "new content";
- ((IDocumentExtension4) doc).set(newContent, fFile.getModificationStamp());
- assertEquals("Set contents in document with read only regions failed", newContent, doc.get());
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java
deleted file mode 100644
index e300cc0..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import java.io.ByteArrayInputStream;
-
-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.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.properties.ConfigurablePropertySheetPage;
-import org.eclipse.wst.sse.ui.views.properties.IPropertySourceExtension;
-import org.eclipse.wst.sse.ui.views.properties.PropertySheetConfiguration;
-
-public class TestPropertySheetConfiguration extends TestCase {
- private final String PROJECT_NAME = "TestPropertySheetConfiguration";
- private final String FILE_NAME = "testPropertySheetConfiguration.xml";
-
- private static StructuredTextEditor fEditor;
- private static IEditorPart fMainEditor;
- private static IFile fFile;
- private static boolean fIsSetup = false;
-
- public TestPropertySheetConfiguration() {
- super("TestPropertySheetConfiguration");
- }
-
- protected void setUp() throws Exception {
- if (!fIsSetup) {
- // create project
- createProject(PROJECT_NAME);
- fFile = getOrCreateFile(PROJECT_NAME + "/" + FILE_NAME);
- fIsSetup = true;
- }
- // editor is opened each time
- if (fIsSetup && fMainEditor == null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- fMainEditor = IDE.openEditor(page, fFile, true, true);
- if (fMainEditor instanceof StructuredTextEditor)
- fEditor = (StructuredTextEditor) fMainEditor;
- else if (fMainEditor != null) {
- Object adapter = fMainEditor.getAdapter(ITextEditor.class);
- if (adapter instanceof StructuredTextEditor)
- fEditor = (StructuredTextEditor) adapter;
- }
- if (fEditor == null)
- assertTrue("Unable to open structured text editor", false);
- }
- }
-
- protected void tearDown() throws Exception {
- // editor is closed each time
- if (fMainEditor != null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- page.closeEditor(fMainEditor, false);
- assertTrue("Unable to close editor", true);
- fMainEditor = null;
- fEditor = null;
- }
- }
-
- private void createProject(String projName) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- private IFile getOrCreateFile(String filePath) {
- IFile blankFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- if (blankFile != null && !blankFile.exists()) {
- try {
- blankFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return blankFile;
- }
-
- public void testPropertySourceRemoval() throws BadLocationException {
- IDocument document = (IDocument) fEditor.getAdapter(IDocument.class);
- // set up the editor document
- document.replace(0, 0, "<test><myproperty props=\"yes\" /></test>");
-
- // set current selection in editor
- ISelection setSelection = new TextSelection(9, 0);
- fEditor.getSelectionProvider().setSelection(setSelection);
-
- // get current selection in editor
- Object item = null;
- ISelection selection = fEditor.getSelectionProvider().getSelection();
- if (selection instanceof IStructuredSelection) {
- item = ((IStructuredSelection) selection).getFirstElement();
-
- IPropertySheetPage propertySheet = (IPropertySheetPage) fEditor.getAdapter(IPropertySheetPage.class);
- assertTrue("No ConfigurablePropertySheetPage found", propertySheet instanceof ConfigurablePropertySheetPage);
- if (propertySheet instanceof ConfigurablePropertySheetPage) {
- ConfigurablePropertySheetPage cps = (ConfigurablePropertySheetPage) propertySheet;
- PropertySheetConfiguration config = cps.getConfiguration();
- assertNotNull("No property sheet configuration found", config);
-
- IPropertySourceProvider provider = config.getPropertySourceProvider(cps);
- assertNotNull("No property sheet provider found", provider);
-
- IPropertySource source = provider.getPropertySource(item);
- if (source instanceof IPropertySourceExtension) {
- boolean canRemove = ((IPropertySourceExtension) source).isPropertyRemovable("props");
- assertTrue("Current property cannot be removed", canRemove);
- if (canRemove) {
- ((IPropertySourceExtension) source).removeProperty("props");
- assertTrue("Current property cannot be removed", true);
- // force return here, to avoid last fall through
- // failing assert
- return;
- }
- }
- }
- }
- // if we get to here, always fail, since something went wrong.
- assertTrue("testPropertySourceRemoval test did not take expected path", false);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestReconcilerXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestReconcilerXML.java
deleted file mode 100644
index f9797fb..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestReconcilerXML.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import java.io.ByteArrayInputStream;
-import java.util.Iterator;
-
-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.preference.IPreferenceStore;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.preferences.CommonEditorPreferenceNames;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart;
-
-/**
- * Tests reconciler in an open editor.
- */
-public class TestReconcilerXML extends TestCase {
- private final String PROJECT_NAME = "TestReconcilerXML";
- private final String FILE_NAME = "TestReconcilerXMLfile.xml";
- final private String ANNOTATION_ERROR = "org.eclipse.wst.sse.ui.temp.error"; //$NON-NLS-1$
- final private String ANNOTATION_WARNING = "org.eclipse.wst.sse.ui.temp.warning"; //$NON-NLS-1$
-
- private static IEditorPart fEditor;
- private static IFile fFile;
- private static boolean fIsSetup = false;
-
- private boolean fReconcilerPref;
-
- public TestReconcilerXML() {
- super("TestReconcilerXML");
- }
-
- protected void setUp() throws Exception {
- // only create project and file once
- if (!fIsSetup) {
- // create project
- createProject(PROJECT_NAME);
- fFile = getOrCreateFile(PROJECT_NAME + "/" + FILE_NAME);
- fIsSetup = true;
- }
-
- // editor is opened each time
- if (fIsSetup && fEditor == null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- fEditor = IDE.openEditor(page, fFile, true, true);
- if (!((fEditor instanceof XMLMultiPageEditorPart) || (fEditor instanceof StructuredTextEditor)))
- assertTrue("Unable to open structured text editor", false);
- }
-
- // turn on reconciling
- IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore();
- fReconcilerPref = store.getBoolean(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS);
- if (!fReconcilerPref)
- store.setValue(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, true);
- }
-
- protected void tearDown() throws Exception {
- // restore reconciling preference
- IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore();
- store.setValue(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, fReconcilerPref);
-
- // editor is closed each time
- if (fEditor != null) {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- page.closeEditor(fEditor, false);
- assertTrue("Unable to close editor", true);
- fEditor = null;
- }
- }
-
- private void createProject(String projName) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- private IFile getOrCreateFile(String filePath) {
- IFile blankFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- if (blankFile != null && !blankFile.exists()) {
- try {
- blankFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return blankFile;
- }
-
- /**
- * Tests reconciler by verifying no errors/warnings found with well-formed
- * xml.
- */
- public void testWellFormed() {
- IDocument doc = (IDocument) fEditor.getAdapter(IDocument.class);
- doc.set("<html><body><h1>Title</h1></body></html>");
- ITextEditor textEditor = (ITextEditor) fEditor.getAdapter(ITextEditor.class);
- IAnnotationModel annoModel = textEditor.getDocumentProvider().getAnnotationModel(fEditor.getEditorInput());
- DefaultMarkerAnnotationAccess annotationAccess = new DefaultMarkerAnnotationAccess();
-
- // verify well-formed xml
- try {
- Thread.sleep(5000);
- Iterator iter = annoModel.getAnnotationIterator();
- while (iter.hasNext()) {
- Annotation anno = (Annotation) iter.next();
- String annoType = anno.getType();
- if ((annotationAccess.isSubtype(annoType, ANNOTATION_ERROR)) || (annotationAccess.isSubtype(annoType, ANNOTATION_WARNING))) {
- assertTrue("testReconciler: Unexpected initial annotations" + anno.getText(), false);
- }
- }
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Tests reconciler by verifying error/warning found with ill-formed xml.
- * (missing close bracket)
- */
- public void testIllFormedNoCloseBracket() {
- IDocument doc = (IDocument) fEditor.getAdapter(IDocument.class);
- doc.set("<html><body><h1>Title</h1></body></html>");
- ITextEditor textEditor = (ITextEditor) fEditor.getAdapter(ITextEditor.class);
- IAnnotationModel annoModel = textEditor.getDocumentProvider().getAnnotationModel(fEditor.getEditorInput());
- DefaultMarkerAnnotationAccess annotationAccess = new DefaultMarkerAnnotationAccess();
-
- // verify ill-formed xml
- try {
- doc.replace(6, 6, "<body ");
- Thread.sleep(5000);
- boolean errorFound = false;
- Iterator iter = annoModel.getAnnotationIterator();
- while (iter.hasNext()) {
- Annotation anno = (Annotation) iter.next();
- String annoType = anno.getType();
- if ((annotationAccess.isSubtype(annoType, ANNOTATION_ERROR)) || (annotationAccess.isSubtype(annoType, ANNOTATION_WARNING))) {
- errorFound = true;
- }
- }
- assertTrue("testReconciler: Did not find expected errors in: " + doc.get(), errorFound);
- }
- catch (BadLocationException e) {
- e.printStackTrace();
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Tests reconciler by verifying error/warning found with ill-formed xml.
- * (missing attribute value)
- */
- public void testIllFormedNoAttrValue() {
- IDocument doc = (IDocument) fEditor.getAdapter(IDocument.class);
- doc.set("<html><body><h1>Title</h1></body></html>");
- ITextEditor textEditor = (ITextEditor) fEditor.getAdapter(ITextEditor.class);
- IAnnotationModel annoModel = textEditor.getDocumentProvider().getAnnotationModel(fEditor.getEditorInput());
- DefaultMarkerAnnotationAccess annotationAccess = new DefaultMarkerAnnotationAccess();
-
- // verify ill-formed xml
- try {
- doc.replace(6, 6, "<body hello>");
- Thread.sleep(5000);
- boolean errorFound = false;
- Iterator iter = annoModel.getAnnotationIterator();
- while (iter.hasNext()) {
- Annotation anno = (Annotation) iter.next();
- String annoType = anno.getType();
- if ((annotationAccess.isSubtype(annoType, ANNOTATION_ERROR)) || (annotationAccess.isSubtype(annoType, ANNOTATION_WARNING))) {
- errorFound = true;
- }
- }
- assertTrue("testReconciler: Did not find expected errors in: " + doc.get(), errorFound);
- }
- catch (BadLocationException e) {
- e.printStackTrace();
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSourceValidationFramework.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSourceValidationFramework.java
deleted file mode 100644
index ae78e61..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestSourceValidationFramework.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import java.io.ByteArrayInputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-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.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.preferences.CommonEditorPreferenceNames;
-import org.eclipse.wst.sse.ui.internal.reconcile.DocumentRegionProcessor;
-import org.eclipse.wst.sse.ui.internal.reconcile.validator.ValidatorMetaData;
-import org.eclipse.wst.sse.ui.internal.reconcile.validator.ValidatorStrategy;
-
-/**
- * Tests reconciler in an open editor. The location of this class is awkward
- * in that it refers to content types declared in plugins that aren't required
- * to be present.
- */
-public class TestSourceValidationFramework extends TestCase {
- /**
- * THIS SUBCLASS IS FOR TESTING ONLY
- */
- public static class TestStructuredTextEditor extends StructuredTextEditor {
- public SourceViewerConfiguration textViewerConfiguration = null;
-
- protected void setSourceViewerConfiguration(SourceViewerConfiguration config) {
- super.setSourceViewerConfiguration(config);
- textViewerConfiguration = config;
- }
- }
-
- private static final String PROJECT_NAME = "TestSourceValidationFramework";
-
- private static final String SEPARATOR = String.valueOf(IPath.SEPARATOR);
-
- private boolean fPreviousReconcilerPref;
-
- public TestSourceValidationFramework() {
- super("TestSourceValidationFramework");
- }
-
- private IFile ensureFileIsAccessible(String filePath, byte[] contents) {
- IFile blankFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- if (blankFile != null && !blankFile.isAccessible()) {
- try {
- byte[] bytes = contents;
- if (bytes == null) {
- bytes = new byte[0];
- }
- blankFile.create(new ByteArrayInputStream(bytes), true, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return blankFile;
- }
-
- private IContentType[] detectContentTypes(String fileName) {
- IContentType[] types = null;
- IFile file = ensureFileIsAccessible(PROJECT_NAME + SEPARATOR + fileName, null);
-
- types = Platform.getContentTypeManager().findContentTypesFor(file.getName());
- if (types.length == 0) {
- IContentDescription d = null;
- try {
- // optimized description lookup, might not succeed
- d = file.getContentDescription();
- if (d != null) {
- types = new IContentType[]{d.getContentType()};
- }
- }
- catch (CoreException e) {
- /*
- * should not be possible given the accessible and file type
- * check above
- */
- }
- }
- if (types == null) {
- types = Platform.getContentTypeManager().findContentTypesFor(file.getName());
- }
- return types;
- }
-
- private String[] detectContentTypeIDs(String fileName) {
- IContentType[] types = detectContentTypes(fileName);
- String[] ids = new String[types.length];
- for (int i = 0; i < types.length; i++) {
- ids[i] = types[i].getId();
- }
- return ids;
- }
-
- private boolean identicalContents(Object o1[], Object o2[]) {
- if (o1.length == 0 && o2.length == 0)
- return true;
-
- Object[] array1 = new Object[o1.length];
- Object[] array2 = new Object[o2.length];
- System.arraycopy(o1, 0, array1, 0, o1.length);
- System.arraycopy(o2, 0, array2, 0, o2.length);
- Arrays.sort(array1);
- Arrays.sort(array2);
- return Arrays.equals(array1, array2);
- }
-
-
- private void ensureProjectIsAccessible(String projName) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- try {
- if (!project.exists())
- project.create(description, new NullProgressMonitor());
- if (!project.isAccessible())
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- private List getSourceValidatorIDs(String fileName) throws Exception {
- List validatorIds = new ArrayList(1);
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
-
- IFile file = ensureFileIsAccessible(PROJECT_NAME + SEPARATOR + fileName, null);
- IEditorPart editor = IDE.openEditor(page, file, TestStructuredTextEditor.class.getName(), true);
-
- ITextEditor textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
- TestStructuredTextEditor testTextEditor = (TestStructuredTextEditor) textEditor;
- IReconciler reconciler = testTextEditor.textViewerConfiguration.getReconciler(testTextEditor.getTextViewer());
-
- assertNotNull(reconciler);
- assertTrue("unexpected IReconciler implementation: " + reconciler.getClass(), reconciler instanceof DocumentRegionProcessor);
-
- Class reconcilerClass = reconciler.getClass();
- Method method = null;
- while (reconcilerClass != Object.class && method == null) {
- Method[] methods = reconcilerClass.getDeclaredMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].getName().equals("getValidatorStrategy")) {
- method = methods[i];
- }
- }
- reconcilerClass = reconcilerClass.getSuperclass();
- }
-
- assertNotNull("no getValidatorStrategy method found on " + reconciler.getClass(), method);
- method.setAccessible(true);
- ValidatorStrategy strategy = (ValidatorStrategy) method.invoke(reconciler, new Object[0]);
- assertNotNull(strategy);
- Field fMetaData = strategy.getClass().getDeclaredField("fMetaData");
- assertNotNull("validator metadata field \"fMetaData\" not found on strategy " + strategy.getClass(), fMetaData);
- fMetaData.setAccessible(true);
- List metadata = (List) fMetaData.get(strategy);
- assertNotNull(metadata);
- for (int i = 0; i < metadata.size(); i++) {
- validatorIds.add(((ValidatorMetaData) metadata.get(i)).getValidatorId());
- }
-
- page.closeEditor(editor, false);
-
- return validatorIds;
- }
-
- protected void setUp() throws Exception {
- ensureProjectIsAccessible(PROJECT_NAME);
-
- // turn on reconciling
- IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore();
- fPreviousReconcilerPref = store.getBoolean(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS);
- if (!fPreviousReconcilerPref) {
- store.setValue(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, true);
- }
- }
-
- protected void tearDown() throws Exception {
- // restore reconciling preference
- IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore();
- store.setValue(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, fPreviousReconcilerPref);
- }
-
- public void testSourceValidationEnablementWithInheritedValidators() throws Exception {
- Object[] xmlValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.xml").toArray();
- assertTrue("No XML source validators found", xmlValidatorIDs.length > 0);
- Object[] xml99ValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.xml99").toArray();
- assertTrue("No XML99 source validators found", xml99ValidatorIDs.length > 0);
-
- Arrays.sort(xmlValidatorIDs);
- Arrays.sort(xml99ValidatorIDs);
-
- assertEquals("validator lists should be the same length", xmlValidatorIDs.length, xml99ValidatorIDs.length);
- for (int i = 0; i < xmlValidatorIDs.length; i++) {
- assertEquals("validator IDs should be the same [" + i + "]", xmlValidatorIDs[i], xml99ValidatorIDs[i]);
- }
- }
-
- public void testSourceValidationEnablementWithUniqueValidators() throws Exception {
- String[] xmlContentTypes = detectContentTypeIDs("testValidatorConfigurations.xml");
- String[] xsdContentTypes = detectContentTypeIDs("testValidatorConfigurations.xsd");
-
- /*
- * If the current configuration does not include a distinct XSD
- * content type, skip the rest
- */
- if (!identicalContents(xmlContentTypes, xsdContentTypes)) {
- List xmlValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.xml");
- assertTrue("No XML source validators found", !xmlValidatorIDs.isEmpty());
- List xsdValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.xsd");
- assertTrue("No XSD source validators found", !xsdValidatorIDs.isEmpty());
- for (int i = 0; i < xmlValidatorIDs.size(); i++) {
- assertTrue("XML Validator found on XSD input", !xsdValidatorIDs.contains(xmlValidatorIDs.get(i)));
- }
- }
- else {
- String message = "No distinct XSD content type found while running " + getClass().getName();
- System.err.println(message);
- Logger.log(Logger.WARNING, message);
- }
- }
-
- public void testSourceValidationEnablementWithUnrelatedContentTypes() throws Exception {
- String[] dtdContentTypes = detectContentTypeIDs("testValidatorConfigurations.dtd");
- String[] jspContentTypes = detectContentTypeIDs("testValidatorConfigurations.jsp");
- if (dtdContentTypes.length == 0) {
- String message = "No DTD content type found while running " + getClass().getName();
- System.err.println(message);
- Logger.log(Logger.WARNING, message);
- }
- if (jspContentTypes.length == 0) {
- String message = "No JSP content type found while running " + getClass().getName();
- System.err.println(message);
- Logger.log(Logger.WARNING, message);
- }
-
-
- if (dtdContentTypes.length > 0 && jspContentTypes.length > 0 && !identicalContents(dtdContentTypes, jspContentTypes)) {
- List dtdValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.dtd");
- assertTrue("No DTD source validators found", !dtdValidatorIDs.isEmpty());
- List jspValidatorIDs = getSourceValidatorIDs("testValidatorConfigurations.jsp");
- assertTrue("No JSP source validators found", !jspValidatorIDs.isEmpty());
- int dtdValidatorCount = dtdValidatorIDs.size();
- dtdValidatorIDs.removeAll(jspValidatorIDs);
- assertEquals("validators found running on both CSS and DTD", dtdValidatorCount, dtdValidatorIDs.size());
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.java
deleted file mode 100644
index f15e411..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-public class VerifyEditorPlugin extends TestCase {
-
- public void testPluginExists() {
- // TODO: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=81527
- assertTrue(true);
- Plugin plugin = null;
- try {
- plugin = XMLUIPlugin.getInstance();
- } catch (Exception e) {
- plugin = null;
- }
- assertNotNull("xml editor plugin could not be instantiated", plugin);
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java
deleted file mode 100644
index 7ef45d5..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.ui.internal.validation.TestDelegatingSourceValidatorForXML;
-import org.eclipse.wst.xml.ui.internal.validation.TestMarkupValidator;
-import org.eclipse.wst.xml.ui.tests.viewer.TestViewerConfigurationXML;
-
-
-public class XMLUITestSuite extends TestSuite {
- public static Test suite() {
- return new XMLUITestSuite();
- }
-
- public XMLUITestSuite() {
- super("XML UI Test Suite");
- addTest(new TestSuite(VerifyEditorPlugin.class));
- addTest(new TestSuite(XMLUIPreferencesTest.class));
- addTest(new TestSuite(TestViewerConfigurationXML.class));
- addTest(new TestSuite(TestEditorConfigurationXML.class));
- addTest(new TestSuite(TestOpenEditorXML.class));
- addTest((new TestSuite(TestPropertySheetConfiguration.class)));
- addTestSuite(TestDelegatingSourceValidatorForXML.class);
- addTestSuite(TestMarkupValidator.class);
- addTestSuite(TestReconcilerXML.class);
- addTestSuite(TestSourceValidationFramework.class);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java
deleted file mode 100644
index 8d400a7..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class XMLUITestsPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static XMLUITestsPlugin plugin;
-
- /**
- * The constructor.
- */
- public XMLUITestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- */
- public static XMLUITestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- return key;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java
deleted file mode 100644
index 91c7bbf..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests.breakpoints;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.IBreakpointProvider;
-import org.eclipse.wst.xml.ui.tests.XMLUITestsPlugin;
-
-
-public class BreakpointErrorProvider implements IBreakpointProvider {
-
- ISourceEditingTextTools fTool;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extensions.breakpoint.IBreakpointProvider#addBreakpoint(org.w3c.dom.Document,
- * org.eclipse.jface.text.IDocument, org.eclipse.ui.IEditorInput,
- * org.w3c.dom.Node, int, int)
- */
- public IStatus addBreakpoint(IDocument idoc, IEditorInput input, int lineNumber, int offset) throws CoreException {
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enable = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if (enable)
- return new Status(IStatus.ERROR, XMLUITestsPlugin.getDefault().getBundle().getSymbolicName(), IStatus.ERROR, "Test Error!", null);
- return new Status(IStatus.OK, XMLUITestsPlugin.getDefault().getBundle().getSymbolicName(), IStatus.OK, "", null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extensions.breakpoint.IBreakpointProvider#getResource(org.eclipse.ui.IEditorInput)
- */
- public IResource getResource(IEditorInput input) {
- IResource res = (IResource) input.getAdapter(IFile.class);
- if (res == null)
- res = (IResource) input.getAdapter(IResource.class);
- return res;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extensions.breakpoint.IBreakpointProvider#setSourceEditingTextTools(org.eclipse.wst.sse.ui.extensions.breakpoint.SourceEditingTextTools)
- */
- public void setSourceEditingTextTools(ISourceEditingTextTools tool) {
- fTool = tool;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java
deleted file mode 100644
index 46a7f66..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests.breakpoints;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.sse.ui.internal.IExtendedEditorAction;
-import org.eclipse.wst.sse.ui.internal.IExtendedSimpleEditor;
-import org.eclipse.wst.xml.ui.tests.XMLUITestsPlugin;
-
-
-public class EnableWarningAction extends Action implements IExtendedEditorAction {
- IExtendedSimpleEditor activeEditor;
-
- public EnableWarningAction() {
- super();
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enabled = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if(enabled)
- setText("Disable Breakpoint Errors");
- else
- setText("Enable Breakpoint Errors");
- }
-
- /**
- * @param text
- */
- public EnableWarningAction(String text) {
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enabled = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if(enabled)
- setText("Disable Breakpoint Errors");
- else
- setText("Enable Breakpoint Errors");
- }
-
- /**
- * @param text
- * @param image
- */
- public EnableWarningAction(String text, ImageDescriptor image) {
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enabled = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if(enabled)
- setText("Disable Breakpoint Errors");
- else
- setText("Enable Breakpoint Errors");
- }
-
- /**
- * @param text
- * @param style
- */
- public EnableWarningAction(String text, int style) {
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enabled = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if(enabled)
- setText("Disable Breakpoint Errors");
- else
- setText("Enable Breakpoint Errors");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extension.IExtendedEditorAction#isVisible()
- */
- public boolean isVisible() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- super.run();
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean value = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- XMLUITestsPlugin.getDefault().getPreferenceStore().setValue("break-error", !value);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.ui.extension.IExtendedEditorAction#setActiveExtendedEditor(org.eclipse.wst.sse.ui.extension.IExtendedSimpleEditor)
- */
- public void setActiveExtendedEditor(IExtendedSimpleEditor targetEditor) {
- activeEditor = targetEditor;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.texteditor.IUpdate#update()
- */
- public void update() {
- XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
- boolean enabled = XMLUITestsPlugin.getDefault().getPreferenceStore().getBoolean("break-error");
- if(enabled)
- setText("Disable Breakpoint Errors");
- else
- setText("Enable Breakpoint Errors");
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java
deleted file mode 100644
index 3fa89bd..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
- package org.eclipse.wst.xml.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.IAnnotationHover;
-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.PlatformUI;
-import org.eclipse.wst.sse.core.text.IStructuredPartitions;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.eclipse.wst.xml.ui.tests.Logger;
-
-/**
- * @author pavery
- */
-public class TestViewerConfigurationXML extends TestCase {
-
- private StructuredTextViewerConfigurationXML fConfig = null;
- private boolean fDisplayExists = true;
- private StructuredTextViewer fViewer = null;
- private boolean isSetup = false;
-
- public TestViewerConfigurationXML() {
- super("TestViewerConfigurationXML");
- }
- protected void setUp() throws Exception {
-
- super.setUp();
- if(!this.isSetup){
- setUpViewerConfiguration();
- this.isSetup = true;
- }
- }
-
- private void setUpViewerConfiguration() {
-
- // some test environments might not have a "real" display
- if(Display.getCurrent() != null) {
-
- Shell shell = null;
- Composite parent = null;
-
- if(PlatformUI.isWorkbenchRunning()) {
- shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
- else {
- shell = new Shell(Display.getCurrent());
- }
- parent = new Composite(shell, SWT.NONE);
-
- // dummy viewer
- fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationXML();
- }
- else {
- fDisplayExists = false;
- Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
- }
- }
-
- /**
- * Not necessary
- */
- public void testGetAnnotationHover() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IAnnotationHover hover = fConfig.getAnnotationHover(fViewer);
- assertNotNull("AnnotationHover is null", hover);
- }
-
- public void testGetAutoEditStrategies() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
-
- IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IXMLPartitions.XML_DEFAULT);
- assertNotNull(strategies);
- assertTrue("there are no auto edit strategies", strategies.length > 0);
- }
-
- public void testGetConfiguredContentTypes() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
- assertNotNull(configuredContentTypes);
- assertTrue("there are no configured content types", configuredContentTypes.length > 0);
- }
-
- /**
- * Not necessary
- */
- public void testGetContentAssistant() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IContentAssistant ca = fConfig.getContentAssistant(fViewer);
- assertNotNull("there is no content assistant", ca);
- }
-
- public void testGetContentFormatter() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IContentFormatter cf = fConfig.getContentFormatter(fViewer);
- assertNotNull("there is no content formatter", cf);
- }
-
- public void testGetDoubleClickStrategy() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
- if(strategy != null) {
- return;
- }
- }
- assertTrue("there are no configured double click strategies", false);
- }
-
- public void testGetHyperlinkDetectors() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
- assertNotNull("there are no hyperlink detectors", detectors);
- assertTrue("there are no hyperlink detectors", detectors.length > 0);
- }
-
- public void testGetIndentPrefixes() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- String prefixes[] = fConfig.getIndentPrefixes(fViewer, contentTypes[i]);
- if(prefixes != null) {
- return;
- }
- }
- assertTrue("there are no configured indent prefixes", false);
- }
-
- /**
- * Not necessary
- */
- public void testGetInformationControlCreator() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- IInformationControlCreator infoCreator = fConfig.getInformationControlCreator(fViewer);
- assertNotNull("InformationControlCreator is null", infoCreator);
- }
-
- /**
- * Not necessary
- */
- public void testGetInformationPresenter() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
- assertNotNull("InformationPresenter is null", presenter);
- }
-
- public void testGetLineStyleProviders() {
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
- for (int i = 0; i < contentTypes.length; i++) {
- LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
- if(providers != null) {
- return;
- }
- }
- assertTrue("there are no configured line style providers", false);
- }
-
- /**
- * Not necessary
- */
- public void testGetReconciler() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- IReconciler r = fConfig.getReconciler(fViewer);
- assertNotNull("Reconciler is null", r);
- }
-
- public void testGetTextHover() {
-
- // probably no display
- if(!fDisplayExists)
- return;
-
- String[] hoverPartitions = new String[]{IStructuredPartitions.DEFAULT_PARTITION, IXMLPartitions.XML_DEFAULT};
-
- for (int i = 0; i < hoverPartitions.length; i++) {
- ITextHover hover = fConfig.getTextHover(fViewer, hoverPartitions[i], SWT.NONE);
- assertNotNull("hover was null for partition: " + hoverPartitions[i], hover);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java
deleted file mode 100644
index 3398345..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.tests.viewer;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.w3c.dom.Attr;
-
-
-public class ViewerTestXML extends ViewPart {
- /**
- * Sets the viewer's highlighting text range to the text range indicated
- * by the selected Nodes.
- */
- protected class NodeRangeSelectionListener implements ISelectionChangedListener {
- public void selectionChanged(SelectionChangedEvent event) {
- if (!event.getSelection().isEmpty() && event.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- IndexedRegion startNode = (IndexedRegion) selection.getFirstElement();
- IndexedRegion endNode = (IndexedRegion) selection.toArray()[selection.size() - 1];
-
- if (startNode instanceof Attr)
- startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
- if (endNode instanceof Attr)
- endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
- int start = startNode.getStartOffset();
- int end = endNode.getEndOffset();
-
- fSourceViewer.resetVisibleRegion();
- fSourceViewer.setVisibleRegion(start, end - start);
- fSourceViewer.setSelectedRange(start, 0);
- }
- else {
- fSourceViewer.resetVisibleRegion();
- }
- }
- }
-
- protected class NumberInputDialog extends Dialog {
- public Text length;
-
- int lengthValue;
- public Text start;
- int startValue;
-
- public NumberInputDialog(Shell shell) {
- super(shell);
- }
-
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
- Composite container = new Composite(composite, SWT.NULL);
- container.setLayoutData(new GridData(GridData.FILL_BOTH));
- container.setLayout(new GridLayout(2, true));
- setShellStyle(getShell().getStyle() | SWT.RESIZE);
-
- Label label = new Label(container, SWT.NULL);
- label.setText("Start");
- label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- label = new Label(container, SWT.NULL);
- label.setText("Length");
- label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- start = new Text(container, SWT.BORDER);
- startValue = fSourceViewer.getVisibleRegion().getOffset();
- start.setText("" + startValue);
- start.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- length = new Text(container, SWT.BORDER);
- lengthValue = fSourceViewer.getVisibleRegion().getLength();
- length.setText("" + lengthValue);
- length.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- // start.addModifyListener(new ModifyListener() {
- // public void modifyText(ModifyEvent e) {
- // if (e.widget == start) {
- // try {
- // startValue = Integer.decode(start.getText()).intValue();
- // }
- // catch (NumberFormatException e2) {
- // startValue = 0;
- // }
- // }
- // }
- // });
- // length.addModifyListener(new ModifyListener() {
- // public void modifyText(ModifyEvent e) {
- // if (e.widget == length) {
- // try {
- // lengthValue = Integer.decode(length.getText()).intValue();
- // }
- // catch (NumberFormatException e2) {
- // lengthValue = 0;
- // }
- // }
- // }
- // });
-
- return composite;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#okPressed()
- */
- protected void okPressed() {
- try {
- startValue = Integer.decode(start.getText()).intValue();
- }
- catch (NumberFormatException e2) {
- startValue = 0;
- }
- try {
- lengthValue = Integer.decode(length.getText()).intValue();
- }
- catch (NumberFormatException e2) {
- lengthValue = 0;
- }
- super.okPressed();
- }
- }
-
- private final String DEFAULT_VIEWER_CONTENTS = "<?xml version=\"1.0\"?>\n<!DOCTYPE taglib PUBLIC \"-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN\" \"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd\">\n";
- private StructuredTextViewerConfiguration fConfig = null;
- private IContentOutlinePage fContentOutlinePage = null;
- private ISelectionChangedListener fHighlightRangeListener = null;
-
- private StructuredTextViewer fSourceViewer = null;
-
- private final String SSE_EDITOR_FONT = "org.eclipse.wst.sse.ui.textfont";
-
- protected void addActions(IContributionManager mgr) {
- if (mgr != null) {
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "New XML";
- }
-
- public void run() {
- super.run();
- BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
- public void run() {
- setupViewerForNew();
- fSourceViewer.setEditable(true);
- }
- });
- }
- });
- mgr.add(new Separator());
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Change Visibility";
- }
-
- public void run() {
- super.run();
- NumberInputDialog dlg = new NumberInputDialog(fSourceViewer.getControl().getShell());
- int proceed = dlg.open();
- if (proceed == Window.CANCEL)
- return;
- fSourceViewer.resetVisibleRegion();
- fSourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Show All";
- }
-
- public void run() {
- super.run();
- fSourceViewer.resetVisibleRegion();
- }
- });
- mgr.add(new Separator());
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Change Visibility in Editor";
- }
-
- public void run() {
- super.run();
- StructuredTextViewer sourceViewer = null;
- IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (part != null && part instanceof StructuredTextEditor) {
- sourceViewer = ((StructuredTextEditor) part).getTextViewer();
- }
- if (sourceViewer != null) {
- NumberInputDialog dlg = new NumberInputDialog(sourceViewer.getControl().getShell());
- int proceed = dlg.open();
- if (proceed == Window.CANCEL)
- return;
- sourceViewer.resetVisibleRegion();
- sourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
- }
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Show All in Editor";
- }
-
- public void run() {
- super.run();
- StructuredTextViewer sourceViewer = null;
- IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (part != null && part instanceof StructuredTextEditor) {
- sourceViewer = ((StructuredTextEditor) part).getTextViewer();
- }
- if (sourceViewer != null) {
- sourceViewer.resetVisibleRegion();
- }
- }
- });
- mgr.add(new Separator());
- // no longer able to set input to NULL
- // mgr.add(new Action() {
- // public String getText() {
- // return getToolTipText();
- // }
- //
- // public String getToolTipText() {
- // return "Set Input to NULL";
- // }
- // public void run() {
- // super.run();
- // viewer.setInput(null);
- // }
- // });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input from Active Editor";
- }
-
- public void run() {
- super.run();
- ITextEditor textEditor = getActiveEditor();
- if (textEditor != null) {
- setupViewerForEditor(textEditor);
- fSourceViewer.setEditable(true);
- }
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input and Follow Selection";
- }
-
- public void run() {
- super.run();
- followSelection();
- fSourceViewer.setEditable(true);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Take Input and Follow Selection As ReadOnly";
- }
-
- public void run() {
- super.run();
- followSelection();
- fSourceViewer.setEditable(false);
- }
- });
- mgr.add(new Action() {
- public String getText() {
- return getToolTipText();
- }
-
- public String getToolTipText() {
- return "Stop Following Selection";
- }
-
- public void run() {
- super.run();
- stopFollowSelection();
- }
- });
- }
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
- */
- public void createPartControl(Composite parent) {
- IContributionManager mgr = getViewSite().getActionBars().getMenuManager();
- addActions(mgr);
-
- // create source viewer & its content type-specific viewer
- // configuration
- fSourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
- fConfig = new StructuredTextViewerConfigurationXML();
-
- // set up the viewer with a document & viewer config
- setupViewerForNew();
-
- setupViewerPreferences();
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#dispose()
- */
- public void dispose() {
- stopFollowSelection();
- fSourceViewer.unconfigure();
- }
-
- /**
- * Hooks up the viewer to follow the selection made in the active editor
- */
- private void followSelection() {
- ITextEditor editor = getActiveEditor();
- if (editor != null) {
- setupViewerForEditor(editor);
- if (fHighlightRangeListener == null)
- fHighlightRangeListener = new NodeRangeSelectionListener();
-
- fContentOutlinePage = ((IContentOutlinePage) editor.getAdapter(IContentOutlinePage.class));
- if (fContentOutlinePage != null) {
- fContentOutlinePage.addSelectionChangedListener(fHighlightRangeListener);
-
- if (!fContentOutlinePage.getSelection().isEmpty() && fContentOutlinePage.getSelection() instanceof IStructuredSelection) {
- fSourceViewer.resetVisibleRegion();
-
- Object[] nodes = ((IStructuredSelection) fContentOutlinePage.getSelection()).toArray();
- IndexedRegion startNode = (IndexedRegion) nodes[0];
- IndexedRegion endNode = (IndexedRegion) nodes[nodes.length - 1];
-
- if (startNode instanceof Attr)
- startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
- if (endNode instanceof Attr)
- endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
- int start = startNode.getStartOffset();
- int end = endNode.getEndOffset();
-
- fSourceViewer.setVisibleRegion(start, end - start);
- fSourceViewer.setSelectedRange(start, 0);
- }
- }
- }
- }
-
- /**
- * Returns the current active text editor if possible
- *
- * @return ITextEditor
- */
- private ITextEditor getActiveEditor() {
- ITextEditor editor = null;
- IEditorPart editorPart = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if (editorPart instanceof ITextEditor)
- editor = (ITextEditor) editorPart;
- if (editor == null && editorPart != null)
- editor = (ITextEditor) editorPart.getAdapter(ITextEditor.class);
- return editor;
- }
-
- /**
- * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
- */
- public void init(IViewSite site, IMemento memento) throws PartInitException {
- super.init(site, memento);
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchPart#setFocus()
- */
- public void setFocus() {
- if (fSourceViewer.getControl() != null && !fSourceViewer.getControl().isDisposed())
- fSourceViewer.getControl().setFocus();
- }
-
- /**
- * Sets up the viewer with the same document/input as the given editor
- *
- * @param ITextEditor
- * editor - the editor to use *cannot to be null*
- */
- private void setupViewerForEditor(ITextEditor editor) {
- stopFollowSelection(); // if was following selection, stop
- IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
- fSourceViewer.setDocument(doc);
-
- // need to reconfigure after set document just so highlighter works
- fSourceViewer.configure(new StructuredTextViewerConfigurationXML());
- }
-
- /**
- * Set up source viewer with a new document & configure it
- */
- private void setupViewerForNew() {
- stopFollowSelection(); // if was following selection, stop
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- IDocument doc = modelManager.createStructuredDocumentFor(ContentTypeIdForXML.ContentTypeID_XML);
- doc.set(DEFAULT_VIEWER_CONTENTS);
-
- fSourceViewer.setDocument(doc);
- // need to reconfigure after set document just so highlighter works
- fSourceViewer.configure(fConfig);
- }
-
- /**
- * Set up source viewer with any additional preferences it should have Ex:
- * font, tab width
- */
- private void setupViewerPreferences() {
- fSourceViewer.getTextWidget().setFont(JFaceResources.getFont(SSE_EDITOR_FONT));
- }
-
- /**
- * Cease following the selection made in the editor
- */
- private void stopFollowSelection() {
- if (fContentOutlinePage != null) {
- fContentOutlinePage.removeSelectionChangedListener(fHighlightRangeListener);
- fSourceViewer.resetVisibleRegion();
- fContentOutlinePage = null;
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.ui.tests/test.xml b/tests/org.eclipse.wst.xml.ui.tests/test.xml
deleted file mode 100644
index d928e35..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/test.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
- <property
- name="plugin-name"
- value="org.eclipse.wst.xml.ui.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xml.ui.tests.XMLUITestSuite" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international-instance.xml b/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international-instance.xml
deleted file mode 100644
index 4f30bd8..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international-instance.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<multi-root xsi:noNamespaceSchemaLocation="international.xsd" xmlns="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <root>The quick brown fox jumps over the lazy dog</root>
- <뿌리성분>빠른 갈색 여우는 게으른 개에 강하한다</뿌리성분>
- <根元素>这只快棕色狐狸跳过懒惰狗</根元素>
- <root>这只快棕色狐狸跳过懒惰狗</root>
- <뿌리성분>The quick brown fox jumps over the lazy dog</뿌리성분>
- <뿌리성분>The quick brown fox jumps over the lazy dog</뿌리성분>
- <根元素>빠른 갈색 여우는 게으른 개에 강하한다</根元素>
-</multi-root>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international.xsd b/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international.xsd
deleted file mode 100644
index 87d13ca..0000000
--- a/tests/org.eclipse.wst.xml.ui.tests/testresources/Non8BitChars/international.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xml="http://www.w3.org/XML/1998/namespace">
-
- <!--<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>-->
-
- <xsd:element name="multi-root">
- <xsd:complexType>
- <xsd:sequence maxOccurs="unbounded">
- <xsd:element ref="root" minOccurs="0"/>
- <xsd:element ref="뿌리성분" minOccurs="0"/>
- <xsd:element ref="根元素" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="root" type="prose" />
-
- <xsd:element name="뿌리성분" type="prose"/>
-
- <xsd:element name="根元素" type="prose" />
-
- <xsd:simpleType name="prose">
- <xsd:restriction base="xsd:string">
- <xsd:pattern value="The quick brown fox jumps over the lazy dog"/>
- <xsd:pattern value="这只快棕色狐狸跳过懒惰狗"/>
- <xsd:pattern value="빠른 갈색 여우는 게으른 개에 강하한다"/>
- </xsd:restriction>
- </xsd:simpleType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.classpath b/tests/org.eclipse.wst.xml.validation.tests/.classpath
deleted file mode 100644
index 76c6027..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.cvsignore b/tests/org.eclipse.wst.xml.validation.tests/.cvsignore
deleted file mode 100644
index 42e94a0..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-temp.folder
-build.xml
-validatexmltests.jar
-javaCompiler.validatexmltests.jar.args
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.project b/tests/org.eclipse.wst.xml.validation.tests/.project
deleted file mode 100644
index 112562f..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.validation.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 84c59e6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xml.validation.tests
-Bundle-Version: 1.0.302.qualifier
-Bundle-ClassPath: validatexmltests.jar
-Bundle-Activator: org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.core.internal.validation;x-internal:=true,
- org.eclipse.wst.xml.core.internal.validation.eclipse;x-internal:=true,
- org.eclipse.wst.xml.core.internal.validation.errorcustomization;x-internal:=true,
- org.eclipse.wst.xml.validation.tests.internal;x-internal:=true
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.validation,
- org.eclipse.core.resources,
- org.eclipse.wst.common.uriresolver
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.xml.validation.tests/about.html b/tests/org.eclipse.wst.xml.validation.tests/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/build.properties b/tests/org.eclipse.wst.xml.validation.tests/build.properties
deleted file mode 100644
index 4d85d0c..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = test.xml,\
- testresources/,\
- validatexmltests.jar,\
- META-INF/,\
- about.html
-source.validatexmltests.jar = src/
-bin.excludes = testresources/.cvsignore
diff --git a/tests/org.eclipse.wst.xml.validation.tests/plugin.properties b/tests/org.eclipse.wst.xml.validation.tests/plugin.properties
deleted file mode 100644
index 83faaf6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xml.validation.tests
-Bundle-Vendor.0 = Eclipse
-Bundle-Name.0 = XML Validator Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/XMLValidationConfigurationTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/XMLValidationConfigurationTest.java
deleted file mode 100644
index 91f7f9a..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/XMLValidationConfigurationTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test the XMLValidationConfiguration class.
- */
-public class XMLValidationConfigurationTest extends TestCase
-{
- XMLValidationConfiguration configuration;
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XMLValidationConfigurationTest.class);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception
- {
- super.setUp();
- configuration = new XMLValidationConfiguration();
- }
-
-
- protected void tearDown() throws Exception
- {
- configuration = null;
- super.tearDown();
- }
-
-
- /**
- * Test the default setting of the WARN_NO_GRAMMAR feature.
- */
- public void testSetWarnNoGrammarFeatureDefault()
- {
- try
- {
- assertFalse("The WARN_NO_GRAMMAR feature is not set by default to false.", configuration.getFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR));
- }
- catch(Exception e)
- {
- fail("Unable to set read the WARN_NO_GRAMMAR feature: " + e);
- }
- }
-
- /**
- * Test setting the WARN_NO_GRAMMAR feature to true.
- */
- public void testSetWarnNoGrammarFeatureTrue()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, true);
- assertTrue("The WARN_NO_GRAMMAR feature is not set to true.", configuration.getFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR));
- }
- catch(Exception e)
- {
- fail("Unable to set WARN_NO_GRAMMAR to true: " + e);
- }
- }
-
- /**
- * Test setting the WARN_NO_GRAMMAR feature to false.
- */
- public void testSetWarnNoGrammarFeatureFalse()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, false);
- assertFalse("The WARN_NO_GRAMMAR feature is not set to false.", configuration.getFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR));
- }
- catch(Exception e)
- {
- fail("Unable to set WARN_NO_GRAMMAR to false: " + e);
- }
- }
-
- /**
- * Test setting a feature that doesn't exist.
- */
- public void testSetNotExistantFeature()
- {
- try
- {
- configuration.setFeature("NON_EXISTANT_FEATURE", false);
- fail("Setting a non existant feature did not produce an exception.");
- }
- catch(Exception e)
- {
- // The test succeeds if the exception is caught.
- }
- }
-
- /**
- * Test getting a feature that doesn't exist.
- */
- public void testGetNotExistantFeature()
- {
- try
- {
- configuration.getFeature("NON_EXISTANT_FEATURE");
- fail("Getting a non existant feature did not produce an exception.");
- }
- catch(Exception e)
- {
- // The test succeeds if the exception is caught.
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorTest.java
deleted file mode 100644
index f0a68e7..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.eclipse;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin;
-
-public class ValidatorTest extends TestCase
-{
- ValidatorWrapper validator = new ValidatorWrapper();
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(ValidatorTest.class);
- }
-
- /**
- * Test the addInfoToMessage method. The following tests are performed:<br/>
- * 1. When the validation message contains a null key nothing is added to the message.<br/>
- * 2. When the message contains the key "ENTIRE_ELEMENT" the three attributes are added
- * to the method and the SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE is null.<br/>
- * 3. When the message contains the key "EntityNotDeclared" the three attributes are set.
- */
- public void testAddInfoToMessage()
- {
- // These strings are common addition information types.
- String COLUMN_NUMBER_ATTRIBUTE = "columnNumber"; //$NON-NLS-1$
- String SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = "squiggleSelectionStrategy"; //$NON-NLS-1$
- String SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = "squiggleNameOrValue"; //$NON-NLS-1$
-
- // Test that the message does not contain the attributes when the method is called
- // with a null key.
- ValidationMessage validationMessage = new ValidationMessage("", 1, 1, "");
- Message message = new Message();
- validator.addInfoToMessage(validationMessage, message);
- assertNull("COLUMN_NUMBER_ATTRIBUTE was not null for a ValidationMessage with a null key. COLUMN_NUMBER_ATTRIBUTE = " + message.getAttribute(COLUMN_NUMBER_ATTRIBUTE), message.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertNull("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not null for a ValidationMessage with a null key. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), message.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertNull("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not null for a ValidationMessage with a null key. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), message.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
-
- // Test that the message contains the three attributes when the key is set to "ElementUnterminated".
- ValidationMessage validationMessage2 = new ValidationMessage("", 1, 1, "", "ElementUnterminated", null);
- Message message2 = new Message();
- validator.addInfoToMessage(validationMessage2, message2);
- assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key ENTIRE_ELEMENT. COLUMN_NUMBER_ATTRIBUTE = " + message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not ENTIRE_ELEMENT. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "ENTIRE_ELEMENT", message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertNull("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not null for a ValidationMessage with the key ENTIRE_ELEMENT. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message2.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), message2.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
-
- // Test that the message contains the three attributes when the key is set to "EntityNotDeclared".
- ValidationMessage validationMessage3 = new ValidationMessage("", 1, 1, "", "EntityNotDeclared", new Object[]{"MyName"});
- Message message3 = new Message();
- validator.addInfoToMessage(validationMessage3, message3);
- assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key EntityNotDeclared. COLUMN_NUMBER_ATTRIBUTE = " + message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not TEXT_ENTITY_REFERENCE. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "TEXT_ENTITY_REFERENCE", message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertEquals("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not set to MyName for a ValidationMessage with the key EntityNotDeclared. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message3.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), "MyName", message3.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
- }
-
- /**
- * Test the validate method. Tests to be performed:<br/>
- * 1. Test that validating a valid file from a URI or an input stream produces the same result.<br/>
- * 2. Test that validating an invalid file from a URI or an input stream produces the same result.
- */
- public void testValidate()
- {
- try
- {
- // Test that validating a valid file from a URI and an input stream produces the same result.
- String PLUGIN_ABSOLUTE_PATH = XMLValidatorTestsPlugin.getPluginLocation().toString() + "/";
- String uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml";
- ValidationReport report1 = validator.validate(uri, null, null);
- ValidationReport report2 = null;
- InputStream is = null;
- try
- {
- is = new URL(uri).openStream();
- report2 = validator.validate(uri, is, null);
- }
- catch(Exception e)
- {
- fail("A problem occurred while validating a valid file with an inputstream: " + e);
- }
- finally
- {
- if(is != null)
- {
- try
- {
- is.close();
- }
- catch(IOException e)
- {
- // Do nothing.
- }
- }
- }
- assertTrue("Validation using a URI did not product a valid validation result.", report1.isValid());
- assertEquals("Validation using URI and using inputstream of the same file produces different numbers of errors.", report1.getValidationMessages().length, report2.getValidationMessages().length);
-
- // Test that validating an invalid file from a URI and an input stream produces the same result.
- uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml";
- report1 = validator.validate(uri, null, null);
- report2 = null;
- is = null;
- try
- {
- is = new URL(uri).openStream();
- report2 = validator.validate(uri, is, null);
- }
- catch(Exception e)
- {
- fail("A problem occurred while validating an invalid file with an inputstream: " + e);
- }
- finally
- {
- if(is != null)
- {
- try
- {
- is.close();
- }
- catch(IOException e)
- {
- // Do nothing.
- }
- }
- }
- assertFalse("Validation using a URI did not product an invalid validation result.", report1.isValid());
- assertEquals("Validation using URI and using inputstream of the same file produces different numbers of errors.", report1.getValidationMessages().length, report2.getValidationMessages().length);
- }
- catch(Exception e)
- {
- fail("Unable to locate plug-in location: " + e);
- }
- }
-
- /**
- * Test that the warn no grammar preference is read from the XML core preferences.
- * There are three tests to perform.
- * 1. Test that the default preference is disabled.
- * 2. Test that setting the preference to enabled works.
- * 3. Test that setting the preference to disabled works.
- */
- public void testWarnNoGrammarPreference()
- {
- // Test that the default preference is disabled.
- validator.setupValidation(null);
- assertFalse("The default warn no grammar preference is not false.", validator.getWarnNoGrammarPreference());
-
- // Test that the preference is read when enabled.
- XMLCorePlugin.getDefault().getPluginPreferences().setValue(XMLCorePreferenceNames.WARN_NO_GRAMMAR, true);
- validator.setupValidation(null);
- assertTrue("The warn no grammar preference is not true when the preference is set to true.", validator.getWarnNoGrammarPreference());
-
-
- // Test that the preference is read when disabled.
- XMLCorePlugin.getDefault().getPluginPreferences().setValue(XMLCorePreferenceNames.WARN_NO_GRAMMAR, false);
- validator.setupValidation(null);
- assertFalse("The warn no grammar preference is not false when the preference is set to false.", validator.getWarnNoGrammarPreference());
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorWrapper.java
deleted file mode 100644
index eb6ad99..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorWrapper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.eclipse;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-
-/**
- * This class extends validator to expose the protected methods
- * for testing.
- */
-public class ValidatorWrapper extends Validator
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.xml.core.internal.validation.eclipse.Validator#addInfoToMessage(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage, org.eclipse.wst.validation.internal.provisional.core.IMessage)
- */
- protected void addInfoToMessage(ValidationMessage validationMessage, IMessage message)
- {
- super.addInfoToMessage(validationMessage, message);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.xml.core.internal.validation.eclipse.Validator#setupValidation(org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext)
- */
- public void setupValidation(NestedValidatorContext context)
- {
- super.setupValidation(context);
- }
-
-/**
- * Export the warn no grammar preference for testing.
- *
- * @return The warn no grammar preference.
- */
- public boolean getWarnNoGrammarPreference()
- {
- return warnNoGrammar;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLMessageInfoHelperTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLMessageInfoHelperTest.java
deleted file mode 100644
index 4dbf3cb..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLMessageInfoHelperTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.eclipse;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test case to test the XMLMessageInfoHelper class.
- */
-public class XMLMessageInfoHelperTest extends TestCase
-{
- private XMLMessageInfoHelper helper = new XMLMessageInfoHelper();
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XMLMessageInfoHelperTest.class);
- }
-
- /**
- * Test that the createMessageInfo method returns {"", null} when
- * given a non-existant key and null message arguments.
- */
- public void testNotExistantKeyAndNullMessageArguments()
- {
- String[] messageInfo = helper.createMessageInfo("NON_EXISTANT_KEY", null);
- assertEquals("The selection strategy returned was not an empty string.", "", messageInfo[0]);
- assertNull("The nameOrValue returned was not null.", messageInfo[1]);
- }
-
- /**
- * Test that the createMessageInfo method returns {"", null} when
- * given a non-existant key and null message arguments.
- */
- public void testNullKeyAndMessageArguments()
- {
- String[] messageInfo = helper.createMessageInfo(null, null);
- assertEquals("The selection strategy returned was not an empty string.", "", messageInfo[0]);
- assertNull("The nameOrValue returned was not null.", messageInfo[1]);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorTest.java
deleted file mode 100644
index f0055c9..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.eclipse;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test the Eclipse specific XML validator.
- */
-public class XMLValidatorTest extends TestCase
-{
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XMLValidatorTest.class);
- }
-
- /**
- * Test to ensure the URI resolver is not null in the Eclipse
- * specific XML validator.
- */
- public void testURIResolverIsRegistered()
- {
- XMLValidatorWrapper validator = new XMLValidatorWrapper();
- assertNotNull("The URI resolver is null.", validator.getURIResolver());
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorWrapper.java
deleted file mode 100644
index 8e1a096..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorWrapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.eclipse;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-
-/**
- * Wrapper for the Eclipse XML validator class to allow for testing.
- */
-public class XMLValidatorWrapper extends XMLValidator
-{
- /**
- * Constructor.
- */
- public XMLValidatorWrapper()
- {
- super();
- }
-
- /**
- * Get the URI resolver registered on the XML validator.
- *
- * @return The URI resolver registered on the XML validator.
- */
- public URIResolver getURIResolver()
- {
- return uriResolver;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerTest.java
deleted file mode 100644
index 4b45d1e..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-import org.eclipse.wst.xml.core.internal.validation.XMLValidator;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationInfo;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorCustomizationManager.ErrorMessageInformation;
-import org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin;
-
-/**
- * Test the ErrorCustomizationManager class.
- */
-public class ErrorCustomizationManagerTest extends TestCase
-{
-
- /**
- * Test the startElement method with the following tests:
- * 1. Test that the root element is properly pushed to the stack.
- * 2. Test that a subsequent element is properly pushed to the stack and
- * registered as a child element.
- */
- public void testStartElement()
- {
- // 1. Test that the root element is properly pushed to the stack.
- String namespace1 = "http://namespace1";
- String localname1 = "localname";
- ErrorCustomizationManagerWrapper manager = new ErrorCustomizationManagerWrapper();
- assertEquals("1. The element information stack is not empty to start.", 0, manager.getElementInformationStack().size());
- manager.startElement(namespace1, localname1);
- ElementInformation elemInfo = (ElementInformation)manager.getElementInformationStack().pop();
- assertEquals("1. The element information stack is not empty to after popping the top element.", 0, manager.getElementInformationStack().size());
- assertEquals("1. The namespace specified on the element information is not http://namespace1 it is " + elemInfo.getNamespace(), namespace1, elemInfo.getNamespace());
- assertEquals("1. The local name specified on the element information is not localname it is " + elemInfo.getLocalname(), localname1, elemInfo.getLocalname());
-
- // 2. Test that a subsequent element is properly pushed to the stack and registered as a child element.
- String localname2 = "localname2";
- ErrorCustomizationManagerWrapper manager2 = new ErrorCustomizationManagerWrapper();
- assertEquals("2. The element information stack is not empty to start.", 0, manager2.getElementInformationStack().size());
- manager2.startElement(namespace1, localname1);
- manager2.startElement(namespace1, localname2);
- assertEquals("2. The element information stack does not contain 2 elements.", 2, manager2.getElementInformationStack().size());
- ElementInformation elemInfo2 = (ElementInformation)manager2.getElementInformationStack().pop();
- assertEquals("2. The element information stack does not contain 1 element after popping the top element.", 1, manager2.getElementInformationStack().size());
- assertEquals("2. The namespace specified on the element information child is not http://namespace1 it is " + elemInfo2.getNamespace(), namespace1, elemInfo2.getNamespace());
- assertEquals("2. The local name specified on the element information child is not localname2 it is " + elemInfo2.getLocalname(), localname2, elemInfo2.getLocalname());
- ElementInformation elemInfo3 = (ElementInformation)manager2.getElementInformationStack().pop();
- assertEquals("2. The element information stack does not contain 0 elements after popping the top element.", 0, manager2.getElementInformationStack().size());
- assertEquals("2. The namespace specified on the element information is not http://namespace1 it is " + elemInfo3.getNamespace(), namespace1, elemInfo3.getNamespace());
- assertEquals("2. The local name specified on the element information is not localname it is " + elemInfo3.getLocalname(), localname1, elemInfo3.getLocalname());
- assertEquals("2. The element information does not contain 1 child element it contains " + elemInfo3.getChildren().size(), 1, elemInfo3.getChildren().size());
- ElementInformation elemInfo4 = (ElementInformation)elemInfo3.getChildren().get(0);
- assertEquals("2. The namespace specified on the element information's child is not http://namespace1 it is " + elemInfo4.getNamespace(), namespace1, elemInfo4.getNamespace());
- assertEquals("2. The local name specified on the element information's child is not localname2 it is " + elemInfo4.getLocalname(), localname2, elemInfo4.getLocalname());
- }
-
- /**
- * Test the endElement method with the following tests:
- * 1. Check that the last element on the stack is successfully popped.
- * 2. Test that an element in a sample namespace produces the expected message.
- * 3. Test that an element not in a sample namespace retains its value.
- */
- public void testEndElement()
- {
- // 1. Check that the last element on the stack is successfully popped.
- String namespace1 = "http://namespace1";
- String localname1 = "localname";
- ErrorCustomizationManagerWrapper manager = new ErrorCustomizationManagerWrapper();
- manager.getElementInformationStack().push(new ElementInformation(namespace1, localname1));
- manager.endElement(namespace1, localname1);
- assertEquals("1. The stack still contains an element.", 0, manager.getElementInformationStack().size());
-
- // 2. Test that an element in a sample namespace produces the expected message.
- String namespace2 = "XMLValidationTestSampleNamespace";
- ErrorCustomizationRegistry.getInstance().addErrorMessageCustomizer(namespace2, new SampleErrorMessageCustomizer());
- ErrorCustomizationManagerWrapper manager2 = new ErrorCustomizationManagerWrapper();
- manager2.getElementInformationStack().push(new ElementInformation(namespace2, localname1));
- ErrorMessageInformation emi = manager2.new ErrorMessageInformation();
- emi.message = new ValidationMessage("SampleMessage", 1, 2, namespace2);
- manager2.setMessageForConsideration(emi);
- manager2.endElement(namespace2, localname1);
- assertEquals("2. The message was not customized to AAAA. The message is " + emi.message.getMessage(), "AAAA", emi.message.getMessage());
-
- // 3. Test that an element not in a sample namespace retains its value.
- String namespace3 = "XMLValidationTestSampleNamespace3";
- ErrorCustomizationManagerWrapper manager3 = new ErrorCustomizationManagerWrapper();
- manager3.getElementInformationStack().push(new ElementInformation(namespace3, localname1));
- ErrorMessageInformation emi2 = manager3.new ErrorMessageInformation();
- emi2.message = new ValidationMessage("SampleMessage", 1, 2, namespace3);
- manager3.setMessageForConsideration(emi2);
- manager3.endElement(namespace3, localname1);
- assertEquals("3. The message did not retain its value of SampleMessage. The message is " + emi2.message.getMessage(), "SampleMessage", emi2.message.getMessage());
- }
-
- /**
- * Test the considerReportedError method with the following tests:
- * 1. Check that the messageForConsideration is not set if there are no current
- * validation messages.
- * 2. Check that the messageForConsideration is set correctly if there is a
- * validation message.
- */
- public void testConsiderReportedError()
- {
- // 1. Check that the messageForConsideration is not set if there are no current validation messages.
- String namespace1 = "http://namespace1";
- ErrorCustomizationManagerWrapper manager = new ErrorCustomizationManagerWrapper();
- ValidationInfo valinfo = new ValidationInfo(namespace1);
- manager.considerReportedError(valinfo, "key", null);
- assertNull("1. The messageForConsideration is not null when no validation messages exist.", manager.getMessageForConsideration());
-
- // 2. Check that the messageForConsideration is set correctly if there is a validation message.
- ErrorCustomizationManagerWrapper manager2 = new ErrorCustomizationManagerWrapper();
- ValidationInfo valinfo2 = new ValidationInfo(namespace1);
- valinfo2.addError("message", 1, 1, namespace1);
- manager2.considerReportedError(valinfo2, "key", null);
- assertNotNull("2. The messageForConsideration is null when a validation message exists.", manager2.getMessageForConsideration());
- }
-
- /**
- * Test that an error customizer is only called for the
- * correct element.
- */
- public void testErrorReportedOnCorrectElement()
- {
- IErrorMessageCustomizer testCustomizer = new IErrorMessageCustomizer()
- {
- public String customizeMessage(ElementInformation elementInfo, String key, Object[] arguments)
- {
- if(elementInfo.getLocalname().equals("child1"))
- {
- fail("An error was reported for the child1 element.");
- }
- return null;
- }
- };
- ErrorCustomizationRegistry registry = ErrorCustomizationRegistry.getInstance();
- registry.addErrorMessageCustomizer("http://www.example.org/simplenested", testCustomizer);
- try
- {
- String PLUGIN_ABSOLUTE_PATH = XMLValidatorTestsPlugin.getPluginLocation().toString() + "/";
- String uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml";
-
- XMLValidator validator = new XMLValidator();
- validator.validate(uri, null, new XMLValidationConfiguration());
- validator.validate(uri, null, new XMLValidationConfiguration());
- }
- catch(IOException e)
- {
- fail("An exception occurred while running the test:" + e);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerWrapper.java
deleted file mode 100644
index 68202bc..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerWrapper.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-import java.util.Stack;
-
-/**
- * A wrapper for class ErrorCustomizationManager to facilitate testing.
- */
-public class ErrorCustomizationManagerWrapper extends ErrorCustomizationManager
-{
- /**
- * Get the element information stack.
- *
- * @return
- * The element information stack.
- */
- public Stack getElementInformationStack()
- {
- return elementInformationStack;
- }
-
- /**
- * Get the current message for consideration.
- *
- * @return
- * The current message for consideration.
- */
- public ErrorMessageInformation getMessageForConsideration()
- {
- return messageForConsideration;
- }
-
- /**
- * Set the current message for consideration.
- *
- * @param message
- * The current message for consideration.
- */
- public void setMessageForConsideration(ErrorMessageInformation message)
- {
- messageForConsideration = message;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryTest.java
deleted file mode 100644
index bb03412..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for the ErrorCustomizationRegistry class.
- */
-public class ErrorCustomizationRegistryTest extends TestCase
-{
- private ErrorCustomizationRegistry registry = null;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception
- {
- registry = new ErrorCustomizationRegistryWrapper();
- super.setUp();
- }
-
- /**
- * Test the AddErrorMessageCustomizerToRegistry method with the following tests:
- * 1. Test that adding an error customizer for a namespace is successful.
- * 2. Test that adding two error customizers for a namespace returns both customizers.
- * 3. Test that adding an entry with a null namespace adds the entry for the empty string
- * namespace.
- */
- public void testAddErrorMessageCustomizerToRegistry()
- {
- // 1. Test that adding an error customizer for a namespace is successful.
- String namespace1 = "http://namespace1";
- IErrorMessageCustomizer customizer = new IErrorMessageCustomizer(){
- public String customizeMessage(ElementInformation elementInfo, String errorKey, Object[] arguments)
- {
- // This stub for testing does not require an implementation.
- return null;
- }
- };
- registry.addErrorMessageCustomizer(namespace1, customizer);
- IErrorMessageCustomizer[] registeredCustomizers = registry.getCustomizers(namespace1);
- assertEquals("1. There should only be 1 customizer registered for the namespace but there are " + registeredCustomizers.length, 1, registeredCustomizers.length);
- assertEquals("1. The IErrorMessageCustomizer returned is not the same one registered.", customizer, registeredCustomizers[0]);
-
- // 2. Test that adding two error customizers for a namespace returns both customizers.
- IErrorMessageCustomizer customizer2 = new IErrorMessageCustomizer(){
- public String customizeMessage(ElementInformation elementInfo, String errorKey, Object[] arguments)
- {
- // This stub for testing does not require an implementation.
- return null;
- }
- };
- registry.addErrorMessageCustomizer(namespace1, customizer2);
- registeredCustomizers = registry.getCustomizers(namespace1);
- assertEquals("2. There should be 2 customizers registered for the namespace but there are " + registeredCustomizers.length, 2, registeredCustomizers.length);
- assertEquals("2. The first IErrorMessageCustomizer returned is not the same one registered.", customizer, registeredCustomizers[0]);
- assertEquals("2. The second IErrorMessageCustomizer returned is not the same one registered.", customizer2, registeredCustomizers[1]);
-
- // 3. Test that adding an entry with a null namespace adds the entry for the empty string namespace.
- registry.addErrorMessageCustomizer(null, customizer);
- registeredCustomizers = registry.getCustomizers("");
- assertEquals("3. There should be 1 customizers registered for the namespace but there are " + registeredCustomizers.length, 1, registeredCustomizers.length);
- assertEquals("3. The IErrorMessageCustomizer returned is not the same one registered.", customizer, registeredCustomizers[0]);
- }
-
- /**
- * Test the getCustomizers method with the following tests:
- * 1. Test that requesting an error customizer array for a namespace that has not been
- * registered produces an empty array.
- * 2. Test that requesting an error customizer array for the null namespace returns the
- * one registered customizer.
- * 3. Test that requesting an error customizer array for the empty string namespace returns
- * the one registered customizer.
- */
- public void testGetCustomizers()
- {
- // 1. Test that requesting an error customizer list for a namespace that has not been
- // registered produces an empty list.
- IErrorMessageCustomizer[] customizers = registry.getCustomizers("http://nonregisterednamespace");
- assertEquals("1. The array of customizers for an unregistered namespace is not empty.", 0, customizers.length);
-
- // 2. Test that requesting an error customizer array for the null namespace returns the
- // one registered customizer.
- IErrorMessageCustomizer customizer = new IErrorMessageCustomizer(){
- public String customizeMessage(ElementInformation elementInfo, String errorKey, Object[] arguments)
- {
- // This stub for testing does not require an implementation.
- return null;
- }
- };
- registry.addErrorMessageCustomizer(null, customizer);
- customizers = registry.getCustomizers(null);
- assertEquals("2. The array of customizers for a registered customizer for the null namespace does not contain 1 customizer.", 1, customizers.length);
- assertEquals("2. The customizer for the null namespace was not successfully returned.", customizer, customizers[0]);
-
- // 3. Test that requesting an error customizer array for the empty string namespace returns
- // the one registered customizer for the null namespace.
- customizers = registry.getCustomizers("");
- assertEquals("3. The array of customizers for a registered customizer for the null namespace does not contain 1 customizer for the empty string namespace.", 1, customizers.length);
- assertEquals("3. The customizer for the empty string namespace was not successfully returned.", customizer, customizers[0]);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryWrapper.java
deleted file mode 100644
index 2e02d73..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryWrapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-/**
- * A wrapper for the ErrorCustomizationRegistry class to allow for testing.
- */
-public class ErrorCustomizationRegistryWrapper extends ErrorCustomizationRegistry
-{
- /**
- * Public constructor.
- */
- public ErrorCustomizationRegistryWrapper()
- {
- super();
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateTest.java
deleted file mode 100644
index 24f7e49..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin;
-
-/**
- * Test the ErrorMessageCustomizerDelegate class.
- */
-public class ErrorMessageCustomizerDelegateTest extends TestCase
-{
- /**
- * Test the loadCustomizer method with the following tests:
- * 1. Test that a valid bundle a class succeeds.
- * 2. Test that an invalid class fails and keeps the customizer set to null.
- * 3. Test that a null bundle fails and keeps the customizer set to null.
- */
- public void testLoadCustomizer()
- {
- // 1. Test that a valid bundle a class succeeds.
- ErrorMessageCustomizerDelegateWrapper delegate = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.SampleErrorMessageCustomizer");
- delegate.loadCustomizer();
- assertNotNull("1. The customizer loaded was null for a valid customizer and bundle.", delegate.getCustomizer());
-
- // 2. Test that an invalid class fails and keeps the customizer set to null.
- ErrorMessageCustomizerDelegateWrapper delegate2 = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.NonexistantErrorMessageCustomizer");
- delegate2.loadCustomizer();
- assertNull("2. The customizer loaded was not null for an invalid customizer class.", delegate2.getCustomizer());
-
- // 3. Test that a null bundle fails and keeps the customizer set to null.
- ErrorMessageCustomizerDelegateWrapper delegate3 = new ErrorMessageCustomizerDelegateWrapper(null, "org.eclipse.wst.xml.core.internal.validation.errorcustomization.SampleErrorMessageCustomizer");
- delegate3.loadCustomizer();
- assertNull("3. The customizer loaded was not null for a null bundle.", delegate3.getCustomizer());
- }
-
- /**
- * Test the customizeMessage method with the following tests:
- * 1. Test that the message returned is correct for a valid customizer.
- * 2. Test that the message returned is null for an invalid customizer class.
- */
- public void testCustomizeMessage()
- {
- // 1. Test that the message returned is correct for a valid customizer.
- ErrorMessageCustomizerDelegateWrapper delegate = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.SampleErrorMessageCustomizer");
- String message = delegate.customizeMessage(null, null, null);
- assertEquals("1. The message returned was not AAAA.", "AAAA", message);
-
- // 2. Test that the message returned is null for an invalid customizer class.
- ErrorMessageCustomizerDelegateWrapper delegate2 = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.NonexistantErrorMessageCustomizer");
- message = delegate2.customizeMessage(null, null, null);
- assertNull("2. The message returned was not null for an invalid customizer.", message);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateWrapper.java
deleted file mode 100644
index eb87161..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateWrapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-import org.osgi.framework.Bundle;
-
-/**
- * A wrapper of the class ErrorMessageCustomizerDelegate to facilitate testing.
- */
-public class ErrorMessageCustomizerDelegateWrapper extends ErrorMessageCustomizerDelegate
-{
- /**
- * Constructor.
- */
- public ErrorMessageCustomizerDelegateWrapper(Bundle bundle, String classname)
- {
- super(bundle, classname);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorMessageCustomizerDelegate#loadCustomizer()
- */
- public void loadCustomizer()
- {
- super.loadCustomizer();
- }
-
- public IErrorMessageCustomizer getCustomizer()
- {
- return customizer;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/SampleErrorMessageCustomizer.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/SampleErrorMessageCustomizer.java
deleted file mode 100644
index 7b61828..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/SampleErrorMessageCustomizer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.internal.validation.errorcustomization;
-
-/**
- * A sample error message customizer for testing. This customizer has a simple
- * implementation that simple returns the string "AAAA".
- */
-public class SampleErrorMessageCustomizer implements IErrorMessageCustomizer {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.xml.core.internal.validation.errorcustomization.IErrorMessageCustomizer#customizeMessage(org.eclipse.wst.xml.core.internal.validation.errorcustomization.ElementInformation, java.lang.String, java.lang.Object[])
- */
- public String customizeMessage(ElementInformation elementInfo,
- String errorKey, Object[] arguments) {
- // TODO Auto-generated method stub
- return "AAAA";
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java
deleted file mode 100644
index 1d276ee..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import junit.framework.Test;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfigurationTest;
-import org.eclipse.wst.xml.core.internal.validation.eclipse.ValidatorTest;
-import org.eclipse.wst.xml.core.internal.validation.eclipse.XMLMessageInfoHelperTest;
-import org.eclipse.wst.xml.core.internal.validation.eclipse.XMLValidatorTest;
-import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorCustomizationManagerTest;
-import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorCustomizationRegistryTest;
-import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorMessageCustomizerDelegateTest;
-
-/**
- * The root test suite that contains all other XML validator test suites.
- */
-public class AllXMLTests extends junit.framework.TestSuite
-{
- /**
- * Create this test suite.
- *
- * @return This test suite.
- */
- public static Test suite()
- {
- return new AllXMLTests();
- }
-
- /**
- * Constructor
- */
- public AllXMLTests()
- {
- super("XMLTestsTestSuite");
- addTest(XMLValidationConfigurationTest.suite());
- addTest(ValidatorTest.suite());
- addTest(XMLMessageInfoHelperTest.suite());
- addTest(XMLValidatorTest.suite());
- addTest(XMLExamplesTest.suite());
- addTest(BugFixesTest.suite());
- addTest(PathsTest.suite());
- addTestSuite(ErrorCustomizationManagerTest.class);
- addTestSuite(ErrorMessageCustomizerDelegateTest.class);
- addTestSuite(ErrorCustomizationRegistryTest.class);
- addTestSuite(LineNumberAdjustmentsTest.class);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java
deleted file mode 100644
index 1d8c734..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-
-import java.io.IOException;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xml.core.internal.validation.eclipse.XMLValidator;
-
-
-/**
- * Base test case class which provides methods to
- * - create logs
- * - read from logs
- * - run log comparison tests
- */
-public class BaseTestCase extends TestCase
-{
- protected String FILE_PROTOCOL = "file:///";
- protected String PLUGIN_ABSOLUTE_PATH;
- protected String SAMPLES_DIR = "testresources/samples/";
- protected XMLValidator validator = XMLValidator.getInstance();
- protected XMLValidationConfiguration configuration;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws IOException
- {
- PLUGIN_ABSOLUTE_PATH = XMLValidatorTestsPlugin.getPluginLocation().toString() + "/";
- configuration = new XMLValidationConfiguration();
- try
- {
- configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, false);
- }
- catch(Exception e)
- {
- fail("Unable to set the feature on the XML validation configuration.");
- }
- }
-
- /**
- * Run a validator test. The test will run the validator, and compare the validation result with
- * the information specified.
- *
- * @param testfile The file to run the validator test on.
- * @param keys The list of allows message keys.
- * @param numErrors The number of expected errors.
- * @param numWarnings The number of expected warnings.
- */
- public void runTest(String testfile, List keys, int numErrors, int numWarnings)
- {
- ValidationReport valreport = validator.validate(testfile, null, configuration);
-
- ValidationMessage[] valmessages = valreport.getValidationMessages();
- int nummessages = valmessages.length;
-
- int errorCount = 0;
- int warningCount = 0;
-
- for(int i = 0; i < nummessages; i++)
- {
- ValidationMessage valmes = valmessages[i];
- String key = valmes.getKey();
- assertTrue("The message key " + key + " is not correct.", keys.contains(key));
- if(valmes.getSeverity() == ValidationMessage.SEV_LOW)
- {
- warningCount++;
- }
- else
- {
- errorCount++;
- }
- }
- assertEquals(errorCount + " errors were reported but " + numErrors + " errors were expected.", numErrors, errorCount);
- assertEquals(warningCount + " warnings were reported but " + numWarnings + " warnings were expected.", numWarnings, warningCount);
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java
deleted file mode 100644
index 9f5e074..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.validation.tests.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-/**
- * Test class for the XML validator to test bug fixes.
- */
-public class BugFixesTest extends BaseTestCase
-{
- private static final String BUGFIXES_DIR = "bugfixes/";
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(BugFixesTest.class);
- }
-
- /**
- * Test /bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml.
- */
- public void testRootNoNSChildNS()
- {
- String testname = "RootNoNSChildNS";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "RootNoNSChildNS/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/EmptyFile/Empty.xml.
- */
- public void testEmpty()
- {
- String testname = "Empty";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml.
- */
- public void testValidateWithDTDValid()
- {
- String testname = "ValidateWithDTDValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ValidateWithDTD/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml.
- */
- public void testValidateWithDTDInvalid()
- {
- String testname = "ValidateWithDTDInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ValidateWithDTD/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MSG_CONTENT_INVALID");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/NotWellFormed/NotWellFormed.xml.
- */
- public void testNotWellFormed()
- {
- String testname = "NotWellFormed";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "NotWellFormed/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("ETagRequired");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/CannotLocateDTD/InvalidHost.xml.
- */
- public void testInvalidHost()
- {
- String testname = "InvalidHost";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "CannotLocateDTD/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("FILE_NOT_FOUND");
- int numErrors = 0;
- int numWarnings = 1;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/CannotLocateDTD/InvalidLocation.xml.
- */
- public void testInvalidLocation()
- {
- String testname = "InvalidLocation";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "CannotLocateDTD/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("FILE_NOT_FOUND");
- int numErrors = 0;
- int numWarnings = 1;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /bugfixes/NoGrammar/NoGrammar.xml.
- */
- public void testNoGrammar()
- {
- String testname = "NoGrammar";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "NoGrammar/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("NO_GRAMMAR_FOUND");
- int numErrors = 0;
- int numWarnings = 1;
-
- try
- {
- configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, true);
- }
- catch(Exception e)
- {
- fail("Unable to set configuration WARN_NO_GRAMMAR.");
- }
- runTest(testfile, keys, numErrors, numWarnings);
- try
- {
- configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, false);
- }
- catch(Exception e)
- {
- fail("Unable to set configuration WARN_NO_GRAMMAR.");
- }
- }
-
- /**
- * Test /bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml.
- */
- public void testNoNamespaceSchema()
- {
- String testname = "NoNamespaceSchema";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "NoNamespaceSchema/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("cvc-complex-type.2.4.b");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/LineNumberAdjustmentsTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/LineNumberAdjustmentsTest.java
deleted file mode 100644
index 51b6506..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/LineNumberAdjustmentsTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.validation.tests.internal;
-
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-
-/**
- * A test class to test the line number adjustments made in the XML validator.
- */
-public class LineNumberAdjustmentsTest extends BaseTestCase
-{
- private static final String LINE_NUMBER_ADJUSTMENTS_DIR = "LineNumberAdjustments/";
-
- /**
- * Run a validator test. The test will run the validator, and compare the validation result with
- * the information specified.
- *
- * @param testfile
- * The file to run the validator test on.
- * @param key
- * The message key.
- * @param numErrors
- * The number of expected errors.
- * @param numWarnings
- * The number of expected warnings.
- * @param lineno
- * The line number the message should be located on.
- * @param columnno
- * The column number the message should be located on.
- */
- public void runTest(String testfile, String key, int numErrors, int numWarnings, int lineno, int columnno)
- {
- ValidationReport valreport = validator.validate(testfile, null, configuration);
-
- ValidationMessage[] valmessages = valreport.getValidationMessages();
- int nummessages = valmessages.length;
-
- int errorCount = 0;
- int warningCount = 0;
-
- for(int i = 0; i < nummessages; i++)
- {
- ValidationMessage valmes = valmessages[i];
- String messkey = valmes.getKey();
- assertTrue("The message key " + key + " is not correct.", key.equals(messkey));
- assertEquals("The line number is incorrect.", lineno, valmes.getLineNumber());
- assertEquals("The column number is incorrect.", columnno, valmes.getColumnNumber());
- if(valmes.getSeverity() == ValidationMessage.SEV_LOW)
- {
- warningCount++;
- }
- else
- {
- errorCount++;
- }
- }
- assertEquals(errorCount + " errors were reported but " + numErrors + " errors were expected.", numErrors, errorCount);
- assertEquals(warningCount + " warnings were reported but " + numWarnings + " warnings were expected.", numWarnings, warningCount);
- }
-
- /**
- * Test /LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml.
- */
- public void testcvccomplextype23()
- {
- String testname = "cvc-complex-type.2.3";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "cvc-complex-type.2.3/" + testname + ".xml";
- String key = "cvc-complex-type.2.3";
- int lineno = 2;
- int columnno = 187;
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, key, numErrors, numWarnings, lineno, columnno);
- }
-
- /**
- * Test /LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml.
- */
- public void testcvccomplextype24b()
- {
- String testname = "cvc-complex-type.2.4.b";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "cvc-complex-type.2.4.b/" + testname + ".xml";
- String key = "cvc-complex-type.2.4.b";
- int lineno = 2;
- int columnno = 187;
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, key, numErrors, numWarnings, lineno, columnno);
- }
-
- /**
- * Test /LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml.
- */
- public void testMsgContentIncomplete()
- {
- String testname = "MSG_CONTENT_INCOMPLETE";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "MSG_CONTENT_INCOMPLETE/" + testname + ".xml";
- String key = "MSG_CONTENT_INCOMPLETE";
- int lineno = 6;
- int columnno = 7;
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, key, numErrors, numWarnings, lineno, columnno);
- }
-
- /**
- * Test /LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml.
- */
- public void testMsgContentInvalid()
- {
- String testname = "MSG_CONTENT_INVALID";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "MSG_CONTENT_INVALID/" + testname + ".xml";
- String key = "MSG_CONTENT_INVALID";
- int lineno = 6;
- int columnno = 7;
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, key, numErrors, numWarnings, lineno, columnno);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java
deleted file mode 100644
index f2390c0..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-/**
- * Test class for the XML validator to test bug fixes.
- *
- * @author Lawrence Mandel, IBM
- */
-public class PathsTest extends BaseTestCase
-{
- private static final String PATHS_DIR = "Paths/";
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(PathsTest.class);
- }
-
- /**
- * Test /Paths/Space InPath/SpaceInPathValid.xml.
- */
- public void testSpaceInPathValid()
- {
- String testname = "SpaceInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Space InPath/SpaceInPathInvalid.xml.
- */
- public void testSpaceInPathInvalid()
- {
- String testname = "SpaceInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/CloseBracketInPathValid.xml.
- */
- public void testCloseBracketInPathValid()
- {
- String testname = "CloseBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xml.
- */
- public void testCloseBracketInPathInvalid()
- {
- String testname = "CloseBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xml.
- */
- public void testCloseBracketInFilenameValid()
- {
- String testname = "CloseBracket)InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xml.
- */
- public void testCloseBracketInFilenameInvalid()
- {
- String testname = "CloseBracket)InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Dash-InPath/DashInPathValid.xml.
- */
- public void testDashInPathValid()
- {
- String testname = "DashInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Dash-InPath/DashInPathInvalid.xml.
- */
- public void testDashInPathInvalid()
- {
- String testname = "DashInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/DashInFilename/Dash-InFilenameValid.xml.
- */
- public void testDashInFilenameValid()
- {
- String testname = "Dash-InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/DashInFilename/Dash-InFilenameInvalid.xml.
- */
- public void testDashInFilenameInvalid()
- {
- String testname = "Dash-InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ExclamationInPathValid.xml.
- */
- public void testExclamationInPathValid()
- {
- String testname = "ExclamationInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ExclamationInPathInvalid.xml.
- */
- public void testExclamationInPathInvalid()
- {
- String testname = "ExclamationInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/Exclamation!InFilenameValid.xml.
- */
- public void testExclamationInFilenameValid()
- {
- String testname = "Exclamation!InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xml.
- */
- public void testExclamationInFilenameInvalid()
- {
- String testname = "Exclamation!InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/OpenBracketInPathValid.xml.
- */
- public void testOpenBracketInPathValid()
- {
- String testname = "OpenBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xml.
- */
- public void testOpenBracketInPathInvalid()
- {
- String testname = "OpenBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xml.
- */
- public void testOpenBracketInFilenameValid()
- {
- String testname = "OpenBracket(InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xml.
- */
- public void testOpenBracketInFilenameInvalid()
- {
- String testname = "OpenBracket(InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Period.InPath/PeriodInPathValid.xml.
- */
- public void testPeriodBracketInPathValid()
- {
- String testname = "PeriodInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Period.InPath/PeriodInPathInvalid.xml.
- */
- public void testPeriodBracketInPathInvalid()
- {
- String testname = "PeriodInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/PeriodInFilename/Period.InFilenameValid.xml.
- */
- public void testPeriodBracketInFilenameValid()
- {
- String testname = "Period.InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/PeriodInFilename/Period.InFilenameInvalid.xml.
- */
- public void testPeriodBracketInFilenameInvalid()
- {
- String testname = "Period.InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Quote'InPath/QuoteInPathValid.xml.
- */
- public void testQuoteInPathValid()
- {
- String testname = "QuoteInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Quote'InPath/QuoteInPathInvalid.xml.
- */
- public void testQuoteInPathInvalid()
- {
- String testname = "QuoteInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/QuoteInFilename/Quote'InFilenameValid.xml.
- */
- public void testQuoteInFilenameValid()
- {
- String testname = "Quote'InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/QuoteInFilename/Quote'InFilenameInvalid.xml.
- */
- public void testQuoteInFilenameInvalid()
- {
- String testname = "Quote'InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/SpaceInFilename/Space InFilenameValid.xml.
- */
- public void testSpaceInFilenameValid()
- {
- String testname = "Space InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/SpaceInFilename/Space InFilenameInvalid.xml.
- */
- public void testSpaceInFilenameInvalid()
- {
- String testname = "Space InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Tilde~InPath/TildeInPathValid.xml.
- */
- public void testTildeInPathValid()
- {
- String testname = "TildeInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Tilde~InPath/TildeInPathInvalid.xml.
- */
- public void testTildeInPathInvalid()
- {
- String testname = "TildeInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/TildeInFilename/Tilde~InFilenameValid.xml.
- */
- public void testTildeInFilenameValid()
- {
- String testname = "Tilde~InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/TildeInFilename/Tilde~InFilenameInvalid.xml.
- */
- public void testTildeInFilenameInvalid()
- {
- String testname = "Tilde~InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Underscore_InPath/UnderscoreInPathValid.xml.
- */
- public void testUnderscoreInPathValid()
- {
- String testname = "UnderscoreInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/Underscore_InPath/UnderscoreInPathInvalid.xml.
- */
- public void testUnderscoreInPathInvalid()
- {
- String testname = "UnderscoreInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml.
- */
- public void testUnderscoreInFilenameValid()
- {
- String testname = "Underscore_InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml.
- */
- public void testUnderscoreInFilenameInvalid()
- {
- String testname = "Underscore_InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/AngleHatInPathValid.xml.
- */
- public void testAngleHatInPathValid()
- {
- String testname = "AngleHatInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/AngleHatInPathInvalid.xml.
- */
- public void testAngleHatInPathInvalid()
- {
- String testname = "AngleHatInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml.
- */
- public void testAngleHatInFilenameValid()
- {
- String testname = "AngleHat^InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml.
- */
- public void testAngleHatInFilenameInvalid()
- {
- String testname = "AngleHat^InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("MarkupEntityMismatch");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java
deleted file mode 100644
index 2511f63..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-/**
- * Test class for the XML validator to test the XMLProject.
- *
- * @author Lawrence Mandel, IBM
- */
-public class XMLExamplesTest extends BaseTestCase
-{
- private static final String XMLExamples_DIR = "XMLExamples/";
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XMLExamplesTest.class);
- }
-
- /**
- * Test /XMLExamples/Invoice/Invoice.xml.
- */
- public void testInvoice()
- {
- String testname = "Invoice";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "Invoice/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/InvoiceRemote/Invoice.xml.
- */
- public void testInvoiceRemote()
- {
- String testname = "Invoice";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "InvoiceRemote/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/InvoiceRemote/Invoice.xml.
- */
- public void testInvoiceRemoteIndirect()
- {
- String testname = "InvoiceIndirect";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "InvoiceRemote/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/InvoiceInvalid/Invoice.xml.
- */
- public void testInvoiceInvalid()
- {
- String testname = "Invoice";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "InvoiceInvalid/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("FILE_NOT_FOUND");
- int numErrors = 0;
- int numWarnings = 1;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/PublicationCatalogue/Catalogue.xml.
- */
- public void testCatalogue()
- {
- String testname = "Catalogue";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "PublicationCatalogue/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/PublicationCatalogueInvalid/Catalogue.xml.
- */
- public void testCatalogueInvalid()
- {
- String testname = "CatalogueInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "PublicationCatalogueInvalid/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("FILE_NOT_FOUND");
- int numErrors = 0;
- int numWarnings = 1;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
-
- /**
- * Test /XMLExamples/j2ee/web.xml.
- */
- /**
- public void testWeb()
- {
-
- String testname = "web";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "j2ee/" + testname + ".xml";
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testfile, keys, numErrors, numWarnings);
- }
- */
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java
deleted file mode 100644
index 76ee31d..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.validation.tests.internal;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The plugin class for this test plugin.
- */
-public class XMLValidatorTestsPlugin extends Plugin {
- private static XMLValidatorTestsPlugin plugin = null;
-
- public XMLValidatorTestsPlugin() {
- plugin = this;
- }
-
- public static String getPluginLocation() throws IOException {
- String file = FileLocator.resolve(plugin.getBundle().getEntry("/")).getFile();
- return new Path(file).removeTrailingSeparator().toString();
- }
-
- public static XMLValidatorTestsPlugin getPlugin()
- {
- return plugin;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.validation.tests/test.xml b/tests/org.eclipse.wst.xml.validation.tests/test.xml
deleted file mode 100644
index bea3313..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xml.validation.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xml.validation.tests.internal.AllXMLTests" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore b/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore
deleted file mode 100644
index bb53574..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-generatedResults
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml
deleted file mode 100644
index 4985c9a..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE root [
-<!ELEMENT root (child+)>
-<!ELEMENT child (#PCDATA)>
-]>
-<root>
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml
deleted file mode 100644
index 0e1bd52..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE root [
-<!ELEMENT root (child+)>
-<!ELEMENT child (#PCDATA)>
-]>
-<root>
-aaaa
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/NoChildren.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/NoChildren.xsd
deleted file mode 100644
index 2e0f4d0..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/NoChildren.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NoChildren" xmlns:tns="http://www.example.org/NoChildren">
-
- <element name="MyElement" type="tns:NewXSDComplexType"></element>
-
- <complexType name="NewXSDComplexType">
- <sequence>
- <element name="NewElement1" type="string" maxOccurs="unbounded" minOccurs="0"></element>
- </sequence>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml
deleted file mode 100644
index c805ecf..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:MyElement xmlns:tns="http://www.example.org/NoChildren" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/NoChildren NoChildren.xsd ">
-aaaaa
-</tns:MyElement>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/NoChildren.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/NoChildren.xsd
deleted file mode 100644
index ab01a09..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/NoChildren.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NoChildren" xmlns:tns="http://www.example.org/NoChildren">
-
- <element name="MyElement" type="tns:NewXSDComplexType"></element>
-
- <complexType name="NewXSDComplexType">
- <sequence>
- <element name="NewElement1" type="string" maxOccurs="unbounded" minOccurs="1"></element>
- </sequence>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml
deleted file mode 100644
index 3bbedb6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:MyElement xmlns:tns="http://www.example.org/NoChildren" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/NoChildren NoChildren.xsd ">
-
-</tns:MyElement>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xml"
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml
deleted file mode 100644
index 9ef6646..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xml
deleted file mode 100644
index bf35cb1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.dtd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.dtd
deleted file mode 100644
index 0737ba6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.dtd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT Invoice (Header,Item+)>
-<!ELEMENT Header (Date,BillTo)>
-<!ATTLIST Header
- invoiceNumber CDATA #REQUIRED
->
-<!ELEMENT Item (description*)>
-<!ATTLIST Item
- price CDATA #REQUIRED
- discount (promotion | regular) "regular"
->
-<!ELEMENT Date ((Month,Day,Year)|(Day,Month,Year))>
-<!ELEMENT BillTo (Address)>
-<!ATTLIST BillTo
- custNumber ID #REQUIRED
- name CDATA #IMPLIED
- phone CDATA #IMPLIED
->
-<!ELEMENT description (#PCDATA)>
-<!ELEMENT Address (street1,street2?,city,(state|province),zip,country?)>
-<!ELEMENT street1 (#PCDATA)>
-<!ELEMENT street2 (#PCDATA)>
-<!ELEMENT city (#PCDATA)>
-<!ELEMENT state (#PCDATA)>
-<!ELEMENT province (#PCDATA)>
-<!ELEMENT zip (#PCDATA)>
-<!ELEMENT country (#PCDATA)>
-<!ELEMENT Month (#PCDATA)>
-<!ELEMENT Day (#PCDATA)>
-<!ELEMENT Year (#PCDATA)>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.xml
deleted file mode 100644
index b79af27..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001</Year>
- </Date>
- <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada</country>
- </Address>
- </BillTo>
- </Header>
- <Item discount="promotion" price="57">
- <description>high speed 3D graphics card</description>
- </Item>
-</Invoice>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceInvalid/Invoice.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceInvalid/Invoice.xml
deleted file mode 100644
index b79af27..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceInvalid/Invoice.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001</Year>
- </Date>
- <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada</country>
- </Address>
- </BillTo>
- </Header>
- <Item discount="promotion" price="57">
- <description>high speed 3D graphics card</description>
- </Item>
-</Invoice>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/Invoice.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/Invoice.xml
deleted file mode 100644
index 15ba3ea..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/Invoice.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/Invoice.dtd">
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001</Year>
- </Date>
- <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada</country>
- </Address>
- </BillTo>
- </Header>
- <Item discount="promotion" price="57">
- <description>high speed 3D graphics card</description>
- </Item>
-</Invoice>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/InvoiceIndirect.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/InvoiceIndirect.xml
deleted file mode 100644
index f9e9874..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/InvoiceIndirect.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/IndirectInvoice.dtd">
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001</Year>
- </Date>
- <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada</country>
- </Address>
- </BillTo>
- </Header>
- <Item discount="promotion" price="57">
- <description>high speed 3D graphics card</description>
- </Item>
-</Invoice>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml
deleted file mode 100644
index 2749876..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<c:Catalogue xmlns:c="http://www.eclipse.org/webtools/Catalogue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue Catalogue.xsd ">
- <c:Book>
- <title>Professional XML Schema</title>
- <date>2001</date>
- <isbn>1-861005-47-4</isbn>
- <publisher>Wrox Press</publisher>
- </c:Book>
- <c:Magazine>
- <title>WebSphere Developer's Journal</title>
- <date>2001</date>
- </c:Magazine>
- <c:Book>
- <title>Java and XSLT</title>
- <date>2001</date>
- <isbn>0-596-00143-6</isbn>
- <publisher>O'Reilly</publisher>
- </c:Book>
-</c:Catalogue>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xsd
deleted file mode 100644
index d4ff9fd..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.eclipse.org/webtools/Catalogue" xmlns:c="http://www.eclipse.org/webtools/Catalogue">
-
- <complexType name="PublicationType">
- <sequence>
- <element name="title" type="string"></element>
- <element name="author" type="string" minOccurs="0" maxOccurs="unbounded"></element>
- <element name="date" type="gYear"></element>
- </sequence>
- </complexType>
-
- <complexType name="BookType">
- <complexContent>
- <extension base="c:PublicationType">
- <sequence>
- <element name="isbn" type="string" />
- <element name="publisher" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="MagazineType">
- <complexContent>
- <restriction base="c:PublicationType">
- <sequence>
- <element name="title" type="string" />
- <element name="author" type="string" minOccurs="0" maxOccurs="0"/>
- <element name="date" type="gYear"></element>
- </sequence>
- </restriction>
- </complexContent>
- </complexType>
-
- <element name="Publication" type="c:PublicationType" abstract="true"></element>
-
- <element name="Book" type="c:BookType" substitutionGroup="c:Publication"></element>
-
- <element name="Magazine" type="c:MagazineType" substitutionGroup="c:Publication"></element>
-
- <element name="Catalogue">
- <complexType>
- <sequence>
- <element ref="c:Publication" maxOccurs="unbounded"></element>
- </sequence>
- </complexType>
- </element>
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogueInvalid/Catalogue.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogueInvalid/Catalogue.xml
deleted file mode 100644
index 2749876..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogueInvalid/Catalogue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<c:Catalogue xmlns:c="http://www.eclipse.org/webtools/Catalogue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue Catalogue.xsd ">
- <c:Book>
- <title>Professional XML Schema</title>
- <date>2001</date>
- <isbn>1-861005-47-4</isbn>
- <publisher>Wrox Press</publisher>
- </c:Book>
- <c:Magazine>
- <title>WebSphere Developer's Journal</title>
- <date>2001</date>
- </c:Magazine>
- <c:Book>
- <title>Java and XSLT</title>
- <date>2001</date>
- <isbn>0-596-00143-6</isbn>
- <publisher>O'Reilly</publisher>
- </c:Book>
-</c:Catalogue>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/j2ee/web.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/j2ee/web.xml
deleted file mode 100644
index 8c60a40..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/j2ee/web.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>module</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
-
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidHost.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidHost.xml
deleted file mode 100644
index 19e8db6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidHost.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE example PUBLIC "Public Identifier" "http://www.eclipse.blah/non-existent-dtd.dtd">
-<example/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidLocation.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidLocation.xml
deleted file mode 100644
index 421b8bc..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidLocation.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE example PUBLIC "Public Identifier" "http://www.eclipse.org/webtools/non-existent-dtd.dtd">
-<example/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml
deleted file mode 100644
index 8ce7ba6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root xmlns="http://www.example.org/simplenested" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/simplenested simplenested.xsd ">
- <child1>child1</child1>
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xsd
deleted file mode 100644
index 2cf5ad2..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/simplenested" xmlns:tns="http://www.example.org/simplenested">
-
- <element name="root">
- <complexType>
- <sequence>
-
- <element ref="tns:child1"></element>
- <element ref="tns:child2"></element>
- </sequence>
- </complexType>
- </element>
- <element name="child1" type="string"></element>
- <element name="child2" type="string"></element>
-
-</schema>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/EmptyFile/Empty.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/EmptyFile/Empty.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/EmptyFile/Empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoGrammar/NoGrammar.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoGrammar/NoGrammar.xml
deleted file mode 100644
index 089c886..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoGrammar/NoGrammar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <child>
- <child2/>
- </child>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml
deleted file mode 100644
index 00f19a1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="NoNamespaceSchema.xsd">
- <child1>child1</child1>
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xsd
deleted file mode 100644
index e2b0f24..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="root" type="RootType"></xsd:element>
- <xsd:complexType name="RootType">
- <xsd:sequence>
- <xsd:element name="child1" type="xsd:string"></xsd:element>
- <xsd:element name="child2" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NotWellFormed/NotWellFormed.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NotWellFormed/NotWellFormed.xml
deleted file mode 100644
index 8099b2a..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NotWellFormed/NotWellFormed.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <noclosingtag>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml
deleted file mode 100644
index b4e44ef..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<root>
- <test:test xmlns:test="http://test.org/test">
- </test:test>
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml
deleted file mode 100644
index 904d0a1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE simple SYSTEM "simple.dtd">
-
-<simple version="2.0" xmlns="http://www.simple.com/simple">
- <dummy> </dummy>
-</simple>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml
deleted file mode 100644
index e995d8b..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE simple SYSTEM "simple.dtd">
-
-<simple version="2.0" xmlns="http://www.simple.com/simple">
- <simple1>
- <simple2/>
- </simple1>
-</simple>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/simple.dtd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/simple.dtd
deleted file mode 100644
index 2849b97..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/simple.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!ELEMENT simple (simple1)>
-<!ATTLIST simple
- version CDATA #REQUIRED
- xmlns CDATA #FIXED 'http://www.simple.com/simple'
- >
-<!ELEMENT simple1 (simple2)>
-<!ELEMENT simple2 EMPTY>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.classpath b/tests/org.eclipse.wst.xsd.validation.tests/.classpath
deleted file mode 100644
index 76c6027..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore b/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore
deleted file mode 100644
index a037531..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-validatexsdtests.jar
-temp.folder
-javaCompiler.validatexsdtests.jar.args
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.project b/tests/org.eclipse.wst.xsd.validation.tests/.project
deleted file mode 100644
index d48cd47..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xsd.validation.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 588b199..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsd.validation.tests
-Bundle-Version: 1.0.301.qualifier
-Bundle-ClassPath: validatexsdtests.jar
-Bundle-Activator: org.eclipse.wst.xsd.validation.tests.internal.XSDValidationTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.xml.core,
- org.eclipse.core.runtime,
- org.eclipse.wst.xsd.core,
- org.eclipse.wst.validation,
- org.eclipse.wst.common.uriresolver
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.wst.xsd.core.internal.validation;x-internal:=true,
- org.eclipse.wst.xsd.core.internal.validation.eclipse;x-internal:=true,
- org.eclipse.wst.xsd.validation.tests.internal;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/about.html b/tests/org.eclipse.wst.xsd.validation.tests/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/build.properties b/tests/org.eclipse.wst.xsd.validation.tests/build.properties
deleted file mode 100644
index da10ca1..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = validatexsdtests.jar,\
- test.xml,\
- testresources/,\
- META-INF/,\
- about.html
-source.validatexsdtests.jar = src/
-
-bin.excludes = testresources/.cvsignore,\
- testresources/generatedResults/
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties b/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties
deleted file mode 100644
index fa0d84b..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xsd.validation.tests
-Bundle-Vendor.0 = Eclipse
-Bundle-Name.0 = XSD Validation Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfigurationTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfigurationTest.java
deleted file mode 100644
index 4983d79..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfigurationTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation;
-
-import junit.framework.TestCase;
-
-/**
- * Test the XSDValidationConfiguration class.
- */
-public class XSDValidationConfigurationTest extends TestCase
-{
- XSDValidationConfiguration configuration;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception
- {
- super.setUp();
- configuration = new XSDValidationConfiguration();
- }
-
-
- protected void tearDown() throws Exception
- {
- configuration = null;
- super.tearDown();
- }
-
-
- /**
- * Test the default setting of the HONOUR_ALL_SCHEMA_LOCATIONS feature.
- */
- public void testSetHonourAllSchemaLocationsFeatureDefault()
- {
- try
- {
- assertFalse("The HONOUR_ALL_SCHEMA_LOCATIONS feature is not set by default to false.", configuration.getFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS));
- }
- catch(Exception e)
- {
- fail("Unable to set read the HONOUR_ALL_SCHEMA_LOCATIONS feature: " + e);
- }
- }
-
- /**
- * Test setting the HONOUR_ALL_SCHEMA_LOCATIONS feature to true.
- */
- public void testSetHonourAllSchemaLocationsFeatureTrue()
- {
- try
- {
- configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, true);
- assertTrue("The HONOUR_ALL_SCHEMA_LOCATIONS feature is not set to true.", configuration.getFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS));
- }
- catch(Exception e)
- {
- fail("Unable to set HONOUR_ALL_SCHEMA_LOCATIONS to true: " + e);
- }
- }
-
- /**
- * Test setting the HONOUR_ALL_SCHEMA_LOCATIONS feature to false.
- */
- public void testSetHonourAllSchemaLocationsFeatureFalse()
- {
- try
- {
- configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, false);
- assertFalse("The HONOUR_ALL_SCHEMA_LOCATIONS feature is not set to false.", configuration.getFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS));
- }
- catch(Exception e)
- {
- fail("Unable to set HONOUR_ALL_SCHEMA_LOCATIONS to false: " + e);
- }
- }
-
- /**
- * Test setting a feature that doesn't exist.
- */
- public void testSetNotExistantFeature()
- {
- try
- {
- configuration.setFeature("NON_EXISTANT_FEATURE", false);
- fail("Setting a non existant feature did not produce an exception.");
- }
- catch(Exception e)
- {
- // The test succeeds if the exception is caught.
- }
- }
-
- /**
- * Test getting a feature that doesn't exist.
- */
- public void testGetNotExistantFeature()
- {
- try
- {
- configuration.getFeature("NON_EXISTANT_FEATURE");
- fail("Getting a non existant feature did not produce an exception.");
- }
- catch(Exception e)
- {
- // The test succeeds if the exception is caught.
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorTest.java
deleted file mode 100644
index 668b419..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xsd.validation.tests.internal.XSDValidationTestsPlugin;
-
-/**
- * A test class for the Validator class.
- */
-public class ValidatorTest extends TestCase
-{
- ValidatorWrapper validator = new ValidatorWrapper();
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(ValidatorTest.class);
- }
-
- /**
- * Test the addInfoToMessage method. The following tests are performed:<br/>
- * 1. When the validation message contains a null key nothing is added to the message.<br/>
- * 2. When the message contains the key "ENTIRE_ELEMENT" the three attributes are added
- * to the method and the SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE is null.<br/>
- * 3. When the message contains the key "EntityNotDeclared" the three attributes are set.
- */
- public void testAddInfoToMessage()
- {
- // These strings are common addition information types.
- String COLUMN_NUMBER_ATTRIBUTE = "columnNumber"; //$NON-NLS-1$
- String SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = "squiggleSelectionStrategy"; //$NON-NLS-1$
- String SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = "squiggleNameOrValue"; //$NON-NLS-1$
-
- // Test that the message does not contain the attributes when the method is called
- // with a null key.
- ValidationMessage validationMessage = new ValidationMessage("", 1, 1, "");
- Message message = new Message();
- validator.addInfoToMessage(validationMessage, message);
- assertNull("COLUMN_NUMBER_ATTRIBUTE was not null for a ValidationMessage with a null key. COLUMN_NUMBER_ATTRIBUTE = " + message.getAttribute(COLUMN_NUMBER_ATTRIBUTE), message.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertNull("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not null for a ValidationMessage with a null key. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), message.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertNull("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not null for a ValidationMessage with a null key. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), message.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
-
- // Test that the message contains the three attributes when the key is set to "s4s-elt-character".
- ValidationMessage validationMessage2 = new ValidationMessage("", 1, 1, "", "s4s-elt-character", null);
- Message message2 = new Message();
- validator.addInfoToMessage(validationMessage2, message2);
- assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key s4s-elt-character. COLUMN_NUMBER_ATTRIBUTE = " + message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not TEXT. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "TEXT", message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertEquals("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not an empty string for a ValidationMessage with the key s4s-elt-character. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message2.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), "", message2.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
-
- // Test that the message contains the three attributes when the key is set to "src-resolve".
- ValidationMessage validationMessage3 = new ValidationMessage("'MyName'", 1, 1, "", "src-resolve", null);
- Message message3 = new Message();
- validator.addInfoToMessage(validationMessage3, message3);
- assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key src-resolve. COLUMN_NUMBER_ATTRIBUTE = " + message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE", message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertEquals("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not set to MyName for a ValidationMessage with the key src-resolve. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message3.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), "MyName", message3.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE));
- }
-
- /**
- * Test the validate method. Tests to be performed:<br/>
- * 1. Test that validating a valid file from a URI or an input stream produces the same result.<br/>
- * 2. Test that validating an invalid file from a URI or an input stream produces the same result.
- */
- public void testValidate()
- {
- try
- {
- // Test that validating a valid file from a URI and an input stream produces the same result.
- String PLUGIN_ABSOLUTE_PATH = XSDValidationTestsPlugin.getInstallURL();
- String uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd";
- ValidationReport report1 = validator.validate(uri, null, new NestedValidatorContext());
- ValidationReport report2 = null;
- InputStream is = null;
- try
- {
- is = new URL(uri).openStream();
- report2 = validator.validate(uri, is, new NestedValidatorContext());
- }
- catch(Exception e)
- {
- fail("A problem occurred while validating a valid file with an inputstream: " + e);
- }
- finally
- {
- if(is != null)
- {
- try
- {
- is.close();
- }
- catch(IOException e)
- {
- // Do nothing.
- }
- }
- }
- assertTrue("Validation using a URI did not product a valid validation result.", report1.isValid());
- assertEquals("Validation using URI and using inputstream of the same file produces different numbers of errors.", report1.getValidationMessages().length, report2.getValidationMessages().length);
-
- // Test that validating an invalid file from a URI and an input stream produces the same result.
- uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd";
- report1 = validator.validate(uri, null, new NestedValidatorContext());
- report2 = null;
- is = null;
- try
- {
- is = new URL(uri).openStream();
- report2 = validator.validate(uri, is, new NestedValidatorContext());
- }
- catch(Exception e)
- {
- fail("A problem occurred while validating an invalid file with an inputstream: " + e);
- }
- finally
- {
- if(is != null)
- {
- try
- {
- is.close();
- }
- catch(IOException e)
- {
- // Do nothing.
- }
- }
- }
- assertFalse("Validation using a URI did not product an invalid validation result.", report1.isValid());
- assertEquals("Validation using URI and using inputstream of the same file produces different numbers of errors.", report1.getValidationMessages().length, report2.getValidationMessages().length);
- }
- catch(Exception e)
- {
- fail("Unable to locate plug-in location: " + e);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorWrapper.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorWrapper.java
deleted file mode 100644
index ada95f5..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorWrapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-
-/**
- * A wrapper class to allow for testing the Validator class.
- */
-public class ValidatorWrapper extends Validator
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator#addInfoToMessage(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage, org.eclipse.wst.validation.internal.provisional.core.IMessage)
- */
- public void addInfoToMessage(ValidationMessage validationMessage, IMessage message)
- {
- super.addInfoToMessage(validationMessage, message);
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperTest.java
deleted file mode 100644
index dc6eb1a..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test case to test the XSDMessageInfoHelper class.
- */
-public class XSDMessageInfoHelperTest extends TestCase
-{
- private XSDMessageInfoHelperWrapper helper = new XSDMessageInfoHelperWrapper();
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XSDMessageInfoHelperTest.class);
- }
-
- /**
- * Test that the createMessageInfo method returns {"", ""} when
- * given a non-existant key and null message arguments.
- */
- public void testNotExistantKeyAndNullMessageArguments()
- {
- String[] messageInfo = helper.createMessageInfo("NON_EXISTANT_KEY", null);
- assertEquals("The selection strategy returned was not an empty string.", "", messageInfo[0]);
- assertEquals("The nameOrValue returned was not an empty string.", "", messageInfo[1]);
- }
-
- /**
- * Test that the createMessageInfo method returns {"", ""} when
- * given a non-existant key an null message arguments.
- */
- public void testNullKeyAndMessageArguments()
- {
- String[] messageInfo = helper.createMessageInfo(null, null);
- assertEquals("The selection strategy returned was not an empty string.", "", messageInfo[0]);
- assertEquals("The nameOrValue returned was not an empty string.", "", messageInfo[1]);
- }
-
- /**
- * Test the method getFirstStringBetweenSingleQuotes. There are a few tests:
- * 1. Test that a simple string with single quotes 'name' returns name.
- * 2. Test that a string with no single quotes returns null.
- * 3. Test that a string with a single single quote 'name returns null.
- * 4. Test that a string with 3 single quotes 'name'name2' returns name.
- */
- public void testGetFirstStringBetweenSingleQuotes()
- {
- // 1. Test that a simple string with single quotes 'name' returns name.
- String result = helper.getFirstStringBetweenSingleQuotes("'name'");
- assertEquals("The returned string was not \"name\" for the string \"'name'\".", "name", result);
-
- // 2. Test that a string with no single quotes returns null.
- result = helper.getFirstStringBetweenSingleQuotes("name");
- assertNull("The returned string was not null for the string \"name\" with no single quotes.", result);
-
- // 3. Test that a string with a single single quote 'name returns null.
- result = helper.getFirstStringBetweenSingleQuotes("'name");
- assertNull("The returned string was not null for the string \"'name\" with one single quote.", result);
-
- // 4. Test that a string with 3 single quotes 'name'name2' returns name.
- result = helper.getFirstStringBetweenSingleQuotes("'name'name2'");
- assertEquals("The returned string was not \"name\" for the string \"'name'name2'\" with 3 single quotes.", "name", result);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperWrapper.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperWrapper.java
deleted file mode 100644
index 0442964..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperWrapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-/**
- * A wrapper class for the XSDMessageInfoHelper class for testing.
- */
-public class XSDMessageInfoHelperWrapper extends XSDMessageInfoHelper
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDMessageInfoHelper#getFirstStringBetweenSingleQuotes(java.lang.String)
- */
- public String getFirstStringBetweenSingleQuotes(String s)
- {
- return super.getFirstStringBetweenSingleQuotes(s);
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorTest.java
deleted file mode 100644
index 25a7458..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test the Eclipse specific XSD validator.
- */
-public class XSDValidatorTest extends TestCase
-{
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XSDValidatorTest.class);
- }
-
- /**
- * Test to ensure the URI resolver is not null in the Eclipse
- * specific XSD validator.
- */
- public void testURIResolverIsRegistered()
- {
- XSDValidatorWrapper validator = new XSDValidatorWrapper();
- assertNotNull("The URI resolver is null.", validator.getURIResolver());
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorWrapper.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorWrapper.java
deleted file mode 100644
index 9147eea..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorWrapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-
-/**
- * Wrapper for the Eclipse XSD validator class to allow for testing.
- */
-public class XSDValidatorWrapper extends XSDValidator
-{
- /**
- * Constructor.
- */
- public XSDValidatorWrapper()
- {
- super();
- }
-
- /**
- * Get the URI resolver registered on the XML validator.
- *
- * @return The URI resolver registered on the XML validator.
- */
- public URIResolver getURIResolver()
- {
- return uriresolver;
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java
deleted file mode 100644
index 6ba1e61..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-import junit.framework.Test;
-
-import org.eclipse.wst.xsd.core.internal.validation.XSDValidationConfigurationTest;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.ValidatorTest;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDMessageInfoHelperTest;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDValidatorTest;
-/**
- * The root test suite that contains all other XSD validator test suites.
- */
-public class AllXSDTests extends junit.framework.TestSuite
-{
- /**
- * Create this test suite.
- *
- * @return This test suite.
- */
- public static Test suite()
- {
- return new AllXSDTests();
- }
-
- /**
- * Constructor
- */
- public AllXSDTests()
- {
- super("AllXSDTests");
- addTest(ValidatorTest.suite());
- addTest(XSDMessageInfoHelperTest.suite());
- addTest(XSDValidatorTest.suite());
- addTest(BugFixesTest.suite());
- addTest(PathsTest.suite());
- addTestSuite(XSDValidationConfigurationTest.class);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java
deleted file mode 100644
index fecd613..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Iterator;
-import java.util.List;
-
-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.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xsd.core.internal.validation.XSDValidationConfiguration;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDValidator;
-
-/**
- * Base test case class which provides methods to
- * - create logs
- * - read from logs
- * - run log comparison tests
- */
-public class BaseTestCase extends TestCase
-{
- protected String FILE_PROTOCOL = "file:///";
- protected String PLUGIN_ABSOLUTE_PATH;
- protected String SAMPLES_DIR = "testresources/samples/";
- protected String GENERATED_RESULTS_DIR = "testresources/generatedResults/";
- protected String IDEAL_RESULTS_DIR = "testresources/idealResults/";
- protected String LOG_FILE_LOCATION = "results.log";
- protected static final String PLUGIN_NAME = "org.eclipse.wst.xsd.validation.tests";
- private XSDValidator validator = XSDValidator.getInstance();
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- PLUGIN_ABSOLUTE_PATH = XSDValidationTestsPlugin.getInstallURL();
- }
-
- /**
- * Run a validator test. The test will run the validator, log the results and compare the results
- * with the ideal results. The test will only pass if the two log files are the same.
- *
- * @param testfile The file to run the validator test on.
- * @param loglocation The location to create the log file.
- * @param idealloglocation The location of the ideal log file.
- */
- public void runTest(String testfile, String loglocation, String idealloglocation)
- {
- runTest(testfile, loglocation, idealloglocation, new XSDValidationConfiguration());
- }
- /**
- * Run a validator test. The test will run the validator, log the results and compare the results
- * with the ideal results. The test will only pass if the two log files are the same.
- *
- * @param testfile
- * The file to run the validator test on.
- * @param loglocation
- * The location to create the log file.
- * @param idealloglocation
- * The location of the ideal log file.
- * @param configuration
- * The XSDValidationConfiguration for this validation test.
- */
- public void runTest(String testfile, String loglocation, String idealloglocation, XSDValidationConfiguration configuration)
- {
- ValidationReport valreport = validator.validate(testfile, null, configuration);
- try
- {
- createLog(loglocation, valreport);
- String generatedLog = getStringFromFile(loglocation);
- String idealLog = getStringFromFile(idealloglocation);
- assertEquals(idealLog, generatedLog);
- } catch (Exception e)
- {
- fail("Could not compare log files");
- }
- }
-
- /**
- * Get a string representation of a file.
- *
- * @param filename the file name of the file to get the string representation.
- * @return The string representation if successful.
- * @throws Exception Thrown if unable to create a string representaion of the file.
- */
- private String getStringFromFile(String filename) throws Exception
- {
- StringBuffer filestring = new StringBuffer();
- Reader reader = null;
- BufferedReader bufreader = null;
- try
- {
- File file = new File(filename);
- reader = new FileReader(file);
- bufreader = new BufferedReader(reader);
- while (bufreader.ready())
- {
- filestring.append(bufreader.readLine() + "\n");
- }
- } catch (FileNotFoundException e)
- {
- throw new Exception();
- } finally
- {
- bufreader.close();
- reader.close();
- }
- return filestring.toString();
- }
-
- /**
- * Create a log file for an XSD test.
- *
- * @param filename The name of the log file to create.
- * @param valreport The validation report for this file.
- * @return The file contents as a string if successful or null if not successful.
- */
- private String createLog(String filename, ValidationReport valreport)
- {
- ValidationMessage[] valmessages = valreport.getValidationMessages();
- int nummessages = valmessages.length;//validator.getErrors().size() + validator.getWarnings().size();
- StringBuffer errorsString = new StringBuffer();
- StringBuffer warningsString = new StringBuffer();
- int numerrors = 0;
- int numwarnings = 0;
- for(int i = 0; i < nummessages; i++)
- {
- ValidationMessage valmes = valmessages[i];
- if(valmes.getSeverity() == ValidationMessage.SEV_LOW)
- {
- numwarnings++;
- String message = valmes.getMessage();
- message = message.replaceAll("'[^']*" + getPluginName() + "[^'/]*/", "'");
- message = message.replaceAll("[(][^(]*" + getPluginName() + "[^'/]*/", "(");
- warningsString.append(message + " [" + valmes.getLineNumber() +", " + valmes.getColumnNumber() +"]\n");
- warningsString.append(createNestedMessageString(valmes.getNestedMessages()));
- }
- else
- {
- numerrors++;
- String message = valmes.getMessage();
- message = message.replaceAll("'[^']*" + getPluginName() + "[^'/]*/", "'");
- message = message.replaceAll("[(][^(]*" + getPluginName() + "[^'/]*/", "(");
- errorsString.append(message + " [" + valmes.getLineNumber() +", " + valmes.getColumnNumber() +"]\n");
- errorsString.append(createNestedMessageString(valmes.getNestedMessages()));
- }
- }
- StringBuffer log = new StringBuffer();
- log.append("number of errors : " + numerrors + "\n");
- if(numwarnings > 0)
- {
- log.append("number of warnings : " + numwarnings + "\n");
- }
- log.append("\n------------error list-------------------------------------------\n");
- if(numerrors == 0)
- {
- log.append("(none)\n");
- }
- else
- {
- log.append(errorsString.toString());
- }
- if(numwarnings > 0)
- {
- log.append("------------warning list-----------------------------------------\n");
- log.append(errorsString.toString());
- }
- log.append(warningsString.toString());
- log.append("-----------------------------------------------------------------\n");
-
- DataOutputStream outStream = null;
- try
- {
- File logfile = new File(filename);
- File parent = logfile.getParentFile();
- if (!parent.exists())
- {
- parent.mkdirs();
- }
- if(logfile.exists())
- {
- logfile.delete();
- }
- logfile.createNewFile();
-
- outStream = new DataOutputStream(new FileOutputStream(filename, true));
- outStream.writeBytes(log.toString());
- outStream.close();
-
- } catch (IOException e)
- {
- // If we can't write the log then clear the log.
- log.delete(0, log.length());
- }
- return log.toString();
- }
-
- protected String getPluginName()
- {
- return PLUGIN_NAME;
- }
-
- private String createNestedMessageString(List nestedMessages)
- {
- return createNestedMessageString(nestedMessages, 0);
- }
-
- private String createNestedMessageString(List nestedMessages, int depth)
- {
- if(nestedMessages != null && nestedMessages.size() > 0)
- {
- String messageString = "";
- Iterator nestedMesIter = nestedMessages.iterator();
- while(nestedMesIter.hasNext())
- {
- ValidationMessage nesvalmes = (ValidationMessage)nestedMesIter.next();
- for(int i = 0; i < depth; i++)
- {
- messageString += " ";
- }
- // If the message contains any file references make them relative.
- String message = nesvalmes.getMessage();
- message = message.replaceAll("'[^']*" + getPluginName() + "[^'/]*/", "'");
- message = message.replaceAll("[(][^(]*" + getPluginName() + "[^'/]*/", "[(]");
- messageString += ("-> " + message + " [" + nesvalmes.getLineNumber() +", " + nesvalmes.getColumnNumber() +"]\n");
- messageString += createNestedMessageString(nesvalmes.getNestedMessages(), depth + 1);
- }
- return messageString;
- }
- else
- {
- return "";
- }
- }
-
- protected IProject createSimpleProject(String projectName, String[] files)
- {
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject(projectName);
- if(!project.exists())
- {
- try
- {
- project.create(null);
- }
- catch(CoreException e)
- {
- fail("Could not create project " + projectName + e);
- }
- }
- if(!project.isOpen())
- {
- try
- {
- project.open(null);
- }
- catch(CoreException e)
- {
- fail("Could not open project " + projectName + e);
- }
- }
- try
- {
- IProjectDescription projectDescription = project.getDescription();
- projectDescription.setName(projectName);
- project.setDescription(projectDescription, null);
- }
- catch(Exception e)
- {
- fail("Unable to set project properties for project " + projectName + ". " + e);
- }
-
- if(files != null)
- {
- int numfiles = files.length;
- for(int i = 0; i < numfiles; i++)
- {
- try
- {
- String filename = files[i];
- filename = filename.replace('\\','/');
- if(filename.startsWith("file:"))
- {
- filename = filename.substring(5);
- while(filename.startsWith("/"))
- {
- filename = filename.substring(1);
- }
- }
-
- File file = new File(filename);
- FileInputStream in = new FileInputStream(file);
- IFile iFile = project.getFile(file.getName());
- if(!iFile.exists())
- {
- iFile.create(in, true, null);
- in.close();
- }
- }
- catch(Exception e)
- {
- fail("Unable to locate file " + files[i]);
- }
- }
- }
- try
- {
- project.refreshLocal(-1, null);
- }
- catch(Exception e)
- {}
- return project;
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java
deleted file mode 100644
index 6fa6ad6..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.eclipse.wst.xsd.core.internal.validation.XSDValidationConfiguration;
-
-
-
-/**
- * Test class for bug fixes.
- */
-public class BugFixesTest extends BaseTestCase
-{
- private String BUGFIXES_DIR = "BugFixes/";
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(BugFixesTest.class);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- super.setUp();
- }
-
- /**
- * Test /BugFixes/Empty.xsd
- */
- public void testEmpty()
- {
- String testname = "Empty";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd
- */
- public void testInvalidSchemaInXMLCatalog()
- {
- String testname = "InvalidSchemaInXMLCatalog";
- String testfile = PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "InvalidSchemaInXMLCatalog/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "InvalidSchemaInXMLCatalog/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "InvalidSchemaInXMLCatalog/" + testname + ".xsd-log";
-
- createSimpleProject("Project", new String[]{testfile});
-
-
- ICatalog catalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- INextCatalog[] nextCatalogs = catalog.getNextCatalogs();
- for (int i = 0; i < nextCatalogs.length; i++)
- {
- INextCatalog nextCatalog = nextCatalogs[i];
- if(XMLCorePlugin.USER_CATALOG_ID.equals(nextCatalog.getId())){
- ICatalog userCatalog = nextCatalog.getReferencedCatalog();
- if(userCatalog != null)
- {
- ICatalogEntry catalogEntry = (ICatalogEntry)userCatalog.createCatalogElement(ICatalogEntry.ENTRY_TYPE_PUBLIC);
- catalogEntry.setKey("testKey");
- catalogEntry.setURI("http://testuri");
- userCatalog.addCatalogElement(catalogEntry);
- runTest("platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd"/*FILE_PROTOCOL + file.getLocation().toString()*/, loglocation, idealloglocation);
- catalog.removeCatalogElement(catalogEntry);
- }
- }
- }
- }
-
- /**
- * Test /BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd
- */
- public void testMissingClosingSchemaTag()
- {
- String testname = "MissingClosingSchemaTag";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "MissingClosingSchemaTag/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "MissingClosingSchemaTag/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "MissingClosingSchemaTag/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd
- */
- public void testImportXSDWithXSDImportInDiffDir()
- {
- String testname = "ImportXSDWithXSDImportInDiffDir";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ImportXSDWithXSDImportInDiffDir/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ImportXSDWithXSDImportInDiffDir/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ImportXSDWithXSDImportInDiffDir/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd
- */
- public void testImportInvalidLocation()
- {
- String testname = "ImportInvalidLocation";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ImportInvalidLocation/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ImportInvalidLocation/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ImportInvalidLocation/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd
- */
- public void testTwoOpenBrackets()
- {
- String testname = "TwoOpenBrackets";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "TwoOpenBrackets/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "TwoOpenBrackets/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "TwoOpenBrackets/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/ImportWithIncorrectSlash/A.xsd
- */
- public void testImportWithIncorrectSlash()
- {
- String testname = "A";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/HonourAllSchemaLocations/dog.xsd
- */
- public void testHonourAllSchemaLocations()
- {
- String testname = "dog";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "HonourAllSchemaLocations/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "HonourAllSchemaLocations/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "HonourAllSchemaLocations/" + testname + ".xsd-log";
-
- XSDValidationConfiguration configuration = new XSDValidationConfiguration();
- try
- {
- configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, true);
- }
- catch(Exception e)
- {
- fail("Unable to set the HONOUR_ALL_SCHEMA_LOCATIONS feature to true: " + e);
- }
- runTest(testfile, loglocation, idealloglocation, configuration);
- }
-
- /**
- * Test /BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd
- */
- public void testInvalidSchemaWithNamespaceInCatalog()
- {
- String testname = "InvalidSchemaWithNamespaceInCatalog";
- String testfile = PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "XSDRegisteredWithCatalog/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "XSDRegisteredWithCatalog/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "XSDRegisteredWithCatalog/" + testname + ".xsd-log";
-
- createSimpleProject("Project", new String[]{testfile});
-
-
- ICatalog catalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- INextCatalog[] nextCatalogs = catalog.getNextCatalogs();
- for (int i = 0; i < nextCatalogs.length; i++)
- {
- INextCatalog nextCatalog = nextCatalogs[i];
- if(XMLCorePlugin.USER_CATALOG_ID.equals(nextCatalog.getId())){
- ICatalog userCatalog = nextCatalog.getReferencedCatalog();
- if(userCatalog != null)
- {
- ICatalogEntry catalogEntry = (ICatalogEntry)userCatalog.createCatalogElement(ICatalogEntry.ENTRY_TYPE_PUBLIC);
- catalogEntry.setKey("http://www.eclipse.org/webtools/Catalogue");
- catalogEntry.setURI("platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd");
- userCatalog.addCatalogElement(catalogEntry);
- runTest("platform:/resource/Project/InvalidSchemaWithNamespaceInCatalog.xsd", loglocation, idealloglocation);
- catalog.removeCatalogElement(catalogEntry);
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/PathsTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/PathsTest.java
deleted file mode 100644
index e2aaecd..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/PathsTest.java
+++ /dev/null
@@ -1,1086 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Tests that test various types of variations in file paths.
- */
-public class PathsTest extends BaseTestCase
-{
- private String PATHS_DIR = "Paths/";
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(PathsTest.class);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- super.setUp();
- }
-
- /**
- * Test /Paths/Space InPath/SpaceInPathValid.xsd
- */
- public void testSpaceInPathValid()
- {
- String testname = "SpaceInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Space InPath/SpaceInPathInvalid.xsd
- */
- public void testSpaceInPathInvalid()
- {
- String testname = "SpaceInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/CloseBracketInPathValid.xsd
- */
- public void testCloseBracketInPathValid()
- {
- String testname = "CloseBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xsd
- */
- public void testCloseBrackettInPathInvalid()
- {
- String testname = "CloseBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xsd
- */
- public void testCloseBracketInFilenameValid()
- {
- String testname = "CloseBracket)InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xsd
- */
- public void testCloseBracketInFilenameInvalid()
- {
- String testname = "CloseBracket)InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/DashInPathValid.xsd
- */
- public void testDashInPathValid()
- {
- String testname = "DashInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/DashInPathInvalid.xsd
- */
- public void testDashInPathInvalid()
- {
- String testname = "DashInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/Dash-InFilenameValid.xsd
- */
- public void testDashInFilenameValid()
- {
- String testname = "Dash-InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/Dash-InFilenameInvalid.xsd
- */
- public void testDashInFilenameInvalid()
- {
- String testname = "Dash-InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ExclamationInPathValid.xsd
- */
- public void testExclamationInPathValid()
- {
- String testname = "ExclamationInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ExclamationInPathInvalid.xsd
- */
- public void testExclamationInPathInvalid()
- {
- String testname = "ExclamationInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/Exclamation!InFilenameValid.xsd
- */
- public void testExclamationInFilenameValid()
- {
- String testname = "Exclamation!InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xsd
- */
- public void testExclamationInFilenameInvalid()
- {
- String testname = "Exclamation!InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/OpenBracketInPathValid.xsd
- */
- public void testOpenBracketInPathValid()
- {
- String testname = "OpenBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xsd
- */
- public void testOpenBracketInPathInvalid()
- {
- String testname = "OpenBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xsd
- */
- public void testOpenBracketInFilenameValid()
- {
- String testname = "OpenBracket(InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xsd
- */
- public void testOpenBracketInFilenameInvalid()
- {
- String testname = "OpenBracket(InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/PeriodInPathValid.xsd
- */
- public void testPeriodInPathValid()
- {
- String testname = "PeriodInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/PeriodInPathInvalid.xsd
- */
- public void testPeriodInPathInvalid()
- {
- String testname = "PeriodInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/Period.InFilenameValid.xsd
- */
- public void testPeriodInFilenameValid()
- {
- String testname = "Period.InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/Period.InFilenameInvalid.xsd
- */
- public void testPeriodInFilenameInvalid()
- {
- String testname = "Period.InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/QuoteInPathValid.xsd
- */
- public void testQuoteInPathValid()
- {
- String testname = "QuoteInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/QuoteInPathInvalid.xsd
- */
- public void testQuoteInPathInvalid()
- {
- String testname = "QuoteInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/Quote'InFilenameValid.xsd
- */
- public void testQuoteInFilenameValid()
- {
- String testname = "Quote'InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/Quote'InFilenameInvalid.xsd
- */
- public void testQuoteInFilenameInvalid()
- {
- String testname = "Quote'InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/Space InFilenameValid.xsd
- */
- public void testSpaceInFilenameValid()
- {
- String testname = "Space InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/Space InFilenameInvalid.xsd
- */
- public void testSpaceInFilenameInvalid()
- {
- String testname = "Space InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/TildeInPathValid.xsd
- */
- public void testTildeInPathValid()
- {
- String testname = "TildeInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/TildeInPathInvalid.xsd
- */
- public void testTildeInPathInvalid()
- {
- String testname = "TildeInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/Tilde~InFilenameValid.xsd
- */
- public void testTildeInFilenameValid()
- {
- String testname = "Tilde~InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd
- */
- public void testTildeInFilenameInvalid()
- {
- String testname = "Tilde~InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/UnderscoreInPathValid.xsd
- */
- public void testUnderscoreInPathValid()
- {
- String testname = "UnderscoreInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd
- */
- public void testUnderscoreInPathInvalid()
- {
- String testname = "UnderscoreInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd
- */
- public void testUnderscoreInFilenameValid()
- {
- String testname = "Underscore_InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd
- */
- public void testUnderscoreInFilenameInvalid()
- {
- String testname = "Underscore_InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/AngleHatInPathValid.xsd
- */
- public void testAngleHatInPathValid()
- {
- String testname = "AngleHatInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd
- */
- public void testAngleHatInPathInvalid()
- {
- String testname = "AngleHatInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd
- */
- public void testAngleHatInFilenameValid()
- {
- String testname = "AngleHat^InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd
- */
- public void testAngleHatInFilenameInvalid()
- {
- String testname = "AngleHat^InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /*****************
- * Test Imports
- *****************/
-
- /**
- * Test /Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd
- */
- public void testImportAngleHatInFilenameValid()
- {
- String testname = "ImportAngleHat^InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd
- */
- public void testImportAngleHatInFilenameInvalid()
- {
- String testname = "ImportAngleHat^InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd
- */
- public void testImportAngleHatInPathValid()
- {
- String testname = "ImportAngleHatInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd
- */
- public void testImportAngleHatInPathInvalid()
- {
- String testname = "ImportAngleHatInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
-
- /**
- * Test /Paths/Space InPath/ImportSpaceInPathValid.xsd
- */
- public void testImportSpaceInPathValid()
- {
- String testname = "ImportSpaceInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Space InPath/ImportSpaceInPathInvalid.xsd
- */
- public void testImportSpaceInPathInvalid()
- {
- String testname = "ImportSpaceInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/ImportCloseBracketInPathValid.xsd
- */
- public void testImportCloseBracketInPathValid()
- {
- String testname = "ImportCloseBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/ImportCloseBracketInPathInvalid.xsd
- */
- public void testImportCloseBrackettInPathInvalid()
- {
- String testname = "ImportCloseBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameValid.xsd
- */
- public void testImportCloseBracketInFilenameValid()
- {
- String testname = "ImportCloseBracket)InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameInvalid.xsd
- */
- public void testImportCloseBracketInFilenameInvalid()
- {
- String testname = "ImportCloseBracket)InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/ImportDashInPathValid.xsd
- */
- public void testImportDashInPathValid()
- {
- String testname = "ImportDashInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/ImportDashInPathInvalid.xsd
- */
- public void testImportDashInPathInvalid()
- {
- String testname = "ImportDashInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/ImportDash-InFilenameValid.xsd
- */
- public void testImportDashInFilenameValid()
- {
- String testname = "ImportDash-InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd
- */
- public void testImportDashInFilenameInvalid()
- {
- String testname = "ImportDash-InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ImportExclamationInPathValid.xsd
- */
- public void testImportExclamationInPathValid()
- {
- String testname = "ImportExclamationInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ImportExclamationInPathInvalid.xsd
- */
- public void testImportExclamationInPathInvalid()
- {
- String testname = "ImportExclamationInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/ImportExclamation!InFilenameValid.xsd
- */
- public void testImportExclamationInFilenameValid()
- {
- String testname = "ImportExclamation!InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/ImportExclamation!InFilenameInvalid.xsd
- */
- public void testImportExclamationInFilenameInvalid()
- {
- String testname = "ImportExclamation!InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/ImportOpenBracketInPathValid.xsd
- */
- public void testImportOpenBracketInPathValid()
- {
- String testname = "ImportOpenBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/ImportOpenBracketInPathInvalid.xsd
- */
- public void testImportOpenBracketInPathInvalid()
- {
- String testname = "ImportOpenBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameValid.xsd
- */
- public void testImportOpenBracketInFilenameValid()
- {
- String testname = "ImportOpenBracket(InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameInvalid.xsd
- */
- public void testImportOpenBracketInFilenameInvalid()
- {
- String testname = "ImportOpenBracket(InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/ImportPeriodInPathValid.xsd
- */
- public void testImportPeriodInPathValid()
- {
- String testname = "ImportPeriodInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/ImportPeriodInPathInvalid.xsd
- */
- public void testImportPeriodInPathInvalid()
- {
- String testname = "ImportPeriodInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd
- */
- public void testImportPeriodInFilenameValid()
- {
- String testname = "ImportPeriod.InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd
- */
- public void testImportPeriodInFilenameInvalid()
- {
- String testname = "ImportPeriod.InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/ImportQuoteInPathValid.xsd
- */
- public void testImportQuoteInPathValid()
- {
- String testname = "ImportQuoteInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/ImportQuoteInPathInvalid.xsd
- */
- public void testImportQuoteInPathInvalid()
- {
- String testname = "ImportQuoteInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/ImportQuote'InFilenameValid.xsd
- */
- public void testImportQuoteInFilenameValid()
- {
- String testname = "ImportQuote'InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/ImportQuote'InFilenameInvalid.xsd
- */
- public void testImportQuoteInFilenameInvalid()
- {
- String testname = "ImportQuote'InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd
- */
- public void testImportSpaceInFilenameValid()
- {
- String testname = "ImportSpace InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd
- */
- public void testImportSpaceInFilenameInvalid()
- {
- String testname = "ImportSpace InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/ImportTildeInPathValid.xsd
- */
- public void testImportTildeInPathValid()
- {
- String testname = "ImportTildeInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd
- */
- public void testImportTildeInPathInvalid()
- {
- String testname = "ImportTildeInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd
- */
- public void testImportTildeInFilenameValid()
- {
- String testname = "ImportTilde~InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd
- */
- public void testImportTildeInFilenameInvalid()
- {
- String testname = "ImportTilde~InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd
- */
- public void testImportUnderscoreInPathValid()
- {
- String testname = "ImportUnderscoreInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd
- */
- public void testImportUnderscoreInPathInvalid()
- {
- String testname = "ImportUnderscoreInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd
- */
- public void testImportUnderscoreInFilenameValid()
- {
- String testname = "ImportUnderscore_InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd
- */
- public void testImportUnderscoreInFilenameInvalid()
- {
- String testname = "ImportUnderscore_InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/XSDValidationTestsPlugin.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/XSDValidationTestsPlugin.java
deleted file mode 100644
index 2a4a752..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/XSDValidationTestsPlugin.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The plugin class for this test plugin.
- */
-public class XSDValidationTestsPlugin extends Plugin
-{
- protected static Bundle pluginBundle;
-
- public XSDValidationTestsPlugin()
- {
- }
-
- /**
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- pluginBundle = context.getBundle();
- }
-
- /**
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception
- {
- pluginBundle = null;
- super.stop(context);
- }
-
- /**
- * Get the install URL of this plugin.
- *
- * @return the install url of this plugin
- */
- public static String getInstallURL()
- {
- try
- {
- return FileLocator.resolve(pluginBundle.getEntry("/")).getFile();
- }
- catch (IOException e)
- {
- return null;
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/test.xml b/tests/org.eclipse.wst.xsd.validation.tests/test.xml
deleted file mode 100644
index 3fdec81..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xsd.validation.tests" />
-
- <property
- name="classname"
- value="org.eclipse.wst.xsd.validation.tests.internal.AllXSDTests" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/.cvsignore b/tests/org.eclipse.wst.xsd.validation.tests/testresources/.cvsignore
deleted file mode 100644
index bb53574..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-generatedResults
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/EmptyFile/Empty.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/EmptyFile/Empty.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/EmptyFile/Empty.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/HonourAllSchemaLocations/dog.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/HonourAllSchemaLocations/dog.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/HonourAllSchemaLocations/dog.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log
deleted file mode 100644
index faffcef..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 1
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-schema_reference.4: Failed to read schema document 'subdir/importing.xsda', because 1) could not find the document; 2) the document could not be read; 3) the root element of the document is not <xsd:schema>. [3, 98]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportWithIncorrectSlash/A.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportWithIncorrectSlash/A.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportWithIncorrectSlash/A.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd-log
deleted file mode 100644
index 54a6653..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-src-resolve.4.2: Error resolving component 'stringa'. It was detected that 'stringa' is in namespace 'http://www.w3.org/2001/XMLSchema', but components from this namespace are not referenceable from schema document 'platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd'. If this is the incorrect namespace, perhaps the prefix of 'stringa' needs to be changed. If this is the correct namespace, then an appropriate 'import' tag should be added to 'platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd'. [3, 50]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd-log
deleted file mode 100644
index e7fb00d..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 125]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd-log
deleted file mode 100644
index cf33997..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-The markup in the document preceding the root element must be well-formed. [1, 2]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd-log
deleted file mode 100644
index 5ed1a99..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Element type "complexType" must be followed by either attribute specifications, ">" or "/>". [6, 3]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd-log
deleted file mode 100644
index d594c99..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd-log
deleted file mode 100644
index 8fa6135..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd-log"
deleted file mode 100644
index 43a672e..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd-log"
deleted file mode 100644
index 2fcf49b..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathInvalid.xsd-log
deleted file mode 100644
index 3dcef18..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd-log
deleted file mode 100644
index 82697df..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd-log"
deleted file mode 100644
index d0627d4..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd-log"
deleted file mode 100644
index 80a8f42..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd-log"
deleted file mode 100644
index 7ed9be8..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd-log"
deleted file mode 100644
index 9dd8bce..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd-log
deleted file mode 100644
index 60a7021..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd-log
deleted file mode 100644
index fe79aea..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd-log"
deleted file mode 100644
index 9c739f9..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd-log"
deleted file mode 100644
index f8071e2..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathInvalid.xsd-log
deleted file mode 100644
index 569a6e2..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd-log
deleted file mode 100644
index bb78124..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Copy of -forXerces2.6.2- ImportTilde~InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Copy of -forXerces2.6.2- ImportTilde~InFilenameInvalid.xsd-log
deleted file mode 100644
index 0b9b109..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Copy of -forXerces2.6.2- ImportTilde~InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/TildeInFilename/Tilde%7EInFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd-log
deleted file mode 100644
index 63f6e91..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd-log
deleted file mode 100644
index 1597130..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd-log
deleted file mode 100644
index 49ea3f7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd-log
deleted file mode 100644
index 91e7786..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd). For more information, right click on the message and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/EmptyFile/Empty.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/EmptyFile/Empty.xsd
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/EmptyFile/Empty.xsd
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part1.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part1.xsd
deleted file mode 100644
index 21c81f7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part1.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Dog"
- xmlns:tns="http://www.example.org/Dog" >
-
- <complexType name="Head"></complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part2.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part2.xsd
deleted file mode 100644
index 0b13d05..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part2.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Dog"
- xmlns:tns="http://www.example.org/Dog" >
-
-
- <complexType name="Tail"></complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/dog.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/dog.xsd
deleted file mode 100644
index 6c4c669..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/dog.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/ADog"
- xmlns:tns="http://www.example.org/ADog"
- xmlns:pref="http://www.example.org/Dog">
-
- <import namespace="http://www.example.org/Dog"
- schemaLocation="Part1.xsd">
- </import>
- <import namespace="http://www.example.org/Dog"
- schemaLocation="Part2.xsd">
- </import>
-
- <complexType name="DogType">
- <sequence>
-
- <element name="Tail" type="pref:Tail"></element>
- <element name="Body" type="string"></element>
- </sequence>
- </complexType>
-
- <element name="aDog" type="tns:DogType"></element>
-
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd
deleted file mode 100644
index 4b8347e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/root" xmlns:ex="http://www.example.com/root">
- <import namespace="http://www.example.com/importing" schemaLocation="subdir/importing.xsda"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/A.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/A.xsd
deleted file mode 100644
index 0c20fe1..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/A.xsd
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://AC">
- <xsd:include schemaLocation="C.xsd"/>
- <xsd:import namespace="http://B" schemaLocation="B.xsd"/>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/B.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/B.xsd
deleted file mode 100644
index b45007e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/B.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://B">
- <xsd:import namespace="http://AC" schemaLocation=".\C.xsd"/>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/C.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/C.xsd
deleted file mode 100644
index f6df675..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/C.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://AC">
- <xsd:complexType name="SampleType">
- <xsd:sequence>
- <xsd:element name="SampleElement" nillable="true" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd
deleted file mode 100644
index 95e6af0..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/root" xmlns:ex="http://www.example.com/root">
- <import namespace="http://www.example.com/importing" schemaLocation="subdir/importing.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/importing.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/importing.xsd
deleted file mode 100644
index 9af5462..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/importing.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/importing" xmlns:ex="http://www.example.com/importing" xmlns:simple="http://www.example.com/simple">
- <import namespace="http://www.example.com/simple" schemaLocation="simple.xsd"/>
- <simpleType name="mySimpleType">
- <list itemType="string"/>
- </simpleType>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/simple.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/simple.xsd
deleted file mode 100644
index 8810a4d..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/simple.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/simple" xmlns:ibm="http://www.example.com/simple">
- <element name="myElement" type="string"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd
deleted file mode 100644
index 8044319..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/invalid" xmlns:invalid="http://www.example.com/invalid">
- <element name="NewGlobalElement" type="stringa"></element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd
deleted file mode 100644
index d4d7634..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd
deleted file mode 100644
index 297c8f6..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/TwoOpenBrackets" xmlns:tns="http://www.example.org/TwoOpenBrackets">
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd
deleted file mode 100644
index e3e24da..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.eclipse.org/webtools/Catalogue" xmlns:c="http://www.eclipse.org/webtools/Catalogue">
-
- <complexType name="PublicationType"
- <sequence>
- <element name="title" type="string"></element>
- <element name="author" type="string" minOccurs="0" maxOccurs="unbounded"></element>
- <element name="date" type="gYear"></element>
- </sequence>
- </complexType>
-
- <complexType name="BookType">
- <complexContent>
- <extension base="c:PublicationType">
- <sequence>
- <element name="isbn" type="string" />
- <element name="publisher" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="MagazineType">
- <complexContent>
- <restriction base="c:PublicationType">
- <sequence>
- <element name="title" type="string" />
- <element name="author" type="string" minOccurs="0" maxOccurs="0"/>
- <element name="date" type="gYear"></element>
- </sequence>
- </restriction>
- </complexContent>
- </complexType>
-
- <element name="Publication" type="c:PublicationType" abstract="true"></element>
-
- <element name="Book" type="c:BookType" substitutionGroup="c:Publication"></element>
-
- <element name="Magazine" type="c:MagazineType" substitutionGroup="c:Publication"></element>
-
- <element name="Catalogue">
- <complexType>
- <sequence>
- <element ref="c:Publication" maxOccurs="unbounded"></element>
- </sequence>
- </complexType>
- </element>
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd
deleted file mode 100644
index c6df147..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHat^InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd
deleted file mode 100644
index e084e6e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHat^InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd
deleted file mode 100644
index 2d82c95..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHatInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd
deleted file mode 100644
index 67bd0d7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHatInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd"
deleted file mode 100644
index 8bd9a74..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracketInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd"
deleted file mode 100644
index 2180513..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracketInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd"
deleted file mode 100644
index d60d06f..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracket)InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd"
deleted file mode 100644
index 7a2503b..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracket)InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathInvalid.xsd
deleted file mode 100644
index 09648ca..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="DashInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathValid.xsd
deleted file mode 100644
index 3f2da8d..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="DashInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd
deleted file mode 100644
index c534d83..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Dash-InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameValid.xsd
deleted file mode 100644
index b6334ae..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Dash-InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd"
deleted file mode 100644
index 3189ff3..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="ExclamationInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd"
deleted file mode 100644
index e8390c6..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="ExclamationInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd"
deleted file mode 100644
index 3430528..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Exclamation!InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd"
deleted file mode 100644
index e92dd97..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Exclamation!InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd"
deleted file mode 100644
index 1412516..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracketInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd"
deleted file mode 100644
index ee461dd..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracketInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd"
deleted file mode 100644
index 70a67e9..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracket(InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd"
deleted file mode 100644
index d0ab738..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracket(InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd
deleted file mode 100644
index 4897802..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="PeriodInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathValid.xsd
deleted file mode 100644
index 223ab33..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="PeriodInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd
deleted file mode 100644
index dc62544..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Period.InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd
deleted file mode 100644
index 4e97d47..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Period.InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd"
deleted file mode 100644
index fd7496c..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="QuoteInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd"
deleted file mode 100644
index 4f83c85..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="QuoteInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd"
deleted file mode 100644
index f1fb34b..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Quote'InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd"
deleted file mode 100644
index 9ccf6de..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Quote'InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathInvalid.xsd
deleted file mode 100644
index 63a27ad..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="SpaceInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathValid.xsd
deleted file mode 100644
index 3c93d20..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="SpaceInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd
deleted file mode 100644
index 97c0baa..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Space InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd
deleted file mode 100644
index 916ba37..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Space InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd
deleted file mode 100644
index 2a09853..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Tilde~InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd
deleted file mode 100644
index fbe9a6c..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Tilde~InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd
deleted file mode 100644
index 6963d4b..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="TildeInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathValid.xsd
deleted file mode 100644
index 1c81133..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="TildeInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd
deleted file mode 100644
index 0bda16e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Underscore_InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd
deleted file mode 100644
index cf216fc..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Underscore_InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd
deleted file mode 100644
index c5277a1..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="UnderscoreInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd
deleted file mode 100644
index fd74266..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="UnderscoreInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
