diff options
| author | Arnaud Vandyck <avdyk@debian.org> | 2007-07-03 20:21:12 +0200 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2007-10-23 21:37:16 +0000 |
| commit | e53fd609f784e5d829e2775631b4c1fab49ee7bc (patch) | |
| tree | 0f913459c9e666e1c3396a647d9bd0a3c192fc41 | |
| parent | acffd7f1f99be312834f8836f2dd3ad52b5bb3ba (diff) | |
2.9.0-1 (patches unapplied)import/2.9.0-1ubuntu/hardy-develubuntu/hardy
Imported using git-ubuntu import.
Notes
Notes:
* New upstream.
* debian/control: removed Stefan Gybas and Wolfgang Baer from uploaders.
* debian/rule: added generation of the documentation (merge
libxerces2-java-doc).
755 files changed, 9057 insertions, 6754 deletions
@@ -1,39 +0,0 @@ -*** UNRESOLVED *** - -1. Naming - 1.1. XNI package names and content. Drop the XNI prefix? - -2. Dependencies - 2.2. Java version - -3. APIs - 3.2. Parser configuration - 3.2.1. Filters - 3.3. Buffer management - 3.3.1. To transcode or not to transcode - -4. Layering and Packaging - 4.1. Core vs. optional modules (dependencies?) - 4.2. How to deal with community donations - -5. Website and Documentation - 5.1. Continue to use Stylebook? plain HTML? - -*** DEFERRED *** - -*** RESOLVED *** - -2. Dependencies - 2.1. APIs: DOM, SAX, etc. - Resolution: SAX dependence removed from XNI -3. APIs - 3.1. DTD handlers - 3.1.1. Separate or combined? - Resolution: Separate. - 3.1.2. Which methods are needed? - Resolution: Modification to content model callbacks - so that start/endEntity is more useful. - 3.2. Parser configuration - 3.2.2. Scanners - Resolution: Source and scanner interfaces added. - diff --git a/LICENSE.resolver.txt b/LICENSE.resolver.txt index b9f6031..261eeb9 100644 --- a/LICENSE.resolver.txt +++ b/LICENSE.resolver.txt @@ -1,53 +1,201 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - */ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) 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. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/LICENSE.serializer.txt b/LICENSE.serializer.txt new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE.serializer.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) 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. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. @@ -1,9 +1,12 @@ ========================================================================= == NOTICE file corresponding to section 4(d) of the Apache License, == - == Version 2.0, in this case for the Apache Xerces distribution. == + == Version 2.0, in this case for the Apache Xerces Java distribution. == ========================================================================= - This product includes software developed by + Apache Xerces Java + Copyright 1999-2006 The Apache Software Foundation + + This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Portions of this software were originally based on the following: diff --git a/NOTICE.resolver.txt b/NOTICE.resolver.txt new file mode 100644 index 0000000..cf064e3 --- /dev/null +++ b/NOTICE.resolver.txt @@ -0,0 +1,9 @@ +Apache XML Commons Resolver +Copyright 2006 The Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation http://www.apache.org/ + +Portions of this code are derived from classes placed in the +public domain by Arbortext on 10 Apr 2000. See: +http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm diff --git a/NOTICE.serializer.txt b/NOTICE.serializer.txt new file mode 100644 index 0000000..c445858 --- /dev/null +++ b/NOTICE.serializer.txt @@ -0,0 +1,18 @@ + ========================================================================= + == NOTICE file corresponding to section 4(d) of the Apache License, == + == Version 2.0, in this case for the Apache Xalan Java distribution. == + ========================================================================= + + Apache Xalan (Xalan serializer) + Copyright 1999-2006 The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). + + Portions of this software was originally based on the following: + - software copyright (c) 1999-2002, Lotus Development Corporation., + http://www.lotus.com. + - software copyright (c) 2001-2002, Sun Microsystems., + http://www.sun.com. + - software copyright (c) 2003, IBM Corporation., + http://www.ibm.com. @@ -3,14 +3,15 @@ ------------------------------ =========================================================================== - * Copyright 1999-2001,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/Readme.html b/Readme.html index 11d9744..9c07fbb 100644 --- a/Readme.html +++ b/Readme.html @@ -1,13 +1,14 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <!-- - * Copyright 1999,2001,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -1,21 +0,0 @@ -This is the Status file for the Xerces for Java code base. -This file provides an overview of the things that need to -be done. However, specific action items are enumerated in -the TODO file. - -There are lots of things that need to be done: - -* Performance, performance, performance! -* Conformance, conformance, conformance! -* Kill bugs - -* Grammar caching -* Grammar access -* Re-validation - -* Documentation -* Samples -* Scripts to build parser subconfigurations -* Additional configuration options - -* Anything else? @@ -1,33 +0,0 @@ -*** CURRENT *** - -1. Documentation - 1.4. JavaDoc - 1.4.1. Fix all warnings reported by JavaDoc - -3. Validation Engine - 3.2. Implement grammar cache - 3.3. Add PSVI items to streaming infoset - -*** COMPLETED *** - -1. Documentation - 1.1. Samples - 1.2. Xerces Native Interface (XNI) - 1.2.1. XNI overview - 1.2.2. Parser components and configurations - 1.2.3. Using Xerces2 Components - 1.3. Remove/add FAQ items -2. Schema Validation - 2.1. Port of Xerces 1.x Schema code [andyc,???] - * in ...impl.v1 package - 2.1.1. Remove old classes - 2.1.2. Add classes, changing packaging - 2.1.3. Remove StringPool dependencies - 2.1.4. Move from internal interfaces to XNI - 2.2. Implement new Schema code -3. Validation Engine - 3.1. Separate "universal" validator into separate components: - DTD validator, namespace binder - 3.1.1. Separate source code, changing packages as needed - 3.1.2. Update parser configuration - @@ -2,11 +2,12 @@ rem rem ========================================================================== -rem = Copyright 2000-2004,2006 The Apache Software Foundation. -rem = -rem = Licensed under the Apache License, Version 2.0 (the "License"); -rem = you may not use this file except in compliance with the License. -rem = You may obtain a copy of the License at +rem = Licensed to the Apache Software Foundation (ASF) under one or more +rem = contributor license agreements. See the NOTICE file distributed with +rem = this work for additional information regarding copyright ownership. +rem = The ASF licenses this file to You under the Apache License, Version 2.0 +rem = (the "License"); you may not use this file except in compliance with +rem = the License. You may obtain a copy of the License at rem = rem = http://www.apache.org/licenses/LICENSE-2.0 rem = @@ -1,11 +1,12 @@ #!/bin/sh # #========================================================================= -# Copyright 2000-2004,2006 The Apache Software Foundation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # @@ -1,5 +1,20 @@ <?xml version="1.0"?> - +<!-- + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +--> <!-- =================================================================== Read the README file for build instruction. @@ -9,13 +24,9 @@ Authors: Anupam Bagchi <abagchi@apache.org> Andy Clark, IBM -Copyright: - Copyright (c) 2000-2006 The Apache Software Foundation. - - $Id: build.xml 441600 2006-09-08 18:20:40Z mrglavas $ + $Id: build.xml 478338 2006-11-22 21:51:16Z mrglavas $ ==================================================================== --> - <project default="usage" basedir="."> <!-- Xerces Java directories --> @@ -46,9 +57,9 @@ Copyright: <property name='parser.Name' value='Xerces-J'/> <property name='parser.name' value='xerces-j'/> <property name='parser.shortname' value='xerces'/> - <property name='parser.Version' value='2.8.1'/> - <property name='parser.version' value='2.8.1'/> - <property name='parser_version' value='2_8_1'/> + <property name='parser.Version' value='2.9.0'/> + <property name='parser.version' value='2.9.0'/> + <property name='parser_version' value='2_9_0'/> <property name='deprecatedjar.parser' value='xerces.jar'/> <property name='jar.apis' value='xml-apis.jar'/> @@ -56,6 +67,7 @@ Copyright: <property name='jar.samples' value='xercesSamples.jar'/> <property name='jar.dv' value='xercesDV.jar'/> <property name='jar.resolver' value='resolver.jar'/> + <property name='jar.serializer' value='serializer.jar'/> <property name='jar.junit' value='junit.jar'/> <property name='default.parser.config.name' value='XIncludeAwareParserConfiguration'/> @@ -241,7 +253,7 @@ Copyright: <xjavac srcdir="${build.src}" destdir="${build.dest}" - classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}" + classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}" debug="${debug}" deprecation="${deprecation}" optimize="${optimize}" @@ -266,7 +278,9 @@ Copyright: <jar jarfile="${build.dir}/${deprecatedjar.parser}" basedir="${build.dest}" compress="true" - includes="org/**, javax/**,META-INF/**"/> + includes="org/**, javax/**,META-INF/**"> + <metainf dir="." includes="LICENSE,NOTICE"/> + </jar> </target> <!-- =================================================================== --> @@ -288,6 +302,7 @@ Copyright: <manifest> <attribute name="Ant-Version" value="${ant.version}"/> </manifest> + <metainf dir="." includes="LICENSE,NOTICE"/> </jar> </target> @@ -331,7 +346,9 @@ Copyright: <jar jarfile="${build.dir}/${jar.samples}" basedir="${build.dest}" compress="true" - includes="dom/**,sax/**,jaxp/**,socket/**,ui/**,xni/**,xs/**"/> + includes="dom/**,sax/**,jaxp/**,socket/**,ui/**,xni/**,xs/**"> + <metainf dir="." includes="LICENSE,NOTICE"/> + </jar> </target> <!-- =================================================================== --> @@ -441,7 +458,7 @@ Copyright: org.apache.xerces.xpointer' locale='en_US' sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/xerces2' - classpath='${tools.dir}/${jar.resolver}' + classpath='${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}' author='true' version='true' windowtitle='Xerces2 Implementation' doctitle='Xerces2 Implementation' @@ -506,16 +523,16 @@ Copyright: </copy> <copy file="LICENSE" tofile="${distsrc.dir}/LICENSE"/> - <copy file="NOTICE" tofile="${distsrc.dir}/NOTICE"/> + <copy file="NOTICE" tofile="${distsrc.dir}/NOTICE"/> + <copy file="NOTICE.resolver.txt" tofile="${distsrc.dir}/NOTICE.resolver.txt"/> + <copy file="NOTICE.serializer.txt" tofile="${distsrc.dir}/NOTICE.serializer.txt"/> <copy file="LICENSE.DOM-documentation.html" tofile="${distsrc.dir}/LICENSE.DOM-documentation.html"/> <copy file="LICENSE.DOM-software.html" tofile="${distsrc.dir}/LICENSE.DOM-software.html"/> <copy file="LICENSE-SAX.html" tofile="${distsrc.dir}/LICENSE-SAX.html"/> <copy file="LICENSE.resolver.txt" tofile="${distsrc.dir}/LICENSE.resolver.txt"/> + <copy file="LICENSE.serializer.txt" tofile="${distsrc.dir}/LICENSE.serializer.txt"/> <copy file="README" tofile="${distsrc.dir}/README"/> <copy file="Readme.html" tofile="${distsrc.dir}/Readme.html"/> - <copy file="STATUS" tofile="${distsrc.dir}/STATUS"/> - <copy file="TODO" tofile="${distsrc.dir}/TODO"/> - <copy file="ISSUES" tofile="${distsrc.dir}/ISSUES"/> <copy file="build.xml" tofile="${distsrc.dir}/build.xml"/> <copy file="${basedir}/build.sh" tofile="${distsrc.dir}/build.sh" /> <chmod file="${distsrc.dir}/build.sh" perm="ugo+rx" /> @@ -544,7 +561,7 @@ Copyright: <copy todir="${disttools.dir}" > <fileset dir="${tools.dir}" - includes="**/*.txt, **/*.bat, **/*.jar, **/*.zip, **/*.opt" + includes="**/*.txt, **/*.html, **/*.bat, **/*.jar, **/*.zip, **/*.opt" excludes="**/CVS*, **/.#*, **/*.class" /> </copy> @@ -603,10 +620,13 @@ Copyright: <copy file="LICENSE" tofile="${distbin.dir}/LICENSE"/> <copy file="NOTICE" tofile="${distsrc.dir}/NOTICE"/> + <copy file="NOTICE.resolver.txt" tofile="${distsrc.dir}/NOTICE.resolver.txt"/> + <copy file="NOTICE.serializer.txt" tofile="${distsrc.dir}/NOTICE.serializer.txt"/> <copy file="LICENSE.DOM-documentation.html" tofile="${distsrc.dir}/LICENSE.DOM-documentation.html"/> <copy file="LICENSE.DOM-software.html" tofile="${distsrc.dir}/LICENSE.DOM-software.html"/> <copy file="LICENSE-SAX.html" tofile="${distbin.dir}/LICENSE-SAX.html"/> <copy file="LICENSE.resolver.txt" tofile="${distbin.dir}/LICENSE.resolver.txt"/> + <copy file="LICENSE.serializer.txt" tofile="${distsrc.dir}/LICENSE.serializer.txt"/> <copy file="Readme.html" tofile="${distbin.dir}/Readme.html"/> <copy file="${build.dir}/${jar.samples}" tofile="${distbin.dir}/${jar.samples}"/> @@ -626,10 +646,12 @@ Copyright: <!-- =================================================================== --> <target name="pack-bin" depends="pack-bin-common, jars"> <copy file="${build.dir}/${jar.parser}" tofile="${distbin.dir}/${jar.parser}"/> - <!-- support xml-commons APIs --> + <!-- include the xml-commons APIs --> <copy file="${tools.dir}/${jar.apis}" tofile="${distbin.dir}/${jar.apis}"/> - <!-- support xml-commons resolver --> + <!-- include the xml-commons resolver --> <copy file="${tools.dir}/${jar.resolver}" tofile="${distbin.dir}/${jar.resolver}"/> + <!-- include the Xalan Serializer --> + <copy file="${tools.dir}/${jar.serializer}" tofile="${distbin.dir}/${jar.serializer}"/> <zip zipfile="${build.dir}/${parser.Name}-bin.${parser.version}.zip" basedir="${build.dir}" @@ -652,8 +674,10 @@ Copyright: <target name="deprecated-bin" depends="pack-bin-common, deprecatedjars"> <copy file="${build.dir}/${deprecatedjar.parser}" tofile="${distbin.dir}/${deprecatedjar.parser}"/> - <!-- support xml-commons resolver --> + <!-- include the xml-commons resolver --> <copy file="${tools.dir}/${jar.resolver}" tofile="${distbin.dir}/${jar.resolver}"/> + <!-- include the Xalan Serializer --> + <copy file="${tools.dir}/${jar.serializer}" tofile="${distbin.dir}/${jar.serializer}"/> <zip zipfile="${build.dir}/deprecated${parser.Name}-bin.${parser.version}.zip" basedir="${build.dir}" @@ -678,35 +702,35 @@ Copyright: <echo message="Using classpath='${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes'" /> <echo message="Running sax.Counter ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="sax.Counter" failOnError="yes"> <arg value="${data.dir}/personal.xml"/> </java> <echo message="Running sax.Writer ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="sax.Writer" failOnError="yes"> <arg value="${data.dir}/personal.xml"/> </java> <echo message="Running dom.Counter ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.Counter" failOnError="yes"> <arg value="${data.dir}/personal.xml"/> </java> <echo message="Running dom.Writer ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.Writer" failOnError="yes"> <arg value="${data.dir}/personal.xml"/> </java> <echo message="Running thread.Test dom" /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="thread.Test" failOnError="yes"> <arg value="-dom"/> @@ -719,7 +743,7 @@ Copyright: </java> <echo message="Running thread.Test sax" /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="thread.Test" failOnError="yes"> <arg value="-threads"/> @@ -735,45 +759,45 @@ Copyright: <!-- <echo message="Running DOMFilter ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.DOMFilter" args="-p dom.wrappers.DOMParser ${data.dir}/personal.xml"/> --> <!-- The following are samples but not command-line applications. <echo message="Running IteratorView ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.traversal.IteratorView" failOnError="yes" args="${data.dir}/personal.xml"/> <echo message="Running TreeWalkerView ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.traversal.TreeWalkerView" failOnError="yes" args="${data.dir}/personal.xml"/> <echo message="Running TreeViewer ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.TreeViewer" failOnError="yes" args="${data.dir}/personal.xml"/> --> <echo message="Running dom.DTest ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.DTest" failOnError="yes"> </java> <echo message="Running dom.mem.Test ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.mem.Test" failOnError="yes"> </java> <echo message="Running dom.range.Test ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.range.Test" failOnError="yes"> <arg value="all"/> @@ -781,13 +805,13 @@ Copyright: <echo message="Running dom.ids.Test ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.ids.Test" failOnError="yes"> </java> <echo message="Running dom.serialization.Test ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.serialization.Test" failOnError="yes"> <arg value="${data.dir}/personal-schema.xml"/> @@ -795,7 +819,7 @@ Copyright: </java> <echo message="Running schema.Test ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="schema.Test" failOnError="yes"> </java> @@ -804,7 +828,7 @@ Copyright: classname="schema.config.AllTests" failOnError="yes"> <classpath> - <pathelement path="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" /> + <pathelement path="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" /> <pathelement path="${tools.dir}/${jar.junit}" /> <pathelement path="${build.dir}/tests" /> </classpath> @@ -814,20 +838,20 @@ Copyright: classname="schema.annotations.AllTests" failOnError="yes"> <classpath> - <pathelement path="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" /> + <pathelement path="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" /> <pathelement path="${tools.dir}/${jar.junit}" /> <pathelement path="${build.dir}/tests" /> </classpath> </java> <echo message="Running jaxp.PropertyTest ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="jaxp.PropertyTest" failOnError="yes"> </java> <echo message="Running jaxp.JAXPSpecTest ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="jaxp.JAXPSpecTest" failOnError="yes"> <arg value="testSchemaLanguageSAX"/> @@ -837,19 +861,19 @@ Copyright: </java> <echo message="Running xinclude.Test ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="xinclude.Test" failOnError="yes"> </java> <echo message="Running dom.registry.Test ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.registry.Test" failOnError="yes"> </java> <echo message="Running dom.dom3.Test ..." /> <java fork="yes" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}:${build.dir}/classes" classname="dom.dom3.Test" failOnError="yes"> </java> @@ -859,19 +883,22 @@ Copyright: <!-- Builds both deprecated xerces and sample jar files --> <!-- =================================================================== --> <target name="deprecatedjars" depends="deprecatedjar, sampjar"> - <!-- support xml-commons resolver --> + <!-- include the xml-commons resolver --> <copy file="${tools.dir}/${jar.resolver}" tofile="${build.dir}/${jar.resolver}"/> + <!-- include the Xalan Serializer --> + <copy file="${tools.dir}/${jar.serializer}" tofile="${build.dir}/${jar.serializer}"/> </target> <!-- =================================================================== --> <!-- Builds xercesImpl, xml-apis and sample jar files --> <!-- =================================================================== --> <target name="jars" depends="jar, sampjar"> - <!-- support xml-commons APIs --> + <!-- include the xml-commons APIs --> <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/> - - <!-- support xml-commons resolver --> + <!-- include the xml-commons resolver --> <copy file="${tools.dir}/${jar.resolver}" tofile="${build.dir}/${jar.resolver}"/> + <!-- include the Xalan Serializer --> + <copy file="${tools.dir}/${jar.serializer}" tofile="${build.dir}/${jar.serializer}"/> </target> <!-- =================================================================== --> @@ -913,6 +940,7 @@ Copyright: <manifest> <attribute name="Ant-Version" value="${ant.version}"/> </manifest> + <metainf dir="." includes="LICENSE,NOTICE"/> </jar> </target> @@ -933,7 +961,7 @@ Copyright: optimize="${optimize}" includeAntRuntime="false" includeJavaRuntime="true" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}"/> + classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"/> </target> @@ -990,6 +1018,7 @@ Copyright: org/apache/xerces/parsers/XIncludeParserConfiguration.java org/apache/xerces/parsers/XIncludeAwareParserConfiguration.java org/apache/xerces/parsers/SecurityConfiguration.java + org/apache/xerces/parsers/SoftReferenceSymbolTableConfiguration.java org/apache/xerces/parsers/XML11Configurable.java org/apache/xerces/parsers/XML11Configuration.java org/apache/xerces/parsers/XML11DTDConfiguration.java @@ -1184,12 +1213,12 @@ Copyright: <!-- Builds xercesImpl (dtd), xml-apis, and sample jars --> <!-- =================================================================== --> <target name="dtdjars" depends="dtdjar, sampjar"> - <!-- support xml-commons APIs --> + <!-- include the xml-commons APIs --> <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/> - - <!-- support xml-commons resolver --> + <!-- include the xml-commons resolver --> <copy file="${tools.dir}/${jar.resolver}" tofile="${build.dir}/${jar.resolver}"/> - + <!-- include the Xalan Serializer --> + <copy file="${tools.dir}/${jar.serializer}" tofile="${build.dir}/${jar.serializer}"/> </target> <!-- =================================================================== --> @@ -1199,7 +1228,9 @@ Copyright: <jar jarfile="${build.dir}/${jar.dv}" basedir="${build.dest}" compress="true" - includes="org/apache/xerces/**"/> + includes="org/apache/xerces/**"> + <metainf dir="." includes="LICENSE,NOTICE"/> + </jar> </target> <!-- =================================================================== --> @@ -1362,7 +1393,7 @@ Copyright: <xjavac srcdir="${build.src}" destdir="${build.dest}" - classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}" + classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}" debug="${debug}" deprecation="${deprecation}" optimize="${optimize}" @@ -1405,6 +1436,7 @@ Copyright: <manifest> <attribute name="Ant-Version" value="${ant.version}"/> </manifest> + <metainf dir="." includes="LICENSE,NOTICE"/> </jar> </target> @@ -1412,10 +1444,11 @@ Copyright: <!-- Builds xercesImpl, xml-apis and sample jars with Schema 1.1 support --> <!-- =================================================================== --> <target name="jars-schema11" depends="jar-schema11, sampjar"> - <!-- support xml-commons APIs --> + <!-- include the xml-commons APIs --> <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/> - - <!-- support xml-commons resolver --> + <!-- include the xml-commons resolver --> <copy file="${tools.dir}/${jar.resolver}" tofile="${build.dir}/${jar.resolver}"/> + <!-- include the Xalan Serializer --> + <copy file="${tools.dir}/${jar.serializer}" tofile="${build.dir}/${jar.serializer}"/> </target> </project> diff --git a/debian/changelog b/debian/changelog index 657e22f..7e64503 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libxerces2-java (2.9.0-1) unstable; urgency=low + + * New upstream. + * debian/control: removed Stefan Gybas and Wolfgang Baer from uploaders. + * debian/rule: added generation of the documentation (merge + libxerces2-java-doc). + + -- Arnaud Vandyck <avdyk@debian.org> Tue, 3 Jul 2007 20:21:12 +0200 + libxerces2-java (2.8.1-2) unstable; urgency=low [Arnaud Vandyck] diff --git a/debian/control b/debian/control index 0d1b4e2..124eaf7 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: libxerces2-java Section: libs Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>, Marcus Better <marcus@better.se>, Matthias Klose <doko@ubuntu.com> -Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0), java-gcj-compat-dev, ant, libxml-commons-resolver1.1-java, libjaxp1.3-java +Uploaders: Arnaud Vandyck <avdyk@debian.org>, Marcus Better <marcus@better.se>, Matthias Klose <doko@ubuntu.com> +Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0), java-gcj-compat-dev, ant, libxml-commons-resolver1.1-java, libjaxp1.3-java, libstylebook-java Standards-Version: 3.7.2 Package: libxerces2-java @@ -47,3 +47,17 @@ Description: Validating XML parser for Java with DOM level 3 support (native cod Xerces Native Interface, and also a fully conforming XML Schema processor. . This package contains the natively compiled code for use by gij. + +Package: libxerces2-java-doc +Architecture: all +Section: doc +Suggests: libxerces2-java, doc-html-w3 +Description: Validating XML parser for Java -- Documentation and examples + The Xerces2 Java parser is the reference implementation of XNI, the + Xerces Native Interface, and also a fully conforming XML Schema processor. + . + This package contains the documentation in HTML format, the Javadoc API + documentation and some examples. + . + For more information about Xerces-J see the home page at + http://xml.apache.org/xerces2-j/index.html. diff --git a/debian/libxerces2-java-doc.examples b/debian/libxerces2-java-doc.examples new file mode 100644 index 0000000..039a091 --- /dev/null +++ b/debian/libxerces2-java-doc.examples @@ -0,0 +1,3 @@ +build/samples/* +build/xercesSamples.jar + diff --git a/debian/libxerces2-java.docs b/debian/libxerces2-java.docs index ea4894c..1910a27 100644 --- a/debian/libxerces2-java.docs +++ b/debian/libxerces2-java.docs @@ -1,3 +1,6 @@ -ISSUES -STATUS -TODO +NOTICE +NOTICE.resolver.txt +NOTICE.serializer.txt +README +Readme.html + diff --git a/debian/patches/04_build_target13.patch b/debian/patches/04_build_target13.patch deleted file mode 100644 index 2c1531a..0000000 --- a/debian/patches/04_build_target13.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- build.xml.orig 2005-04-19 20:41:32.000000000 +0200 -+++ build.xml 2005-04-19 20:42:05.000000000 +0200 -@@ -227,6 +227,7 @@ - <xjavac srcdir="${build.src}" - destdir="${build.dest}" - classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}" -+ target="1.4" - debug="${debug}" - deprecation="${deprecation}" - optimize="${optimize}" diff --git a/debian/rules b/debian/rules index f4596bf..b4ab78c 100755 --- a/debian/rules +++ b/debian/rules @@ -15,11 +15,13 @@ endif # Additional JARs to add to the class path, either full path or just the # basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted -DEB_JARS := xml-commons-resolver-1.1 jaxp-1.3.jar +DEB_JARS := xml-commons-resolver-1.1 +#jaxp-1.3.jar stylebook # Ant targets to call DEB_ANT_CLEAN_TARGET := clean -DEB_ANT_BUILD_TARGET := jar +DEB_ANT_BUILD_TARGET := jar sampjar javadocs +#docs install/libxerces2-java:: mkdir -p debian/libxerces2-java/usr/share/java @@ -33,3 +35,6 @@ endif clean:: rm -rf build +binary-post-install/libxerces2-java-doc:: + dh_install -plibxerces2-java-doc build/docs/javadocs/* \ + usr/share/doc/libxerces2-java-doc/api diff --git a/docs/api.xml b/docs/api.xml index aa30d2c..58e48ca 100644 --- a/docs/api.xml +++ b/docs/api.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/bugzilla.xml b/docs/bugzilla.xml index 5673674..4436948 100644 --- a/docs/bugzilla.xml +++ b/docs/bugzilla.xml @@ -1,13 +1,14 @@ <?xml version="1.0" standalone="no"?> <!-- - * Copyright 2003-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/charter.xml b/docs/charter.xml index 0b43240..82823f2 100644 --- a/docs/charter.xml +++ b/docs/charter.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/docs-book.xml b/docs/docs-book.xml index 76c281e..736ecd6 100644 --- a/docs/docs-book.xml +++ b/docs/docs-book.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/dom.xml b/docs/dom.xml index 0e07cbd..cb628b4 100644 --- a/docs/dom.xml +++ b/docs/dom.xml @@ -1,13 +1,14 @@ <?xml version="1.0" standalone="no"?> <!-- - * Copyright 2002-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/dom3.xml b/docs/dom3.xml index 2a8d58c..98ffce6 100644 --- a/docs/dom3.xml +++ b/docs/dom3.xml @@ -1,13 +1,14 @@ <?xml version="1.0" standalone="no"?> <!-- - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/download.xml b/docs/download.xml index acbdaa9..ab7f96b 100644 --- a/docs/download.xml +++ b/docs/download.xml @@ -1,13 +1,14 @@ <?xml version="1.0" standalone="no"?> <!-- - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/faq-build.xml b/docs/faq-build.xml index ef84ed3..6aba37a 100644 --- a/docs/faq-build.xml +++ b/docs/faq-build.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/faq-common.xml b/docs/faq-common.xml index c121f30..ce0fe3e 100644 --- a/docs/faq-common.xml +++ b/docs/faq-common.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/faq-contributing.xml b/docs/faq-contributing.xml index 8a7bb97..bba016d 100644 --- a/docs/faq-contributing.xml +++ b/docs/faq-contributing.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2002-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/faq-dom.xml b/docs/faq-dom.xml index 6c133c3..0a8bb30 100644 --- a/docs/faq-dom.xml +++ b/docs/faq-dom.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2002-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -75,8 +76,6 @@ import org.w3c.dom.ls.LSParser; ... -System.setProperty(DOMImplementationRegistry.PROPERTY, - "org.apache.xerces.dom.DOMImplementationSourceImpl"); DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance(); @@ -87,7 +86,7 @@ LSParser builder = impl.createLSParser( DOMImplementationLS.MODE_SYNCHRONOUS, null); Document document = builder.parseURI("data/personal.xml");</source> - <note>You can now use DOM Level 3 Load/Save and Core interfaces with the default Xerces distribution. + <note>You can now use DOM Level 3 Load/Save and Core interfaces with the regular Xerces distribution. </note> </a> </faq> @@ -106,8 +105,6 @@ import org.w3c.dom.ls.LSSerializer; ... -System.setProperty(DOMImplementationRegistry.PROPERTY, - "org.apache.xerces.dom.DOMImplementationSourceImpl"); DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance(); DOMImplementationLS impl = @@ -123,7 +120,8 @@ String str = writer.writeToString(document);</source> </p> <p> - You can also serialize a DOM tree by using the Xerces <code>org.apache.xml.XMLSerializer</code> serialization code directly. This is a non-standard way of serializing a DOM and should be avoided: + It is also possible to serialize a DOM tree by using the Xerces <code>org.apache.xml.XMLSerializer</code> serialization code directly. + This non-standard way of serializing a DOM has been <strong>deprecated</strong> since Xerces-J 2.9.0 and should be avoided. </p> <source>import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; @@ -137,7 +135,7 @@ format.setIndenting(true); format.setLineWidth(0); format.setPreserveSpace(true); XMLSerializer serializer = new XMLSerializer ( - new FileWriter("output.xml"), format); + new FileOutputStream("output.xml"), format); serializer.asDOMSerializer(); serializer.serialize(document);</source> </a> diff --git a/docs/faq-general.xml b/docs/faq-general.xml index 6bd85cd..dd6323f 100644 --- a/docs/faq-general.xml +++ b/docs/faq-general.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -93,15 +94,45 @@ </p> </a> </faq> - <faq title="Xerces HTML, XHTML, and XML Serializers"> - <q>What can I use instead of Xerces' HTML, XHTML, or XML serializers? + <faq title="Xerces XML, HTML and XHTML Serializers"> + <q>What should I be using instead of Xerces' XML, HTML or XHTML serializers? </q> <a> <p> -If you want to achieve interoperability, you should not be using Xerces serialization code directly. +As of the 2.9.0 release Xerces-J began sharing a common serialization codebase with Xalan and now includes <code>serializer.jar</code> +with its distribution for DOM Level 3 serialization support. The entire <code>org.apache.xml.serialize</code> package was +<strong>deprecated</strong> in Xerces 2.9.0. The HTML and XHTML serializers were previously <strong>deprecated</strong> in the +Xerces 2.6.2 release. You can find more details about the rationale for this decision here in the +<jump href="http://marc.theaimsgroup.com/?l=xalan-dev&m=107593381313807&w=2">archives</jump>. +</p> + +<p> +If you want to achieve interoperability and avoid using deprecated APIs, you should not be using Xerces serialization code directly. Instead, the <jump href="http://java.sun.com/xml/jaxp/index.jsp">JAXP</jump> Transformer API should be used to serialize HTML, XHTML, and SAX. The <jump href="http://www.w3.org/DOM/DOMTR">DOM</jump> Level 3 Load and Save API (or JAXP Transformer API) should be used to serialize DOM. </p> + <p>Using <jump href="http://www.w3.org/DOM/DOMTR">DOM</jump> Level 3 you can serialize XML as follows:</p> + +<source>import org.w3c.dom.DOMImplementationRegistry; +import org.w3c.dom.Document; +import org.w3c.dom.ls.DOMImplementationLS; +import org.w3c.dom.ls.LSSerializer; +import org.w3c.dom.ls.LSOutput; + +... + +DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance(); + +DOMImplementationLS impl = + (DOMImplementationLS)registry.getDOMImplementation("LS"); + +... + +LSSerializer writer = impl.createLSSerializer(); +LSOutput output = impl.createLSOutput(); +output.setByteStream(System.out); +writer.write(document, output);</source> + <p>Using <jump href="http://java.sun.com/xml/jaxp/index.jsp">JAXP</jump> you can serialize HTML and XHTML as follows:</p> <source> @@ -122,14 +153,9 @@ t.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, t.setOutputProperty(OutputKeys.METHOD, "html"); // Serialize DOM tree -t.transform(new DOMSource(doc), new StreamResult(System.out)); -</source> +t.transform(new DOMSource(doc), new StreamResult(System.out));</source> -<p> -You can find more details about the future of Xerces' serializers in the <jump href="http://marc.theaimsgroup.com/?l=xalan-dev&m=107593381313807&w=2">archives</jump>. -</p> -<note>The HTML and XHTML serializers (<code>org.apache.xml.serialize</code>) have been <code>deprecated</code> in the Xerces 2.6.2 release. We might deprecate <code>XMLSerializer</code> in a future release.</note> </a> </faq> <faq title="Obtaining smaller jars"> diff --git a/docs/faq-grammars.xml b/docs/faq-grammars.xml index d22c335..d394502 100644 --- a/docs/faq-grammars.xml +++ b/docs/faq-grammars.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2002-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/faq-pcfp.xml b/docs/faq-pcfp.xml index 60594ba..e5d84f8 100644 --- a/docs/faq-pcfp.xml +++ b/docs/faq-pcfp.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/faq-performance.xml b/docs/faq-performance.xml index f144e14..dbc21da 100644 --- a/docs/faq-performance.xml +++ b/docs/faq-performance.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2000-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/faq-sax.xml b/docs/faq-sax.xml index 53910de..408b031 100644 --- a/docs/faq-sax.xml +++ b/docs/faq-sax.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/faq-write.xml b/docs/faq-write.xml index 436feeb..01f762d 100644 --- a/docs/faq-write.xml +++ b/docs/faq-write.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/faq-xcatalogs.xml b/docs/faq-xcatalogs.xml index 3e9a098..64d3b0c 100644 --- a/docs/faq-xcatalogs.xml +++ b/docs/faq-xcatalogs.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,8 +26,8 @@ Apache <jump href="http://xml.apache.org/commons/">XML Commons</jump> Resolver: <code>resolver.jar</code> needs to be on your classpath (or accessible in some other way to the ClassLoader). The resolver provides an implementation - of <jump href="http://www.oasis-open.org/committees/entity/spec.html">OASIS XML Catalogs</jump> - as well as some <link anchor='xcatalogs-other-formats'>other</link> catalog formats. The XML Commons Resolver 1.1 is included with + of <jump href="http://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html">OASIS XML Catalogs v1.1</jump> + as well as some <link anchor='xcatalogs-other-formats'>other</link> catalog formats. The XML Commons Resolver 1.2 is included with the binary distribution of Xerces. For information about interacting directly with the Resolver's API visit the <jump href="http://xml.apache.org/commons/">XML Commons</jump> site. @@ -223,13 +224,11 @@ catalog2.xml: <anchor name='xcatalogs-other-formats'/> <p> Xerces only includes a utility class for OASIS XML Catalogs, however - the XML Commons Resolver supports several other catalog formats + the XML Commons Resolver supports a few other catalog formats including: the plain text format described by OASIS - <jump href="http://www.oasis-open.org/specs/a401.htm">TR 9401</jump>, - the XCatalog XML format defined by John Cowan, and an extended - version of OASIS XML Catalogs which supports suffix matching. For - more information visit the - <jump href="http://xml.apache.org/commons/">XML Commons</jump> site. + <jump href="http://www.oasis-open.org/specs/a401.htm">TR 9401</jump> + and the XCatalog XML format defined by John Cowan. For more information + visit the <jump href="http://xml.apache.org/commons/">XML Commons</jump> site. </p> </a> </faq> diff --git a/docs/faq-xinclude.xml b/docs/faq-xinclude.xml index 49cdbb7..e0b1d7b 100644 --- a/docs/faq-xinclude.xml +++ b/docs/faq-xinclude.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2003-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -87,7 +88,7 @@ spf.setXIncludeAware(true); Yes. The XInclude specification requires processors to use the base URI (as specified in the <jump href="http://www.w3.org/TR/xmlbase/">XML Base</jump> recommendation) to resolve relative IRIs to compute the - <jump href="http://www.w3.org/TR/2004/REC-xinclude-20041220/#include-location">include location</jump>. + <jump href="http://www.w3.org/TR/2006/REC-xinclude-20061115/#include-location">include location</jump>. Support for XML Base was added to the XInclude implementation in Xerces-J 2.6.0. </p> </a> @@ -108,7 +109,7 @@ spf.setXIncludeAware(true); <q>Does the XInclude processor perform references property fixup?</q> <a> <p> - Section <jump href="http://www.w3.org/TR/xinclude/#references-property">4.5.3</jump> + Section <jump href="http://www.w3.org/TR/2006/REC-xinclude-20061115/#references-property">4.5.3</jump> of the XInclude 1.0 W3C Recommendation describes fixup of the [references] property of an attribute information item. For IDREF/IDREFS the property contains an ordered list of element information items. Xerces provides no mechanism for accessing this @@ -149,7 +150,7 @@ spf.setXIncludeAware(true); <a> <p> Yes, the values of the <code>accept</code> and <code>accept-language</code> attributes - from an <jump href="http://www.w3.org/TR/2004/REC-xinclude-20041220/#include_element">include</jump> + from an <jump href="http://www.w3.org/TR/2006/REC-xinclude-20061115/#include_element">include</jump> element are included as request properties in an HTTP request. Support for content negotation when parse="xml" was added to the XInclude implementation in Xerces-J 2.7.0. </p> diff --git a/docs/faq-xni.xml b/docs/faq-xni.xml index f28a4e9..b4ba358 100644 --- a/docs/faq-xni.xml +++ b/docs/faq-xni.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2002-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -126,6 +127,15 @@ </td> </tr> <tr> + <td>SoftReferenceSymbolTableConfiguration</td> + <td>Extends the default configuration allowing Xerces to handle usage scenarios + where the names in the XML documents being parsed are mostly unique by + installing a memory sensitive SymbolTable. The internalized strings stored + in this SymbolTable are softly reachable and may be cleared by the garbage + collector in response to memory demand. + </td> + </tr> + <tr> <td>StandardParserConfiguration</td> <td>Extends DTDConfiguration by adding support for XML schema validation.</td> </tr> diff --git a/docs/faq-xs.xml b/docs/faq-xs.xml index b959fc8..f338c5d 100644 --- a/docs/faq-xs.xml +++ b/docs/faq-xs.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2002-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/features.xml b/docs/features.xml index 1f9c58a..bbe9ec0 100644 --- a/docs/features.xml +++ b/docs/features.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/install.xml b/docs/install.xml index df4b86d..4e421df 100644 --- a/docs/install.xml +++ b/docs/install.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -48,6 +49,18 @@ jar xf &ParserName;-tools.&parserversion;.zip</source> <td>License for the XML Commons Resolver</td> </tr> <tr> + <td>NOTICE.resolver.txt</td> + <td>NOTICE file for the XML Commons Resolver</td> + </tr> + <tr> + <td>LICENSE.serializer.txt</td> + <td>License for the Apache Xalan serializer</td> + </tr> + <tr> + <td>NOTICE.serializer.txt</td> + <td>NOTICE file for the Apache Xalan serializer</td> + </tr> + <tr> <td>LICENSE-SAX.html</td> <td>SAX License</td> </tr> @@ -65,8 +78,13 @@ jar xf &ParserName;-tools.&parserversion;.zip</source> </tr> <tr> <td>resolver.jar</td> - <td>Jar file containing the XML Commons Resolver. Currently, - Resolver 1.1 is distributed with &ParserName;.</td> + <td>Jar file containing the XML Commons Resolver. Currently + Resolver 1.2 is distributed with &ParserName;.</td> + </tr> + <tr> + <td>serializer.jar</td> + <td>Jar file containing the Apache Xalan serializer. Currently + the serializer included in Xalan 2.7.1 is distributed with &ParserName;.</td> </tr> <tr> <td>xercesImpl.jar</td> @@ -76,7 +94,7 @@ jar xf &ParserName;-tools.&parserversion;.zip</source> <tr> <td>xml-apis.jar</td> <td>Jar file containing all the standard APIs implemented by - the parser. Currently, &ParserName; supports DOM level 3, SAX + the parser. Currently &ParserName; supports DOM level 3, SAX 2.0.2, and the <code>javax.xml.datatype</code>, <code>javax.xml.parsers</code> and <code>javax.xml.validation</code> parts of JAXP 1.3.</td> @@ -130,6 +148,18 @@ jar xf &ParserName;-tools.&parserversion;.zip</source> <td>License for the XML Commons Resolver</td> </tr> <tr> + <td>NOTICE.resolver.txt</td> + <td>NOTICE file for the XML Commons Resolver</td> + </tr> + <tr> + <td>LICENSE.serializer.txt</td> + <td>License for the Apache Xalan serializer</td> + </tr> + <tr> + <td>NOTICE.serializer.txt</td> + <td>NOTICE file for the Apache Xalan serializer</td> + </tr> + <tr> <td>LICENSE-SAX.html</td> <td>SAX License</td> </tr> @@ -162,18 +192,6 @@ jar xf &ParserName;-tools.&parserversion;.zip</source> <td>Web page redirect required for building documentation</td> </tr> <tr> - <td>STATUS</td> - <td>Current source code status information</td> - </tr> - <tr> - <td>TODO</td> - <td>Current list of "todo" items</td> - </tr> - <tr> - <td>ISSUES</td> - <td>Current open issues that need to be resolved</td> - </tr> - <tr> <td>data/</td> <td>Directory containing sample XML data files</td> </tr> @@ -188,8 +206,7 @@ jar xf &ParserName;-tools.&parserversion;.zip</source> <tr> <td>src/</td> <td> - Directory containing source code for parser and supplemental - APIs + Directory containing source code for parser and supplemental APIs </td> </tr> </table> diff --git a/docs/limitations.xml b/docs/limitations.xml index e09936a..2d95c7f 100644 --- a/docs/limitations.xml +++ b/docs/limitations.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/properties.xml b/docs/properties.xml index de45cb6..fd118ab 100644 --- a/docs/properties.xml +++ b/docs/properties.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/readme.xml b/docs/readme.xml index b93c929..92a6ad9 100644 --- a/docs/readme.xml +++ b/docs/readme.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -42,9 +43,9 @@ Xerces2 also provides a <link idref='dom3'>complete implementation</link> of the <jump href="http://www.w3.org/DOM/DOMTR#dom3">Document Object Model Level 3 Core and Load/Save</jump> W3C Recommendations and provides a - <link idref='faq-xinclude'>complete implementation</link> of the <jump href="http://www.w3.org/TR/2004/REC-xinclude-20041220/">XML Inclusions + <link idref='faq-xinclude'>complete implementation</link> of the <jump href="http://www.w3.org/TR/2006/REC-xinclude-20061115/">XML Inclusions (XInclude)</jump> W3C Recommendation. It also provides <link idref='faq-xcatalogs'>support</link> - for <jump href="http://www.oasis-open.org/committees/entity/spec.html">OASIS XML Catalogs</jump>. + for <jump href="http://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html">OASIS XML Catalogs v1.1</jump>. </p> @@ -88,8 +89,8 @@ Second Edition Recommendation </li> <li> - <jump href='http://www.w3.org/TR/2004/REC-xinclude-20041220/'> - XML Inclusions (XInclude) Version 1.0</jump> Recommendation + <jump href='http://www.w3.org/TR/2006/REC-xinclude-20061115/'> + XML Inclusions (XInclude) Version 1.0</jump> Second Edition Recommendation </li> <li> <jump href='http://www.w3.org/DOM/'>Document Object Model</jump> @@ -132,9 +133,11 @@ <s2 title='Changes from Previous Release'> <p> - The &ParserNameLong; &ParserVersion; fixes several bugs which were present - in the previous release. It also includes a few minor enhancements and performance - improvements. + The &ParserNameLong; &ParserVersion; includes the Xalan serializer in its + distribution. Xerces and Xalan now share a common serialization codebase. The + DOM Level 3 serialization support which was in Xerces was migrated into the Xalan + serializer and Xerces' native serializer was deprecated. This release also + includes a few minor enhancements and several bug fixes. </p> <p> For a more complete list of changes, refer to the diff --git a/docs/releases.xml b/docs/releases.xml index 7f7f7a4..fcd9bf2 100644 --- a/docs/releases.xml +++ b/docs/releases.xml @@ -1,22 +1,117 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. --> -<!-- $Id: releases.xml 443177 2006-09-14 01:03:26Z mrglavas $ --> +<!-- $Id: releases.xml 478400 2006-11-23 00:04:31Z mrglavas $ --> <!DOCTYPE releases SYSTEM 'dtd/releases.dtd'> <releases> + <release version='&ParserName; 2.9.0'> + <desc> + <p> + As of this release, Xerces and Xalan now share a common serialization codebase. + The DOM Level 3 serialization support which was in Xerces was migrated into + the Xalan serializer and Xerces' native serializer was deprecated. In this release + we also upgraded the xml-commons resolver to v1.2 (which provides support for OASIS + XML Catalogs v1.1), introduced a few minor features and fixed several bugs. + </p> + </desc> + <changes> + <update> + <note> + Migrated the DOM Level 3 serialization support onto a common serialization + codebase shared with Xalan and deprecated Xerces' native serializer. + </note> + <submitter name='Neil Delima, Michael Glavassevich'/> + </update> + <add> + <note> + Upgraded the xml-commons resolver to v1.2. This new version of + the resolver adds support for + <jump href="http://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html">OASIS XML Catalogs v1.1</jump>. + </note> + <submitter name='Michael Glavassevich'/> + </add> + <add> + <note> + Created a new parser configuration which uses a memory sensitive + SymbolTable which can handle usage scenarios where the names in the + XML documents being parsed are mostly unique. The internalized + strings stored in this SymbolTable are softly reachable and may be + cleared by the garbage collector in response to memory demand. + </note> + <submitter name='Peter McCracken'/> + </add> + <update> + <note> + Updated the schema loader so that it can now process XML 1.1 schema documents. + </note> + <submitter name='Michael Glavassevich'/> + </update> + <fix> + <note> + Fixed several bugs in the checking of schema type restrictions + that involve substitution groups. + </note> + <submitter name='Lucian Holland, Ignacio Hernandez-Ros'/> + </fix> + <fix> + <note> + Fixed a bug in Xerces' regular expression support where patterns containing + "$" and "^" were being interpreted as anchors in a schema context. + </note> + <submitter name='Chris Carman'/> + </fix> + <fix> + <note> + Fixed a bug in the XPath matcher for identity constraints which allowed + steps containing NCName:* to select element or attribute names which do + not match the specified namespace. + </note> + <submitter name='Michael Glavassevich'/> + </fix> + <fix> + <note> + Fixed a bug in the XPath parser for identity constraints which caused + field and selector XPaths containing the non-abbreviated form of the + child and attribute axes to be reported as invalid. + </note> + <submitter name='Michael Glavassevich'/> + </fix> + <fix> + <note> + Fixed a bug which allowed the JAXP SchemaFactory to mutate a user + supplied DOM input. + </note> + <submitter name='Michael Glavassevich'/> + </fix> + <fix> + <note> + Fixed a bug which caused the JAXP 1.2 method for schema validation to + produce DTD validation errors when XInclude processing is enabled. + </note> + <submitter name='Michael Glavassevich'/> + </fix> + <fix> + <note> + Fixed various bugs and made various improvements. + </note> + <submitter name='Nathan Beyer, Michael Glavassevich, Jacob Kjome'/> + </fix> + </changes> + </release> <release version='&ParserName; 2.8.1'> <desc> <p> diff --git a/docs/samples-dom.xml b/docs/samples-dom.xml index 358b8bb..3ed8475 100644 --- a/docs/samples-dom.xml +++ b/docs/samples-dom.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/samples-jaxp.xml b/docs/samples-jaxp.xml index ca9b39d..3fece70 100644 --- a/docs/samples-jaxp.xml +++ b/docs/samples-jaxp.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/samples-sax.xml b/docs/samples-sax.xml index a7bf652..d301b74 100644 --- a/docs/samples-sax.xml +++ b/docs/samples-sax.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/samples-socket.xml b/docs/samples-socket.xml index 1e286b0..4fa2918 100644 --- a/docs/samples-socket.xml +++ b/docs/samples-socket.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/samples-ui.xml b/docs/samples-ui.xml index 3d766b3..edce472 100644 --- a/docs/samples-ui.xml +++ b/docs/samples-ui.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/samples-xni.xml b/docs/samples-xni.xml index 0547620..f5cdf25 100644 --- a/docs/samples-xni.xml +++ b/docs/samples-xni.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/samples.xml b/docs/samples.xml index b9e88a6..b0a1ae4 100644 --- a/docs/samples.xml +++ b/docs/samples.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/sax.xml b/docs/sax.xml index 94c6e53..1fedad1 100644 --- a/docs/sax.xml +++ b/docs/sax.xml @@ -1,13 +1,14 @@ <?xml version="1.0" standalone="no"?> <!-- - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/xml-schema.xml b/docs/xml-schema.xml index 26563d2..e0dd106 100644 --- a/docs/xml-schema.xml +++ b/docs/xml-schema.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2002-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/xni-config.xml b/docs/xni-config.xml index 3480d82..8cd884a 100644 --- a/docs/xni-config.xml +++ b/docs/xni-config.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/xni-core.xml b/docs/xni-core.xml index e9272a9..99a88bc 100644 --- a/docs/xni-core.xml +++ b/docs/xni-core.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/xni-design.xml b/docs/xni-design.xml index e53adaf..94822a6 100644 --- a/docs/xni-design.xml +++ b/docs/xni-design.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/xni-xerces2.xml b/docs/xni-xerces2.xml index f29a385..d056438 100644 --- a/docs/xni-xerces2.xml +++ b/docs/xni-xerces2.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/xni.xml b/docs/xni.xml index cb1afeb..3f8c3b4 100644 --- a/docs/xni.xml +++ b/docs/xni.xml @@ -1,13 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/dom/Counter.java b/samples/dom/Counter.java index efce266..a19d8b0 100644 --- a/samples/dom/Counter.java +++ b/samples/dom/Counter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -45,7 +46,7 @@ import org.xml.sax.SAXParseException; * * @author Andy Clark, IBM * - * @version $Id: Counter.java 329525 2005-10-30 05:39:22Z mrglavas $ + * @version $Id: Counter.java 447683 2006-09-19 02:36:31Z mrglavas $ */ public class Counter { diff --git a/samples/dom/DOM3.java b/samples/dom/DOM3.java index 1d6db04..79b7818 100644 --- a/samples/dom/DOM3.java +++ b/samples/dom/DOM3.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/samples/dom/DOMAddLines.java b/samples/dom/DOMAddLines.java index 8f957be..3d465ad 100644 --- a/samples/dom/DOMAddLines.java +++ b/samples/dom/DOMAddLines.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -42,7 +43,7 @@ import org.w3c.dom.NodeList; * - How to attach user defined Objects to Nodes using method setUserData * This example relies on the following: * - Turning off the "fast" DOM so we can use set expansion to FULL - * @version $Id: DOMAddLines.java 320323 2005-05-09 01:01:40Z mrglavas $ + * @version $Id: DOMAddLines.java 447683 2006-09-19 02:36:31Z mrglavas $ */ public class DOMAddLines extends DOMParser { diff --git a/samples/dom/DOMGenerate.java b/samples/dom/DOMGenerate.java index 5395ba9..90649c7 100644 --- a/samples/dom/DOMGenerate.java +++ b/samples/dom/DOMGenerate.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.w3c.dom.Element; * - Generate a DOM from Scratch. * - Output DOM to a String using Serializer * @author Jeffrey Rodriguez - * @version $Id: DOMGenerate.java 320323 2005-05-09 01:01:40Z mrglavas $ + * @version $Id: DOMGenerate.java 447683 2006-09-19 02:36:31Z mrglavas $ */ public class DOMGenerate { public static void main( String[] argv ) { diff --git a/samples/dom/GetElementsByTagName.java b/samples/dom/GetElementsByTagName.java index adc78ce..2d1eb8a 100644 --- a/samples/dom/GetElementsByTagName.java +++ b/samples/dom/GetElementsByTagName.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,7 +35,7 @@ import org.xml.sax.SAXParseException; * @author Jeffrey Rodriguez, IBM * @author Andy Clark, IBM * - * @version $Id: GetElementsByTagName.java 329525 2005-10-30 05:39:22Z mrglavas $ + * @version $Id: GetElementsByTagName.java 447683 2006-09-19 02:36:31Z mrglavas $ */ public class GetElementsByTagName { diff --git a/samples/dom/ParserWrapper.java b/samples/dom/ParserWrapper.java index 057cce8..de0fb4d 100644 --- a/samples/dom/ParserWrapper.java +++ b/samples/dom/ParserWrapper.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import org.xml.sax.SAXNotSupportedException; /** * Encapsulates a DOM parser. * - * @version $Id: ParserWrapper.java 319809 2004-02-24 23:52:54Z mrglavas $ + * @version $Id: ParserWrapper.java 447683 2006-09-19 02:36:31Z mrglavas $ */ public interface ParserWrapper { diff --git a/samples/dom/Writer.java b/samples/dom/Writer.java index 7e7337a..a4eedb5 100644 --- a/samples/dom/Writer.java +++ b/samples/dom/Writer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import org.xml.sax.SAXParseException; * * @author Andy Clark, IBM * - * @version $Id: Writer.java 329525 2005-10-30 05:39:22Z mrglavas $ + * @version $Id: Writer.java 447683 2006-09-19 02:36:31Z mrglavas $ */ public class Writer { diff --git a/samples/dom/traversal/IteratorView.java b/samples/dom/traversal/IteratorView.java index a2d8c99..0a8edc7 100644 --- a/samples/dom/traversal/IteratorView.java +++ b/samples/dom/traversal/IteratorView.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/samples/dom/traversal/NameNodeFilter.java b/samples/dom/traversal/NameNodeFilter.java index 3640162..9e178ac 100644 --- a/samples/dom/traversal/NameNodeFilter.java +++ b/samples/dom/traversal/NameNodeFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/samples/dom/traversal/TreeWalkerView.java b/samples/dom/traversal/TreeWalkerView.java index 1a3681f..4c7f8e2 100644 --- a/samples/dom/traversal/TreeWalkerView.java +++ b/samples/dom/traversal/TreeWalkerView.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/samples/dom/wrappers/Xerces.java b/samples/dom/wrappers/Xerces.java index 259a847..dafc7b2 100644 --- a/samples/dom/wrappers/Xerces.java +++ b/samples/dom/wrappers/Xerces.java @@ -1,9 +1,10 @@ /* - * Copyright 1999, 2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.xml.sax.SAXNotSupportedException; /** * Wraps the Xerces DOM parser. * - * @version $Id: Xerces.java 319809 2004-02-24 23:52:54Z mrglavas $ + * @version $Id: Xerces.java 447683 2006-09-19 02:36:31Z mrglavas $ */ public class Xerces implements ParserWrapper, ParserWrapper.DocumentInfo, ErrorHandler { diff --git a/samples/jaxp/DatatypeAPIUsage.java b/samples/jaxp/DatatypeAPIUsage.java index d83e3cb..dc76908 100644 --- a/samples/jaxp/DatatypeAPIUsage.java +++ b/samples/jaxp/DatatypeAPIUsage.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import javax.xml.datatype.XMLGregorianCalendar; /** * <p>A sample which demonstrates usage of the JAXP 1.3 Datatype API.</p> * - * @version $Id: DatatypeAPIUsage.java 320415 2005-06-01 04:56:47Z mrglavas $ + * @version $Id: DatatypeAPIUsage.java 447685 2006-09-19 02:37:49Z mrglavas $ */ public class DatatypeAPIUsage { diff --git a/samples/jaxp/InlineSchemaValidator.java b/samples/jaxp/InlineSchemaValidator.java index 085daa9..f0d6380 100644 --- a/samples/jaxp/InlineSchemaValidator.java +++ b/samples/jaxp/InlineSchemaValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -65,7 +66,7 @@ import org.xml.sax.SAXParseException; * * @author Michael Glavassevich, IBM * - * @version $Id: InlineSchemaValidator.java 329638 2005-10-30 20:49:20Z mrglavas $ + * @version $Id: InlineSchemaValidator.java 447685 2006-09-19 02:37:49Z mrglavas $ */ public class InlineSchemaValidator implements ErrorHandler, NamespaceContext { diff --git a/samples/jaxp/ParserAPIUsage.java b/samples/jaxp/ParserAPIUsage.java index 35745dc..496db79 100644 --- a/samples/jaxp/ParserAPIUsage.java +++ b/samples/jaxp/ParserAPIUsage.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.xml.sax.helpers.DefaultHandler; * @author Michael Glavassevich, IBM * @author Ankit Pasricha, IBM * - * @version $Id: ParserAPIUsage.java 320439 2005-06-10 03:43:46Z mrglavas $ + * @version $Id: ParserAPIUsage.java 447685 2006-09-19 02:37:49Z mrglavas $ */ public class ParserAPIUsage extends DefaultHandler { diff --git a/samples/jaxp/SourceValidator.java b/samples/jaxp/SourceValidator.java index 6d911f1..51d2d6b 100644 --- a/samples/jaxp/SourceValidator.java +++ b/samples/jaxp/SourceValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -61,7 +62,7 @@ import org.xml.sax.helpers.XMLReaderFactory; * * @author Michael Glavassevich, IBM * - * @version $Id: SourceValidator.java 329638 2005-10-30 20:49:20Z mrglavas $ + * @version $Id: SourceValidator.java 447685 2006-09-19 02:37:49Z mrglavas $ */ public class SourceValidator implements ErrorHandler { diff --git a/samples/jaxp/TypeInfoWriter.java b/samples/jaxp/TypeInfoWriter.java index e45684c..8b49341 100644 --- a/samples/jaxp/TypeInfoWriter.java +++ b/samples/jaxp/TypeInfoWriter.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -52,7 +53,7 @@ import org.xml.sax.helpers.XMLReaderFactory; * * @author Michael Glavassevich, IBM * - * @version $Id: TypeInfoWriter.java 329638 2005-10-30 20:49:20Z mrglavas $ + * @version $Id: TypeInfoWriter.java 447685 2006-09-19 02:37:49Z mrglavas $ */ public class TypeInfoWriter extends DefaultHandler { diff --git a/samples/sax/Counter.java b/samples/sax/Counter.java index a90d1bb..bca1a17 100644 --- a/samples/sax/Counter.java +++ b/samples/sax/Counter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -49,7 +50,7 @@ import org.xml.sax.helpers.XMLReaderFactory; * * @author Andy Clark, IBM * - * @version $Id: Counter.java 329521 2005-10-30 05:19:30Z mrglavas $ + * @version $Id: Counter.java 447686 2006-09-19 02:38:34Z mrglavas $ */ public class Counter extends DefaultHandler { diff --git a/samples/sax/DocumentTracer.java b/samples/sax/DocumentTracer.java index 5861a07..9343bbc 100644 --- a/samples/sax/DocumentTracer.java +++ b/samples/sax/DocumentTracer.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -50,7 +51,7 @@ import org.xml.sax.ext.LexicalHandler; * @author Andy Clark, IBM * @author Arnaud Le Hors, IBM * - * @version $Id: DocumentTracer.java 329521 2005-10-30 05:19:30Z mrglavas $ + * @version $Id: DocumentTracer.java 447686 2006-09-19 02:38:34Z mrglavas $ */ public class DocumentTracer extends DefaultHandler diff --git a/samples/sax/Writer.java b/samples/sax/Writer.java index ec903d2..6ec6e08 100644 --- a/samples/sax/Writer.java +++ b/samples/sax/Writer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -46,7 +47,7 @@ import org.xml.sax.helpers.XMLReaderFactory; * * @author Andy Clark, IBM * - * @version $Id: Writer.java 429930 2006-08-09 02:33:11Z mrglavas $ + * @version $Id: Writer.java 447686 2006-09-19 02:38:34Z mrglavas $ */ public class Writer extends DefaultHandler diff --git a/samples/sax/helpers/AttributesImpl.java b/samples/sax/helpers/AttributesImpl.java index b3dd93f..38ca070 100644 --- a/samples/sax/helpers/AttributesImpl.java +++ b/samples/sax/helpers/AttributesImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/samples/simpletype/DatatypeInterfaceUsage.java b/samples/simpletype/DatatypeInterfaceUsage.java index aebd7d6..211b584 100644 --- a/samples/simpletype/DatatypeInterfaceUsage.java +++ b/samples/simpletype/DatatypeInterfaceUsage.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -42,7 +43,7 @@ import org.xml.sax.helpers.DefaultHandler; * * @author Ankit Pasricha, IBM * - * @version $Id: DatatypeInterfaceUsage.java 320381 2005-05-20 22:01:01Z mrglavas $ + * @version $Id: DatatypeInterfaceUsage.java 447687 2006-09-19 02:39:08Z mrglavas $ */ public class DatatypeInterfaceUsage extends DefaultHandler { diff --git a/samples/simpletype/SimpleTypeUsage.java b/samples/simpletype/SimpleTypeUsage.java index 7b973ef..5259d1c 100644 --- a/samples/simpletype/SimpleTypeUsage.java +++ b/samples/simpletype/SimpleTypeUsage.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/samples/socket/DelayedInput.java b/samples/socket/DelayedInput.java index 2843c9c..deeeeaa 100644 --- a/samples/socket/DelayedInput.java +++ b/samples/socket/DelayedInput.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -48,7 +49,7 @@ import org.xml.sax.helpers.XMLReaderFactory; * * @author Andy Clark, IBM * - * @version $Id: DelayedInput.java 345600 2005-11-18 23:23:15Z mrglavas $ + * @version $Id: DelayedInput.java 447688 2006-09-19 02:39:49Z mrglavas $ */ public class DelayedInput extends DefaultHandler { diff --git a/samples/socket/KeepSocketOpen.java b/samples/socket/KeepSocketOpen.java index a130af0..8abf913 100644 --- a/samples/socket/KeepSocketOpen.java +++ b/samples/socket/KeepSocketOpen.java @@ -1,9 +1,10 @@ /* - * Copyright 2000,2001,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -88,7 +89,7 @@ import org.xml.sax.SAXParseException; * * @author Andy Clark, IBM * - * @version $Id: KeepSocketOpen.java 319809 2004-02-24 23:52:54Z mrglavas $ + * @version $Id: KeepSocketOpen.java 447688 2006-09-19 02:39:49Z mrglavas $ */ public class KeepSocketOpen { diff --git a/samples/socket/io/WrappedInputStream.java b/samples/socket/io/WrappedInputStream.java index 3df04cf..6fd62b6 100644 --- a/samples/socket/io/WrappedInputStream.java +++ b/samples/socket/io/WrappedInputStream.java @@ -1,9 +1,10 @@ /* - * Copyright 2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import java.io.IOException; * * @author Andy Clark, IBM * - * @version $Id: WrappedInputStream.java 319809 2004-02-24 23:52:54Z mrglavas $ + * @version $Id: WrappedInputStream.java 447688 2006-09-19 02:39:49Z mrglavas $ */ public class WrappedInputStream extends FilterInputStream { diff --git a/samples/socket/io/WrappedOutputStream.java b/samples/socket/io/WrappedOutputStream.java index 6362e50..2474a68 100644 --- a/samples/socket/io/WrappedOutputStream.java +++ b/samples/socket/io/WrappedOutputStream.java @@ -1,9 +1,10 @@ /* - * Copyright 2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -48,7 +49,7 @@ import java.io.OutputStream; * * @author Andy Clark, IBM * - * @version $Id: WrappedOutputStream.java 319809 2004-02-24 23:52:54Z mrglavas $ + * @version $Id: WrappedOutputStream.java 447688 2006-09-19 02:39:49Z mrglavas $ */ public class WrappedOutputStream extends FilterOutputStream { diff --git a/samples/ui/DOMParserSaveEncoding.java b/samples/ui/DOMParserSaveEncoding.java index e03b222..b2d20e7 100644 --- a/samples/ui/DOMParserSaveEncoding.java +++ b/samples/ui/DOMParserSaveEncoding.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/samples/ui/DOMTree.java b/samples/ui/DOMTree.java index 3fa9e18..21eec8b 100644 --- a/samples/ui/DOMTree.java +++ b/samples/ui/DOMTree.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.w3c.dom.NodeList; * Displays a DOM document in a tree control. * * @author Andy Clark, IBM - * @version $Id: DOMTree.java 320327 2005-05-09 01:18:19Z mrglavas $ + * @version $Id: DOMTree.java 447689 2006-09-19 02:40:36Z mrglavas $ */ public class DOMTree extends JTree diff --git a/samples/ui/DOMTreeFull.java b/samples/ui/DOMTreeFull.java index 06ff529..b07dfea 100644 --- a/samples/ui/DOMTreeFull.java +++ b/samples/ui/DOMTreeFull.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import org.w3c.dom.Notation; * DOMTree class to enter every DOM node into a Swing JTree tree. * The forward and backward mappings between Nodes to TreeNodes are kept. * - * @version $Id: DOMTreeFull.java 320327 2005-05-09 01:18:19Z mrglavas $ + * @version $Id: DOMTreeFull.java 447689 2006-09-19 02:40:36Z mrglavas $ */ public class DOMTreeFull extends JTree diff --git a/samples/ui/DefaultImages.java b/samples/ui/DefaultImages.java index 2dba319..5e5ed58 100644 --- a/samples/ui/DefaultImages.java +++ b/samples/ui/DefaultImages.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/samples/ui/TreeView.java b/samples/ui/TreeView.java index 0509cee..48dfe80 100644 --- a/samples/ui/TreeView.java +++ b/samples/ui/TreeView.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -72,7 +73,7 @@ import org.xml.sax.SAXParseException; * A sample DOM Tree Viewer. This sample program illustrates how to * traverse a DOM tree and display it in a Swing JTree View. * - * @version $Id: TreeView.java 345599 2005-11-18 23:19:17Z mrglavas $ + * @version $Id: TreeView.java 447689 2006-09-19 02:40:36Z mrglavas $ */ public class TreeView extends JFrame implements ActionListener, TextListener { diff --git a/samples/ui/TreeViewer.java b/samples/ui/TreeViewer.java index 4955170..4b8851a 100644 --- a/samples/ui/TreeViewer.java +++ b/samples/ui/TreeViewer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/samples/xni/Counter.java b/samples/xni/Counter.java index 4caa015..08364f4 100644 --- a/samples/xni/Counter.java +++ b/samples/xni/Counter.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -49,7 +50,7 @@ import org.apache.xerces.xni.parser.XMLParserConfiguration; * * @author Andy Clark, IBM * - * @version $Id: Counter.java 345598 2005-11-18 23:16:34Z mrglavas $ + * @version $Id: Counter.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class Counter extends XMLDocumentParser diff --git a/samples/xni/DocumentTracer.java b/samples/xni/DocumentTracer.java index 2ea35d7..f58ad94 100644 --- a/samples/xni/DocumentTracer.java +++ b/samples/xni/DocumentTracer.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -46,7 +47,7 @@ import org.apache.xerces.xni.parser.XMLParserConfiguration; * @author Andy Clark, IBM * @author Arnaud Le Hors, IBM * - * @version $Id: DocumentTracer.java 345598 2005-11-18 23:16:34Z mrglavas $ + * @version $Id: DocumentTracer.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class DocumentTracer extends XMLDocumentParser diff --git a/samples/xni/ObjectFactory.java b/samples/xni/ObjectFactory.java index 3195b47..5adb742 100644 --- a/samples/xni/ObjectFactory.java +++ b/samples/xni/ObjectFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -40,7 +41,7 @@ import java.io.InputStreamReader; * class and modified to be used as a general utility for creating objects * dynamically. * - * @version $Id: ObjectFactory.java 320285 2005-04-18 04:15:35Z mrglavas $ + * @version $Id: ObjectFactory.java 447690 2006-09-19 02:41:53Z mrglavas $ */ final class ObjectFactory { diff --git a/samples/xni/PSVIWriter.java b/samples/xni/PSVIWriter.java index 47cdac9..c13f199 100644 --- a/samples/xni/PSVIWriter.java +++ b/samples/xni/PSVIWriter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -82,7 +83,7 @@ import org.xml.sax.SAXNotSupportedException; * * @author Arun Yadav,Sun Miscrosystem. * @author Peter McCracken, IBM - * @version $Id: PSVIWriter.java 320203 2005-01-11 13:47:23Z mrglavas $ + * @version $Id: PSVIWriter.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class PSVIWriter implements XMLComponent, XMLDocumentFilter { diff --git a/samples/xni/PassThroughFilter.java b/samples/xni/PassThroughFilter.java index 344bc06..adb6dd6 100644 --- a/samples/xni/PassThroughFilter.java +++ b/samples/xni/PassThroughFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -39,7 +40,7 @@ import org.apache.xerces.xni.parser.XMLDocumentSource; * * @author Andy Clark, IBM * - * @version $Id: PassThroughFilter.java 319809 2004-02-24 23:52:54Z mrglavas $ + * @version $Id: PassThroughFilter.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class PassThroughFilter implements XMLDocumentHandler { diff --git a/samples/xni/SecuritySupport.java b/samples/xni/SecuritySupport.java index 0ceec4e..ff72034 100644 --- a/samples/xni/SecuritySupport.java +++ b/samples/xni/SecuritySupport.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/samples/xni/UpperCaseFilter.java b/samples/xni/UpperCaseFilter.java index 9d615ad..673a1b9 100644 --- a/samples/xni/UpperCaseFilter.java +++ b/samples/xni/UpperCaseFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import org.apache.xerces.xni.XNIException; * * @author Andy Clark, IBM * - * @version $Id: UpperCaseFilter.java 319809 2004-02-24 23:52:54Z mrglavas $ + * @version $Id: UpperCaseFilter.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class UpperCaseFilter extends PassThroughFilter { diff --git a/samples/xni/Writer.java b/samples/xni/Writer.java index f12bd4d..c4d1b93 100644 --- a/samples/xni/Writer.java +++ b/samples/xni/Writer.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -43,7 +44,7 @@ import org.apache.xerces.xni.parser.XMLPullParserConfiguration; * * @author Andy Clark, IBM * - * @version $Id: Writer.java 345598 2005-11-18 23:16:34Z mrglavas $ + * @version $Id: Writer.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class Writer extends XMLDocumentParser diff --git a/samples/xni/XMLGrammarBuilder.java b/samples/xni/XMLGrammarBuilder.java index 790cd1b..0faa71d 100644 --- a/samples/xni/XMLGrammarBuilder.java +++ b/samples/xni/XMLGrammarBuilder.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -41,7 +42,7 @@ import org.apache.xerces.xni.parser.XMLParserConfiguration; * towards combining this functionality in a DOM or SAX context. * * @author Neil Graham, IBM - * @version $Id: XMLGrammarBuilder.java 348824 2005-11-24 22:34:40Z mrglavas $ + * @version $Id: XMLGrammarBuilder.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class XMLGrammarBuilder { diff --git a/samples/xni/parser/AbstractConfiguration.java b/samples/xni/parser/AbstractConfiguration.java index d6ba20c..185083b 100644 --- a/samples/xni/parser/AbstractConfiguration.java +++ b/samples/xni/parser/AbstractConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -52,7 +53,7 @@ import org.apache.xerces.xni.parser.XMLParserConfiguration; * * @author Andy Clark, IBM * - * @version $Id: AbstractConfiguration.java 319809 2004-02-24 23:52:54Z mrglavas $ + * @version $Id: AbstractConfiguration.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public abstract class AbstractConfiguration implements XMLParserConfiguration { diff --git a/samples/xni/parser/CSVConfiguration.java b/samples/xni/parser/CSVConfiguration.java index 1e67d2b..5f93b93 100644 --- a/samples/xni/parser/CSVConfiguration.java +++ b/samples/xni/parser/CSVConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -60,7 +61,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * * @author Andy Clark, IBM * - * @version $Id: CSVConfiguration.java 320203 2005-01-11 13:47:23Z mrglavas $ + * @version $Id: CSVConfiguration.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class CSVConfiguration extends AbstractConfiguration { diff --git a/samples/xni/parser/CSVParser.java b/samples/xni/parser/CSVParser.java index 3dcd5fa..ea4c29e 100644 --- a/samples/xni/parser/CSVParser.java +++ b/samples/xni/parser/CSVParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.apache.xerces.parsers.AbstractSAXParser; * * @author Andy Clark, IBM * - * @version $Id: CSVParser.java 319809 2004-02-24 23:52:54Z mrglavas $ + * @version $Id: CSVParser.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class CSVParser extends AbstractSAXParser { diff --git a/samples/xni/parser/NonValidatingParserConfiguration.java b/samples/xni/parser/NonValidatingParserConfiguration.java index 7a93ebc..fb74390 100644 --- a/samples/xni/parser/NonValidatingParserConfiguration.java +++ b/samples/xni/parser/NonValidatingParserConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.xni.parser.XMLParserConfiguration; * * @author Andy Clark, IBM * - * @version $Id: NonValidatingParserConfiguration.java 320203 2005-01-11 13:47:23Z mrglavas $ + * @version $Id: NonValidatingParserConfiguration.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class NonValidatingParserConfiguration extends StandardParserConfiguration { diff --git a/samples/xni/parser/PSVIConfiguration.java b/samples/xni/parser/PSVIConfiguration.java index da911b2..61d10c7 100644 --- a/samples/xni/parser/PSVIConfiguration.java +++ b/samples/xni/parser/PSVIConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import xni.PSVIWriter; * configuration including XML Schema Validator in the pipeline. * * @author Elena Litani, IBM - * @version $Id: PSVIConfiguration.java 408782 2006-05-22 23:05:51Z mrglavas $ + * @version $Id: PSVIConfiguration.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class PSVIConfiguration extends XIncludeAwareParserConfiguration { diff --git a/samples/xni/parser/PSVIParser.java b/samples/xni/parser/PSVIParser.java index 9264e13..49751b5 100644 --- a/samples/xni/parser/PSVIParser.java +++ b/samples/xni/parser/PSVIParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.apache.xerces.parsers.AbstractSAXParser; * </ul> * * @author Elena Litani,IBM - * @version $Id: PSVIParser.java 319809 2004-02-24 23:52:54Z mrglavas $ + * @version $Id: PSVIParser.java 447690 2006-09-19 02:41:53Z mrglavas $ */ public class PSVIParser extends AbstractSAXParser { diff --git a/samples/xni/xerces.properties b/samples/xni/xerces.properties index 25a959c..be83aa0 100644 --- a/samples/xni/xerces.properties +++ b/samples/xni/xerces.properties @@ -1,9 +1,10 @@ # -# Copyright 2003,2004 The Apache Software Foundation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # @@ -14,7 +15,7 @@ # limitations under the License. # # @author Neil Graham -# @version $Id: xerces.properties 320431 2005-06-07 17:42:00Z mrglavas $ +# @version $Id: xerces.properties 447693 2006-09-19 02:48:07Z mrglavas $ ########################################## # When you create a Xerces parser, either directly using a native diff --git a/samples/xs/QueryXS.java b/samples/xs/QueryXS.java index d5c2833..4f48922 100644 --- a/samples/xs/QueryXS.java +++ b/samples/xs/QueryXS.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.w3c.dom.ls.LSParser; * use XML Schema API (org.apache.xerces.xs) to navigate XML Schema components. * * @author Elena Litani, IBM - * @version $Id: QueryXS.java 320297 2005-05-02 22:07:08Z mrglavas $ + * @version $Id: QueryXS.java 447691 2006-09-19 02:42:47Z mrglavas $ */ public class QueryXS implements DOMErrorHandler { diff --git a/src/org/apache/html/dom/HTMLAnchorElementImpl.java b/src/org/apache/html/dom/HTMLAnchorElementImpl.java index d1893b6..175d277 100644 --- a/src/org/apache/html/dom/HTMLAnchorElementImpl.java +++ b/src/org/apache/html/dom/HTMLAnchorElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLAnchorElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLAnchorElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLAppletElementImpl.java b/src/org/apache/html/dom/HTMLAppletElementImpl.java index b53cdaf..3446adb 100644 --- a/src/org/apache/html/dom/HTMLAppletElementImpl.java +++ b/src/org/apache/html/dom/HTMLAppletElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLAppletElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLAppletElement * @see HTMLElementImpl diff --git a/src/org/apache/html/dom/HTMLAreaElementImpl.java b/src/org/apache/html/dom/HTMLAreaElementImpl.java index 48ddd85..8ce210e 100644 --- a/src/org/apache/html/dom/HTMLAreaElementImpl.java +++ b/src/org/apache/html/dom/HTMLAreaElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLAreaElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLAreaElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLBRElementImpl.java b/src/org/apache/html/dom/HTMLBRElementImpl.java index 6a9b98d..a4bbc8d 100644 --- a/src/org/apache/html/dom/HTMLBRElementImpl.java +++ b/src/org/apache/html/dom/HTMLBRElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLBRElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLBRElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLBaseElementImpl.java b/src/org/apache/html/dom/HTMLBaseElementImpl.java index 4621a06..54cce7a 100644 --- a/src/org/apache/html/dom/HTMLBaseElementImpl.java +++ b/src/org/apache/html/dom/HTMLBaseElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLBaseElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLBaseElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLBaseFontElementImpl.java b/src/org/apache/html/dom/HTMLBaseFontElementImpl.java index 72185e2..b083a19 100644 --- a/src/org/apache/html/dom/HTMLBaseFontElementImpl.java +++ b/src/org/apache/html/dom/HTMLBaseFontElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLBaseFontElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLBaseFontElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLBodyElementImpl.java b/src/org/apache/html/dom/HTMLBodyElementImpl.java index 304cc12..7c04dce 100644 --- a/src/org/apache/html/dom/HTMLBodyElementImpl.java +++ b/src/org/apache/html/dom/HTMLBodyElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLBodyElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLBodyElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLBuilder.java b/src/org/apache/html/dom/HTMLBuilder.java index 6d5612d..35aa4e1 100644 --- a/src/org/apache/html/dom/HTMLBuilder.java +++ b/src/org/apache/html/dom/HTMLBuilder.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -35,7 +36,7 @@ import org.xml.sax.SAXException; * for working with the OpenXML HTML parser. * * - * @version $Revision: 319808 $ $Date: 2004-02-24 18:34:05 -0500 (Tue, 24 Feb 2004) $ + * @version $Revision: 449313 $ $Date: 2006-09-23 18:01:43 -0400 (Sat, 23 Sep 2006) $ * @author <a href="mailto:arkin@openxml.org">Assaf Arkin</a> */ public class HTMLBuilder @@ -51,17 +52,10 @@ public class HTMLBuilder /** * The current node in the document into which elements, text and - * other nodes will be inserted. This starts as the document iself + * other nodes will be inserted. This starts as the document itself * and reflects each element that is currently being parsed. */ protected ElementImpl _current; - - /** - * A reference to the current locator, this is generally the parser - * itself. The locator is used to locate errors and identify the - * source locations of elements. - */ - private Locator _locator; /** @@ -194,9 +188,7 @@ public class HTMLBuilder public void ignorableWhitespace( char[] text, int start, int length ) throws SAXException - { - Node node; - + { if ( ! _ignoreWhitespace ) _current.appendChild( new TextImpl( _document, new String( text, start, length ) ) ); } @@ -204,9 +196,7 @@ public class HTMLBuilder public void processingInstruction( String target, String instruction ) throws SAXException - { - Node node; - + { // Processing instruction may appear before the document element (in fact, before the // document has been created, or after the document element has been closed. if ( _current == null && _document == null ) @@ -225,13 +215,13 @@ public class HTMLBuilder public HTMLDocument getHTMLDocument() { - return (HTMLDocument) _document; + return _document; } public void setDocumentLocator( Locator locator ) { - _locator = locator; + // ignored } diff --git a/src/org/apache/html/dom/HTMLButtonElementImpl.java b/src/org/apache/html/dom/HTMLButtonElementImpl.java index e481aca..6dbc865 100644 --- a/src/org/apache/html/dom/HTMLButtonElementImpl.java +++ b/src/org/apache/html/dom/HTMLButtonElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLButtonElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLButtonElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLCollectionImpl.java b/src/org/apache/html/dom/HTMLCollectionImpl.java index 3b542cd..c049de1 100644 --- a/src/org/apache/html/dom/HTMLCollectionImpl.java +++ b/src/org/apache/html/dom/HTMLCollectionImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -53,7 +54,7 @@ import org.w3c.dom.html.HTMLTableSectionElement; * * @xerces.internal * - * @version $Revision: 442427 $ $Date: 2006-09-11 22:54:42 -0400 (Mon, 11 Sep 2006) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLCollection */ diff --git a/src/org/apache/html/dom/HTMLDListElementImpl.java b/src/org/apache/html/dom/HTMLDListElementImpl.java index 095666f..a736c73 100644 --- a/src/org/apache/html/dom/HTMLDListElementImpl.java +++ b/src/org/apache/html/dom/HTMLDListElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLDListElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLDListElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLDOMImplementationImpl.java b/src/org/apache/html/dom/HTMLDOMImplementationImpl.java index f04d884..775f94a 100644 --- a/src/org/apache/html/dom/HTMLDOMImplementationImpl.java +++ b/src/org/apache/html/dom/HTMLDOMImplementationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.w3c.dom.html.HTMLDocument; * * @xerces.internal * - * @version $Revision: 320092 $ $Date: 2004-10-04 23:23:48 -0400 (Mon, 04 Oct 2004) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.DOMImplementation */ diff --git a/src/org/apache/html/dom/HTMLDirectoryElementImpl.java b/src/org/apache/html/dom/HTMLDirectoryElementImpl.java index dbd149b..46e5d13 100644 --- a/src/org/apache/html/dom/HTMLDirectoryElementImpl.java +++ b/src/org/apache/html/dom/HTMLDirectoryElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLDirectoryElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLDirectoryElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLDivElementImpl.java b/src/org/apache/html/dom/HTMLDivElementImpl.java index 559fe75..eb34a8c 100644 --- a/src/org/apache/html/dom/HTMLDivElementImpl.java +++ b/src/org/apache/html/dom/HTMLDivElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLDivElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLDivElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLDocumentImpl.java b/src/org/apache/html/dom/HTMLDocumentImpl.java index 124e68a..7a60dfb 100644 --- a/src/org/apache/html/dom/HTMLDocumentImpl.java +++ b/src/org/apache/html/dom/HTMLDocumentImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -53,7 +54,7 @@ import org.w3c.dom.html.HTMLTitleElement; * * @xerces.internal * - * @version $Revision: 441883 $ $Date: 2006-09-09 20:38:58 -0400 (Sat, 09 Sep 2006) $ + * @version $Revision: 451609 $ $Date: 2006-09-30 12:20:57 -0400 (Sat, 30 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLDocument */ @@ -65,35 +66,35 @@ public class HTMLDocumentImpl private static final long serialVersionUID = 4285791750126227180L; /** - * Holds {@link HTMLCollectionImpl} object with live collection of all + * Holds <code>HTMLCollectionImpl</code> object with live collection of all * anchors in document. This reference is on demand only once. */ private HTMLCollectionImpl _anchors; /** - * Holds {@link HTMLCollectionImpl} object with live collection of all + * Holds <code>HTMLCollectionImpl</code> object with live collection of all * forms in document. This reference is on demand only once. */ private HTMLCollectionImpl _forms; /** - * Holds {@link HTMLCollectionImpl} object with live collection of all + * Holds <code>HTMLCollectionImpl</code> object with live collection of all * images in document. This reference is on demand only once. */ private HTMLCollectionImpl _images; /** - * Holds {@link HTMLCollectionImpl} object with live collection of all + * Holds <code>HTMLCollectionImpl</code> object with live collection of all * links in document. This reference is on demand only once. */ private HTMLCollectionImpl _links; /** - * Holds {@link HTMLCollectionImpl} object with live collection of all + * Holds <code>HTMLCollectionImpl</code> object with live collection of all * applets in document. This reference is on demand only once. */ private HTMLCollectionImpl _applets; @@ -398,6 +399,10 @@ public class HTMLDocumentImpl public synchronized Element getElementById( String elementId ) { + Element idElement = super.getElementById(elementId); + if (idElement != null) { + return idElement; + } return getElementById( elementId, this ); } @@ -417,10 +422,10 @@ public class HTMLDocumentImpl public final NodeList getElementsByTagNameNS( String namespaceURI, String localName ) { - if ( namespaceURI != null && namespaceURI.length() > 0 ) + if ( namespaceURI != null && namespaceURI.length() > 0 ) { return super.getElementsByTagNameNS( namespaceURI, localName.toUpperCase(Locale.ENGLISH) ); - else - return super.getElementsByTagName( localName.toUpperCase(Locale.ENGLISH) ); + } + return super.getElementsByTagName( localName.toUpperCase(Locale.ENGLISH) ); } @@ -432,7 +437,7 @@ public class HTMLDocumentImpl * create. * @param qualifiedName The qualified name of the element type to * instantiate. - * @param localName The local name of the element to instantiate. + * @param localpart The local name of the element to instantiate. * @return Element A new Element object with the following attributes: * @throws DOMException INVALID_CHARACTER_ERR: Raised if the specified * name contains an invalid character. @@ -446,11 +451,10 @@ public class HTMLDocumentImpl public Element createElementNS( String namespaceURI, String qualifiedName ) { - if ( namespaceURI == null || namespaceURI.length() == 0 ) + if ( namespaceURI == null || namespaceURI.length() == 0 ) { return createElement( qualifiedName ); - else { - return super.createElementNS( namespaceURI, qualifiedName ); } + return super.createElementNS( namespaceURI, qualifiedName ); } @@ -477,15 +481,16 @@ public class HTMLDocumentImpl } catch ( Exception except ) { + /* Throwable thrw; if ( except instanceof java.lang.reflect.InvocationTargetException ) thrw = ( (java.lang.reflect.InvocationTargetException) except ).getTargetException(); else thrw = except; -// System.out.println( "Exception " + thrw.getClass().getName() ); -// System.out.println( thrw.getMessage() ); - + System.out.println( "Exception " + thrw.getClass().getName() ); + System.out.println( thrw.getMessage() ); + */ throw new IllegalStateException( "HTM15 Tag '" + tagName + "' associated with an Element class that failed to construct.\n" + tagName); } } diff --git a/src/org/apache/html/dom/HTMLElementImpl.java b/src/org/apache/html/dom/HTMLElementImpl.java index 78247a0..2da3b05 100644 --- a/src/org/apache/html/dom/HTMLElementImpl.java +++ b/src/org/apache/html/dom/HTMLElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -35,7 +36,7 @@ import org.w3c.dom.html.HTMLFormElement; * * @xerces.internal * - * @version $Revision: 380041 $ $Date: 2006-02-22 23:42:27 -0500 (Wed, 22 Feb 2006) $ + * @version $Revision: 449313 $ $Date: 2006-09-23 18:01:43 -0400 (Sat, 23 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLElement */ @@ -54,72 +55,50 @@ public class HTMLElementImpl * @param owner The owner HTML document * @param tagName The element's tag name */ - public HTMLElementImpl( HTMLDocumentImpl owner, String tagName ) - { + public HTMLElementImpl( HTMLDocumentImpl owner, String tagName ) { super( owner, tagName.toUpperCase(Locale.ENGLISH) ); } - - public String getId() - { + public String getId() { return getAttribute( "id" ); } - - public void setId( String id ) - { + public void setId( String id ) { setAttribute( "id", id ); - } - + } - public String getTitle() - { + public String getTitle() { return getAttribute( "title" ); } - - public void setTitle( String title ) - { + public void setTitle( String title ) { setAttribute( "title", title ); } - - public String getLang() - { + public String getLang() { return getAttribute( "lang" ); - } + } - - public void setLang( String lang ) - { + public void setLang( String lang ) { setAttribute( "lang", lang ); } - - public String getDir() - { + public String getDir() { return getAttribute( "dir" ); } - - public void setDir( String dir ) - { + public void setDir( String dir ) { setAttribute( "dir", dir ); } - - - public String getClassName() - { + + public String getClassName() { return getAttribute( "class" ); } - - public void setClassName( String className ) - { + public void setClassName( String className ) { setAttribute( "class", className ); } - /** * Convenience method used to translate an attribute value into an integer * value. Returns the integer value or zero if the attribute is not a @@ -128,19 +107,15 @@ public class HTMLElementImpl * @param value The value of the attribute * @return The integer value, or zero if not a valid numeric string */ - int getInteger( String value ) - { - try - { + int getInteger( String value ) { + try { return Integer.parseInt( value ); } - catch ( NumberFormatException except ) - { + catch ( NumberFormatException except ) { return 0; } } - /** * Convenience method used to translate an attribute value into a boolean * value. If the attribute has an associated value (even an empty string), @@ -150,12 +125,10 @@ public class HTMLElementImpl * @param value The value of the attribute * @return True or false depending on whether the attribute has been set */ - boolean getBinary( String name ) - { + boolean getBinary( String name ) { return ( getAttributeNode( name ) != null ); } - /** * Convenience method used to set a boolean attribute. If the value is true, * the attribute is set to an empty string. If the value is false, the attribute @@ -164,62 +137,50 @@ public class HTMLElementImpl * @param name The name of the attribute * @param value The value of the attribute */ - void setAttribute( String name, boolean value ) - { - if ( value ) + void setAttribute( String name, boolean value ) { + if ( value ) { setAttribute( name, name ); - else + } + else { removeAttribute( name ); + } } - - public Attr getAttributeNode( String attrName ) - { - return super.getAttributeNode( attrName.toLowerCase(Locale.ENGLISH) ); + public Attr getAttributeNode( String attrName ) { + return super.getAttributeNode( attrName.toLowerCase(Locale.ENGLISH) ); } - public Attr getAttributeNodeNS( String namespaceURI, - String localName ) - { - if ( namespaceURI != null && namespaceURI.length() > 0 ) - return super.getAttributeNodeNS( namespaceURI, localName ); - else - return super.getAttributeNode( localName.toLowerCase(Locale.ENGLISH) ); + String localName ) { + if ( namespaceURI != null && namespaceURI.length() > 0 ) { + return super.getAttributeNodeNS( namespaceURI, localName ); + } + return super.getAttributeNode( localName.toLowerCase(Locale.ENGLISH) ); } - - public String getAttribute( String attrName ) - { - return super.getAttribute( attrName.toLowerCase(Locale.ENGLISH) ); + public String getAttribute( String attrName ) { + return super.getAttribute( attrName.toLowerCase(Locale.ENGLISH) ); } - public String getAttributeNS( String namespaceURI, - String localName ) - { - if ( namespaceURI != null && namespaceURI.length() > 0 ) - return super.getAttributeNS( namespaceURI, localName ); - else - return super.getAttribute( localName.toLowerCase(Locale.ENGLISH) ); + String localName ) { + if ( namespaceURI != null && namespaceURI.length() > 0 ) { + return super.getAttributeNS( namespaceURI, localName ); + } + return super.getAttribute( localName.toLowerCase(Locale.ENGLISH) ); } - - public final NodeList getElementsByTagName( String tagName ) - { - return super.getElementsByTagName( tagName.toUpperCase(Locale.ENGLISH) ); + public final NodeList getElementsByTagName( String tagName ) { + return super.getElementsByTagName( tagName.toUpperCase(Locale.ENGLISH) ); } - public final NodeList getElementsByTagNameNS( String namespaceURI, - String localName ) - { - if ( namespaceURI != null && namespaceURI.length() > 0 ) - return super.getElementsByTagNameNS( namespaceURI, localName.toUpperCase(Locale.ENGLISH) ); - else - return super.getElementsByTagName( localName.toUpperCase(Locale.ENGLISH) ); - } - + String localName ) { + if ( namespaceURI != null && namespaceURI.length() > 0 ) { + return super.getElementsByTagNameNS( namespaceURI, localName.toUpperCase(Locale.ENGLISH) ); + } + return super.getElementsByTagName( localName.toUpperCase(Locale.ENGLISH) ); + } /** * Convenience method used to capitalize a one-off attribute value before it @@ -229,25 +190,24 @@ public class HTMLElementImpl * @param value The value of the attribute * @return The capitalized value */ - String capitalize( String value ) - { + String capitalize( String value ) { + char[] chars; int i; // Convert string to charactares. Convert the first one to upper case, // the other characters to lower case, and return the converted string. chars = value.toCharArray(); - if ( chars.length > 0 ) - { + if ( chars.length > 0 ) { chars[ 0 ] = Character.toUpperCase( chars[ 0 ] ); - for ( i = 1 ; i < chars.length ; ++i ) + for ( i = 1 ; i < chars.length ; ++i ) { chars[ i ] = Character.toLowerCase( chars[ i ] ); + } return String.valueOf( chars ); } return value; } - /** * Convenience method used to capitalize a one-off attribute value before it * is returned. For example, the align values "LEFT" and "left" will both @@ -256,23 +216,21 @@ public class HTMLElementImpl * @param name The name of the attribute * @return The capitalized value */ - String getCapitalized( String name ) - { + String getCapitalized( String name ) { String value; char[] chars; int i; value = getAttribute( name ); - if ( value != null ) - { + if ( value != null ) { // Convert string to charactares. Convert the first one to upper case, // the other characters to lower case, and return the converted string. chars = value.toCharArray(); - if ( chars.length > 0 ) - { + if ( chars.length > 0 ) { chars[ 0 ] = Character.toUpperCase( chars[ 0 ] ); - for ( i = 1 ; i < chars.length ; ++i ) + for ( i = 1 ; i < chars.length ; ++i ) { chars[ i ] = Character.toLowerCase( chars[ i ] ); + } return String.valueOf( chars ); } } @@ -285,20 +243,15 @@ public class HTMLElementImpl * This method is exposed for form elements through the DOM API, but other * elements have no access to it through the API. */ - public HTMLFormElement getForm() - { - Node parent; - - parent = getParentNode(); - while ( parent != null ) - { - if ( parent instanceof HTMLFormElement ) + public HTMLFormElement getForm() { + Node parent = getParentNode(); + while ( parent != null ) { + if ( parent instanceof HTMLFormElement ) { return (HTMLFormElement) parent; + } parent = parent.getParentNode(); } return null; } - } - diff --git a/src/org/apache/html/dom/HTMLFieldSetElementImpl.java b/src/org/apache/html/dom/HTMLFieldSetElementImpl.java index 9447719..f482639 100644 --- a/src/org/apache/html/dom/HTMLFieldSetElementImpl.java +++ b/src/org/apache/html/dom/HTMLFieldSetElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLFieldSetElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLFieldSetElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLFontElementImpl.java b/src/org/apache/html/dom/HTMLFontElementImpl.java index ee8aa1b..2ddafd5 100644 --- a/src/org/apache/html/dom/HTMLFontElementImpl.java +++ b/src/org/apache/html/dom/HTMLFontElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLFontElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLFontElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLFormControl.java b/src/org/apache/html/dom/HTMLFormControl.java index e818e3a..03318b7 100644 --- a/src/org/apache/html/dom/HTMLFormControl.java +++ b/src/org/apache/html/dom/HTMLFormControl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.html.dom; * collection. All form control elements implement this empty interface. * * @xerces.internal - * @version $Revision: 320092 $ $Date: 2004-10-04 23:23:48 -0400 (Mon, 04 Oct 2004) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> */ public interface HTMLFormControl diff --git a/src/org/apache/html/dom/HTMLFormElementImpl.java b/src/org/apache/html/dom/HTMLFormElementImpl.java index af00a81..cbe7e0b 100644 --- a/src/org/apache/html/dom/HTMLFormElementImpl.java +++ b/src/org/apache/html/dom/HTMLFormElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,7 +23,7 @@ import org.w3c.dom.html.HTMLFormElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLFormElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLFrameElementImpl.java b/src/org/apache/html/dom/HTMLFrameElementImpl.java index 8f49d86..d9d8dad 100644 --- a/src/org/apache/html/dom/HTMLFrameElementImpl.java +++ b/src/org/apache/html/dom/HTMLFrameElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLFrameElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLFrameElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLFrameSetElementImpl.java b/src/org/apache/html/dom/HTMLFrameSetElementImpl.java index 7ba7446..f4f9a0e 100644 --- a/src/org/apache/html/dom/HTMLFrameSetElementImpl.java +++ b/src/org/apache/html/dom/HTMLFrameSetElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLFrameSetElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLFrameSetElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLHRElementImpl.java b/src/org/apache/html/dom/HTMLHRElementImpl.java index 4e35090..006966a 100644 --- a/src/org/apache/html/dom/HTMLHRElementImpl.java +++ b/src/org/apache/html/dom/HTMLHRElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLHRElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLHRElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLHeadElementImpl.java b/src/org/apache/html/dom/HTMLHeadElementImpl.java index 1d3b718..f634f12 100644 --- a/src/org/apache/html/dom/HTMLHeadElementImpl.java +++ b/src/org/apache/html/dom/HTMLHeadElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLHeadElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLHeadElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLHeadingElementImpl.java b/src/org/apache/html/dom/HTMLHeadingElementImpl.java index 145e1c5..90d5edf 100644 --- a/src/org/apache/html/dom/HTMLHeadingElementImpl.java +++ b/src/org/apache/html/dom/HTMLHeadingElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLHeadingElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLHeadingElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLHtmlElementImpl.java b/src/org/apache/html/dom/HTMLHtmlElementImpl.java index ac84961..0864bac 100644 --- a/src/org/apache/html/dom/HTMLHtmlElementImpl.java +++ b/src/org/apache/html/dom/HTMLHtmlElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLHtmlElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLHtmlElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLIFrameElementImpl.java b/src/org/apache/html/dom/HTMLIFrameElementImpl.java index c848f6f..16c7df4 100644 --- a/src/org/apache/html/dom/HTMLIFrameElementImpl.java +++ b/src/org/apache/html/dom/HTMLIFrameElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLIFrameElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLIFrameElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLImageElementImpl.java b/src/org/apache/html/dom/HTMLImageElementImpl.java index c103fde..1f61cb4 100644 --- a/src/org/apache/html/dom/HTMLImageElementImpl.java +++ b/src/org/apache/html/dom/HTMLImageElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLImageElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLImageElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLInputElementImpl.java b/src/org/apache/html/dom/HTMLInputElementImpl.java index 618a733..7ff65e8 100644 --- a/src/org/apache/html/dom/HTMLInputElementImpl.java +++ b/src/org/apache/html/dom/HTMLInputElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLInputElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLInputElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLIsIndexElementImpl.java b/src/org/apache/html/dom/HTMLIsIndexElementImpl.java index 80bef4c..2bbc5d1 100644 --- a/src/org/apache/html/dom/HTMLIsIndexElementImpl.java +++ b/src/org/apache/html/dom/HTMLIsIndexElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLIsIndexElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLIsIndexElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLLIElementImpl.java b/src/org/apache/html/dom/HTMLLIElementImpl.java index a8ebeaa..4c0e69e 100644 --- a/src/org/apache/html/dom/HTMLLIElementImpl.java +++ b/src/org/apache/html/dom/HTMLLIElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLLIElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLLIElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLLabelElementImpl.java b/src/org/apache/html/dom/HTMLLabelElementImpl.java index 9efba0b..9ede980 100644 --- a/src/org/apache/html/dom/HTMLLabelElementImpl.java +++ b/src/org/apache/html/dom/HTMLLabelElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLLabelElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLLabelElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLLegendElementImpl.java b/src/org/apache/html/dom/HTMLLegendElementImpl.java index 21b4c63..165457d 100644 --- a/src/org/apache/html/dom/HTMLLegendElementImpl.java +++ b/src/org/apache/html/dom/HTMLLegendElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLLegendElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLLegendElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLLinkElementImpl.java b/src/org/apache/html/dom/HTMLLinkElementImpl.java index 91b753b..49c5f39 100644 --- a/src/org/apache/html/dom/HTMLLinkElementImpl.java +++ b/src/org/apache/html/dom/HTMLLinkElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLLinkElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLLinkElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLMapElementImpl.java b/src/org/apache/html/dom/HTMLMapElementImpl.java index e3abdc3..65cdfbc 100644 --- a/src/org/apache/html/dom/HTMLMapElementImpl.java +++ b/src/org/apache/html/dom/HTMLMapElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import org.w3c.dom.Node; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLMapElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLMenuElementImpl.java b/src/org/apache/html/dom/HTMLMenuElementImpl.java index e03e7ec..f4a2340 100644 --- a/src/org/apache/html/dom/HTMLMenuElementImpl.java +++ b/src/org/apache/html/dom/HTMLMenuElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLMenuElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLMenuElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLMetaElementImpl.java b/src/org/apache/html/dom/HTMLMetaElementImpl.java index ad48ff2..f4bece9 100644 --- a/src/org/apache/html/dom/HTMLMetaElementImpl.java +++ b/src/org/apache/html/dom/HTMLMetaElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLMetaElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLMetaElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLModElementImpl.java b/src/org/apache/html/dom/HTMLModElementImpl.java index 95ed3e2..2f13543 100644 --- a/src/org/apache/html/dom/HTMLModElementImpl.java +++ b/src/org/apache/html/dom/HTMLModElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLModElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLModElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLOListElementImpl.java b/src/org/apache/html/dom/HTMLOListElementImpl.java index cd98338..97def65 100644 --- a/src/org/apache/html/dom/HTMLOListElementImpl.java +++ b/src/org/apache/html/dom/HTMLOListElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLOListElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLOListElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLObjectElementImpl.java b/src/org/apache/html/dom/HTMLObjectElementImpl.java index fea914a..20baef6 100644 --- a/src/org/apache/html/dom/HTMLObjectElementImpl.java +++ b/src/org/apache/html/dom/HTMLObjectElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLObjectElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLObjectElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLOptGroupElementImpl.java b/src/org/apache/html/dom/HTMLOptGroupElementImpl.java index 08233ee..38a4179 100644 --- a/src/org/apache/html/dom/HTMLOptGroupElementImpl.java +++ b/src/org/apache/html/dom/HTMLOptGroupElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLOptGroupElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLOptGroupElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLOptionElementImpl.java b/src/org/apache/html/dom/HTMLOptionElementImpl.java index 894229d..1a10eac 100644 --- a/src/org/apache/html/dom/HTMLOptionElementImpl.java +++ b/src/org/apache/html/dom/HTMLOptionElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.w3c.dom.html.HTMLSelectElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@openxml.org">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLOptionElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLParagraphElementImpl.java b/src/org/apache/html/dom/HTMLParagraphElementImpl.java index e5cf2e6..2b61d10 100644 --- a/src/org/apache/html/dom/HTMLParagraphElementImpl.java +++ b/src/org/apache/html/dom/HTMLParagraphElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLParagraphElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLParagraphElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLParamElementImpl.java b/src/org/apache/html/dom/HTMLParamElementImpl.java index 35e5e2b..5ff6128 100644 --- a/src/org/apache/html/dom/HTMLParamElementImpl.java +++ b/src/org/apache/html/dom/HTMLParamElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLParamElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLParamElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLPreElementImpl.java b/src/org/apache/html/dom/HTMLPreElementImpl.java index fd17411..09f7a9f 100644 --- a/src/org/apache/html/dom/HTMLPreElementImpl.java +++ b/src/org/apache/html/dom/HTMLPreElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLPreElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLPreElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLQuoteElementImpl.java b/src/org/apache/html/dom/HTMLQuoteElementImpl.java index 62aa12b..64f04dd 100644 --- a/src/org/apache/html/dom/HTMLQuoteElementImpl.java +++ b/src/org/apache/html/dom/HTMLQuoteElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLQuoteElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLQuoteElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLScriptElementImpl.java b/src/org/apache/html/dom/HTMLScriptElementImpl.java index 2d0c6b0..963f890 100644 --- a/src/org/apache/html/dom/HTMLScriptElementImpl.java +++ b/src/org/apache/html/dom/HTMLScriptElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import org.w3c.dom.html.HTMLScriptElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLScriptElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLSelectElementImpl.java b/src/org/apache/html/dom/HTMLSelectElementImpl.java index 0c0f780..b75423a 100644 --- a/src/org/apache/html/dom/HTMLSelectElementImpl.java +++ b/src/org/apache/html/dom/HTMLSelectElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.w3c.dom.html.HTMLSelectElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLSelectElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLStyleElementImpl.java b/src/org/apache/html/dom/HTMLStyleElementImpl.java index 72e45d4..a67a549 100644 --- a/src/org/apache/html/dom/HTMLStyleElementImpl.java +++ b/src/org/apache/html/dom/HTMLStyleElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLStyleElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLStyleElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLTableCaptionElementImpl.java b/src/org/apache/html/dom/HTMLTableCaptionElementImpl.java index 4ea0c3f..6959dfd 100644 --- a/src/org/apache/html/dom/HTMLTableCaptionElementImpl.java +++ b/src/org/apache/html/dom/HTMLTableCaptionElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLTableCaptionElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLTableCaptionElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLTableCellElementImpl.java b/src/org/apache/html/dom/HTMLTableCellElementImpl.java index 6d4d6bb..536a458 100644 --- a/src/org/apache/html/dom/HTMLTableCellElementImpl.java +++ b/src/org/apache/html/dom/HTMLTableCellElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import org.w3c.dom.html.HTMLTableRowElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 449313 $ $Date: 2006-09-23 18:01:43 -0400 (Sat, 23 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLTableCellElement * @see org.apache.xerces.dom.ElementImpl @@ -63,7 +64,6 @@ public class HTMLTableCellElementImpl { Node parent; Node child; - int index; parent = getParentNode(); if ( parent instanceof HTMLTableRowElement ) diff --git a/src/org/apache/html/dom/HTMLTableColElementImpl.java b/src/org/apache/html/dom/HTMLTableColElementImpl.java index 47af72e..2c9fa99 100644 --- a/src/org/apache/html/dom/HTMLTableColElementImpl.java +++ b/src/org/apache/html/dom/HTMLTableColElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLTableColElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLTableColElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLTableElementImpl.java b/src/org/apache/html/dom/HTMLTableElementImpl.java index 3cedf44..d8fcbb7 100644 --- a/src/org/apache/html/dom/HTMLTableElementImpl.java +++ b/src/org/apache/html/dom/HTMLTableElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import org.w3c.dom.html.HTMLTableSectionElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLAnchorElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLTableRowElementImpl.java b/src/org/apache/html/dom/HTMLTableRowElementImpl.java index 99bd697..042ad4e 100644 --- a/src/org/apache/html/dom/HTMLTableRowElementImpl.java +++ b/src/org/apache/html/dom/HTMLTableRowElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.w3c.dom.html.HTMLTableSectionElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 449313 $ $Date: 2006-09-23 18:01:43 -0400 (Sat, 23 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLTableRowElement * @see org.apache.xerces.dom.ElementImpl @@ -43,10 +44,12 @@ public class HTMLTableRowElementImpl Node parent; parent = getParentNode(); - if ( parent instanceof HTMLTableSectionElement ) + if ( parent instanceof HTMLTableSectionElement ) { parent = parent.getParentNode(); - if ( parent instanceof HTMLTableElement ) - return getRowIndex( parent );; + } + if ( parent instanceof HTMLTableElement ) { + return getRowIndex( parent ); + } return -1; } @@ -56,10 +59,12 @@ public class HTMLTableRowElementImpl Node parent; parent = getParentNode(); - if ( parent instanceof HTMLTableSectionElement ) + if ( parent instanceof HTMLTableSectionElement ) { parent = parent.getParentNode(); - if ( parent instanceof HTMLTableElement ) + } + if ( parent instanceof HTMLTableElement ) { ( (HTMLTableElementImpl) parent ).insertRowX( rowIndex, this ); + } } @@ -68,10 +73,10 @@ public class HTMLTableRowElementImpl Node parent; parent = getParentNode(); - if ( parent instanceof HTMLTableSectionElement ) + if ( parent instanceof HTMLTableSectionElement ) { return getRowIndex( parent ); - else - return -1; + } + return -1; } @@ -80,8 +85,9 @@ public class HTMLTableRowElementImpl Node parent; parent = getParentNode(); - if ( parent instanceof HTMLTableSectionElement ) + if ( parent instanceof HTMLTableSectionElement ) { ( (HTMLTableSectionElementImpl) parent ).insertRowX( sectionRowIndex, this ); + } } @@ -94,17 +100,20 @@ public class HTMLTableRowElementImpl // TR elements under the TABLE/section. Access to the returned NodeList // is very fast and the snapshot solves many synchronization problems. rows = ( (HTMLElement) parent ).getElementsByTagName( "TR" ); - for ( i = 0 ; i < rows.getLength() ; ++i ) - if ( rows.item( i ) == this ) + for ( i = 0 ; i < rows.getLength() ; ++i ) { + if ( rows.item( i ) == this ) { return i; + } + } return -1; } public HTMLCollection getCells() { - if ( _cells == null ) + if ( _cells == null ) { _cells = new HTMLCollectionImpl( this, HTMLCollectionImpl.CELL ); + } return _cells; } @@ -115,15 +124,13 @@ public class HTMLTableRowElementImpl int i; child = getFirstChild(); - while ( child != null ) - { + while ( child != null ) { removeChild( child ); child = child.getNextSibling(); } i = 0; child = cells.item( i ); - while ( child != null ) - { + while ( child != null ) { appendChild ( child ); ++i; child = cells.item( i ); @@ -138,12 +145,9 @@ public class HTMLTableRowElementImpl newCell = new HTMLTableCellElementImpl( (HTMLDocumentImpl) getOwnerDocument(), "TD" ); child = getFirstChild(); - while ( child != null ) - { - if ( child instanceof HTMLTableCellElement ) - { - if ( index == 0 ) - { + while ( child != null ) { + if ( child instanceof HTMLTableCellElement ) { + if ( index == 0 ) { insertBefore( newCell, child ); return newCell; } @@ -161,12 +165,9 @@ public class HTMLTableRowElementImpl Node child; child = getFirstChild(); - while ( child != null ) - { - if ( child instanceof HTMLTableCellElement ) - { - if ( index == 0 ) - { + while ( child != null ) { + if ( child instanceof HTMLTableCellElement ) { + if ( index == 0 ) { removeChild ( child ); return; } @@ -207,8 +208,9 @@ public class HTMLTableRowElementImpl // Make sure that the access key is a single character. ch = getAttribute( "char" ); - if ( ch != null && ch.length() > 1 ) + if ( ch != null && ch.length() > 1 ) { ch = ch.substring( 0, 1 ); + } return ch; } @@ -216,8 +218,9 @@ public class HTMLTableRowElementImpl public void setCh( String ch ) { // Make sure that the access key is a single character. - if ( ch != null && ch.length() > 1 ) + if ( ch != null && ch.length() > 1 ) { ch = ch.substring( 0, 1 ); + } setAttribute( "char", ch ); } diff --git a/src/org/apache/html/dom/HTMLTableSectionElementImpl.java b/src/org/apache/html/dom/HTMLTableSectionElementImpl.java index a379371..02cf413 100644 --- a/src/org/apache/html/dom/HTMLTableSectionElementImpl.java +++ b/src/org/apache/html/dom/HTMLTableSectionElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import org.w3c.dom.html.HTMLTableSectionElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLTableSectionElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLTextAreaElementImpl.java b/src/org/apache/html/dom/HTMLTextAreaElementImpl.java index c540856..90c3333 100644 --- a/src/org/apache/html/dom/HTMLTextAreaElementImpl.java +++ b/src/org/apache/html/dom/HTMLTextAreaElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLTextAreaElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLTextAreaElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLTitleElementImpl.java b/src/org/apache/html/dom/HTMLTitleElementImpl.java index 30f9d0f..049c85f 100644 --- a/src/org/apache/html/dom/HTMLTitleElementImpl.java +++ b/src/org/apache/html/dom/HTMLTitleElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import org.w3c.dom.html.HTMLTitleElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLTitleElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/HTMLUListElementImpl.java b/src/org/apache/html/dom/HTMLUListElementImpl.java index 0ff8f8b..7f6ee0c 100644 --- a/src/org/apache/html/dom/HTMLUListElementImpl.java +++ b/src/org/apache/html/dom/HTMLUListElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.w3c.dom.html.HTMLUListElement; /** * @xerces.internal - * @version $Revision: 329271 $ $Date: 2005-10-28 15:25:05 -0400 (Fri, 28 Oct 2005) $ + * @version $Revision: 447255 $ $Date: 2006-09-18 01:36:42 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a> * @see org.w3c.dom.html.HTMLUListElement * @see org.apache.xerces.dom.ElementImpl diff --git a/src/org/apache/html/dom/NameNodeListImpl.java b/src/org/apache/html/dom/NameNodeListImpl.java index 55d7164..4062ced 100644 --- a/src/org/apache/html/dom/NameNodeListImpl.java +++ b/src/org/apache/html/dom/NameNodeListImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.w3c.dom.NodeList; * * @xerces.internal * - * @version $Id: NameNodeListImpl.java 320092 2004-10-05 03:23:48Z mrglavas $ + * @version $Id: NameNodeListImpl.java 447255 2006-09-18 05:36:42Z mrglavas $ * @since PR-DOM-Level-1-19980818. * @see DeepNodeListImpl */ diff --git a/src/org/apache/html/dom/ObjectFactory.java b/src/org/apache/html/dom/ObjectFactory.java index 399b249..23ae4a0 100644 --- a/src/org/apache/html/dom/ObjectFactory.java +++ b/src/org/apache/html/dom/ObjectFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -39,7 +40,7 @@ import java.io.InputStreamReader; * * @xerces.internal * - * @version $Id: ObjectFactory.java 320285 2005-04-18 04:15:35Z mrglavas $ + * @version $Id: ObjectFactory.java 447255 2006-09-18 05:36:42Z mrglavas $ */ final class ObjectFactory { diff --git a/src/org/apache/html/dom/SecuritySupport.java b/src/org/apache/html/dom/SecuritySupport.java index c485eac..e1c8f1b 100644 --- a/src/org/apache/html/dom/SecuritySupport.java +++ b/src/org/apache/html/dom/SecuritySupport.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/wml/WMLAElement.java b/src/org/apache/wml/WMLAElement.java index 99fd0df..9bb5008 100644 --- a/src/org/apache/wml/WMLAElement.java +++ b/src/org/apache/wml/WMLAElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.wml; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLAElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLAElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLAccessElement.java b/src/org/apache/wml/WMLAccessElement.java index b380528..3104541 100644 --- a/src/org/apache/wml/WMLAccessElement.java +++ b/src/org/apache/wml/WMLAccessElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'access' element specifics the access control for the entire deck * (Section 11.3.1, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLAccessElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLAccessElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLAnchorElement.java b/src/org/apache/wml/WMLAnchorElement.java index 4c84320..051e6b6 100644 --- a/src/org/apache/wml/WMLAnchorElement.java +++ b/src/org/apache/wml/WMLAnchorElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.wml; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLAnchorElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLAnchorElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLBElement.java b/src/org/apache/wml/WMLBElement.java index e5c6142..c8248ae 100644 --- a/src/org/apache/wml/WMLBElement.java +++ b/src/org/apache/wml/WMLBElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'b' element boldface the text * (Section 11.8.1, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLBElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLBElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLBigElement.java b/src/org/apache/wml/WMLBigElement.java index ab80eea..e079fd1 100644 --- a/src/org/apache/wml/WMLBigElement.java +++ b/src/org/apache/wml/WMLBigElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'big' element renders the text with big font * (Section 11.8.1, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLBigElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLBigElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLBrElement.java b/src/org/apache/wml/WMLBrElement.java index 471cf8e..f73c7bc 100644 --- a/src/org/apache/wml/WMLBrElement.java +++ b/src/org/apache/wml/WMLBrElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ package org.apache.wml; * * <p>'br' element starts a new line</p> * - * @version $Id: WMLBrElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLBrElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLCardElement.java b/src/org/apache/wml/WMLCardElement.java index f268c20..4bb4cd2 100644 --- a/src/org/apache/wml/WMLCardElement.java +++ b/src/org/apache/wml/WMLCardElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ package org.apache.wml; * contains a collection of cards. * (Section 11.5, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLCardElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLCardElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLDOMImplementation.java b/src/org/apache/wml/WMLDOMImplementation.java index e41f510..02ae789 100644 --- a/src/org/apache/wml/WMLDOMImplementation.java +++ b/src/org/apache/wml/WMLDOMImplementation.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import org.w3c.dom.*; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLDOMImplementation.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLDOMImplementation.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public interface WMLDOMImplementation extends DOMImplementation { diff --git a/src/org/apache/wml/WMLDoElement.java b/src/org/apache/wml/WMLDoElement.java index b9340ae..c32f8ce 100644 --- a/src/org/apache/wml/WMLDoElement.java +++ b/src/org/apache/wml/WMLDoElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.wml; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLDoElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLDoElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLDocument.java b/src/org/apache/wml/WMLDocument.java index 81bf2c2..ddcd377 100644 --- a/src/org/apache/wml/WMLDocument.java +++ b/src/org/apache/wml/WMLDocument.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import org.w3c.dom.*; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLDocument.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLDocument.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLElement.java b/src/org/apache/wml/WMLElement.java index 3430d0b..e2dc71c 100644 --- a/src/org/apache/wml/WMLElement.java +++ b/src/org/apache/wml/WMLElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.w3c.dom.Element; * <p>All WML Elements are derived from this class that contains two * core attributes defined in the DTD.</p> * - * @version $Id: WMLElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLEmElement.java b/src/org/apache/wml/WMLEmElement.java index 6ef4214..43e82ba 100644 --- a/src/org/apache/wml/WMLEmElement.java +++ b/src/org/apache/wml/WMLEmElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'em' element emphasis the text * (Section 11.8.1, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLEmElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLEmElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLFieldsetElement.java b/src/org/apache/wml/WMLFieldsetElement.java index db8aa5f..1a77cd4 100644 --- a/src/org/apache/wml/WMLFieldsetElement.java +++ b/src/org/apache/wml/WMLFieldsetElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'fieldset' element groups related fields and tet * (Section 11.6.4, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLFieldsetElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLFieldsetElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public interface WMLFieldsetElement extends WMLElement { diff --git a/src/org/apache/wml/WMLGoElement.java b/src/org/apache/wml/WMLGoElement.java index 202feba..0f0e0a7 100644 --- a/src/org/apache/wml/WMLGoElement.java +++ b/src/org/apache/wml/WMLGoElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.wml; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLGoElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLGoElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLHeadElement.java b/src/org/apache/wml/WMLHeadElement.java index 254a70b..f51cbbe 100644 --- a/src/org/apache/wml/WMLHeadElement.java +++ b/src/org/apache/wml/WMLHeadElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>The head element contains information about a deck. * (Section 11.3, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLHeadElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLHeadElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLIElement.java b/src/org/apache/wml/WMLIElement.java index ba9a541..39b3806 100644 --- a/src/org/apache/wml/WMLIElement.java +++ b/src/org/apache/wml/WMLIElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'i' italic the text * (Section 11.8.1, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLIElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLIElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLImgElement.java b/src/org/apache/wml/WMLImgElement.java index 7d8a850..b9e4612 100644 --- a/src/org/apache/wml/WMLImgElement.java +++ b/src/org/apache/wml/WMLImgElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'img' specifies an image in a text flow * (Section 11.9, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLImgElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLImgElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public interface WMLImgElement extends WMLElement { diff --git a/src/org/apache/wml/WMLInputElement.java b/src/org/apache/wml/WMLInputElement.java index 02335b6..4661bf1 100644 --- a/src/org/apache/wml/WMLInputElement.java +++ b/src/org/apache/wml/WMLInputElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'input' element specifies a text entry object. * (Section 11.6.3, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLInputElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLInputElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLMetaElement.java b/src/org/apache/wml/WMLMetaElement.java index 5853edc..b4b10bf 100644 --- a/src/org/apache/wml/WMLMetaElement.java +++ b/src/org/apache/wml/WMLMetaElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>The meta element contains meta-info of an WML deck * (Section 11.3.2, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLMetaElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLMetaElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public interface WMLMetaElement extends WMLElement { diff --git a/src/org/apache/wml/WMLNoopElement.java b/src/org/apache/wml/WMLNoopElement.java index 0b952cb..bced91b 100644 --- a/src/org/apache/wml/WMLNoopElement.java +++ b/src/org/apache/wml/WMLNoopElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.wml; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLNoopElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLNoopElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public interface WMLNoopElement extends WMLElement { diff --git a/src/org/apache/wml/WMLOneventElement.java b/src/org/apache/wml/WMLOneventElement.java index 062e9f2..34ee109 100644 --- a/src/org/apache/wml/WMLOneventElement.java +++ b/src/org/apache/wml/WMLOneventElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.wml; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLOneventElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLOneventElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLOptgroupElement.java b/src/org/apache/wml/WMLOptgroupElement.java index 537cd4c..f6e7020 100644 --- a/src/org/apache/wml/WMLOptgroupElement.java +++ b/src/org/apache/wml/WMLOptgroupElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'optgroup' element groups related 'option' elements into a * hierarchy. (Section 11.6.2.2, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLOptgroupElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLOptgroupElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLOptionElement.java b/src/org/apache/wml/WMLOptionElement.java index 291d72c..3500111 100644 --- a/src/org/apache/wml/WMLOptionElement.java +++ b/src/org/apache/wml/WMLOptionElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ package org.apache.wml; * * <p>'option' element specifies a choice in a 'select' element</p> * - * @version $Id: WMLOptionElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLOptionElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLPElement.java b/src/org/apache/wml/WMLPElement.java index a7b4605..9d1e29f 100644 --- a/src/org/apache/wml/WMLPElement.java +++ b/src/org/apache/wml/WMLPElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'p' element specifies a paragraph * (Section 11.8.3, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLPElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLPElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLPostfieldElement.java b/src/org/apache/wml/WMLPostfieldElement.java index 0396d46..c1ae483 100644 --- a/src/org/apache/wml/WMLPostfieldElement.java +++ b/src/org/apache/wml/WMLPostfieldElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.wml; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLPostfieldElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLPostfieldElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLPrevElement.java b/src/org/apache/wml/WMLPrevElement.java index bcbd17b..e45fd3d 100644 --- a/src/org/apache/wml/WMLPrevElement.java +++ b/src/org/apache/wml/WMLPrevElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.wml; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLPrevElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLPrevElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLRefreshElement.java b/src/org/apache/wml/WMLRefreshElement.java index 7fc4958..e94e84b 100644 --- a/src/org/apache/wml/WMLRefreshElement.java +++ b/src/org/apache/wml/WMLRefreshElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.wml; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLRefreshElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLRefreshElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLSelectElement.java b/src/org/apache/wml/WMLSelectElement.java index 98d12e2..35c3f79 100644 --- a/src/org/apache/wml/WMLSelectElement.java +++ b/src/org/apache/wml/WMLSelectElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'select' element lets user pick from a list of options. * (Section 11.6.2.1, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLSelectElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLSelectElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public interface WMLSelectElement extends WMLElement { diff --git a/src/org/apache/wml/WMLSetvarElement.java b/src/org/apache/wml/WMLSetvarElement.java index f320233..1f3ccd5 100644 --- a/src/org/apache/wml/WMLSetvarElement.java +++ b/src/org/apache/wml/WMLSetvarElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.wml; * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> * - * @version $Id: WMLSetvarElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLSetvarElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLSmallElement.java b/src/org/apache/wml/WMLSmallElement.java index 152b8e2..670e74e 100644 --- a/src/org/apache/wml/WMLSmallElement.java +++ b/src/org/apache/wml/WMLSmallElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,15 +21,13 @@ package org.apache.wml; * The DTD used in this DOM model is from * <a href="http://www.wapforum.org/DTD/wml_1.1.xml"> * http://www.wapforum.org/DTD/wml_1.1.xml</a></p> + * + * <p>'small' render the text with small font + * (Section 11.8.1, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLSmallElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLSmallElement.java 450517 2006-09-27 17:48:28Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ - -/** - * 'small' render the text with small font - * (Section 11.8.1, WAP WML Version 16-Jun-1999) - */ public interface WMLSmallElement extends WMLElement { /** * The xml:lang that specifics the natural or formal language in diff --git a/src/org/apache/wml/WMLStrongElement.java b/src/org/apache/wml/WMLStrongElement.java index a3174c5..032c09e 100644 --- a/src/org/apache/wml/WMLStrongElement.java +++ b/src/org/apache/wml/WMLStrongElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'strong' strongly emphasis the text * (Section 11.8.1, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLStrongElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLStrongElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLTableElement.java b/src/org/apache/wml/WMLTableElement.java index de7b488..2307d60 100644 --- a/src/org/apache/wml/WMLTableElement.java +++ b/src/org/apache/wml/WMLTableElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'table' create a set of aligned columns of text and images. * (Section 11.8.5, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLTableElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLTableElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLTdElement.java b/src/org/apache/wml/WMLTdElement.java index 848b3e4..b4f0f03 100644 --- a/src/org/apache/wml/WMLTdElement.java +++ b/src/org/apache/wml/WMLTdElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'td' specifies a single table cell with in a row * (Section 11.8.6, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLTdElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLTdElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLTemplateElement.java b/src/org/apache/wml/WMLTemplateElement.java index 8e07289..9e5c1b5 100644 --- a/src/org/apache/wml/WMLTemplateElement.java +++ b/src/org/apache/wml/WMLTemplateElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ package org.apache.wml; * * <p>The 'template' element declares a template for the cards in the deck.</p> * - * @version $Id: WMLTemplateElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLTemplateElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLTimerElement.java b/src/org/apache/wml/WMLTimerElement.java index 5718f3c..ac2a048 100644 --- a/src/org/apache/wml/WMLTimerElement.java +++ b/src/org/apache/wml/WMLTimerElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'timer' elements declares a card timer. * (Section 11.6.7, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLTimerElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLTimerElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLTrElement.java b/src/org/apache/wml/WMLTrElement.java index a2d4824..6ef4126 100644 --- a/src/org/apache/wml/WMLTrElement.java +++ b/src/org/apache/wml/WMLTrElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'tr' specifies a single row * (Section 11.8.6, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLTrElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLTrElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLUElement.java b/src/org/apache/wml/WMLUElement.java index b449924..f2b3cc4 100644 --- a/src/org/apache/wml/WMLUElement.java +++ b/src/org/apache/wml/WMLUElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'u' underline the text * (Section 11.8.1, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLUElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLUElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/WMLWmlElement.java b/src/org/apache/wml/WMLWmlElement.java index 92300df..c07f8a8 100644 --- a/src/org/apache/wml/WMLWmlElement.java +++ b/src/org/apache/wml/WMLWmlElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.wml; * <p>'wml' is the root oot of a WML document. * (Section 11.2, WAP WML Version 16-Jun-1999)</p> * - * @version $Id: WMLWmlElement.java 319808 2004-02-24 23:34:05Z mrglavas $ + * @version $Id: WMLWmlElement.java 447258 2006-09-18 05:41:23Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ diff --git a/src/org/apache/wml/dom/WMLAElementImpl.java b/src/org/apache/wml/dom/WMLAElementImpl.java index 9b38c5d..7c0a759 100644 --- a/src/org/apache/wml/dom/WMLAElementImpl.java +++ b/src/org/apache/wml/dom/WMLAElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLAElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLAElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLAElementImpl extends WMLElementImpl implements WMLAElement { diff --git a/src/org/apache/wml/dom/WMLAccessElementImpl.java b/src/org/apache/wml/dom/WMLAccessElementImpl.java index 09218fe..d467f00 100644 --- a/src/org/apache/wml/dom/WMLAccessElementImpl.java +++ b/src/org/apache/wml/dom/WMLAccessElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLAccessElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLAccessElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLAccessElementImpl extends WMLElementImpl implements WMLAccessElement { diff --git a/src/org/apache/wml/dom/WMLAnchorElementImpl.java b/src/org/apache/wml/dom/WMLAnchorElementImpl.java index a77b97d..02308c8 100644 --- a/src/org/apache/wml/dom/WMLAnchorElementImpl.java +++ b/src/org/apache/wml/dom/WMLAnchorElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLAnchorElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLAnchorElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLAnchorElementImpl extends WMLElementImpl implements WMLAnchorElement { diff --git a/src/org/apache/wml/dom/WMLBElementImpl.java b/src/org/apache/wml/dom/WMLBElementImpl.java index be29524..6756961 100644 --- a/src/org/apache/wml/dom/WMLBElementImpl.java +++ b/src/org/apache/wml/dom/WMLBElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLBElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLBElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLBElementImpl extends WMLElementImpl implements WMLBElement { diff --git a/src/org/apache/wml/dom/WMLBigElementImpl.java b/src/org/apache/wml/dom/WMLBigElementImpl.java index 684efab..6b14131 100644 --- a/src/org/apache/wml/dom/WMLBigElementImpl.java +++ b/src/org/apache/wml/dom/WMLBigElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLBigElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLBigElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLBigElementImpl extends WMLElementImpl implements WMLBigElement { diff --git a/src/org/apache/wml/dom/WMLBrElementImpl.java b/src/org/apache/wml/dom/WMLBrElementImpl.java index d07deb0..3e05d2c 100644 --- a/src/org/apache/wml/dom/WMLBrElementImpl.java +++ b/src/org/apache/wml/dom/WMLBrElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLBrElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLBrElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLBrElementImpl extends WMLElementImpl implements WMLBrElement { diff --git a/src/org/apache/wml/dom/WMLCardElementImpl.java b/src/org/apache/wml/dom/WMLCardElementImpl.java index 0b1e993..f2e4787 100644 --- a/src/org/apache/wml/dom/WMLCardElementImpl.java +++ b/src/org/apache/wml/dom/WMLCardElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLCardElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLCardElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLCardElementImpl extends WMLElementImpl implements WMLCardElement { diff --git a/src/org/apache/wml/dom/WMLDOMImplementationImpl.java b/src/org/apache/wml/dom/WMLDOMImplementationImpl.java index 54e28ec..8be2fc3 100644 --- a/src/org/apache/wml/dom/WMLDOMImplementationImpl.java +++ b/src/org/apache/wml/dom/WMLDOMImplementationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import org.apache.xerces.dom.*; /** * @xerces.internal - * @version $Id: WMLDOMImplementationImpl.java 320279 2005-04-17 23:49:58Z mrglavas $ + * @version $Id: WMLDOMImplementationImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLDOMImplementationImpl extends DOMImplementationImpl implements WMLDOMImplementation { diff --git a/src/org/apache/wml/dom/WMLDoElementImpl.java b/src/org/apache/wml/dom/WMLDoElementImpl.java index c8e3ae3..b21a97b 100644 --- a/src/org/apache/wml/dom/WMLDoElementImpl.java +++ b/src/org/apache/wml/dom/WMLDoElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLDoElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLDoElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLDoElementImpl extends WMLElementImpl implements WMLDoElement { diff --git a/src/org/apache/wml/dom/WMLDocumentImpl.java b/src/org/apache/wml/dom/WMLDocumentImpl.java index af39dce..dc505e8 100644 --- a/src/org/apache/wml/dom/WMLDocumentImpl.java +++ b/src/org/apache/wml/dom/WMLDocumentImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.w3c.dom.Element; /** * @xerces.internal - * @version $Id: WMLDocumentImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLDocumentImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLDocumentImpl extends DocumentImpl implements WMLDocument { diff --git a/src/org/apache/wml/dom/WMLElementImpl.java b/src/org/apache/wml/dom/WMLElementImpl.java index bb6f1c1..22614d4 100644 --- a/src/org/apache/wml/dom/WMLElementImpl.java +++ b/src/org/apache/wml/dom/WMLElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,7 +21,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLElementImpl extends ElementImpl implements WMLElement { diff --git a/src/org/apache/wml/dom/WMLEmElementImpl.java b/src/org/apache/wml/dom/WMLEmElementImpl.java index 38f7d52..9c42fb2 100644 --- a/src/org/apache/wml/dom/WMLEmElementImpl.java +++ b/src/org/apache/wml/dom/WMLEmElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLEmElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLEmElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLEmElementImpl extends WMLElementImpl implements WMLEmElement { diff --git a/src/org/apache/wml/dom/WMLFieldsetElementImpl.java b/src/org/apache/wml/dom/WMLFieldsetElementImpl.java index c1c6cec..61f7f88 100644 --- a/src/org/apache/wml/dom/WMLFieldsetElementImpl.java +++ b/src/org/apache/wml/dom/WMLFieldsetElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLFieldsetElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLFieldsetElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLFieldsetElementImpl extends WMLElementImpl implements WMLFieldsetElement { diff --git a/src/org/apache/wml/dom/WMLGoElementImpl.java b/src/org/apache/wml/dom/WMLGoElementImpl.java index 7ae1dc8..1ae9133 100644 --- a/src/org/apache/wml/dom/WMLGoElementImpl.java +++ b/src/org/apache/wml/dom/WMLGoElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLGoElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLGoElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLGoElementImpl extends WMLElementImpl implements WMLGoElement { diff --git a/src/org/apache/wml/dom/WMLHeadElementImpl.java b/src/org/apache/wml/dom/WMLHeadElementImpl.java index d6fb338..aa00e37 100644 --- a/src/org/apache/wml/dom/WMLHeadElementImpl.java +++ b/src/org/apache/wml/dom/WMLHeadElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLHeadElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLHeadElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLHeadElementImpl extends WMLElementImpl implements WMLHeadElement { diff --git a/src/org/apache/wml/dom/WMLIElementImpl.java b/src/org/apache/wml/dom/WMLIElementImpl.java index afbbef9..1c8fe91 100644 --- a/src/org/apache/wml/dom/WMLIElementImpl.java +++ b/src/org/apache/wml/dom/WMLIElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLIElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLIElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLIElementImpl extends WMLElementImpl implements WMLIElement { diff --git a/src/org/apache/wml/dom/WMLImgElementImpl.java b/src/org/apache/wml/dom/WMLImgElementImpl.java index c0e3bcf..acb1e1c 100644 --- a/src/org/apache/wml/dom/WMLImgElementImpl.java +++ b/src/org/apache/wml/dom/WMLImgElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLImgElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLImgElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLImgElementImpl extends WMLElementImpl implements WMLImgElement { diff --git a/src/org/apache/wml/dom/WMLInputElementImpl.java b/src/org/apache/wml/dom/WMLInputElementImpl.java index fb0d1bb..70c0205 100644 --- a/src/org/apache/wml/dom/WMLInputElementImpl.java +++ b/src/org/apache/wml/dom/WMLInputElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLInputElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLInputElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLInputElementImpl extends WMLElementImpl implements WMLInputElement { diff --git a/src/org/apache/wml/dom/WMLMetaElementImpl.java b/src/org/apache/wml/dom/WMLMetaElementImpl.java index d9077c2..23c9820 100644 --- a/src/org/apache/wml/dom/WMLMetaElementImpl.java +++ b/src/org/apache/wml/dom/WMLMetaElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLMetaElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLMetaElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLMetaElementImpl extends WMLElementImpl implements WMLMetaElement { diff --git a/src/org/apache/wml/dom/WMLNoopElementImpl.java b/src/org/apache/wml/dom/WMLNoopElementImpl.java index e604b2e..ff00dc0 100644 --- a/src/org/apache/wml/dom/WMLNoopElementImpl.java +++ b/src/org/apache/wml/dom/WMLNoopElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLNoopElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLNoopElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLNoopElementImpl extends WMLElementImpl implements WMLNoopElement { diff --git a/src/org/apache/wml/dom/WMLOneventElementImpl.java b/src/org/apache/wml/dom/WMLOneventElementImpl.java index 214ed1b..678444d 100644 --- a/src/org/apache/wml/dom/WMLOneventElementImpl.java +++ b/src/org/apache/wml/dom/WMLOneventElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLOneventElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLOneventElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLOneventElementImpl extends WMLElementImpl implements WMLOneventElement { diff --git a/src/org/apache/wml/dom/WMLOptgroupElementImpl.java b/src/org/apache/wml/dom/WMLOptgroupElementImpl.java index d077658..0ff902a 100644 --- a/src/org/apache/wml/dom/WMLOptgroupElementImpl.java +++ b/src/org/apache/wml/dom/WMLOptgroupElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLOptgroupElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLOptgroupElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLOptgroupElementImpl extends WMLElementImpl implements WMLOptgroupElement { diff --git a/src/org/apache/wml/dom/WMLOptionElementImpl.java b/src/org/apache/wml/dom/WMLOptionElementImpl.java index b6500d6..8b461df 100644 --- a/src/org/apache/wml/dom/WMLOptionElementImpl.java +++ b/src/org/apache/wml/dom/WMLOptionElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLOptionElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLOptionElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLOptionElementImpl extends WMLElementImpl implements WMLOptionElement { diff --git a/src/org/apache/wml/dom/WMLPElementImpl.java b/src/org/apache/wml/dom/WMLPElementImpl.java index fe376ec..83399e2 100644 --- a/src/org/apache/wml/dom/WMLPElementImpl.java +++ b/src/org/apache/wml/dom/WMLPElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLPElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLPElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLPElementImpl extends WMLElementImpl implements WMLPElement { diff --git a/src/org/apache/wml/dom/WMLPostfieldElementImpl.java b/src/org/apache/wml/dom/WMLPostfieldElementImpl.java index f94afea..81fe946 100644 --- a/src/org/apache/wml/dom/WMLPostfieldElementImpl.java +++ b/src/org/apache/wml/dom/WMLPostfieldElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLPostfieldElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLPostfieldElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLPostfieldElementImpl extends WMLElementImpl implements WMLPostfieldElement { diff --git a/src/org/apache/wml/dom/WMLPrevElementImpl.java b/src/org/apache/wml/dom/WMLPrevElementImpl.java index b053866..8c4b684 100644 --- a/src/org/apache/wml/dom/WMLPrevElementImpl.java +++ b/src/org/apache/wml/dom/WMLPrevElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLPrevElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLPrevElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLPrevElementImpl extends WMLElementImpl implements WMLPrevElement { diff --git a/src/org/apache/wml/dom/WMLRefreshElementImpl.java b/src/org/apache/wml/dom/WMLRefreshElementImpl.java index 8958d3e..bea69ce 100644 --- a/src/org/apache/wml/dom/WMLRefreshElementImpl.java +++ b/src/org/apache/wml/dom/WMLRefreshElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLRefreshElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLRefreshElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLRefreshElementImpl extends WMLElementImpl implements WMLRefreshElement { diff --git a/src/org/apache/wml/dom/WMLSelectElementImpl.java b/src/org/apache/wml/dom/WMLSelectElementImpl.java index d63f884..6494aaa 100644 --- a/src/org/apache/wml/dom/WMLSelectElementImpl.java +++ b/src/org/apache/wml/dom/WMLSelectElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLSelectElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLSelectElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLSelectElementImpl extends WMLElementImpl implements WMLSelectElement { diff --git a/src/org/apache/wml/dom/WMLSetvarElementImpl.java b/src/org/apache/wml/dom/WMLSetvarElementImpl.java index 0cbe4bc..dd93e16 100644 --- a/src/org/apache/wml/dom/WMLSetvarElementImpl.java +++ b/src/org/apache/wml/dom/WMLSetvarElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLSetvarElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLSetvarElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLSetvarElementImpl extends WMLElementImpl implements WMLSetvarElement { diff --git a/src/org/apache/wml/dom/WMLSmallElementImpl.java b/src/org/apache/wml/dom/WMLSmallElementImpl.java index 563e597..bf4b7ac 100644 --- a/src/org/apache/wml/dom/WMLSmallElementImpl.java +++ b/src/org/apache/wml/dom/WMLSmallElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLSmallElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLSmallElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLSmallElementImpl extends WMLElementImpl implements WMLSmallElement { diff --git a/src/org/apache/wml/dom/WMLStrongElementImpl.java b/src/org/apache/wml/dom/WMLStrongElementImpl.java index 1db3d97..5a8b4d6 100644 --- a/src/org/apache/wml/dom/WMLStrongElementImpl.java +++ b/src/org/apache/wml/dom/WMLStrongElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLStrongElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLStrongElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLStrongElementImpl extends WMLElementImpl implements WMLStrongElement { diff --git a/src/org/apache/wml/dom/WMLTableElementImpl.java b/src/org/apache/wml/dom/WMLTableElementImpl.java index 7cfb461..4312728 100644 --- a/src/org/apache/wml/dom/WMLTableElementImpl.java +++ b/src/org/apache/wml/dom/WMLTableElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLTableElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLTableElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLTableElementImpl extends WMLElementImpl implements WMLTableElement { diff --git a/src/org/apache/wml/dom/WMLTdElementImpl.java b/src/org/apache/wml/dom/WMLTdElementImpl.java index 206c8c7..997b77c 100644 --- a/src/org/apache/wml/dom/WMLTdElementImpl.java +++ b/src/org/apache/wml/dom/WMLTdElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLTdElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLTdElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLTdElementImpl extends WMLElementImpl implements WMLTdElement { diff --git a/src/org/apache/wml/dom/WMLTemplateElementImpl.java b/src/org/apache/wml/dom/WMLTemplateElementImpl.java index 005e606..972ff56 100644 --- a/src/org/apache/wml/dom/WMLTemplateElementImpl.java +++ b/src/org/apache/wml/dom/WMLTemplateElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLTemplateElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLTemplateElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLTemplateElementImpl extends WMLElementImpl implements WMLTemplateElement { diff --git a/src/org/apache/wml/dom/WMLTimerElementImpl.java b/src/org/apache/wml/dom/WMLTimerElementImpl.java index 55b4a44..b658afa 100644 --- a/src/org/apache/wml/dom/WMLTimerElementImpl.java +++ b/src/org/apache/wml/dom/WMLTimerElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLTimerElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLTimerElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLTimerElementImpl extends WMLElementImpl implements WMLTimerElement { diff --git a/src/org/apache/wml/dom/WMLTrElementImpl.java b/src/org/apache/wml/dom/WMLTrElementImpl.java index 7afb3c1..72a03c6 100644 --- a/src/org/apache/wml/dom/WMLTrElementImpl.java +++ b/src/org/apache/wml/dom/WMLTrElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLTrElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLTrElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLTrElementImpl extends WMLElementImpl implements WMLTrElement { diff --git a/src/org/apache/wml/dom/WMLUElementImpl.java b/src/org/apache/wml/dom/WMLUElementImpl.java index 26e1500..7ce985d 100644 --- a/src/org/apache/wml/dom/WMLUElementImpl.java +++ b/src/org/apache/wml/dom/WMLUElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLUElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLUElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLUElementImpl extends WMLElementImpl implements WMLUElement { diff --git a/src/org/apache/wml/dom/WMLWmlElementImpl.java b/src/org/apache/wml/dom/WMLWmlElementImpl.java index 8df287c..446cd52 100644 --- a/src/org/apache/wml/dom/WMLWmlElementImpl.java +++ b/src/org/apache/wml/dom/WMLWmlElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999,2000,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ import org.apache.wml.*; /** * @xerces.internal - * @version $Id: WMLWmlElementImpl.java 320584 2005-09-30 21:43:35Z mrglavas $ + * @version $Id: WMLWmlElementImpl.java 447257 2006-09-18 05:40:07Z mrglavas $ * @author <a href="mailto:david@topware.com.tw">David Li</a> */ public class WMLWmlElementImpl extends WMLElementImpl implements WMLWmlElement { diff --git a/src/org/apache/xerces/dom/ASDOMImplementationImpl.java b/src/org/apache/xerces/dom/ASDOMImplementationImpl.java index d706802..56a274a 100644 --- a/src/org/apache/xerces/dom/ASDOMImplementationImpl.java +++ b/src/org/apache/xerces/dom/ASDOMImplementationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -39,7 +40,7 @@ import org.apache.xerces.parsers.DOMASBuilderImpl; * This particular class, along with DocumentImpl, supports the DOM * Core, DOM Level 2 optional mofules, and Abstract Schemas (Experimental). * @deprecated - * @version $Id: ASDOMImplementationImpl.java 319807 2004-02-24 23:23:20Z mrglavas $ + * @version $Id: ASDOMImplementationImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class ASDOMImplementationImpl extends DOMImplementationImpl diff --git a/src/org/apache/xerces/dom/ASModelImpl.java b/src/org/apache/xerces/dom/ASModelImpl.java index 8f26a09..4212eb6 100644 --- a/src/org/apache/xerces/dom/ASModelImpl.java +++ b/src/org/apache/xerces/dom/ASModelImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -45,7 +46,7 @@ import org.apache.xerces.impl.xs.SchemaGrammar; * @deprecated * @author Pavani Mukthipudi * @author Neil Graham - * @version $Id: ASModelImpl.java 319807 2004-02-24 23:23:20Z mrglavas $ + * @version $Id: ASModelImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class ASModelImpl implements ASModel { diff --git a/src/org/apache/xerces/dom/AttrImpl.java b/src/org/apache/xerces/dom/AttrImpl.java index 90895c3..9816d5c 100644 --- a/src/org/apache/xerces/dom/AttrImpl.java +++ b/src/org/apache/xerces/dom/AttrImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -105,7 +106,7 @@ import org.w3c.dom.Text; * @author Arnaud Le Hors, IBM * @author Joe Kesselman, IBM * @author Andy Clark, IBM - * @version $Id: AttrImpl.java 380041 2006-02-23 04:42:27Z mrglavas $ + * @version $Id: AttrImpl.java 449328 2006-09-23 22:58:23Z mrglavas $ * @since PR-DOM-Level-1-19980818. * */ @@ -1030,7 +1031,7 @@ public class AttrImpl * NodeList method: Return the Nth immediate child of this node, or * null if the index is out of bounds. * @return org.w3c.dom.Node - * @param Index int + * @param index int */ public Node item(int index) { @@ -1072,12 +1073,12 @@ public class AttrImpl * Checks if a type is derived from another by restriction. See: * http://www.w3.org/TR/DOM-Level-3-Core/core.html#TypeInfo-isDerivedFrom * - * @param ancestorNS + * @param typeNamespaceArg * The namspace of the ancestor type declaration - * @param ancestorName + * @param typeNameArg * The name of the ancestor type declaration - * @param type - * The reference type definition + * @param derivationMethod + * The derivation method * * @return boolean True if the type is derived by restriciton for the * reference type diff --git a/src/org/apache/xerces/dom/AttrNSImpl.java b/src/org/apache/xerces/dom/AttrNSImpl.java index 5403ed0..079dc12 100644 --- a/src/org/apache/xerces/dom/AttrNSImpl.java +++ b/src/org/apache/xerces/dom/AttrNSImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.w3c.dom.DOMException; * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * @author Ralf Pfeiffer, IBM - * @version $Id: AttrNSImpl.java 380043 2006-02-23 05:23:19Z mrglavas $ + * @version $Id: AttrNSImpl.java 449328 2006-09-23 22:58:23Z mrglavas $ */ public class AttrNSImpl extends AttrImpl { @@ -310,12 +311,12 @@ public class AttrNSImpl * Checks if a type is derived from another by restriction. See: * http://www.w3.org/TR/DOM-Level-3-Core/core.html#TypeInfo-isDerivedFrom * - * @param ancestorNS + * @param typeNamespaceArg * The namspace of the ancestor type declaration - * @param ancestorName + * @param typeNameArg * The name of the ancestor type declaration - * @param type - * The reference type definition + * @param derivationMethod + * The derivation method * * @return boolean True if the type is derived by restriciton for the * reference type diff --git a/src/org/apache/xerces/dom/AttributeMap.java b/src/org/apache/xerces/dom/AttributeMap.java index 6225702..d7ff183 100644 --- a/src/org/apache/xerces/dom/AttributeMap.java +++ b/src/org/apache/xerces/dom/AttributeMap.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -35,7 +36,7 @@ import org.w3c.dom.Node; * * @xerces.internal * - * @version $Id: AttributeMap.java 415211 2006-06-18 22:44:11Z mrglavas $ + * @version $Id: AttributeMap.java 449328 2006-09-23 22:58:23Z mrglavas $ */ public class AttributeMap extends NamedNodeMapImpl { @@ -356,7 +357,7 @@ public class AttributeMap extends NamedNodeMapImpl { * The namespace URI of the node to remove. * When it is null or an empty string, this * method behaves like removeNamedItem. - * @param The local name of the node to remove. If the + * @param name The local name of the node to remove. If the * removed attribute is known to have a default * value, an attribute immediately appears * containing the default value. diff --git a/src/org/apache/xerces/dom/CDATASectionImpl.java b/src/org/apache/xerces/dom/CDATASectionImpl.java index 4070599..c795acb 100644 --- a/src/org/apache/xerces/dom/CDATASectionImpl.java +++ b/src/org/apache/xerces/dom/CDATASectionImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -43,7 +44,7 @@ import org.w3c.dom.Node; * * @xerces.internal * - * @version $Id: CDATASectionImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: CDATASectionImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class CDATASectionImpl diff --git a/src/org/apache/xerces/dom/CharacterDataImpl.java b/src/org/apache/xerces/dom/CharacterDataImpl.java index b901fb2..f457187 100644 --- a/src/org/apache/xerces/dom/CharacterDataImpl.java +++ b/src/org/apache/xerces/dom/CharacterDataImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,7 +35,7 @@ import org.w3c.dom.NodeList; * * @xerces.internal * - * @version $Id: CharacterDataImpl.java 320126 2004-11-04 20:42:20Z mrglavas $ + * @version $Id: CharacterDataImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public abstract class CharacterDataImpl diff --git a/src/org/apache/xerces/dom/ChildNode.java b/src/org/apache/xerces/dom/ChildNode.java index 57d90c1..1a5eb0f 100644 --- a/src/org/apache/xerces/dom/ChildNode.java +++ b/src/org/apache/xerces/dom/ChildNode.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.w3c.dom.Node; * * @xerces.internal * - * @version $Id: ChildNode.java 345851 2005-11-21 06:32:34Z mrglavas $ + * @version $Id: ChildNode.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public abstract class ChildNode extends NodeImpl { diff --git a/src/org/apache/xerces/dom/CommentImpl.java b/src/org/apache/xerces/dom/CommentImpl.java index 1ab21b0..2b50a45 100644 --- a/src/org/apache/xerces/dom/CommentImpl.java +++ b/src/org/apache/xerces/dom/CommentImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import org.w3c.dom.Node; * * @xerces.internal * - * @version $Id: CommentImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: CommentImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class CommentImpl diff --git a/src/org/apache/xerces/dom/CoreDOMImplementationImpl.java b/src/org/apache/xerces/dom/CoreDOMImplementationImpl.java index ec77cba..ffe3fc8 100644 --- a/src/org/apache/xerces/dom/CoreDOMImplementationImpl.java +++ b/src/org/apache/xerces/dom/CoreDOMImplementationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -49,7 +50,7 @@ import org.w3c.dom.ls.LSSerializer; * * @xerces.internal * - * @version $Id: CoreDOMImplementationImpl.java 381413 2006-02-27 19:46:27Z mrglavas $ + * @version $Id: CoreDOMImplementationImpl.java 476864 2006-11-19 18:14:47Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class CoreDOMImplementationImpl @@ -404,6 +405,15 @@ public class CoreDOMImplementationImpl * reference to the default error handler. */ public LSSerializer createLSSerializer() { + try { + Class serializerClass = ObjectFactory.findProviderClass( + "org.apache.xml.serializer.dom3.LSSerializerImpl", + ObjectFactory.findClassLoader(), true); + return (LSSerializer) serializerClass.newInstance(); + } + catch (Exception e) {} + // Fall back to Xerces' deprecated serializer if + // the Xalan based serializer is unavailable. return new DOMSerializerImpl(); } diff --git a/src/org/apache/xerces/dom/CoreDocumentImpl.java b/src/org/apache/xerces/dom/CoreDocumentImpl.java index dacf144..4372e0e 100644 --- a/src/org/apache/xerces/dom/CoreDocumentImpl.java +++ b/src/org/apache/xerces/dom/CoreDocumentImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -72,7 +73,7 @@ import org.w3c.dom.ls.LSSerializer; * @author Joe Kesselman, IBM * @author Andy Clark, IBM * @author Ralf Pfeiffer, IBM - * @version $Id: CoreDocumentImpl.java 439176 2006-09-01 04:45:24Z mrglavas $ + * @version $Id: CoreDocumentImpl.java 449328 2006-09-23 22:58:23Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ @@ -1357,7 +1358,9 @@ extends ParentNode implements Document { * as its OwnerDoc. (REC-DOM-Level-1-19981001 left the process of building * DTD information unspecified.) * - * @param name The name of the Entity we wish to provide a value for. + * @param qualifiedName + * @param publicID + * @param systemID * * @throws DOMException(NOT_SUPPORTED_ERR) for HTML documents, where * DTDs are not permitted. (HTML not yet implemented.) diff --git a/src/org/apache/xerces/dom/DOMConfigurationImpl.java b/src/org/apache/xerces/dom/DOMConfigurationImpl.java index 02025a8..7081b74 100644 --- a/src/org/apache/xerces/dom/DOMConfigurationImpl.java +++ b/src/org/apache/xerces/dom/DOMConfigurationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -59,7 +60,7 @@ import org.w3c.dom.ls.LSResourceResolver; * * @author Elena Litani, IBM * @author Neeraj Bajaj, Sun Microsystems. - * @version $Id: DOMConfigurationImpl.java 354522 2005-12-06 19:46:23Z mrglavas $ + * @version $Id: DOMConfigurationImpl.java 478323 2006-11-22 21:17:33Z mrglavas $ */ public class DOMConfigurationImpl extends ParserConfigurationSettings implements XMLParserConfiguration, DOMConfiguration { @@ -428,8 +429,8 @@ public class DOMConfigurationImpl extends ParserConfigurationSettings * has ended. If a client application wants to terminate * parsing early, it should throw an exception. * - * @param source The input source for the top-level of the - * XML document. + * @param inputSource The input source for the top-level of the + * XML document. * * @exception XNIException Any XNI exception, possibly wrapping * another exception. @@ -494,9 +495,7 @@ public class DOMConfigurationImpl extends ParserConfigurationSettings * uninstall the currently installed resolver. */ public void setEntityResolver(XMLEntityResolver resolver) { - if (resolver !=null) { - fProperties.put(ENTITY_RESOLVER, resolver); - } + fProperties.put(ENTITY_RESOLVER, resolver); } // setEntityResolver(XMLEntityResolver) /** @@ -815,6 +814,22 @@ public class DOMConfigurationImpl extends ParserConfigurationSettings } } + else if (name.equalsIgnoreCase(ENTITY_RESOLVER)) { + if (value instanceof XMLEntityResolver || value == null) { + try { + setEntityResolver((XMLEntityResolver) value); + } + catch (XMLConfigurationException e) {} + } + else { + String msg = + DOMMessageFormatter.formatMessage( + DOMMessageFormatter.DOM_DOMAIN, + "TYPE_MISMATCH_ERR", + new Object[] { name }); + throw new DOMException(DOMException.TYPE_MISMATCH_ERR, msg); + } + } else if (name.equalsIgnoreCase(SYMBOL_TABLE)){ // Xerces Symbol Table if (value instanceof SymbolTable){ @@ -932,6 +947,9 @@ public class DOMConfigurationImpl extends ParserConfigurationSettings else if (name.equalsIgnoreCase(Constants.DOM_SCHEMA_LOCATION)) { return getProperty(Constants.JAXP_PROPERTY_PREFIX + Constants.SCHEMA_SOURCE); } + else if (name.equalsIgnoreCase(ENTITY_RESOLVER)) { + return getEntityResolver(); + } else if (name.equalsIgnoreCase(SYMBOL_TABLE)){ return getProperty(SYMBOL_TABLE); } diff --git a/src/org/apache/xerces/dom/DOMErrorImpl.java b/src/org/apache/xerces/dom/DOMErrorImpl.java index 3345acb..3fcd392 100644 --- a/src/org/apache/xerces/dom/DOMErrorImpl.java +++ b/src/org/apache/xerces/dom/DOMErrorImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -35,7 +36,7 @@ import org.apache.xerces.xni.parser.XMLParseException; * @author Gopal Sharma, SUN Microsystems Inc. * @author Elena Litani, IBM * - * @version $Id: DOMErrorImpl.java 320295 2005-05-02 22:02:22Z mrglavas $ + * @version $Id: DOMErrorImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ // REVISIT: the implementation of ErrorReporter. diff --git a/src/org/apache/xerces/dom/DOMImplementationImpl.java b/src/org/apache/xerces/dom/DOMImplementationImpl.java index f3be568..48121c7 100644 --- a/src/org/apache/xerces/dom/DOMImplementationImpl.java +++ b/src/org/apache/xerces/dom/DOMImplementationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -35,7 +36,7 @@ import org.w3c.dom.Element; * * @xerces.internal * - * @version $Id: DOMImplementationImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DOMImplementationImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DOMImplementationImpl extends CoreDOMImplementationImpl diff --git a/src/org/apache/xerces/dom/DOMImplementationListImpl.java b/src/org/apache/xerces/dom/DOMImplementationListImpl.java index bb40da5..1bfbe34 100644 --- a/src/org/apache/xerces/dom/DOMImplementationListImpl.java +++ b/src/org/apache/xerces/dom/DOMImplementationListImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/dom/DOMImplementationSourceImpl.java b/src/org/apache/xerces/dom/DOMImplementationSourceImpl.java index 27ba944..761be72 100644 --- a/src/org/apache/xerces/dom/DOMImplementationSourceImpl.java +++ b/src/org/apache/xerces/dom/DOMImplementationSourceImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.apache.xerces.dom.DOMImplementationListImpl; * * @xerces.internal * - * @version $Id: DOMImplementationSourceImpl.java 320295 2005-05-02 22:02:22Z mrglavas $ + * @version $Id: DOMImplementationSourceImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class DOMImplementationSourceImpl implements DOMImplementationSource { diff --git a/src/org/apache/xerces/dom/DOMInputImpl.java b/src/org/apache/xerces/dom/DOMInputImpl.java index 8858e5a..3543c8a 100644 --- a/src/org/apache/xerces/dom/DOMInputImpl.java +++ b/src/org/apache/xerces/dom/DOMInputImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -49,7 +50,7 @@ and Save Specification</a>. * @xerces.internal * * @author Gopal Sharma, SUN Microsystems Inc. - * @version $Id: DOMInputImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DOMInputImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ // REVISIT: diff --git a/src/org/apache/xerces/dom/DOMLocatorImpl.java b/src/org/apache/xerces/dom/DOMLocatorImpl.java index ac98f18..ef3a13f 100644 --- a/src/org/apache/xerces/dom/DOMLocatorImpl.java +++ b/src/org/apache/xerces/dom/DOMLocatorImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.w3c.dom.Node; * @xerces.internal * * @author Gopal Sharma, SUN Microsystems Inc. - * @version $Id: DOMLocatorImpl.java 320295 2005-05-02 22:02:22Z mrglavas $ + * @version $Id: DOMLocatorImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class DOMLocatorImpl implements DOMLocator { diff --git a/src/org/apache/xerces/dom/DOMMessageFormatter.java b/src/org/apache/xerces/dom/DOMMessageFormatter.java index ef8f323..ea6f18a 100644 --- a/src/org/apache/xerces/dom/DOMMessageFormatter.java +++ b/src/org/apache/xerces/dom/DOMMessageFormatter.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import java.util.PropertyResourceBundle; * @xerces.internal * * @author Sandy Gao, IBM - * @version $Id: DOMMessageFormatter.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DOMMessageFormatter.java 449328 2006-09-23 22:58:23Z mrglavas $ */ public class DOMMessageFormatter { public static final String DOM_DOMAIN = "http://www.w3.org/dom/DOMTR"; @@ -130,8 +131,8 @@ public class DOMMessageFormatter { } /** - * setLocale to be used by the formatter. - * @param locale + * Set Locale to be used by the formatter. + * @param dlocale */ public static void setLocale(Locale dlocale){ locale = dlocale; diff --git a/src/org/apache/xerces/dom/DOMNormalizer.java b/src/org/apache/xerces/dom/DOMNormalizer.java index 7ea2707..97e0407 100644 --- a/src/org/apache/xerces/dom/DOMNormalizer.java +++ b/src/org/apache/xerces/dom/DOMNormalizer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -83,7 +84,7 @@ import org.w3c.dom.Text; * * @author Elena Litani, IBM * @author Neeraj Bajaj, Sun Microsystems, inc. - * @version $Id: DOMNormalizer.java 380043 2006-02-23 05:23:19Z mrglavas $ + * @version $Id: DOMNormalizer.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class DOMNormalizer implements XMLDocumentHandler { diff --git a/src/org/apache/xerces/dom/DOMOutputImpl.java b/src/org/apache/xerces/dom/DOMOutputImpl.java index d2aa01f..2a5a431 100644 --- a/src/org/apache/xerces/dom/DOMOutputImpl.java +++ b/src/org/apache/xerces/dom/DOMOutputImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/dom/DOMStringListImpl.java b/src/org/apache/xerces/dom/DOMStringListImpl.java index b259a5c..71ddab9 100644 --- a/src/org/apache/xerces/dom/DOMStringListImpl.java +++ b/src/org/apache/xerces/dom/DOMStringListImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -77,7 +78,7 @@ public class DOMStringListImpl implements DOMStringList { * DOM Internal: * Add a <code>DOMString</code> to the list. * - * @param domString A string to add to the list + * @param param A string to add to the list */ public void add(String param) { fStrings.add(param); diff --git a/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java b/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java index b407a30..de87aae 100644 --- a/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java +++ b/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import java.util.Vector; * @xerces.internal * * @author Elena Litani, IBM - * @version $Id: DOMXSImplementationSourceImpl.java 320295 2005-05-02 22:02:22Z mrglavas $ + * @version $Id: DOMXSImplementationSourceImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class DOMXSImplementationSourceImpl extends DOMImplementationSourceImpl { diff --git a/src/org/apache/xerces/dom/DeepNodeListImpl.java b/src/org/apache/xerces/dom/DeepNodeListImpl.java index 3646bcb..d1ab526 100644 --- a/src/org/apache/xerces/dom/DeepNodeListImpl.java +++ b/src/org/apache/xerces/dom/DeepNodeListImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -67,7 +68,7 @@ import java.util.Vector; * * @xerces.internal * - * @version $Id: DeepNodeListImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeepNodeListImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DeepNodeListImpl diff --git a/src/org/apache/xerces/dom/DeferredAttrImpl.java b/src/org/apache/xerces/dom/DeferredAttrImpl.java index ccdfc3e..2928f0d 100644 --- a/src/org/apache/xerces/dom/DeferredAttrImpl.java +++ b/src/org/apache/xerces/dom/DeferredAttrImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -58,7 +59,7 @@ package org.apache.xerces.dom; * * @author Andy Clark, IBM * @author Arnaud Le Hors, IBM - * @version $Id: DeferredAttrImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredAttrImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public final class DeferredAttrImpl diff --git a/src/org/apache/xerces/dom/DeferredAttrNSImpl.java b/src/org/apache/xerces/dom/DeferredAttrNSImpl.java index d2166e1..564c890 100644 --- a/src/org/apache/xerces/dom/DeferredAttrNSImpl.java +++ b/src/org/apache/xerces/dom/DeferredAttrNSImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ package org.apache.xerces.dom; * * @author Andy Clark, IBM * @author Arnaud Le Hors, IBM - * @version $Id: DeferredAttrNSImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredAttrNSImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @see DeferredAttrImpl */ public final class DeferredAttrNSImpl diff --git a/src/org/apache/xerces/dom/DeferredCDATASectionImpl.java b/src/org/apache/xerces/dom/DeferredCDATASectionImpl.java index 07a757e..46e5ef5 100644 --- a/src/org/apache/xerces/dom/DeferredCDATASectionImpl.java +++ b/src/org/apache/xerces/dom/DeferredCDATASectionImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -40,7 +41,7 @@ package org.apache.xerces.dom; * * @xerces.internal * - * @version $Id: DeferredCDATASectionImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredCDATASectionImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DeferredCDATASectionImpl diff --git a/src/org/apache/xerces/dom/DeferredCommentImpl.java b/src/org/apache/xerces/dom/DeferredCommentImpl.java index 054d846..c1c4823 100644 --- a/src/org/apache/xerces/dom/DeferredCommentImpl.java +++ b/src/org/apache/xerces/dom/DeferredCommentImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.xerces.dom; * * @xerces.internal * - * @version $Id: DeferredCommentImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredCommentImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DeferredCommentImpl diff --git a/src/org/apache/xerces/dom/DeferredDOMImplementationImpl.java b/src/org/apache/xerces/dom/DeferredDOMImplementationImpl.java index d877442..aef82cd 100644 --- a/src/org/apache/xerces/dom/DeferredDOMImplementationImpl.java +++ b/src/org/apache/xerces/dom/DeferredDOMImplementationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.w3c.dom.DOMImplementation; * * @author Neil Delima, IBM * - * @version $Id: DeferredDOMImplementationImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredDOMImplementationImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class DeferredDOMImplementationImpl extends DOMImplementationImpl { diff --git a/src/org/apache/xerces/dom/DeferredDocumentImpl.java b/src/org/apache/xerces/dom/DeferredDocumentImpl.java index 9012eb6..e60687d 100644 --- a/src/org/apache/xerces/dom/DeferredDocumentImpl.java +++ b/src/org/apache/xerces/dom/DeferredDocumentImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import java.util.Vector; * * @xerces.internal * - * @version $Id: DeferredDocumentImpl.java 437729 2006-08-28 15:52:19Z mrglavas $ + * @version $Id: DeferredDocumentImpl.java 449328 2006-09-23 22:58:23Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DeferredDocumentImpl @@ -373,12 +374,18 @@ public class DeferredDocumentImpl } // createDeferredElement(String,String):int - /** @deprecated. Creates an element node in the table. */ + /** + * Creates an element node in the table. + * @deprecated + */ public int createDeferredElement(String elementName) { return createDeferredElement(null, elementName); } - /** @deprecated. Creates an element node with a URI in the table. */ + /** + * Creates an element node with a URI in the table. + * @deprecated + */ public int createDeferredElement(String elementURI, String elementName) { // create node @@ -453,7 +460,10 @@ public class DeferredDocumentImpl return attrNodeIndex; } - /** @deprecated. Sets an attribute on an element node.*/ + /** + * Sets an attribute on an element node. + * @deprecated + */ public int setDeferredAttribute(int elementNodeIndex, String attrName, String attrURI, String attrValue, boolean specified) { diff --git a/src/org/apache/xerces/dom/DeferredDocumentTypeImpl.java b/src/org/apache/xerces/dom/DeferredDocumentTypeImpl.java index cb14529..3a3402e 100644 --- a/src/org/apache/xerces/dom/DeferredDocumentTypeImpl.java +++ b/src/org/apache/xerces/dom/DeferredDocumentTypeImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.w3c.dom.Node; * * @xerces.internal * - * @version $Id: DeferredDocumentTypeImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredDocumentTypeImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DeferredDocumentTypeImpl diff --git a/src/org/apache/xerces/dom/DeferredElementDefinitionImpl.java b/src/org/apache/xerces/dom/DeferredElementDefinitionImpl.java index 1860a54..e727fee 100644 --- a/src/org/apache/xerces/dom/DeferredElementDefinitionImpl.java +++ b/src/org/apache/xerces/dom/DeferredElementDefinitionImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.w3c.dom.Node; * * @xerces.internal * - * @version $Id: DeferredElementDefinitionImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredElementDefinitionImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class DeferredElementDefinitionImpl extends ElementDefinitionImpl diff --git a/src/org/apache/xerces/dom/DeferredElementImpl.java b/src/org/apache/xerces/dom/DeferredElementImpl.java index 709fdfa..9daa9ae 100644 --- a/src/org/apache/xerces/dom/DeferredElementImpl.java +++ b/src/org/apache/xerces/dom/DeferredElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -43,7 +44,7 @@ import org.w3c.dom.NamedNodeMap; * * @xerces.internal * - * @version $Id: DeferredElementImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredElementImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DeferredElementImpl diff --git a/src/org/apache/xerces/dom/DeferredElementNSImpl.java b/src/org/apache/xerces/dom/DeferredElementNSImpl.java index 9762a18..e9ca31e 100644 --- a/src/org/apache/xerces/dom/DeferredElementNSImpl.java +++ b/src/org/apache/xerces/dom/DeferredElementNSImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,7 +21,7 @@ * duplicated. If you're changing this file you probably want to change * DeferredElementImpl.java at the same time. * - * @version $Id: DeferredElementNSImpl.java 418434 2006-07-01 04:12:35Z mrglavas $ + * @version $Id: DeferredElementNSImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ package org.apache.xerces.dom; diff --git a/src/org/apache/xerces/dom/DeferredEntityImpl.java b/src/org/apache/xerces/dom/DeferredEntityImpl.java index b893dba..7158740 100644 --- a/src/org/apache/xerces/dom/DeferredEntityImpl.java +++ b/src/org/apache/xerces/dom/DeferredEntityImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -49,7 +50,7 @@ package org.apache.xerces.dom; * * @xerces.internal * - * @version $Id: DeferredEntityImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredEntityImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DeferredEntityImpl diff --git a/src/org/apache/xerces/dom/DeferredEntityReferenceImpl.java b/src/org/apache/xerces/dom/DeferredEntityReferenceImpl.java index f0a8ba0..b9bfc3f 100644 --- a/src/org/apache/xerces/dom/DeferredEntityReferenceImpl.java +++ b/src/org/apache/xerces/dom/DeferredEntityReferenceImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -66,7 +67,7 @@ package org.apache.xerces.dom; * * @xerces.internal * - * @version $Id: DeferredEntityReferenceImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredEntityReferenceImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DeferredEntityReferenceImpl diff --git a/src/org/apache/xerces/dom/DeferredNode.java b/src/org/apache/xerces/dom/DeferredNode.java index 7e7a22c..da9167f 100644 --- a/src/org/apache/xerces/dom/DeferredNode.java +++ b/src/org/apache/xerces/dom/DeferredNode.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import org.w3c.dom.Node; * * @xerces.internal * - * @version $Id: DeferredNode.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredNode.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public interface DeferredNode extends Node { diff --git a/src/org/apache/xerces/dom/DeferredNotationImpl.java b/src/org/apache/xerces/dom/DeferredNotationImpl.java index 7b627bf..bc42756 100644 --- a/src/org/apache/xerces/dom/DeferredNotationImpl.java +++ b/src/org/apache/xerces/dom/DeferredNotationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ package org.apache.xerces.dom; * * @xerces.internal * - * @version $Id: DeferredNotationImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredNotationImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DeferredNotationImpl diff --git a/src/org/apache/xerces/dom/DeferredProcessingInstructionImpl.java b/src/org/apache/xerces/dom/DeferredProcessingInstructionImpl.java index 32d1612..d59a05f 100644 --- a/src/org/apache/xerces/dom/DeferredProcessingInstructionImpl.java +++ b/src/org/apache/xerces/dom/DeferredProcessingInstructionImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ package org.apache.xerces.dom; * * @xerces.internal * - * @version $Id: DeferredProcessingInstructionImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredProcessingInstructionImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DeferredProcessingInstructionImpl diff --git a/src/org/apache/xerces/dom/DeferredTextImpl.java b/src/org/apache/xerces/dom/DeferredTextImpl.java index c9d9758..d8484cb 100644 --- a/src/org/apache/xerces/dom/DeferredTextImpl.java +++ b/src/org/apache/xerces/dom/DeferredTextImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ package org.apache.xerces.dom; * * @xerces.internal * - * @version $Id: DeferredTextImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DeferredTextImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DeferredTextImpl diff --git a/src/org/apache/xerces/dom/DocumentFragmentImpl.java b/src/org/apache/xerces/dom/DocumentFragmentImpl.java index b00d090..e62a58a 100644 --- a/src/org/apache/xerces/dom/DocumentFragmentImpl.java +++ b/src/org/apache/xerces/dom/DocumentFragmentImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -59,7 +60,7 @@ import org.w3c.dom.Text; * * @xerces.internal * - * @version $Id: DocumentFragmentImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: DocumentFragmentImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DocumentFragmentImpl diff --git a/src/org/apache/xerces/dom/DocumentImpl.java b/src/org/apache/xerces/dom/DocumentImpl.java index 84ba3c2..918d01a 100644 --- a/src/org/apache/xerces/dom/DocumentImpl.java +++ b/src/org/apache/xerces/dom/DocumentImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -73,7 +74,7 @@ import org.w3c.dom.traversal.TreeWalker; * @author Joe Kesselman, IBM * @author Andy Clark, IBM * @author Ralf Pfeiffer, IBM - * @version $Id: DocumentImpl.java 388860 2006-03-25 23:50:16Z mrglavas $ + * @version $Id: DocumentImpl.java 476034 2006-11-17 03:00:34Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DocumentImpl @@ -325,10 +326,14 @@ public class DocumentImpl void replacedText(NodeImpl node) { // notify ranges if (ranges != null) { - int size = ranges.size(); - for (int i = 0; i != size; i++) { - ((RangeImpl)ranges.elementAt(i)).receiveReplacedText(node); - } + notifyRangesReplacedText(node); + } + } + + private void notifyRangesReplacedText(NodeImpl node) { + final int size = ranges.size(); + for (int i = 0; i != size; i++) { + ((RangeImpl)ranges.elementAt(i)).receiveReplacedText(node); } } @@ -339,11 +344,14 @@ public class DocumentImpl void deletedText(NodeImpl node, int offset, int count) { // notify ranges if (ranges != null) { - int size = ranges.size(); - for (int i = 0; i != size; i++) { - ((RangeImpl)ranges.elementAt(i)).receiveDeletedText(node, - offset, count); - } + notifyRangesDeletedText(node, offset, count); + } + } + + private void notifyRangesDeletedText(NodeImpl node, int offset, int count) { + final int size = ranges.size(); + for (int i = 0; i != size; i++) { + ((RangeImpl)ranges.elementAt(i)).receiveDeletedText(node, offset, count); } } @@ -354,11 +362,14 @@ public class DocumentImpl void insertedText(NodeImpl node, int offset, int count) { // notify ranges if (ranges != null) { - int size = ranges.size(); - for (int i = 0; i != size; i++) { - ((RangeImpl)ranges.elementAt(i)).receiveInsertedText(node, - offset, count); - } + notifyRangesInsertedText(node, offset, count); + } + } + + private void notifyRangesInsertedText(NodeImpl node, int offset, int count) { + final int size = ranges.size(); + for (int i = 0; i != size; i++) { + ((RangeImpl)ranges.elementAt(i)).receiveInsertedText(node, offset, count); } } @@ -369,11 +380,14 @@ public class DocumentImpl void splitData(Node node, Node newNode, int offset) { // notify ranges if (ranges != null) { - int size = ranges.size(); - for (int i = 0; i != size; i++) { - ((RangeImpl)ranges.elementAt(i)).receiveSplitData(node, - newNode, offset); - } + notifyRangesSplitData(node, newNode, offset); + } + } + + private void notifyRangesSplitData(Node node, Node newNode, int offset) { + final int size = ranges.size(); + for (int i = 0; i != size; i++) { + ((RangeImpl)ranges.elementAt(i)).receiveSplitData(node, newNode, offset); } } @@ -596,10 +610,10 @@ public class DocumentImpl protected void copyEventListeners(NodeImpl src, NodeImpl tgt) { Vector nodeListeners = getEventListeners(src); - if (nodeListeners == null) { - return; - } - setEventListeners(tgt, (Vector) nodeListeners.clone()); + if (nodeListeners == null) { + return; + } + setEventListeners(tgt, (Vector) nodeListeners.clone()); } /** @@ -907,7 +921,7 @@ public class DocumentImpl * @param node The node to dispatch to * @param enclosingAttr The Attr node (if any) whose value has been changed * as a result of the DOM operation. Null if none such. - * @param oldValue The String value previously held by the + * @param oldvalue The String value previously held by the * enclosingAttr. Ignored if none such. * @param change Type of modification to the attr. See * MutationEvent.attrChange @@ -962,7 +976,6 @@ public class DocumentImpl * preparation for later generating DOMAttrModified events. * Determines whether this node is within an Attr * @param node node to get enclosing attribute for - * @return either a description of that Attr, or null if none such. */ protected void saveEnclosingAttr(NodeImpl node) { savedEnclosingAttr = null; @@ -1011,26 +1024,30 @@ public class DocumentImpl */ void modifiedCharacterData(NodeImpl node, String oldvalue, String value, boolean replace) { if (mutationEvents) { - if (!replace) { - // MUTATION POST-EVENTS: - LCount lc = - LCount.lookup(MutationEventImpl.DOM_CHARACTER_DATA_MODIFIED); - if (lc.total > 0) { - MutationEvent me = new MutationEventImpl(); - me.initMutationEvent( - MutationEventImpl.DOM_CHARACTER_DATA_MODIFIED, - true, false, null, - oldvalue, value, null, (short) 0); - dispatchEvent(node, me); - } - - // Subroutine: Transmit DOMAttrModified and DOMSubtreeModified, - // if required. (Common to most kinds of mutation) - dispatchAggregateEvents(node, savedEnclosingAttr); - } // End mutation postprocessing + mutationEventsModifiedCharacterData(node, oldvalue, value, replace); } } + private void mutationEventsModifiedCharacterData(NodeImpl node, String oldvalue, String value, boolean replace) { + if (!replace) { + // MUTATION POST-EVENTS: + LCount lc = + LCount.lookup(MutationEventImpl.DOM_CHARACTER_DATA_MODIFIED); + if (lc.total > 0) { + MutationEvent me = new MutationEventImpl(); + me.initMutationEvent( + MutationEventImpl.DOM_CHARACTER_DATA_MODIFIED, + true, false, null, + oldvalue, value, null, (short) 0); + dispatchEvent(node, me); + } + + // Subroutine: Transmit DOMAttrModified and DOMSubtreeModified, + // if required. (Common to most kinds of mutation) + dispatchAggregateEvents(node, savedEnclosingAttr); + } // End mutation postprocessing + } + /** * A method to be called when a character data node has been replaced */ @@ -1041,8 +1058,6 @@ public class DocumentImpl //events if appropriate will be initiated modifiedCharacterData(node, oldvalue, value, false); } - - /** * A method to be called when a node is about to be inserted in the tree. @@ -1060,64 +1075,72 @@ public class DocumentImpl */ void insertedNode(NodeImpl node, NodeImpl newInternal, boolean replace) { if (mutationEvents) { - // MUTATION POST-EVENTS: - // "Local" events (non-aggregated) - // New child is told it was inserted, and where - LCount lc = LCount.lookup(MutationEventImpl.DOM_NODE_INSERTED); - if (lc.total > 0) { - MutationEventImpl me = new MutationEventImpl(); - me.initMutationEvent(MutationEventImpl.DOM_NODE_INSERTED, - true, false, node, - null, null, null, (short) 0); - dispatchEvent(newInternal, me); - } + mutationEventsInsertedNode(node, newInternal, replace); + } + + // notify the range of insertions + if (ranges != null) { + notifyRangesInsertedNode(newInternal); + } + } + + private void mutationEventsInsertedNode(NodeImpl node, NodeImpl newInternal, boolean replace) { + // MUTATION POST-EVENTS: + // "Local" events (non-aggregated) + // New child is told it was inserted, and where + LCount lc = LCount.lookup(MutationEventImpl.DOM_NODE_INSERTED); + if (lc.total > 0) { + MutationEventImpl me = new MutationEventImpl(); + me.initMutationEvent(MutationEventImpl.DOM_NODE_INSERTED, + true, false, node, + null, null, null, (short) 0); + dispatchEvent(newInternal, me); + } - // If within the Document, tell the subtree it's been added - // to the Doc. - lc = LCount.lookup( - MutationEventImpl.DOM_NODE_INSERTED_INTO_DOCUMENT); - if (lc.total > 0) { - NodeImpl eventAncestor = node; - if (savedEnclosingAttr != null) - eventAncestor = (NodeImpl) - savedEnclosingAttr.node.getOwnerElement(); - if (eventAncestor != null) { // Might have been orphan Attr - NodeImpl p = eventAncestor; - while (p != null) { - eventAncestor = p; // Last non-null ancestor - // In this context, ancestry includes - // walking back from Attr to Element - if (p.getNodeType() == ATTRIBUTE_NODE) { - p = (NodeImpl) ((AttrImpl)p).getOwnerElement(); - } - else { - p = p.parentNode(); - } + // If within the Document, tell the subtree it's been added + // to the Doc. + lc = LCount.lookup( + MutationEventImpl.DOM_NODE_INSERTED_INTO_DOCUMENT); + if (lc.total > 0) { + NodeImpl eventAncestor = node; + if (savedEnclosingAttr != null) + eventAncestor = (NodeImpl) + savedEnclosingAttr.node.getOwnerElement(); + if (eventAncestor != null) { // Might have been orphan Attr + NodeImpl p = eventAncestor; + while (p != null) { + eventAncestor = p; // Last non-null ancestor + // In this context, ancestry includes + // walking back from Attr to Element + if (p.getNodeType() == ATTRIBUTE_NODE) { + p = (NodeImpl) ((AttrImpl)p).getOwnerElement(); } - if (eventAncestor.getNodeType() == Node.DOCUMENT_NODE){ - MutationEventImpl me = new MutationEventImpl(); - me.initMutationEvent(MutationEventImpl - .DOM_NODE_INSERTED_INTO_DOCUMENT, - false,false,null,null, - null,null,(short)0); - dispatchEventToSubtree(newInternal, me); + else { + p = p.parentNode(); } } - } - if (!replace) { - // Subroutine: Transmit DOMAttrModified and DOMSubtreeModified - // (Common to most kinds of mutation) - dispatchAggregateEvents(node, savedEnclosingAttr); + if (eventAncestor.getNodeType() == Node.DOCUMENT_NODE){ + MutationEventImpl me = new MutationEventImpl(); + me.initMutationEvent(MutationEventImpl + .DOM_NODE_INSERTED_INTO_DOCUMENT, + false,false,null,null, + null,null,(short)0); + dispatchEventToSubtree(newInternal, me); + } } } - - // notify the range of insertions - if (ranges != null) { - int size = ranges.size(); - for (int i = 0; i != size; i++) { - ((RangeImpl)ranges.elementAt(i)).insertedNodeFromDOM(newInternal); - } - } + if (!replace) { + // Subroutine: Transmit DOMAttrModified and DOMSubtreeModified + // (Common to most kinds of mutation) + dispatchAggregateEvents(node, savedEnclosingAttr); + } + } + + private void notifyRangesInsertedNode(NodeImpl newInternal) { + final int size = ranges.size(); + for (int i = 0; i != size; i++) { + ((RangeImpl)ranges.elementAt(i)).insertedNodeFromDOM(newInternal); + } } /** @@ -1127,64 +1150,77 @@ public class DocumentImpl // notify iterators if (iterators != null) { - int size = iterators.size(); - for (int i = 0; i != size; i++) { - ((NodeIteratorImpl)iterators.elementAt(i)).removeNode(oldChild); - } + notifyIteratorsRemovingNode(oldChild); } // notify ranges if (ranges != null) { - int size = ranges.size(); - for (int i = 0; i != size; i++) { - ((RangeImpl)ranges.elementAt(i)).removeNode(oldChild); - } + notifyRangesRemovingNode(oldChild); } // mutation events if (mutationEvents) { - // MUTATION PREPROCESSING AND PRE-EVENTS: - // If we're within the scope of an Attr and DOMAttrModified - // was requested, we need to preserve its previous value for - // that event. - if (!replace) { - saveEnclosingAttr(node); - } - // Child is told that it is about to be removed - LCount lc = LCount.lookup(MutationEventImpl.DOM_NODE_REMOVED); - if (lc.total > 0) { - MutationEventImpl me= new MutationEventImpl(); - me.initMutationEvent(MutationEventImpl.DOM_NODE_REMOVED, - true, false, node, null, - null, null, (short) 0); - dispatchEvent(oldChild, me); - } + mutationEventsRemovingNode(node, oldChild, replace); + } + } + + private void notifyIteratorsRemovingNode(NodeImpl oldChild) { + final int size = iterators.size(); + for (int i = 0; i != size; i++) { + ((NodeIteratorImpl)iterators.elementAt(i)).removeNode(oldChild); + } + } + + private void notifyRangesRemovingNode(NodeImpl oldChild) { + final int size = ranges.size(); + for (int i = 0; i != size; i++) { + ((RangeImpl)ranges.elementAt(i)).removeNode(oldChild); + } + } + + private void mutationEventsRemovingNode(NodeImpl node, NodeImpl oldChild, boolean replace) { + // MUTATION PREPROCESSING AND PRE-EVENTS: + // If we're within the scope of an Attr and DOMAttrModified + // was requested, we need to preserve its previous value for + // that event. + if (!replace) { + saveEnclosingAttr(node); + } + // Child is told that it is about to be removed + LCount lc = LCount.lookup(MutationEventImpl.DOM_NODE_REMOVED); + if (lc.total > 0) { + MutationEventImpl me= new MutationEventImpl(); + me.initMutationEvent(MutationEventImpl.DOM_NODE_REMOVED, + true, false, node, null, + null, null, (short) 0); + dispatchEvent(oldChild, me); + } - // If within Document, child's subtree is informed that it's - // losing that status - lc = LCount.lookup( - MutationEventImpl.DOM_NODE_REMOVED_FROM_DOCUMENT); - if (lc.total > 0) { - NodeImpl eventAncestor = this; - if(savedEnclosingAttr != null) - eventAncestor = (NodeImpl) - savedEnclosingAttr.node.getOwnerElement(); - if (eventAncestor != null) { // Might have been orphan Attr - for (NodeImpl p = eventAncestor.parentNode(); - p != null; p = p.parentNode()) { - eventAncestor = p; // Last non-null ancestor - } - if (eventAncestor.getNodeType() == Node.DOCUMENT_NODE){ - MutationEventImpl me = new MutationEventImpl(); - me.initMutationEvent( - MutationEventImpl.DOM_NODE_REMOVED_FROM_DOCUMENT, - false, false, null, - null, null, null, (short) 0); - dispatchEventToSubtree(oldChild, me); - } + // If within Document, child's subtree is informed that it's + // losing that status + lc = LCount.lookup( + MutationEventImpl.DOM_NODE_REMOVED_FROM_DOCUMENT); + if (lc.total > 0) { + NodeImpl eventAncestor = this; + if(savedEnclosingAttr != null) + eventAncestor = (NodeImpl) + savedEnclosingAttr.node.getOwnerElement(); + if (eventAncestor != null) { // Might have been orphan Attr + for (NodeImpl p = eventAncestor.parentNode(); + p != null; p = p.parentNode()) { + eventAncestor = p; // Last non-null ancestor + } + if (eventAncestor.getNodeType() == Node.DOCUMENT_NODE){ + MutationEventImpl me = new MutationEventImpl(); + me.initMutationEvent( + MutationEventImpl.DOM_NODE_REMOVED_FROM_DOCUMENT, + false, false, null, + null, null, null, (short) 0); + dispatchEventToSubtree(oldChild, me); } } - } // End mutation preprocessing + } + // End mutation preprocessing } /** @@ -1215,7 +1251,7 @@ public class DocumentImpl */ void replacingData (NodeImpl node) { if (mutationEvents) { - saveEnclosingAttr(node); + saveEnclosingAttr(node); } } @@ -1265,25 +1301,28 @@ public class DocumentImpl // that the Attr is still attached to an owner. This code is // similar but dispatches to the previous owner, "element". if (mutationEvents) { - // If we have to send DOMAttrModified (determined earlier), - // do so. - LCount lc = LCount.lookup(MutationEventImpl.DOM_ATTR_MODIFIED); - if (lc.total > 0) { - MutationEventImpl me= new MutationEventImpl(); - me.initMutationEvent(MutationEventImpl.DOM_ATTR_MODIFIED, - true, false, attr, - attr.getNodeValue(), null, name, - MutationEvent.REMOVAL); - dispatchEvent(oldOwner, me); - } - - // We can hand off to process DOMSubtreeModified, though. - // Note that only the Element needs to be informed; the - // Attr's subtree has not been changed by this operation. - dispatchAggregateEvents(oldOwner, null, null, (short) 0); + mutationEventsRemovedAttrNode(attr, oldOwner, name); } } + private void mutationEventsRemovedAttrNode(AttrImpl attr, NodeImpl oldOwner, String name) { + // If we have to send DOMAttrModified (determined earlier), + // do so. + LCount lc = LCount.lookup(MutationEventImpl.DOM_ATTR_MODIFIED); + if (lc.total > 0) { + MutationEventImpl me= new MutationEventImpl(); + me.initMutationEvent(MutationEventImpl.DOM_ATTR_MODIFIED, + true, false, attr, + attr.getNodeValue(), null, name, + MutationEvent.REMOVAL); + dispatchEvent(oldOwner, me); + } + + // We can hand off to process DOMSubtreeModified, though. + // Note that only the Element needs to be informed; the + // Attr's subtree has not been changed by this operation. + dispatchAggregateEvents(oldOwner, null, null, (short) 0); + } /** * A method to be called when an attribute node has been renamed diff --git a/src/org/apache/xerces/dom/DocumentTypeImpl.java b/src/org/apache/xerces/dom/DocumentTypeImpl.java index 25c1335..bff1c7f 100644 --- a/src/org/apache/xerces/dom/DocumentTypeImpl.java +++ b/src/org/apache/xerces/dom/DocumentTypeImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -45,7 +46,7 @@ import org.w3c.dom.UserDataHandler; * @author Arnaud Le Hors, IBM * @author Joe Kesselman, IBM * @author Andy Clark, IBM - * @version $Id: DocumentTypeImpl.java 380043 2006-02-23 05:23:19Z mrglavas $ + * @version $Id: DocumentTypeImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class DocumentTypeImpl diff --git a/src/org/apache/xerces/dom/ElementDefinitionImpl.java b/src/org/apache/xerces/dom/ElementDefinitionImpl.java index e45c159..e44f3cc 100644 --- a/src/org/apache/xerces/dom/ElementDefinitionImpl.java +++ b/src/org/apache/xerces/dom/ElementDefinitionImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.w3c.dom.Node; * * @xerces.internal * - * @version $Id: ElementDefinitionImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: ElementDefinitionImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class ElementDefinitionImpl extends ParentNode { diff --git a/src/org/apache/xerces/dom/ElementImpl.java b/src/org/apache/xerces/dom/ElementImpl.java index 9e2e5a5..592a21e 100644 --- a/src/org/apache/xerces/dom/ElementImpl.java +++ b/src/org/apache/xerces/dom/ElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -50,7 +51,7 @@ import org.apache.xerces.util.URI; * @author Joe Kesselman, IBM * @author Andy Clark, IBM * @author Ralf Pfeiffer, IBM - * @version $Id: ElementImpl.java 380041 2006-02-23 04:42:27Z mrglavas $ + * @version $Id: ElementImpl.java 449328 2006-09-23 22:58:23Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class ElementImpl @@ -748,7 +749,7 @@ public class ElementImpl * namespace URI is already present in the element, it is replaced * by the new one. * - * @param Attr The Attr node to add to the attribute list. When + * @param newAttr The Attr node to add to the attribute list. When * the Node has no namespaceURI, this method behaves * like setAttributeNode. * @return Attr If the newAttr attribute replaces an existing attribute @@ -1040,12 +1041,12 @@ public class ElementImpl * Checks if a type is derived from another by restriction. See: * http://www.w3.org/TR/DOM-Level-3-Core/core.html#TypeInfo-isDerivedFrom * - * @param ancestorNS + * @param typeNamespaceArg * The namspace of the ancestor type declaration - * @param ancestorName + * @param typeNameArg * The name of the ancestor type declaration - * @param type - * The reference type definition + * @param derivationMethod + * The derivation method * * @return boolean True if the type is derived by restriciton for the * reference type diff --git a/src/org/apache/xerces/dom/ElementNSImpl.java b/src/org/apache/xerces/dom/ElementNSImpl.java index 4641fc7..239bd24 100644 --- a/src/org/apache/xerces/dom/ElementNSImpl.java +++ b/src/org/apache/xerces/dom/ElementNSImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -38,7 +39,7 @@ import org.w3c.dom.DOMException; * * @author Elena litani, IBM * @author Neeraj Bajaj, Sun Microsystems - * @version $Id: ElementNSImpl.java 320344 2005-05-10 15:36:42Z ankitp $ + * @version $Id: ElementNSImpl.java 449328 2006-09-23 22:58:23Z mrglavas $ */ public class ElementNSImpl extends ElementImpl { @@ -448,12 +449,12 @@ public class ElementNSImpl * Checks if a type is derived from another by restriction. See: * http://www.w3.org/TR/DOM-Level-3-Core/core.html#TypeInfo-isDerivedFrom * - * @param ancestorNS + * @param typeNamespaceArg * The namspace of the ancestor type declaration - * @param ancestorName + * @param typeNameArg * The name of the ancestor type declaration - * @param type - * The reference type definition + * @param derivationMethod + * The derivation method * * @return boolean True if the type is derived by restriciton for the * reference type diff --git a/src/org/apache/xerces/dom/EntityImpl.java b/src/org/apache/xerces/dom/EntityImpl.java index fd78a54..5cb5bec 100644 --- a/src/org/apache/xerces/dom/EntityImpl.java +++ b/src/org/apache/xerces/dom/EntityImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -52,7 +53,7 @@ import org.w3c.dom.Node; * @xerces.internal * * @author Elena Litani, IBM - * @version $Id: EntityImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: EntityImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class EntityImpl diff --git a/src/org/apache/xerces/dom/EntityReferenceImpl.java b/src/org/apache/xerces/dom/EntityReferenceImpl.java index 0438f1b..47f0f0e 100644 --- a/src/org/apache/xerces/dom/EntityReferenceImpl.java +++ b/src/org/apache/xerces/dom/EntityReferenceImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -76,7 +77,7 @@ import org.w3c.dom.Node; * @author Joe Kesselman, IBM * @author Andy Clark, IBM * @author Ralf Pfeiffer, IBM - * @version $Id: EntityReferenceImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: EntityReferenceImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class EntityReferenceImpl diff --git a/src/org/apache/xerces/dom/LCount.java b/src/org/apache/xerces/dom/LCount.java index 8a63857..acc7c17 100644 --- a/src/org/apache/xerces/dom/LCount.java +++ b/src/org/apache/xerces/dom/LCount.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ package org.apache.xerces.dom; /** * @xerces.internal * - * @version $Id: LCount.java 320111 2004-10-21 21:51:05Z nddelima $ + * @version $Id: LCount.java 447266 2006-09-18 05:57:49Z mrglavas $ */ class LCount diff --git a/src/org/apache/xerces/dom/NamedNodeMapImpl.java b/src/org/apache/xerces/dom/NamedNodeMapImpl.java index a541f28..6923b61 100644 --- a/src/org/apache/xerces/dom/NamedNodeMapImpl.java +++ b/src/org/apache/xerces/dom/NamedNodeMapImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -47,7 +48,7 @@ import org.w3c.dom.Node; * * @xerces.internal * - * @version $Id: NamedNodeMapImpl.java 380041 2006-02-23 04:42:27Z mrglavas $ + * @version $Id: NamedNodeMapImpl.java 449328 2006-09-23 22:58:23Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class NamedNodeMapImpl @@ -283,7 +284,7 @@ public class NamedNodeMapImpl * The namespace URI of the node to remove. * When it is null or an empty string, this * method behaves like removeNamedItem. - * @param The local name of the node to remove. + * @param name The local name of the node to remove. * @return Node The node removed from the map if a node with such * a local name and namespace URI exists. * @throws NOT_FOUND_ERR: Raised if there is no node named diff --git a/src/org/apache/xerces/dom/NodeImpl.java b/src/org/apache/xerces/dom/NodeImpl.java index d2ed02a..04283d1 100644 --- a/src/org/apache/xerces/dom/NodeImpl.java +++ b/src/org/apache/xerces/dom/NodeImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -74,7 +75,7 @@ import org.w3c.dom.events.EventTarget; * * @author Arnaud Le Hors, IBM * @author Joe Kesselman, IBM - * @version $Id: NodeImpl.java 380043 2006-02-23 05:23:19Z mrglavas $ + * @version $Id: NodeImpl.java 449328 2006-09-23 22:58:23Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public abstract class NodeImpl @@ -557,7 +558,7 @@ public abstract class NodeImpl * @see ParentNode * * @return org.w3c.dom.Node - * @param Index int + * @param index int */ public Node item(int index) { return null; @@ -1505,8 +1506,8 @@ public abstract class NodeImpl * Look up the namespace URI associated to the given prefix, starting from this node. * Use lookupNamespaceURI(null) to lookup the default namespace * - * @param namespaceURI - * @return th URI for the namespace + * @param specifiedPrefix + * @return the URI for the namespace * @since DOM Level 3 */ public String lookupNamespaceURI(String specifiedPrefix) { @@ -1681,9 +1682,6 @@ public abstract class NodeImpl * <code>Text</code> nodes, as well as any user data or event listeners * registered on the nodes. * @param arg The node to compare equality with. - * @param deep If <code>true</code>, recursively compare the subtrees; if - * <code>false</code>, compare only the nodes themselves (and its - * attributes, if it is an <code>Element</code>). * @return If the nodes, and possibly subtrees are equal, * <code>true</code> otherwise <code>false</code>. * @since DOM Level 3 diff --git a/src/org/apache/xerces/dom/NodeIteratorImpl.java b/src/org/apache/xerces/dom/NodeIteratorImpl.java index 7cfebcf..8678ced 100644 --- a/src/org/apache/xerces/dom/NodeIteratorImpl.java +++ b/src/org/apache/xerces/dom/NodeIteratorImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,7 +35,7 @@ import org.w3c.dom.traversal.NodeIterator; * * @xerces.internal * - * @version $Id: NodeIteratorImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: NodeIteratorImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class NodeIteratorImpl implements NodeIterator { diff --git a/src/org/apache/xerces/dom/NodeListCache.java b/src/org/apache/xerces/dom/NodeListCache.java index 28bc21f..6c64947 100644 --- a/src/org/apache/xerces/dom/NodeListCache.java +++ b/src/org/apache/xerces/dom/NodeListCache.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import java.io.Serializable; * * @author Arnaud Le Hors, IBM * - * @version $Id: NodeListCache.java 320585 2005-09-30 22:09:34Z mrglavas $ + * @version $Id: NodeListCache.java 447266 2006-09-18 05:57:49Z mrglavas $ */ class NodeListCache implements Serializable { diff --git a/src/org/apache/xerces/dom/NotationImpl.java b/src/org/apache/xerces/dom/NotationImpl.java index b7ede56..2727f77 100644 --- a/src/org/apache/xerces/dom/NotationImpl.java +++ b/src/org/apache/xerces/dom/NotationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -41,7 +42,7 @@ import org.w3c.dom.Notation; * * @xerces.internal * - * @version $Id: NotationImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: NotationImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class NotationImpl diff --git a/src/org/apache/xerces/dom/ObjectFactory.java b/src/org/apache/xerces/dom/ObjectFactory.java index 0f4a74c..624eaa3 100644 --- a/src/org/apache/xerces/dom/ObjectFactory.java +++ b/src/org/apache/xerces/dom/ObjectFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -39,7 +40,7 @@ import java.io.InputStreamReader; * * @xerces.internal * - * @version $Id: ObjectFactory.java 320285 2005-04-18 04:15:35Z mrglavas $ + * @version $Id: ObjectFactory.java 447266 2006-09-18 05:57:49Z mrglavas $ */ final class ObjectFactory { diff --git a/src/org/apache/xerces/dom/PSVIAttrNSImpl.java b/src/org/apache/xerces/dom/PSVIAttrNSImpl.java index 6d9c7af..20fe4d3 100644 --- a/src/org/apache/xerces/dom/PSVIAttrNSImpl.java +++ b/src/org/apache/xerces/dom/PSVIAttrNSImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2002-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.apache.xerces.xs.*; * * @author Sandy Gao, IBM * - * @version $Id: PSVIAttrNSImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: PSVIAttrNSImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class PSVIAttrNSImpl extends AttrNSImpl implements AttributePSVI { diff --git a/src/org/apache/xerces/dom/PSVIDOMImplementationImpl.java b/src/org/apache/xerces/dom/PSVIDOMImplementationImpl.java index 8d172cc..4fdefb2 100644 --- a/src/org/apache/xerces/dom/PSVIDOMImplementationImpl.java +++ b/src/org/apache/xerces/dom/PSVIDOMImplementationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.w3c.dom.Element; * * @xerces.internal * - * @version $Id: PSVIDOMImplementationImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: PSVIDOMImplementationImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class PSVIDOMImplementationImpl extends CoreDOMImplementationImpl { diff --git a/src/org/apache/xerces/dom/PSVIDocumentImpl.java b/src/org/apache/xerces/dom/PSVIDocumentImpl.java index 3660d27..bd4e926 100644 --- a/src/org/apache/xerces/dom/PSVIDocumentImpl.java +++ b/src/org/apache/xerces/dom/PSVIDocumentImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2002-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import org.w3c.dom.*; * * @author Sandy Gao, IBM * - * @version $Id: PSVIDocumentImpl.java 320296 2005-05-02 22:03:58Z mrglavas $ + * @version $Id: PSVIDocumentImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class PSVIDocumentImpl extends DocumentImpl { diff --git a/src/org/apache/xerces/dom/PSVIElementNSImpl.java b/src/org/apache/xerces/dom/PSVIElementNSImpl.java index dc48196..817afc2 100644 --- a/src/org/apache/xerces/dom/PSVIElementNSImpl.java +++ b/src/org/apache/xerces/dom/PSVIElementNSImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2002-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.apache.xerces.xs.*; * * @author Sandy Gao, IBM * - * @version $Id: PSVIElementNSImpl.java 423592 2006-07-19 20:34:52Z mrglavas $ + * @version $Id: PSVIElementNSImpl.java 449328 2006-09-23 22:58:23Z mrglavas $ */ public class PSVIElementNSImpl extends ElementNSImpl implements ElementPSVI { @@ -236,7 +237,7 @@ public class PSVIElementNSImpl extends ElementNSImpl implements ElementPSVI { /** * Copy PSVI properties from another psvi item. * - * @param attr the source of attribute PSVI items + * @param elem the source of element PSVI items */ public void setPSVI(ElementPSVI elem) { this.fDeclaration = elem.getElementDeclaration(); diff --git a/src/org/apache/xerces/dom/ParentNode.java b/src/org/apache/xerces/dom/ParentNode.java index 80ab305..418a2ca 100644 --- a/src/org/apache/xerces/dom/ParentNode.java +++ b/src/org/apache/xerces/dom/ParentNode.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -64,7 +65,7 @@ import org.w3c.dom.UserDataHandler; * @author Arnaud Le Hors, IBM * @author Joe Kesselman, IBM * @author Andy Clark, IBM - * @version $Id: ParentNode.java 442591 2006-09-12 14:31:03Z mrglavas $ + * @version $Id: ParentNode.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public abstract class ParentNode extends ChildNode { diff --git a/src/org/apache/xerces/dom/ProcessingInstructionImpl.java b/src/org/apache/xerces/dom/ProcessingInstructionImpl.java index 12ee1b8..22fbb1e 100644 --- a/src/org/apache/xerces/dom/ProcessingInstructionImpl.java +++ b/src/org/apache/xerces/dom/ProcessingInstructionImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.w3c.dom.ProcessingInstruction; * * @xerces.internal * - * @version $Id: ProcessingInstructionImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: ProcessingInstructionImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class ProcessingInstructionImpl diff --git a/src/org/apache/xerces/dom/RangeExceptionImpl.java b/src/org/apache/xerces/dom/RangeExceptionImpl.java index 2f7ec9e..6d10c2d 100644 --- a/src/org/apache/xerces/dom/RangeExceptionImpl.java +++ b/src/org/apache/xerces/dom/RangeExceptionImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,7 +21,7 @@ import org.w3c.dom.ranges.RangeException; /** * @xerces.internal * - * @version $Id: RangeExceptionImpl.java 320096 2004-10-05 17:12:51Z mrglavas $ + * @version $Id: RangeExceptionImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class RangeExceptionImpl extends RangeException { diff --git a/src/org/apache/xerces/dom/RangeImpl.java b/src/org/apache/xerces/dom/RangeImpl.java index 9983c61..a63be38 100644 --- a/src/org/apache/xerces/dom/RangeImpl.java +++ b/src/org/apache/xerces/dom/RangeImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import org.w3c.dom.ranges.RangeException; * * @xerces.internal * - * @version $Id: RangeImpl.java 388860 2006-03-25 23:50:16Z mrglavas $ + * @version $Id: RangeImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class RangeImpl implements Range { diff --git a/src/org/apache/xerces/dom/SecuritySupport.java b/src/org/apache/xerces/dom/SecuritySupport.java index 1c28024..e7c9254 100644 --- a/src/org/apache/xerces/dom/SecuritySupport.java +++ b/src/org/apache/xerces/dom/SecuritySupport.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/dom/TextImpl.java b/src/org/apache/xerces/dom/TextImpl.java index f0e8c25..8dc323a 100644 --- a/src/org/apache/xerces/dom/TextImpl.java +++ b/src/org/apache/xerces/dom/TextImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import org.w3c.dom.Text; * * @xerces.internal * - * @version $Id: TextImpl.java 345851 2005-11-21 06:32:34Z mrglavas $ + * @version $Id: TextImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ * @since PR-DOM-Level-1-19980818. */ public class TextImpl diff --git a/src/org/apache/xerces/dom/TreeWalkerImpl.java b/src/org/apache/xerces/dom/TreeWalkerImpl.java index 0e87f34..5b93a57 100644 --- a/src/org/apache/xerces/dom/TreeWalkerImpl.java +++ b/src/org/apache/xerces/dom/TreeWalkerImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.w3c.dom.traversal.TreeWalker; * * @xerces.internal * - * @version $Id: TreeWalkerImpl.java 371588 2006-01-23 16:42:23Z mrglavas $ + * @version $Id: TreeWalkerImpl.java 447266 2006-09-18 05:57:49Z mrglavas $ */ public class TreeWalkerImpl implements TreeWalker { diff --git a/src/org/apache/xerces/dom/events/EventImpl.java b/src/org/apache/xerces/dom/events/EventImpl.java index 0b9cb49..4698570 100644 --- a/src/org/apache/xerces/dom/events/EventImpl.java +++ b/src/org/apache/xerces/dom/events/EventImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.xerces.dom.events; import org.w3c.dom.events.Event; @@ -28,7 +30,7 @@ import org.w3c.dom.events.EventTarget; * * @xerces.internal * - * @version $Id: EventImpl.java 320099 2004-10-06 15:25:33Z mrglavas $ + * @version $Id: EventImpl.java 447262 2006-09-18 05:51:45Z mrglavas $ */ public class EventImpl implements Event { diff --git a/src/org/apache/xerces/dom/events/MutationEventImpl.java b/src/org/apache/xerces/dom/events/MutationEventImpl.java index 2484f4a..f552433 100644 --- a/src/org/apache/xerces/dom/events/MutationEventImpl.java +++ b/src/org/apache/xerces/dom/events/MutationEventImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,7 +23,7 @@ import org.w3c.dom.events.MutationEvent; /** * @xerces.internal * - * @version $Id: MutationEventImpl.java 320099 2004-10-06 15:25:33Z mrglavas $ + * @version $Id: MutationEventImpl.java 447262 2006-09-18 05:51:45Z mrglavas $ */ public class MutationEventImpl diff --git a/src/org/apache/xerces/impl/Constants.java b/src/org/apache/xerces/impl/Constants.java index 3a3bccf..a24e7aa 100644 --- a/src/org/apache/xerces/impl/Constants.java +++ b/src/org/apache/xerces/impl/Constants.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import java.util.NoSuchElementException; * * @author Andy Clark, IBM * - * @version $Id: Constants.java 371617 2006-01-23 18:41:49Z mrglavas $ + * @version $Id: Constants.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public final class Constants { diff --git a/src/org/apache/xerces/impl/ExternalSubsetResolver.java b/src/org/apache/xerces/impl/ExternalSubsetResolver.java index 4de22ef..e0d2edf 100644 --- a/src/org/apache/xerces/impl/ExternalSubsetResolver.java +++ b/src/org/apache/xerces/impl/ExternalSubsetResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * * @author Michael Glavassevich, IBM * - * @version $Id: ExternalSubsetResolver.java 320089 2004-10-04 21:45:49Z mrglavas $ + * @version $Id: ExternalSubsetResolver.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public interface ExternalSubsetResolver extends XMLEntityResolver { diff --git a/src/org/apache/xerces/impl/RevalidationHandler.java b/src/org/apache/xerces/impl/RevalidationHandler.java index c7e5f8a..0f869be 100644 --- a/src/org/apache/xerces/impl/RevalidationHandler.java +++ b/src/org/apache/xerces/impl/RevalidationHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import org.apache.xerces.xni.parser.XMLDocumentFilter; * * @xerces.internal * @author Elena Litani, IBM - * @version $Id: RevalidationHandler.java 320089 2004-10-04 21:45:49Z mrglavas $ + * @version $Id: RevalidationHandler.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public interface RevalidationHandler extends XMLDocumentFilter { diff --git a/src/org/apache/xerces/impl/Version.java b/src/org/apache/xerces/impl/Version.java index 493d2af..4439608 100644 --- a/src/org/apache/xerces/impl/Version.java +++ b/src/org/apache/xerces/impl/Version.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ package org.apache.xerces.impl; /** * This class defines the version number of the parser. * - * @version $Id: Version.java 319804 2004-02-24 23:03:46Z mrglavas $ + * @version $Id: Version.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public class Version { diff --git a/src/org/apache/xerces/impl/XML11DTDScannerImpl.java b/src/org/apache/xerces/impl/XML11DTDScannerImpl.java index 0eb6795..c250380 100644 --- a/src/org/apache/xerces/impl/XML11DTDScannerImpl.java +++ b/src/org/apache/xerces/impl/XML11DTDScannerImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -48,7 +49,7 @@ import org.apache.xerces.xni.XNIException; * @author Glenn Marcy, IBM * @author Eric Ye, IBM * - * @version $Id: XML11DTDScannerImpl.java 354532 2005-12-06 20:08:28Z mrglavas $ + * @version $Id: XML11DTDScannerImpl.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public class XML11DTDScannerImpl extends XMLDTDScannerImpl { diff --git a/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java b/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java index f3b9122..36dfc4f 100644 --- a/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java +++ b/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -51,7 +52,7 @@ import org.apache.xerces.xni.XNIException; * @author Arnaud Le Hors, IBM * @author Eric Ye, IBM * - * @version $Id: XML11DocumentScannerImpl.java 354533 2005-12-06 20:12:10Z mrglavas $ + * @version $Id: XML11DocumentScannerImpl.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public class XML11DocumentScannerImpl extends XMLDocumentScannerImpl { diff --git a/src/org/apache/xerces/impl/XML11EntityScanner.java b/src/org/apache/xerces/impl/XML11EntityScanner.java index 3b44b44..ed9231c 100644 --- a/src/org/apache/xerces/impl/XML11EntityScanner.java +++ b/src/org/apache/xerces/impl/XML11EntityScanner.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.apache.xerces.xni.XMLString; * * @author Michael Glavassevich, IBM * @author Neil Graham, IBM - * @version $Id: XML11EntityScanner.java 320089 2004-10-04 21:45:49Z mrglavas $ + * @version $Id: XML11EntityScanner.java 449330 2006-09-23 23:11:50Z mrglavas $ */ public class XML11EntityScanner @@ -1053,7 +1054,7 @@ public class XML11EntityScanner * * @param delimiter The string that signifies the end of the character * data to be scanned. - * @param data The data structure to fill. + * @param buffer The XMLStringBuffer to fill. * * @return Returns true if there is more data to scan, false otherwise. * diff --git a/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java b/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java index 77ddb87..3ece34a 100644 --- a/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java +++ b/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -61,7 +62,7 @@ import org.apache.xerces.xni.parser.XMLDocumentSource; * @author Elena Litani, IBM * @author Michael Glavassevich, IBM * - * @version $Id: XML11NSDocumentScannerImpl.java 320089 2004-10-04 21:45:49Z mrglavas $ + * @version $Id: XML11NSDocumentScannerImpl.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public class XML11NSDocumentScannerImpl extends XML11DocumentScannerImpl { diff --git a/src/org/apache/xerces/impl/XML11NamespaceBinder.java b/src/org/apache/xerces/impl/XML11NamespaceBinder.java index ceac1fc..c0806e7 100644 --- a/src/org/apache/xerces/impl/XML11NamespaceBinder.java +++ b/src/org/apache/xerces/impl/XML11NamespaceBinder.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ package org.apache.xerces.impl; * * @author Neil Graham, IBM * - * @version $Id: XML11NamespaceBinder.java 320089 2004-10-04 21:45:49Z mrglavas $ + * @version $Id: XML11NamespaceBinder.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public class XML11NamespaceBinder extends XMLNamespaceBinder { diff --git a/src/org/apache/xerces/impl/XMLDTDScannerImpl.java b/src/org/apache/xerces/impl/XMLDTDScannerImpl.java index 6c6151d..6e2c286 100644 --- a/src/org/apache/xerces/impl/XMLDTDScannerImpl.java +++ b/src/org/apache/xerces/impl/XMLDTDScannerImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,6 +23,7 @@ import org.apache.xerces.impl.msg.XMLMessageFormatter; import org.apache.xerces.util.SymbolTable; import org.apache.xerces.util.XMLChar; import org.apache.xerces.util.XMLStringBuffer; +import org.apache.xerces.util.XMLSymbols; import org.apache.xerces.xni.Augmentations; import org.apache.xerces.xni.XMLDTDContentModelHandler; import org.apache.xerces.xni.XMLDTDHandler; @@ -57,7 +59,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * @author Glenn Marcy, IBM * @author Eric Ye, IBM * - * @version $Id: XMLDTDScannerImpl.java 377620 2006-02-14 04:56:13Z mrglavas $ + * @version $Id: XMLDTDScannerImpl.java 454439 2006-10-09 17:45:39Z mrglavas $ */ public class XMLDTDScannerImpl extends XMLScanner @@ -296,10 +298,10 @@ public class XMLDTDScannerImpl * @param standalone True if the document was specified as standalone. * This value is important for verifying certain * well-formedness constraints. - * @param hasExternalDTD True if the document has an external DTD. - * This allows the scanner to properly notify - * the handler of the end of the DTD in the - * absence of an external subset. + * @param hasExternalSubset True if the document has an external DTD. + * This allows the scanner to properly notify + * the handler of the end of the DTD in the + * absence of an external subset. * * @return True if there is more to scan, false otherwise. */ @@ -647,12 +649,9 @@ public class XMLDTDScannerImpl } /** - * Dispatch an XML "event". + * Dispatch an XML "event". * - * @param complete True if this method is intended to scan - * and dispatch as much as possible. - * - * @return True if a TextDecl was scanned. + * @return true if a TextDecl was scanned. * * @throws IOException Thrown on i/o error. * @throws XNIException Thrown on parse error. @@ -1266,7 +1265,12 @@ public class XMLDTDScannerImpl String aName = fEntityScanner.scanName(); if (aName == null) { reportFatalError("MSG_NAME_REQUIRED_IN_NOTATIONTYPE", - new Object[]{elName, atName}); + new Object[]{elName, atName}); + c = skipInvalidEnumerationValue(); + if (c == '|') { + continue; + } + break; } ensureEnumerationSize(fEnumerationCount + 1); fEnumeration[fEnumerationCount++] = aName; @@ -1295,6 +1299,11 @@ public class XMLDTDScannerImpl if (token == null) { reportFatalError("MSG_NMTOKEN_REQUIRED_IN_ENUMERATION", new Object[]{elName, atName}); + c = skipInvalidEnumerationValue(); + if (c == '|') { + continue; + } + break; } ensureEnumerationSize(fEnumerationCount + 1); fEnumeration[fEnumerationCount++] = token; @@ -1319,8 +1328,11 @@ public class XMLDTDScannerImpl * [60] DefaultDecl ::= '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)? AttValue) * </pre> * - * @param name The name of the attribute being scanned. + * @param elName + * @param atName The name of the attribute being scanned. + * @param type * @param defaultVal The string to fill in with the default value. + * @param nonNormalizedDefaultVal */ protected final String scanAttDefaultDecl(String elName, String atName, String type, @@ -2100,5 +2112,16 @@ public class XMLDTDScannerImpl // set starting state setScannerState(SCANNER_STATE_TEXT_DECL); } + + private int skipInvalidEnumerationValue() throws IOException { + int c; + do { + c = fEntityScanner.scanChar(); + } + while (c != '|' && c != ')'); + ensureEnumerationSize(fEnumerationCount + 1); + fEnumeration[fEnumerationCount++] = XMLSymbols.EMPTY_STRING; + return c; + } } // class XMLDTDScannerImpl diff --git a/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java b/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java index 2c2bfcc..4dc792a 100644 --- a/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java +++ b/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -63,7 +64,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * @author Arnaud Le Hors, IBM * @author Eric Ye, IBM * - * @version $Id: XMLDocumentFragmentScannerImpl.java 320089 2004-10-04 21:45:49Z mrglavas $ + * @version $Id: XMLDocumentFragmentScannerImpl.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public class XMLDocumentFragmentScannerImpl extends XMLScanner diff --git a/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java b/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java index b3cbb7b..2e43b58 100644 --- a/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java +++ b/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -62,7 +63,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * @author Arnaud Le Hors, IBM * @author Eric Ye, IBM * - * @version $Id: XMLDocumentScannerImpl.java 418359 2006-06-30 18:48:35Z mrglavas $ + * @version $Id: XMLDocumentScannerImpl.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public class XMLDocumentScannerImpl extends XMLDocumentFragmentScannerImpl { diff --git a/src/org/apache/xerces/impl/XMLEntityDescription.java b/src/org/apache/xerces/impl/XMLEntityDescription.java index 6261020..93d0fb8 100644 --- a/src/org/apache/xerces/impl/XMLEntityDescription.java +++ b/src/org/apache/xerces/impl/XMLEntityDescription.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.xni.XMLResourceIdentifier; * * @author Michael Glavassevich, IBM * - * @version $Id: XMLEntityDescription.java 320089 2004-10-04 21:45:49Z mrglavas $ + * @version $Id: XMLEntityDescription.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public interface XMLEntityDescription extends XMLResourceIdentifier { diff --git a/src/org/apache/xerces/impl/XMLEntityHandler.java b/src/org/apache/xerces/impl/XMLEntityHandler.java index 8179e29..ca785d7 100644 --- a/src/org/apache/xerces/impl/XMLEntityHandler.java +++ b/src/org/apache/xerces/impl/XMLEntityHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.xni.XNIException; * * @author Andy Clark, IBM * - * @version $Id: XMLEntityHandler.java 320089 2004-10-04 21:45:49Z mrglavas $ + * @version $Id: XMLEntityHandler.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public interface XMLEntityHandler { diff --git a/src/org/apache/xerces/impl/XMLEntityManager.java b/src/org/apache/xerces/impl/XMLEntityManager.java index ce2ecc3..c53ffd3 100644 --- a/src/org/apache/xerces/impl/XMLEntityManager.java +++ b/src/org/apache/xerces/impl/XMLEntityManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -16,9 +17,11 @@ package org.apache.xerces.impl; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.io.Reader; import java.io.StringReader; import java.lang.reflect.Method; @@ -32,6 +35,7 @@ import java.util.Iterator; import java.util.Locale; import java.util.Map; import java.util.Stack; +import java.util.StringTokenizer; import org.apache.xerces.impl.io.ASCIIReader; import org.apache.xerces.impl.io.Latin1Reader; @@ -81,7 +85,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * @author Andy Clark, IBM * @author Arnaud Le Hors, IBM * - * @version $Id: XMLEntityManager.java 443118 2006-09-13 20:52:53Z mrglavas $ + * @version $Id: XMLEntityManager.java 473379 2006-11-10 16:18:54Z mrglavas $ */ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { @@ -625,13 +629,7 @@ public class XMLEntityManager * is unable to resolve the entity, then default entity * resolution will occur. * - * @param publicId The public identifier of the entity. - * @param systemId The system identifier of the entity. - * @param baseSystemId The base system identifier of the entity. - * This is the system identifier of the current - * entity and is used to expand the system - * identifier when the system identifier is a - * relative URI. + * @param resourceIdentifier The XMLResourceIdentifier for the resource to resolve. * * @return Returns an input source that wraps the resolved entity. * This method will never return null. @@ -1849,6 +1847,54 @@ public class XMLEntityManager // setInstanceFollowRedirects doesn't exist. catch (Exception exc) {} } + + public static OutputStream createOutputStream(String uri) throws IOException { + // URI was specified. Handle relative URIs. + String expanded = XMLEntityManager.expandSystemId(uri, null, true); + URL url = new URL(expanded != null ? expanded : uri); + OutputStream out = null; + String protocol = url.getProtocol(); + String host = url.getHost(); + // Use FileOutputStream if this URI is for a local file. + if (protocol.equals("file") + && (host == null || host.length() == 0 || host.equals("localhost"))) { + out = new FileOutputStream(getPathWithoutEscapes(url.getPath())); + } + // Try to write to some other kind of URI. Some protocols + // won't support this, though HTTP should work. + else { + URLConnection urlCon = url.openConnection(); + urlCon.setDoInput(false); + urlCon.setDoOutput(true); + urlCon.setUseCaches(false); // Enable tunneling. + if (urlCon instanceof HttpURLConnection) { + // The DOM L3 REC says if we are writing to an HTTP URI + // it is to be done with an HTTP PUT. + HttpURLConnection httpCon = (HttpURLConnection) urlCon; + httpCon.setRequestMethod("PUT"); + } + out = urlCon.getOutputStream(); + } + return out; + } + + private static String getPathWithoutEscapes(String origPath) { + if (origPath != null && origPath.length() != 0 && origPath.indexOf('%') != -1) { + // Locate the escape characters + StringTokenizer tokenizer = new StringTokenizer(origPath, "%"); + StringBuffer result = new StringBuffer(origPath.length()); + int size = tokenizer.countTokens(); + result.append(tokenizer.nextToken()); + for(int i = 1; i < size; ++i) { + String token = tokenizer.nextToken(); + // Decode the 2 digit hexadecimal number following % in '%nn' + result.append((char)Integer.valueOf(token.substring(0, 2), 16).intValue()); + result.append(token.substring(2)); + } + return result.toString(); + } + return origPath; + } // // Protected methods diff --git a/src/org/apache/xerces/impl/XMLEntityScanner.java b/src/org/apache/xerces/impl/XMLEntityScanner.java index 52b13bf..44b5df2 100644 --- a/src/org/apache/xerces/impl/XMLEntityScanner.java +++ b/src/org/apache/xerces/impl/XMLEntityScanner.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import org.apache.xerces.xni.XMLString; * * @author Andy Clark, IBM * @author Neil Graham, IBM - * @version $Id: XMLEntityScanner.java 320114 2004-10-25 16:09:07Z mrglavas $ + * @version $Id: XMLEntityScanner.java 467487 2006-10-24 21:17:04Z mrglavas $ */ public class XMLEntityScanner implements XMLLocator { @@ -77,7 +78,7 @@ public class XMLEntityScanner implements XMLLocator { * Returns the base system identifier of the currently scanned * entity, or null if none is available. */ - public String getBaseSystemId() { + public final String getBaseSystemId() { return (fCurrentEntity != null && fCurrentEntity.entityLocation != null) ? fCurrentEntity.entityLocation.getExpandedSystemId() : null; } // getBaseSystemId():String @@ -99,7 +100,7 @@ public class XMLEntityScanner implements XMLLocator { * * @see org.apache.xerces.util.EncodingMap */ - public void setEncoding(String encoding) throws IOException { + public final void setEncoding(String encoding) throws IOException { if (DEBUG_ENCODINGS) { System.out.println("$$$ setEncoding: "+encoding); @@ -163,12 +164,12 @@ public class XMLEntityScanner implements XMLLocator { * * @param xmlVersion the XML version of the current entity */ - public void setXMLVersion(String xmlVersion) { + public final void setXMLVersion(String xmlVersion) { fCurrentEntity.xmlVersion = xmlVersion; } // setXMLVersion(String) /** Returns true if the current entity being scanned is external. */ - public boolean isExternal() { + public final boolean isExternal() { return fCurrentEntity.isExternal(); } // isExternal():boolean @@ -960,7 +961,7 @@ public class XMLEntityScanner implements XMLLocator { * * @param delimiter The string that signifies the end of the character * data to be scanned. - * @param data The data structure to fill. + * @param buffer The XMLStringBuffer to fill. * * @return Returns true if there is more data to scan, false otherwise. * @@ -1329,7 +1330,7 @@ public class XMLEntityScanner implements XMLLocator { * * @see org.apache.xerces.util.XMLChar#isSpace */ - public boolean skipDeclSpaces() throws IOException { + public final boolean skipDeclSpaces() throws IOException { if (DEBUG_BUFFER) { System.out.print("(skipDeclSpaces: "); XMLEntityManager.print(fCurrentEntity); @@ -1483,7 +1484,7 @@ public class XMLEntityScanner implements XMLLocator { * @return A string containing the public identifier, or * null if none is available. */ - public String getPublicId() { + public final String getPublicId() { return (fCurrentEntity != null && fCurrentEntity.entityLocation != null) ? fCurrentEntity.entityLocation.getPublicId() : null; } // getPublicId():String @@ -1500,7 +1501,7 @@ public class XMLEntityScanner implements XMLLocator { * @return A string containing the expanded system identifier, or null * if none is available. */ - public String getExpandedSystemId() { + public final String getExpandedSystemId() { if (fCurrentEntity != null) { if (fCurrentEntity.entityLocation != null && fCurrentEntity.entityLocation.getExpandedSystemId() != null ) { @@ -1524,7 +1525,7 @@ public class XMLEntityScanner implements XMLLocator { * @return A string containing the literal system identifier, or null * if none is available. */ - public String getLiteralSystemId() { + public final String getLiteralSystemId() { if (fCurrentEntity != null) { if (fCurrentEntity.entityLocation != null && fCurrentEntity.entityLocation.getLiteralSystemId() != null ) { @@ -1556,7 +1557,7 @@ public class XMLEntityScanner implements XMLLocator { * * @return The line number, or -1 if none is available. */ - public int getLineNumber() { + public final int getLineNumber() { if (fCurrentEntity != null) { if (fCurrentEntity.isExternal()) { return fCurrentEntity.lineNumber; @@ -1589,7 +1590,7 @@ public class XMLEntityScanner implements XMLLocator { * * @return The column number, or -1 if none is available. */ - public int getColumnNumber() { + public final int getColumnNumber() { if (fCurrentEntity != null) { if (fCurrentEntity.isExternal()) { return fCurrentEntity.columnNumber; @@ -1620,7 +1621,7 @@ public class XMLEntityScanner implements XMLLocator { * * @return The character offset, or -1 if none is available. */ - public int getCharacterOffset() { + public final int getCharacterOffset() { if (fCurrentEntity != null) { if (fCurrentEntity.isExternal()) { return fCurrentEntity.baseCharOffset + (fCurrentEntity.position - fCurrentEntity.startPosition); @@ -1642,7 +1643,7 @@ public class XMLEntityScanner implements XMLLocator { * having been specified on the XMLInputSource, the parser * will make an initial "guess" which could be in error. */ - public String getEncoding() { + public final String getEncoding() { if (fCurrentEntity != null) { if (fCurrentEntity.isExternal()) { return fCurrentEntity.encoding; @@ -1665,7 +1666,7 @@ public class XMLEntityScanner implements XMLLocator { * final once the XML or text declaration has been read or once it has been * determined that there is no such declaration. */ - public String getXMLVersion() { + public final String getXMLVersion() { if (fCurrentEntity != null) { if (fCurrentEntity.isExternal()) { return fCurrentEntity.xmlVersion; @@ -1679,12 +1680,12 @@ public class XMLEntityScanner implements XMLLocator { } // getXMLVersion():String // allow entity manager to tell us what the current entityis: - public void setCurrentEntity(XMLEntityManager.ScannedEntity ent) { + public final void setCurrentEntity(XMLEntityManager.ScannedEntity ent) { fCurrentEntity = ent; } // set buffer size: - public void setBufferSize(int size) { + public final void setBufferSize(int size) { // REVISIT: Buffer size passed to entity scanner // was not being kept in synch with the actual size // of the buffers in each scanned entity. If any @@ -1699,7 +1700,7 @@ public class XMLEntityScanner implements XMLLocator { } // reset what little state we have... - public void reset(SymbolTable symbolTable, XMLEntityManager entityManager, + public final void reset(SymbolTable symbolTable, XMLEntityManager entityManager, XMLErrorReporter reporter) { fCurrentEntity = null; fSymbolTable = symbolTable; diff --git a/src/org/apache/xerces/impl/XMLErrorReporter.java b/src/org/apache/xerces/impl/XMLErrorReporter.java index f9a966b..63f05c2 100644 --- a/src/org/apache/xerces/impl/XMLErrorReporter.java +++ b/src/org/apache/xerces/impl/XMLErrorReporter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -67,7 +68,7 @@ import org.xml.sax.ErrorHandler; * @author Eric Ye, IBM * @author Andy Clark, IBM * - * @version $Id: XMLErrorReporter.java 320537 2005-06-24 17:56:41Z mrglavas $ + * @version $Id: XMLErrorReporter.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public class XMLErrorReporter implements XMLComponent { diff --git a/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java b/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java index ac5b967..b18b2f5 100644 --- a/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java +++ b/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -60,7 +61,7 @@ import org.apache.xerces.xni.parser.XMLDocumentSource; * * @author Elena Litani, IBM * - * @version $Id: XMLNSDocumentScannerImpl.java 320089 2004-10-04 21:45:49Z mrglavas $ + * @version $Id: XMLNSDocumentScannerImpl.java 449330 2006-09-23 23:11:50Z mrglavas $ */ public class XMLNSDocumentScannerImpl extends XMLDocumentScannerImpl { @@ -93,13 +94,10 @@ extends XMLDocumentScannerImpl { * The scanner is responsible for removing DTD validator * from the pipeline if it is not needed. * - * @param previous The filter component before DTDValidator - * @param dtdValidator - * The DTDValidator - * @param next The documentHandler after the DTDValidator + * @param dtdValidator The DTDValidator */ - public void setDTDValidator(XMLDTDValidatorFilter dtd){ - fDTDValidator = dtd; + public void setDTDValidator(XMLDTDValidatorFilter dtdValidator) { + fDTDValidator = dtdValidator; } /** diff --git a/src/org/apache/xerces/impl/XMLNamespaceBinder.java b/src/org/apache/xerces/impl/XMLNamespaceBinder.java index e496f5b..5d92525 100644 --- a/src/org/apache/xerces/impl/XMLNamespaceBinder.java +++ b/src/org/apache/xerces/impl/XMLNamespaceBinder.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -52,7 +53,7 @@ import org.apache.xerces.xni.parser.XMLDocumentSource; * * @author Andy Clark, IBM * - * @version $Id: XMLNamespaceBinder.java 320089 2004-10-04 21:45:49Z mrglavas $ + * @version $Id: XMLNamespaceBinder.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public class XMLNamespaceBinder implements XMLComponent, XMLDocumentFilter { diff --git a/src/org/apache/xerces/impl/XMLScanner.java b/src/org/apache/xerces/impl/XMLScanner.java index ce38100..6880fc2 100644 --- a/src/org/apache/xerces/impl/XMLScanner.java +++ b/src/org/apache/xerces/impl/XMLScanner.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -55,7 +56,7 @@ import org.apache.xerces.xni.parser.XMLConfigurationException; * @author Arnaud Le Hors, IBM * @author Eric Ye, IBM * - * @version $Id: XMLScanner.java 320089 2004-10-04 21:45:49Z mrglavas $ + * @version $Id: XMLScanner.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public abstract class XMLScanner implements XMLComponent { diff --git a/src/org/apache/xerces/impl/XMLVersionDetector.java b/src/org/apache/xerces/impl/XMLVersionDetector.java index fecd937..8302547 100644 --- a/src/org/apache/xerces/impl/XMLVersionDetector.java +++ b/src/org/apache/xerces/impl/XMLVersionDetector.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,7 +35,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * * @author Neil Graham, IBM * @author Elena Litani, IBM - * @version $Id: XMLVersionDetector.java 331703 2005-11-08 06:14:18Z mrglavas $ + * @version $Id: XMLVersionDetector.java 446761 2006-09-15 21:59:29Z mrglavas $ */ public class XMLVersionDetector { diff --git a/src/org/apache/xerces/impl/dtd/BalancedDTDGrammar.java b/src/org/apache/xerces/impl/dtd/BalancedDTDGrammar.java index 2e62dbc..75907e1 100644 --- a/src/org/apache/xerces/impl/dtd/BalancedDTDGrammar.java +++ b/src/org/apache/xerces/impl/dtd/BalancedDTDGrammar.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.xni.XNIException; * @xerces.internal * * @author Michael Glavassevich, IBM - * @version $Id: BalancedDTDGrammar.java 349355 2005-11-28 03:56:09Z mrglavas $ + * @version $Id: BalancedDTDGrammar.java 446755 2006-09-15 21:56:27Z mrglavas $ */ final class BalancedDTDGrammar extends DTDGrammar { diff --git a/src/org/apache/xerces/impl/dtd/DTDGrammar.java b/src/org/apache/xerces/impl/dtd/DTDGrammar.java index f1c8dd4..b3a9327 100644 --- a/src/org/apache/xerces/impl/dtd/DTDGrammar.java +++ b/src/org/apache/xerces/impl/dtd/DTDGrammar.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -56,7 +57,7 @@ import org.apache.xerces.xni.parser.XMLDTDSource; * @author Andy Clark, IBM * @author Neil Graham, IBM * - * @version $Id: DTDGrammar.java 373451 2006-01-30 06:38:26Z mrglavas $ + * @version $Id: DTDGrammar.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class DTDGrammar implements XMLDTDHandler, XMLDTDContentModelHandler, EntityState, Grammar { diff --git a/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java b/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java index eda6c84..973f8b6 100644 --- a/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java +++ b/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import java.util.Hashtable; * * @author Neil Graham, IBM * - * @version $Id: DTDGrammarBucket.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: DTDGrammarBucket.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class DTDGrammarBucket { diff --git a/src/org/apache/xerces/impl/dtd/XML11DTDProcessor.java b/src/org/apache/xerces/impl/dtd/XML11DTDProcessor.java index d94b84b..d0ddf08 100644 --- a/src/org/apache/xerces/impl/dtd/XML11DTDProcessor.java +++ b/src/org/apache/xerces/impl/dtd/XML11DTDProcessor.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.apache.xerces.xni.parser.XMLEntityResolver; * * @author Neil Graham, IBM * - * @version $Id: XML11DTDProcessor.java 354893 2005-12-07 23:06:22Z mrglavas $ + * @version $Id: XML11DTDProcessor.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XML11DTDProcessor extends XMLDTDLoader{ diff --git a/src/org/apache/xerces/impl/dtd/XML11DTDValidator.java b/src/org/apache/xerces/impl/dtd/XML11DTDValidator.java index d3c0a2f..5bc1e72 100644 --- a/src/org/apache/xerces/impl/dtd/XML11DTDValidator.java +++ b/src/org/apache/xerces/impl/dtd/XML11DTDValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.xni.parser.XMLComponentManager; * @xerces.internal * * @author Neil Graham - * @version $Id: XML11DTDValidator.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: XML11DTDValidator.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XML11DTDValidator extends XMLDTDValidator { diff --git a/src/org/apache/xerces/impl/dtd/XML11NSDTDValidator.java b/src/org/apache/xerces/impl/dtd/XML11NSDTDValidator.java index 22bde0b..df6b4ec 100644 --- a/src/org/apache/xerces/impl/dtd/XML11NSDTDValidator.java +++ b/src/org/apache/xerces/impl/dtd/XML11NSDTDValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -54,7 +55,7 @@ import org.apache.xerces.xni.XNIException; * @author Elena Litani, IBM * @author Michael Glavassevich, IBM * - * @version $Id: XML11NSDTDValidator.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: XML11NSDTDValidator.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XML11NSDTDValidator extends XML11DTDValidator { diff --git a/src/org/apache/xerces/impl/dtd/XMLAttributeDecl.java b/src/org/apache/xerces/impl/dtd/XMLAttributeDecl.java index cbe42c7..44344a3 100644 --- a/src/org/apache/xerces/impl/dtd/XMLAttributeDecl.java +++ b/src/org/apache/xerces/impl/dtd/XMLAttributeDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import org.apache.xerces.xni.QName; /** * @xerces.internal * - * @version $Id: XMLAttributeDecl.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: XMLAttributeDecl.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XMLAttributeDecl { diff --git a/src/org/apache/xerces/impl/dtd/XMLContentSpec.java b/src/org/apache/xerces/impl/dtd/XMLContentSpec.java index 254a35a..0c4396c 100644 --- a/src/org/apache/xerces/impl/dtd/XMLContentSpec.java +++ b/src/org/apache/xerces/impl/dtd/XMLContentSpec.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -68,7 +69,7 @@ package org.apache.xerces.impl.dtd; * * @xerces.internal * - * @version $Id: XMLContentSpec.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: XMLContentSpec.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XMLContentSpec { diff --git a/src/org/apache/xerces/impl/dtd/XMLDTDDescription.java b/src/org/apache/xerces/impl/dtd/XMLDTDDescription.java index dc16071..bc550ad 100644 --- a/src/org/apache/xerces/impl/dtd/XMLDTDDescription.java +++ b/src/org/apache/xerces/impl/dtd/XMLDTDDescription.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import java.util.Vector; * @xerces.internal * * @author Neil Graham, IBM - * @version $Id: XMLDTDDescription.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: XMLDTDDescription.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XMLDTDDescription extends XMLResourceIdentifierImpl implements org.apache.xerces.xni.grammars.XMLDTDDescription { diff --git a/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java b/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java index 868705c..5ff74ca 100644 --- a/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java +++ b/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -61,7 +62,7 @@ import java.io.StringReader; * @author Neil Graham, IBM * @author Michael Glavassevich, IBM * - * @version $Id: XMLDTDLoader.java 373451 2006-01-30 06:38:26Z mrglavas $ + * @version $Id: XMLDTDLoader.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XMLDTDLoader extends XMLDTDProcessor diff --git a/src/org/apache/xerces/impl/dtd/XMLDTDProcessor.java b/src/org/apache/xerces/impl/dtd/XMLDTDProcessor.java index 1c12f0e..24b3f66 100644 --- a/src/org/apache/xerces/impl/dtd/XMLDTDProcessor.java +++ b/src/org/apache/xerces/impl/dtd/XMLDTDProcessor.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -67,7 +68,7 @@ import org.apache.xerces.xni.parser.XMLDTDSource; * * @author Neil Graham, IBM * - * @version $Id: XMLDTDProcessor.java 373451 2006-01-30 06:38:26Z mrglavas $ + * @version $Id: XMLDTDProcessor.java 462674 2006-10-11 03:02:18Z mrglavas $ */ public class XMLDTDProcessor implements XMLComponent, XMLDTDFilter, XMLDTDContentModelFilter { @@ -1708,23 +1709,22 @@ public class XMLDTDProcessor new Object[]{grammar.getElementDeclName(elementIndex).rawname, value}, XMLErrorReporter.SEVERITY_WARNING); } - } - else { - // It's not a leaf, so we have to recurse its left and maybe right - // nodes. Save both values before we recurse and trash the node. + } + // It's not a leaf, so we have to recurse its left and maybe right + // nodes. Save both values before we recurse and trash the node. + else if ((contentSpec.type == XMLContentSpec.CONTENTSPECNODE_CHOICE) + || (contentSpec.type == XMLContentSpec.CONTENTSPECNODE_SEQ)) { final int leftNode = ((int[])contentSpec.value)[0]; final int rightNode = ((int[])contentSpec.otherValue)[0]; - if ((contentSpec.type == XMLContentSpec.CONTENTSPECNODE_CHOICE) - || (contentSpec.type == XMLContentSpec.CONTENTSPECNODE_SEQ)) { - // Recurse on both children. - checkDeclaredElements(grammar, elementIndex, leftNode, contentSpec); - checkDeclaredElements(grammar, elementIndex, rightNode, contentSpec); - } - else if (contentSpec.type == XMLContentSpec.CONTENTSPECNODE_ZERO_OR_MORE - || contentSpec.type == XMLContentSpec.CONTENTSPECNODE_ZERO_OR_ONE - || contentSpec.type == XMLContentSpec.CONTENTSPECNODE_ONE_OR_MORE) { - checkDeclaredElements(grammar, elementIndex, leftNode, contentSpec); - } + // Recurse on both children. + checkDeclaredElements(grammar, elementIndex, leftNode, contentSpec); + checkDeclaredElements(grammar, elementIndex, rightNode, contentSpec); + } + else if (contentSpec.type == XMLContentSpec.CONTENTSPECNODE_ZERO_OR_MORE + || contentSpec.type == XMLContentSpec.CONTENTSPECNODE_ZERO_OR_ONE + || contentSpec.type == XMLContentSpec.CONTENTSPECNODE_ONE_OR_MORE) { + final int leftNode = ((int[])contentSpec.value)[0]; + checkDeclaredElements(grammar, elementIndex, leftNode, contentSpec); } } diff --git a/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java b/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java index 7885704..3c4a506 100644 --- a/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java +++ b/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -79,7 +80,7 @@ import org.apache.xerces.xni.parser.XMLDocumentSource; * @author Jeffrey Rodriguez IBM * @author Neil Graham, IBM * - * @version $Id: XMLDTDValidator.java 441882 2006-09-10 00:24:52Z mrglavas $ + * @version $Id: XMLDTDValidator.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XMLDTDValidator implements XMLComponent, XMLDocumentFilter, XMLDTDValidatorFilter, RevalidationHandler { diff --git a/src/org/apache/xerces/impl/dtd/XMLDTDValidatorFilter.java b/src/org/apache/xerces/impl/dtd/XMLDTDValidatorFilter.java index ab32f2f..d9962db 100644 --- a/src/org/apache/xerces/impl/dtd/XMLDTDValidatorFilter.java +++ b/src/org/apache/xerces/impl/dtd/XMLDTDValidatorFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.xni.parser.XMLDocumentFilter; * * @author Elena Litani, IBM * - * @version $Id: XMLDTDValidatorFilter.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: XMLDTDValidatorFilter.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public interface XMLDTDValidatorFilter extends XMLDocumentFilter { diff --git a/src/org/apache/xerces/impl/dtd/XMLElementDecl.java b/src/org/apache/xerces/impl/dtd/XMLElementDecl.java index ff3f159..2277d5c 100644 --- a/src/org/apache/xerces/impl/dtd/XMLElementDecl.java +++ b/src/org/apache/xerces/impl/dtd/XMLElementDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,7 +23,7 @@ import org.apache.xerces.impl.dtd.models.ContentModelValidator; /** * @xerces.internal * - * @version $Id: XMLElementDecl.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: XMLElementDecl.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XMLElementDecl { diff --git a/src/org/apache/xerces/impl/dtd/XMLEntityDecl.java b/src/org/apache/xerces/impl/dtd/XMLEntityDecl.java index 986879e..e734c90 100644 --- a/src/org/apache/xerces/impl/dtd/XMLEntityDecl.java +++ b/src/org/apache/xerces/impl/dtd/XMLEntityDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ package org.apache.xerces.impl.dtd; /** * @xerces.internal * - * @version $Id: XMLEntityDecl.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: XMLEntityDecl.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XMLEntityDecl { diff --git a/src/org/apache/xerces/impl/dtd/XMLNSDTDValidator.java b/src/org/apache/xerces/impl/dtd/XMLNSDTDValidator.java index 0d551f5..7d93dfb 100644 --- a/src/org/apache/xerces/impl/dtd/XMLNSDTDValidator.java +++ b/src/org/apache/xerces/impl/dtd/XMLNSDTDValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -54,7 +55,7 @@ import org.apache.xerces.xni.XNIException; * * @author Elena Litani, IBM * - * @version $Id: XMLNSDTDValidator.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: XMLNSDTDValidator.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XMLNSDTDValidator extends XMLDTDValidator{ diff --git a/src/org/apache/xerces/impl/dtd/XMLNotationDecl.java b/src/org/apache/xerces/impl/dtd/XMLNotationDecl.java index 6c77008..3e14a86 100644 --- a/src/org/apache/xerces/impl/dtd/XMLNotationDecl.java +++ b/src/org/apache/xerces/impl/dtd/XMLNotationDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ package org.apache.xerces.impl.dtd; /** * @xerces.internal * - * @version $Id: XMLNotationDecl.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: XMLNotationDecl.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XMLNotationDecl { diff --git a/src/org/apache/xerces/impl/dtd/XMLSimpleType.java b/src/org/apache/xerces/impl/dtd/XMLSimpleType.java index 790f568..cd9c6a3 100644 --- a/src/org/apache/xerces/impl/dtd/XMLSimpleType.java +++ b/src/org/apache/xerces/impl/dtd/XMLSimpleType.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import org.apache.xerces.impl.dv.DatatypeValidator; /** * @xerces.internal * - * @version $Id: XMLSimpleType.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: XMLSimpleType.java 446755 2006-09-15 21:56:27Z mrglavas $ */ public class XMLSimpleType { diff --git a/src/org/apache/xerces/impl/dtd/models/CMAny.java b/src/org/apache/xerces/impl/dtd/models/CMAny.java index 700c8d8..30b2d85 100644 --- a/src/org/apache/xerces/impl/dtd/models/CMAny.java +++ b/src/org/apache/xerces/impl/dtd/models/CMAny.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,7 +23,7 @@ package org.apache.xerces.impl.dtd.models; * * @xerces.internal * - * @version $Id: CMAny.java 327940 2005-10-24 03:22:51Z mrglavas $ + * @version $Id: CMAny.java 446752 2006-09-15 21:55:19Z mrglavas $ */ public class CMAny extends CMNode { diff --git a/src/org/apache/xerces/impl/dtd/models/CMBinOp.java b/src/org/apache/xerces/impl/dtd/models/CMBinOp.java index 1863d17..7877158 100644 --- a/src/org/apache/xerces/impl/dtd/models/CMBinOp.java +++ b/src/org/apache/xerces/impl/dtd/models/CMBinOp.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import org.apache.xerces.impl.dtd.XMLContentSpec; * * @xerces.internal * - * @version $Id: CMBinOp.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: CMBinOp.java 446752 2006-09-15 21:55:19Z mrglavas $ */ public class CMBinOp extends CMNode { diff --git a/src/org/apache/xerces/impl/dtd/models/CMLeaf.java b/src/org/apache/xerces/impl/dtd/models/CMLeaf.java index b53d019..cb4676d 100644 --- a/src/org/apache/xerces/impl/dtd/models/CMLeaf.java +++ b/src/org/apache/xerces/impl/dtd/models/CMLeaf.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.apache.xerces.xni.QName; * * @xerces.internal * - * @version $Id: CMLeaf.java 327940 2005-10-24 03:22:51Z mrglavas $ + * @version $Id: CMLeaf.java 446752 2006-09-15 21:55:19Z mrglavas $ */ public class CMLeaf extends CMNode { diff --git a/src/org/apache/xerces/impl/dtd/models/CMNode.java b/src/org/apache/xerces/impl/dtd/models/CMNode.java index 7ecfb43..93606f6 100644 --- a/src/org/apache/xerces/impl/dtd/models/CMNode.java +++ b/src/org/apache/xerces/impl/dtd/models/CMNode.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.xerces.impl.dtd.models; * * @xerces.internal * - * @version $Id: CMNode.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: CMNode.java 446752 2006-09-15 21:55:19Z mrglavas $ */ public abstract class CMNode { diff --git a/src/org/apache/xerces/impl/dtd/models/CMStateSet.java b/src/org/apache/xerces/impl/dtd/models/CMStateSet.java index 7566bed..0a7d002 100644 --- a/src/org/apache/xerces/impl/dtd/models/CMStateSet.java +++ b/src/org/apache/xerces/impl/dtd/models/CMStateSet.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ package org.apache.xerces.impl.dtd.models; * * @xerces.internal * - * @version $Id: CMStateSet.java 327940 2005-10-24 03:22:51Z mrglavas $ + * @version $Id: CMStateSet.java 446752 2006-09-15 21:55:19Z mrglavas $ */ // made this class public so it can be accessed by // the XS content models from the schema package -neilg. diff --git a/src/org/apache/xerces/impl/dtd/models/CMUniOp.java b/src/org/apache/xerces/impl/dtd/models/CMUniOp.java index ce12e7b..db99068 100644 --- a/src/org/apache/xerces/impl/dtd/models/CMUniOp.java +++ b/src/org/apache/xerces/impl/dtd/models/CMUniOp.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import org.apache.xerces.impl.dtd.XMLContentSpec; * * @xerces.internal * - * @version $Id: CMUniOp.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: CMUniOp.java 446752 2006-09-15 21:55:19Z mrglavas $ */ public class CMUniOp extends CMNode { diff --git a/src/org/apache/xerces/impl/dtd/models/ContentModelValidator.java b/src/org/apache/xerces/impl/dtd/models/ContentModelValidator.java index 1f8ab5a..a9762be 100644 --- a/src/org/apache/xerces/impl/dtd/models/ContentModelValidator.java +++ b/src/org/apache/xerces/impl/dtd/models/ContentModelValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import org.apache.xerces.xni.QName; /** * @xerces.internal * - * @version $Id: ContentModelValidator.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: ContentModelValidator.java 446752 2006-09-15 21:55:19Z mrglavas $ */ public interface ContentModelValidator { diff --git a/src/org/apache/xerces/impl/dtd/models/DFAContentModel.java b/src/org/apache/xerces/impl/dtd/models/DFAContentModel.java index 5d9ff57..8b7c07a 100644 --- a/src/org/apache/xerces/impl/dtd/models/DFAContentModel.java +++ b/src/org/apache/xerces/impl/dtd/models/DFAContentModel.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -35,7 +36,7 @@ import org.apache.xerces.xni.QName; * * @xerces.internal * - * @version $Id: DFAContentModel.java 388860 2006-03-25 23:50:16Z mrglavas $ + * @version $Id: DFAContentModel.java 446752 2006-09-15 21:55:19Z mrglavas $ */ public class DFAContentModel implements ContentModelValidator { diff --git a/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java b/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java index cc93650..a442403 100644 --- a/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java +++ b/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -35,7 +36,7 @@ import org.apache.xerces.impl.dtd.XMLContentSpec; * * @xerces.internal * - * @version $Id: MixedContentModel.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: MixedContentModel.java 446752 2006-09-15 21:55:19Z mrglavas $ */ public class MixedContentModel implements ContentModelValidator { diff --git a/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java b/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java index 77e14e2..995de66 100644 --- a/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java +++ b/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -42,7 +43,7 @@ import org.apache.xerces.impl.dtd.XMLContentSpec; * * @xerces.internal * - * @version $Id: SimpleContentModel.java 320090 2004-10-04 22:00:42Z mrglavas $ + * @version $Id: SimpleContentModel.java 446752 2006-09-15 21:55:19Z mrglavas $ */ public class SimpleContentModel implements ContentModelValidator { diff --git a/src/org/apache/xerces/impl/dv/DTDDVFactory.java b/src/org/apache/xerces/impl/dv/DTDDVFactory.java index 7586bbd..1295cb0 100644 --- a/src/org/apache/xerces/impl/dv/DTDDVFactory.java +++ b/src/org/apache/xerces/impl/dv/DTDDVFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import java.util.Hashtable; * * @author Sandy Gao, IBM * - * @version $Id: DTDDVFactory.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: DTDDVFactory.java 446751 2006-09-15 21:54:06Z mrglavas $ */ public abstract class DTDDVFactory { diff --git a/src/org/apache/xerces/impl/dv/DVFactoryException.java b/src/org/apache/xerces/impl/dv/DVFactoryException.java index 7913194..bb659c7 100644 --- a/src/org/apache/xerces/impl/dv/DVFactoryException.java +++ b/src/org/apache/xerces/impl/dv/DVFactoryException.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,7 +23,7 @@ package org.apache.xerces.impl.dv; * * @xerces.internal * - * @version $Id: DVFactoryException.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: DVFactoryException.java 446751 2006-09-15 21:54:06Z mrglavas $ */ public class DVFactoryException extends RuntimeException { diff --git a/src/org/apache/xerces/impl/dv/DatatypeException.java b/src/org/apache/xerces/impl/dv/DatatypeException.java index 44d849b..886d63d 100644 --- a/src/org/apache/xerces/impl/dv/DatatypeException.java +++ b/src/org/apache/xerces/impl/dv/DatatypeException.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import java.util.MissingResourceException; * * @author Sandy Gao, IBM * - * @version $Id: DatatypeException.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: DatatypeException.java 446751 2006-09-15 21:54:06Z mrglavas $ */ public class DatatypeException extends Exception { diff --git a/src/org/apache/xerces/impl/dv/DatatypeValidator.java b/src/org/apache/xerces/impl/dv/DatatypeValidator.java index a161a3f..1c92dbb 100644 --- a/src/org/apache/xerces/impl/dv/DatatypeValidator.java +++ b/src/org/apache/xerces/impl/dv/DatatypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * * @author Sandy Gao, IBM * - * @version $Id: DatatypeValidator.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: DatatypeValidator.java 446751 2006-09-15 21:54:06Z mrglavas $ */ public interface DatatypeValidator { diff --git a/src/org/apache/xerces/impl/dv/InvalidDatatypeFacetException.java b/src/org/apache/xerces/impl/dv/InvalidDatatypeFacetException.java index 7a6da9b..844fb20 100644 --- a/src/org/apache/xerces/impl/dv/InvalidDatatypeFacetException.java +++ b/src/org/apache/xerces/impl/dv/InvalidDatatypeFacetException.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.xerces.impl.dv; * * @author Sandy Gao, IBM * - * @version $Id: InvalidDatatypeFacetException.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: InvalidDatatypeFacetException.java 446751 2006-09-15 21:54:06Z mrglavas $ */ public class InvalidDatatypeFacetException extends DatatypeException { diff --git a/src/org/apache/xerces/impl/dv/InvalidDatatypeValueException.java b/src/org/apache/xerces/impl/dv/InvalidDatatypeValueException.java index f2d3957..4388cda 100644 --- a/src/org/apache/xerces/impl/dv/InvalidDatatypeValueException.java +++ b/src/org/apache/xerces/impl/dv/InvalidDatatypeValueException.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ package org.apache.xerces.impl.dv; * * @author Sandy Gao, IBM * - * @version $Id: InvalidDatatypeValueException.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: InvalidDatatypeValueException.java 446751 2006-09-15 21:54:06Z mrglavas $ */ public class InvalidDatatypeValueException extends DatatypeException { diff --git a/src/org/apache/xerces/impl/dv/ObjectFactory.java b/src/org/apache/xerces/impl/dv/ObjectFactory.java index 935847a..346ad6e 100644 --- a/src/org/apache/xerces/impl/dv/ObjectFactory.java +++ b/src/org/apache/xerces/impl/dv/ObjectFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -39,7 +40,7 @@ import java.io.InputStreamReader; * * @xerces.internal * - * @version $Id: ObjectFactory.java 320285 2005-04-18 04:15:35Z mrglavas $ + * @version $Id: ObjectFactory.java 446751 2006-09-15 21:54:06Z mrglavas $ */ final class ObjectFactory { diff --git a/src/org/apache/xerces/impl/dv/SchemaDVFactory.java b/src/org/apache/xerces/impl/dv/SchemaDVFactory.java index ba51904..8e462b0 100644 --- a/src/org/apache/xerces/impl/dv/SchemaDVFactory.java +++ b/src/org/apache/xerces/impl/dv/SchemaDVFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -35,7 +36,7 @@ import org.apache.xerces.xs.XSObjectList; * * @author Sandy Gao, IBM * - * @version $Id: SchemaDVFactory.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: SchemaDVFactory.java 446751 2006-09-15 21:54:06Z mrglavas $ */ public abstract class SchemaDVFactory { diff --git a/src/org/apache/xerces/impl/dv/SecuritySupport.java b/src/org/apache/xerces/impl/dv/SecuritySupport.java index 95cf402..e3045c2 100644 --- a/src/org/apache/xerces/impl/dv/SecuritySupport.java +++ b/src/org/apache/xerces/impl/dv/SecuritySupport.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/impl/dv/ValidatedInfo.java b/src/org/apache/xerces/impl/dv/ValidatedInfo.java index c45d61b..ae99290 100644 --- a/src/org/apache/xerces/impl/dv/ValidatedInfo.java +++ b/src/org/apache/xerces/impl/dv/ValidatedInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.xs.XSConstants; * * @author Neeraj Bajaj, Sun Microsystems, inc. * - * @version $Id: ValidatedInfo.java 371617 2006-01-23 18:41:49Z mrglavas $ + * @version $Id: ValidatedInfo.java 446751 2006-09-15 21:54:06Z mrglavas $ */ public class ValidatedInfo { diff --git a/src/org/apache/xerces/impl/dv/ValidationContext.java b/src/org/apache/xerces/impl/dv/ValidationContext.java index 413616a..f33d166 100644 --- a/src/org/apache/xerces/impl/dv/ValidationContext.java +++ b/src/org/apache/xerces/impl/dv/ValidationContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ package org.apache.xerces.impl.dv; * @xerces.internal * * @author Sandy Gao, IBM - * @version $Id: ValidationContext.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: ValidationContext.java 446751 2006-09-15 21:54:06Z mrglavas $ */ public interface ValidationContext { // whether to validate against facets diff --git a/src/org/apache/xerces/impl/dv/XSFacets.java b/src/org/apache/xerces/impl/dv/XSFacets.java index 4f0077e..3fa54c5 100644 --- a/src/org/apache/xerces/impl/dv/XSFacets.java +++ b/src/org/apache/xerces/impl/dv/XSFacets.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.impl.xs.util.XSObjectListImpl; * * @author Sandy Gao, IBM * - * @version $Id: XSFacets.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: XSFacets.java 446751 2006-09-15 21:54:06Z mrglavas $ */ public class XSFacets { diff --git a/src/org/apache/xerces/impl/dv/XSSimpleType.java b/src/org/apache/xerces/impl/dv/XSSimpleType.java index 1cec854..e54c813 100644 --- a/src/org/apache/xerces/impl/dv/XSSimpleType.java +++ b/src/org/apache/xerces/impl/dv/XSSimpleType.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.xs.XSSimpleTypeDefinition; * * @author Sandy Gao, IBM * - * @version $Id: XSSimpleType.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: XSSimpleType.java 446751 2006-09-15 21:54:06Z mrglavas $ */ public interface XSSimpleType extends XSSimpleTypeDefinition { diff --git a/src/org/apache/xerces/impl/dv/dtd/DTDDVFactoryImpl.java b/src/org/apache/xerces/impl/dv/dtd/DTDDVFactoryImpl.java index d515249..0a369c8 100644 --- a/src/org/apache/xerces/impl/dv/dtd/DTDDVFactoryImpl.java +++ b/src/org/apache/xerces/impl/dv/dtd/DTDDVFactoryImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import java.util.Hashtable; * * @author Sandy Gao, IBM * - * @version $Id: DTDDVFactoryImpl.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: DTDDVFactoryImpl.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class DTDDVFactoryImpl extends DTDDVFactory { diff --git a/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java b/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java index 7afdf05..902afaf 100644 --- a/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java +++ b/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.apache.xerces.impl.dv.*; * @author Jeffrey Rodriguez, IBM * @author Sandy Gao, IBM * - * @version $Id: ENTITYDatatypeValidator.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: ENTITYDatatypeValidator.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class ENTITYDatatypeValidator implements DatatypeValidator { diff --git a/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java b/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java index 565a9d8..e21272f 100644 --- a/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java +++ b/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -39,7 +40,7 @@ import org.apache.xerces.util.XMLChar; * @author Jeffrey Rodriguez, IBM * @author Sandy Gao, IBM * - * @version $Id: IDDatatypeValidator.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: IDDatatypeValidator.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class IDDatatypeValidator implements DatatypeValidator { diff --git a/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java b/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java index aa14e73..557e490 100644 --- a/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java +++ b/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import org.apache.xerces.util.XMLChar; * @author Jeffrey Rodriguez, IBM * @author Sandy Gao, IBM * - * @version $Id: IDREFDatatypeValidator.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: IDREFDatatypeValidator.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class IDREFDatatypeValidator implements DatatypeValidator { diff --git a/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java b/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java index 530514f..0f820ee 100644 --- a/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java +++ b/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import java.util.StringTokenizer; * @author Jeffrey Rodriguez, IBM * @author Sandy Gao, IBM * - * @version $Id: ListDatatypeValidator.java 320258 2005-03-22 05:35:49Z mrglavas $ + * @version $Id: ListDatatypeValidator.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class ListDatatypeValidator implements DatatypeValidator { diff --git a/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java b/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java index fd9cc20..85b9fa3 100644 --- a/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java +++ b/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.util.XMLChar; * @author Jeffrey Rodriguez, IBM * @author Sandy Gao, IBM * - * @version $Id: NMTOKENDatatypeValidator.java 320258 2005-03-22 05:35:49Z mrglavas $ + * @version $Id: NMTOKENDatatypeValidator.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class NMTOKENDatatypeValidator implements DatatypeValidator { diff --git a/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java b/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java index b62e17c..8a7f64b 100644 --- a/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java +++ b/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.impl.dv.*; * @author Jeffrey Rodriguez, IBM * @author Sandy Gao, IBM * - * @version $Id: NOTATIONDatatypeValidator.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: NOTATIONDatatypeValidator.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class NOTATIONDatatypeValidator implements DatatypeValidator { diff --git a/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java b/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java index f69cdff..f30e2f6 100644 --- a/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java +++ b/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.apache.xerces.impl.dv.*; * * @xerces.internal * - * @version $Id: StringDatatypeValidator.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: StringDatatypeValidator.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class StringDatatypeValidator implements DatatypeValidator { diff --git a/src/org/apache/xerces/impl/dv/dtd/XML11DTDDVFactoryImpl.java b/src/org/apache/xerces/impl/dv/dtd/XML11DTDDVFactoryImpl.java index 65e6f2a..0dbf2ff 100644 --- a/src/org/apache/xerces/impl/dv/dtd/XML11DTDDVFactoryImpl.java +++ b/src/org/apache/xerces/impl/dv/dtd/XML11DTDDVFactoryImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.impl.dv.DatatypeValidator; * * @author Neil Graham, IBM * - * @version $Id: XML11DTDDVFactoryImpl.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: XML11DTDDVFactoryImpl.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class XML11DTDDVFactoryImpl extends DTDDVFactoryImpl { diff --git a/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java b/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java index 9235c3e..17d8047 100644 --- a/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java +++ b/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -40,7 +41,7 @@ import org.apache.xerces.util.XML11Char; * @author Sandy Gao, IBM * @author Neil Graham, IBM * - * @version $Id: XML11IDDatatypeValidator.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: XML11IDDatatypeValidator.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class XML11IDDatatypeValidator extends IDDatatypeValidator { diff --git a/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java b/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java index 7ddd7bf..9232e76 100644 --- a/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java +++ b/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.apache.xerces.util.XML11Char; * @author Sandy Gao, IBM * @author Neil Graham, IBM * - * @version $Id: XML11IDREFDatatypeValidator.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: XML11IDREFDatatypeValidator.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class XML11IDREFDatatypeValidator extends IDREFDatatypeValidator { diff --git a/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java b/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java index b07a3d8..aaee15c 100644 --- a/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java +++ b/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.util.XML11Char; * @author Sandy Gao, IBM * @author Neil Graham, IBM * - * @version $Id: XML11NMTOKENDatatypeValidator.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: XML11NMTOKENDatatypeValidator.java 446749 2006-09-15 21:51:23Z mrglavas $ */ public class XML11NMTOKENDatatypeValidator extends NMTOKENDatatypeValidator { diff --git a/src/org/apache/xerces/impl/dv/util/Base64.java b/src/org/apache/xerces/impl/dv/util/Base64.java index 8bc3c48..84bf114 100644 --- a/src/org/apache/xerces/impl/dv/util/Base64.java +++ b/src/org/apache/xerces/impl/dv/util/Base64.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ package org.apache.xerces.impl.dv.util; * * @author Jeffrey Rodriguez * @author Sandy Gao - * @version $Id: Base64.java 320108 2004-10-14 15:20:18Z mrglavas $ + * @version $Id: Base64.java 446747 2006-09-15 21:46:20Z mrglavas $ */ public final class Base64 { diff --git a/src/org/apache/xerces/impl/dv/util/ByteListImpl.java b/src/org/apache/xerces/impl/dv/util/ByteListImpl.java index ae81404..f444094 100644 --- a/src/org/apache/xerces/impl/dv/util/ByteListImpl.java +++ b/src/org/apache/xerces/impl/dv/util/ByteListImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.xerces.impl.dv.util; import org.apache.xerces.xs.datatypes.ByteList; @@ -25,7 +27,7 @@ import org.apache.xerces.xs.XSException; * * @author Ankit Pasricha, IBM * - * @version $Id: ByteListImpl.java 320102 2004-10-08 15:08:49Z mrglavas $ + * @version $Id: ByteListImpl.java 446747 2006-09-15 21:46:20Z mrglavas $ */ public class ByteListImpl implements ByteList { diff --git a/src/org/apache/xerces/impl/dv/util/HexBin.java b/src/org/apache/xerces/impl/dv/util/HexBin.java index 824124d..487d04c 100644 --- a/src/org/apache/xerces/impl/dv/util/HexBin.java +++ b/src/org/apache/xerces/impl/dv/util/HexBin.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.xerces.impl.dv.util; * @xerces.internal * * @author Jeffrey Rodriguez - * @version $Id: HexBin.java 320108 2004-10-14 15:20:18Z mrglavas $ + * @version $Id: HexBin.java 446747 2006-09-15 21:46:20Z mrglavas $ */ public final class HexBin { static private final int BASELENGTH = 128; diff --git a/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java b/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java index ff10319..445b76c 100644 --- a/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java +++ b/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -41,7 +42,7 @@ import org.apache.xerces.xs.datatypes.XSDateTime; * @author Len Berman * @author Gopal Sharma, SUN Microsystems Inc. * - * @version $Id: AbstractDateTimeDV.java 320544 2005-07-19 04:32:40Z mrglavas $ + * @version $Id: AbstractDateTimeDV.java 449487 2006-09-24 21:11:28Z mrglavas $ */ public abstract class AbstractDateTimeDV extends TypeValidator { @@ -576,7 +577,6 @@ public abstract class AbstractDateTimeDV extends TypeValidator { * If timezone present - normalize dateTime [E Adding durations to dateTimes] * * @param date CCYY-MM-DDThh:mm:ss+03 - * @return CCYY-MM-DDThh:mm:ssZ */ protected void normalize(DateTimeData date) { diff --git a/src/org/apache/xerces/impl/dv/xs/AnyAtomicDV.java b/src/org/apache/xerces/impl/dv/xs/AnyAtomicDV.java index ec55cbe..0e30ed1 100644 --- a/src/org/apache/xerces/impl/dv/xs/AnyAtomicDV.java +++ b/src/org/apache/xerces/impl/dv/xs/AnyAtomicDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * * @author Ankit Pasricha, IBM * - * @version $Id: AnyAtomicDV.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: AnyAtomicDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ class AnyAtomicDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/AnySimpleDV.java b/src/org/apache/xerces/impl/dv/xs/AnySimpleDV.java index 060f4b3..3852726 100644 --- a/src/org/apache/xerces/impl/dv/xs/AnySimpleDV.java +++ b/src/org/apache/xerces/impl/dv/xs/AnySimpleDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: AnySimpleDV.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: AnySimpleDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class AnySimpleDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java b/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java index accda3e..a223464 100644 --- a/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java +++ b/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: AnyURIDV.java 320211 2005-01-31 03:54:06Z mrglavas $ + * @version $Id: AnyURIDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class AnyURIDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/Base64BinaryDV.java b/src/org/apache/xerces/impl/dv/xs/Base64BinaryDV.java index ef359f6..48ff4cc 100644 --- a/src/org/apache/xerces/impl/dv/xs/Base64BinaryDV.java +++ b/src/org/apache/xerces/impl/dv/xs/Base64BinaryDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.impl.dv.util.ByteListImpl; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: Base64BinaryDV.java 367193 2006-01-09 04:38:12Z mrglavas $ + * @version $Id: Base64BinaryDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class Base64BinaryDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java b/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java index d1ed56f..cece2a5 100644 --- a/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java +++ b/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2002, 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.apache.xerces.util.SymbolHash; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: BaseDVFactory.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: BaseDVFactory.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class BaseDVFactory extends SchemaDVFactory { diff --git a/src/org/apache/xerces/impl/dv/xs/BooleanDV.java b/src/org/apache/xerces/impl/dv/xs/BooleanDV.java index c7c068d..889355f 100644 --- a/src/org/apache/xerces/impl/dv/xs/BooleanDV.java +++ b/src/org/apache/xerces/impl/dv/xs/BooleanDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,26 +28,22 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: BooleanDV.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: BooleanDV.java 469063 2006-10-30 04:44:22Z mrglavas $ */ -public class BooleanDV extends TypeValidator{ - - private static final String fValueSpace[] = {"false", "true", "0", "1"}; +public class BooleanDV extends TypeValidator { - public short getAllowedFacets(){ + public short getAllowedFacets() { return (XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_WHITESPACE); } public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException { - Boolean ret = null; - - if (content.equals(fValueSpace[0]) || content.equals(fValueSpace[2])) - ret = Boolean.FALSE; - else if (content.equals(fValueSpace[1]) || content.equals(fValueSpace[3])) - ret = Boolean.TRUE; - else - throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.1", new Object[]{content, "boolean"}); - return ret; + if ("false".equals(content) || "0".equals(content)) { + return Boolean.FALSE; + } + else if ("true".equals(content) || "1".equals(content)) { + return Boolean.TRUE; + } + throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.1", new Object[]{content, "boolean"}); } } // class BooleanDV diff --git a/src/org/apache/xerces/impl/dv/xs/DateDV.java b/src/org/apache/xerces/impl/dv/xs/DateDV.java index 332bade..a39a069 100644 --- a/src/org/apache/xerces/impl/dv/xs/DateDV.java +++ b/src/org/apache/xerces/impl/dv/xs/DateDV.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Elena Litani * @author Gopal Sharma, SUN Microsystems Inc. * - * @version $Id: DateDV.java 320545 2005-07-19 04:49:50Z mrglavas $ + * @version $Id: DateDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class DateDV extends DateTimeDV { diff --git a/src/org/apache/xerces/impl/dv/xs/DateTimeDV.java b/src/org/apache/xerces/impl/dv/xs/DateTimeDV.java index 9387c1d..41c2d66 100644 --- a/src/org/apache/xerces/impl/dv/xs/DateTimeDV.java +++ b/src/org/apache/xerces/impl/dv/xs/DateTimeDV.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Elena Litani * @author Gopal Sharma, SUN Microsystem Inc. * - * @version $Id: DateTimeDV.java 320310 2005-05-06 15:31:15Z ankitp $ + * @version $Id: DateTimeDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class DateTimeDV extends AbstractDateTimeDV { diff --git a/src/org/apache/xerces/impl/dv/xs/DayDV.java b/src/org/apache/xerces/impl/dv/xs/DayDV.java index 39f4e5c..094b2e9 100644 --- a/src/org/apache/xerces/impl/dv/xs/DayDV.java +++ b/src/org/apache/xerces/impl/dv/xs/DayDV.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * * @author Elena Litani * @author Gopal Sharma, SUN Microsystem Inc. - * @version $Id: DayDV.java 320544 2005-07-19 04:32:40Z mrglavas $ + * @version $Id: DayDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class DayDV extends AbstractDateTimeDV { diff --git a/src/org/apache/xerces/impl/dv/xs/DayTimeDurationDV.java b/src/org/apache/xerces/impl/dv/xs/DayTimeDurationDV.java index 2385855..6d3b1a6 100644 --- a/src/org/apache/xerces/impl/dv/xs/DayTimeDurationDV.java +++ b/src/org/apache/xerces/impl/dv/xs/DayTimeDurationDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * * @author Ankit Pasricha, IBM * - * @version $Id: DayTimeDurationDV.java 320310 2005-05-06 15:31:15Z ankitp $ + * @version $Id: DayTimeDurationDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ class DayTimeDurationDV extends DurationDV { diff --git a/src/org/apache/xerces/impl/dv/xs/DecimalDV.java b/src/org/apache/xerces/impl/dv/xs/DecimalDV.java index 9efd596..bee434f 100644 --- a/src/org/apache/xerces/impl/dv/xs/DecimalDV.java +++ b/src/org/apache/xerces/impl/dv/xs/DecimalDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.apache.xerces.xs.datatypes.XSDecimal; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: DecimalDV.java 320196 2005-01-05 21:13:49Z mrglavas $ + * @version $Id: DecimalDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class DecimalDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/DoubleDV.java b/src/org/apache/xerces/impl/dv/xs/DoubleDV.java index 14b75fa..b6d5200 100644 --- a/src/org/apache/xerces/impl/dv/xs/DoubleDV.java +++ b/src/org/apache/xerces/impl/dv/xs/DoubleDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.xs.datatypes.XSDouble; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: DoubleDV.java 367193 2006-01-09 04:38:12Z mrglavas $ + * @version $Id: DoubleDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class DoubleDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/DurationDV.java b/src/org/apache/xerces/impl/dv/xs/DurationDV.java index 2bce7ee..9bdb0f8 100644 --- a/src/org/apache/xerces/impl/dv/xs/DurationDV.java +++ b/src/org/apache/xerces/impl/dv/xs/DurationDV.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * * @author Elena Litani * @author Gopal Sharma, SUN Microsystem Inc. - * @version $Id: DurationDV.java 320310 2005-05-06 15:31:15Z ankitp $ + * @version $Id: DurationDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class DurationDV extends AbstractDateTimeDV { diff --git a/src/org/apache/xerces/impl/dv/xs/EntityDV.java b/src/org/apache/xerces/impl/dv/xs/EntityDV.java index 0216af1..fbbadbb 100644 --- a/src/org/apache/xerces/impl/dv/xs/EntityDV.java +++ b/src/org/apache/xerces/impl/dv/xs/EntityDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.util.XMLChar; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: EntityDV.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: EntityDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class EntityDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/FloatDV.java b/src/org/apache/xerces/impl/dv/xs/FloatDV.java index d9caa4c..3e4c00f 100644 --- a/src/org/apache/xerces/impl/dv/xs/FloatDV.java +++ b/src/org/apache/xerces/impl/dv/xs/FloatDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.xs.datatypes.XSFloat; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: FloatDV.java 367193 2006-01-09 04:38:12Z mrglavas $ + * @version $Id: FloatDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class FloatDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/FullDVFactory.java b/src/org/apache/xerces/impl/dv/xs/FullDVFactory.java index 627f096..5b9bafb 100644 --- a/src/org/apache/xerces/impl/dv/xs/FullDVFactory.java +++ b/src/org/apache/xerces/impl/dv/xs/FullDVFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2002, 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.xs.XSConstants; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: FullDVFactory.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: FullDVFactory.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class FullDVFactory extends BaseDVFactory { diff --git a/src/org/apache/xerces/impl/dv/xs/HexBinaryDV.java b/src/org/apache/xerces/impl/dv/xs/HexBinaryDV.java index 92bca86..18defa3 100644 --- a/src/org/apache/xerces/impl/dv/xs/HexBinaryDV.java +++ b/src/org/apache/xerces/impl/dv/xs/HexBinaryDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.impl.dv.util.HexBin; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: HexBinaryDV.java 367193 2006-01-09 04:38:12Z mrglavas $ + * @version $Id: HexBinaryDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class HexBinaryDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/IDDV.java b/src/org/apache/xerces/impl/dv/xs/IDDV.java index 4a50b72..039126e 100644 --- a/src/org/apache/xerces/impl/dv/xs/IDDV.java +++ b/src/org/apache/xerces/impl/dv/xs/IDDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: IDDV.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: IDDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class IDDV extends TypeValidator{ diff --git a/src/org/apache/xerces/impl/dv/xs/IDREFDV.java b/src/org/apache/xerces/impl/dv/xs/IDREFDV.java index ef68659..17afac4 100644 --- a/src/org/apache/xerces/impl/dv/xs/IDREFDV.java +++ b/src/org/apache/xerces/impl/dv/xs/IDREFDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.util.XMLChar; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: IDREFDV.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: IDREFDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class IDREFDV extends TypeValidator{ diff --git a/src/org/apache/xerces/impl/dv/xs/IntegerDV.java b/src/org/apache/xerces/impl/dv/xs/IntegerDV.java index cc0c9f6..6eef086 100644 --- a/src/org/apache/xerces/impl/dv/xs/IntegerDV.java +++ b/src/org/apache/xerces/impl/dv/xs/IntegerDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * * @author Sandy Gao, IBM * - * @version $Id: IntegerDV.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: IntegerDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class IntegerDV extends DecimalDV { diff --git a/src/org/apache/xerces/impl/dv/xs/ListDV.java b/src/org/apache/xerces/impl/dv/xs/ListDV.java index d8660c9..1557ee5 100644 --- a/src/org/apache/xerces/impl/dv/xs/ListDV.java +++ b/src/org/apache/xerces/impl/dv/xs/ListDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.xs.datatypes.ObjectList; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: ListDV.java 367193 2006-01-09 04:38:12Z mrglavas $ + * @version $Id: ListDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class ListDV extends TypeValidator{ diff --git a/src/org/apache/xerces/impl/dv/xs/MonthDV.java b/src/org/apache/xerces/impl/dv/xs/MonthDV.java index cd162fe..ba56cea 100644 --- a/src/org/apache/xerces/impl/dv/xs/MonthDV.java +++ b/src/org/apache/xerces/impl/dv/xs/MonthDV.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Elena Litani * @author Gopal Sharma, SUN Microsystem Inc. * - * @version $Id: MonthDV.java 320544 2005-07-19 04:32:40Z mrglavas $ + * @version $Id: MonthDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class MonthDV extends AbstractDateTimeDV { diff --git a/src/org/apache/xerces/impl/dv/xs/MonthDayDV.java b/src/org/apache/xerces/impl/dv/xs/MonthDayDV.java index fc30840..e87c01d 100644 --- a/src/org/apache/xerces/impl/dv/xs/MonthDayDV.java +++ b/src/org/apache/xerces/impl/dv/xs/MonthDayDV.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Elena Litani * @author Gopal Sharma, SUN Microsystem Inc. * - * @version $Id: MonthDayDV.java 320544 2005-07-19 04:32:40Z mrglavas $ + * @version $Id: MonthDayDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class MonthDayDV extends AbstractDateTimeDV { diff --git a/src/org/apache/xerces/impl/dv/xs/PrecisionDecimalDV.java b/src/org/apache/xerces/impl/dv/xs/PrecisionDecimalDV.java index 26daa82..a3d9c7a 100644 --- a/src/org/apache/xerces/impl/dv/xs/PrecisionDecimalDV.java +++ b/src/org/apache/xerces/impl/dv/xs/PrecisionDecimalDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.xerces.impl.dv.xs; import org.apache.xerces.impl.dv.InvalidDatatypeValueException; @@ -25,7 +27,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * * @author Ankit Pasricha, IBM * - * @version $Id: PrecisionDecimalDV.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: PrecisionDecimalDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ class PrecisionDecimalDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/QNameDV.java b/src/org/apache/xerces/impl/dv/xs/QNameDV.java index 4dae856..22e030a 100644 --- a/src/org/apache/xerces/impl/dv/xs/QNameDV.java +++ b/src/org/apache/xerces/impl/dv/xs/QNameDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.xs.datatypes.XSQName; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: QNameDV.java 320310 2005-05-06 15:31:15Z ankitp $ + * @version $Id: QNameDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class QNameDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/SchemaDVFactoryImpl.java b/src/org/apache/xerces/impl/dv/xs/SchemaDVFactoryImpl.java index 77c4871..6fe82ba 100644 --- a/src/org/apache/xerces/impl/dv/xs/SchemaDVFactoryImpl.java +++ b/src/org/apache/xerces/impl/dv/xs/SchemaDVFactoryImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.apache.xerces.xs.XSObjectList; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: SchemaDVFactoryImpl.java 320448 2005-06-13 04:58:49Z mrglavas $ + * @version $Id: SchemaDVFactoryImpl.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class SchemaDVFactoryImpl extends SchemaDVFactory { diff --git a/src/org/apache/xerces/impl/dv/xs/SchemaDateTimeException.java b/src/org/apache/xerces/impl/dv/xs/SchemaDateTimeException.java index 386e16b..6253cf5 100644 --- a/src/org/apache/xerces/impl/dv/xs/SchemaDateTimeException.java +++ b/src/org/apache/xerces/impl/dv/xs/SchemaDateTimeException.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,7 @@ package org.apache.xerces.impl.dv.xs; /** * @xerces.internal * - * @version $Id: SchemaDateTimeException.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: SchemaDateTimeException.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class SchemaDateTimeException extends RuntimeException { diff --git a/src/org/apache/xerces/impl/dv/xs/StringDV.java b/src/org/apache/xerces/impl/dv/xs/StringDV.java index 23c1b44..571892e 100644 --- a/src/org/apache/xerces/impl/dv/xs/StringDV.java +++ b/src/org/apache/xerces/impl/dv/xs/StringDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: StringDV.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: StringDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class StringDV extends TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/TimeDV.java b/src/org/apache/xerces/impl/dv/xs/TimeDV.java index 17265a4..9b39717 100644 --- a/src/org/apache/xerces/impl/dv/xs/TimeDV.java +++ b/src/org/apache/xerces/impl/dv/xs/TimeDV.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Elena Litani * @author Gopal Sharma, SUN Microsystem Inc. * - * @version $Id: TimeDV.java 320310 2005-05-06 15:31:15Z ankitp $ + * @version $Id: TimeDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class TimeDV extends AbstractDateTimeDV { diff --git a/src/org/apache/xerces/impl/dv/xs/TypeValidator.java b/src/org/apache/xerces/impl/dv/xs/TypeValidator.java index 8979c12..8a05e58 100644 --- a/src/org/apache/xerces/impl/dv/xs/TypeValidator.java +++ b/src/org/apache/xerces/impl/dv/xs/TypeValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: TypeValidator.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: TypeValidator.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public abstract class TypeValidator { diff --git a/src/org/apache/xerces/impl/dv/xs/UnionDV.java b/src/org/apache/xerces/impl/dv/xs/UnionDV.java index 74c647f..872b969 100644 --- a/src/org/apache/xerces/impl/dv/xs/UnionDV.java +++ b/src/org/apache/xerces/impl/dv/xs/UnionDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Neeraj Bajaj, Sun Microsystems, inc. * @author Sandy Gao, IBM * - * @version $Id: UnionDV.java 320097 2004-10-06 14:56:52Z mrglavas $ + * @version $Id: UnionDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class UnionDV extends TypeValidator{ diff --git a/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java b/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java index 36443cb..28c7b3f 100644 --- a/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java +++ b/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -53,7 +54,7 @@ import org.w3c.dom.TypeInfo; * @author Sandy Gao, IBM * @author Neeraj Bajaj, Sun Microsystems, inc. * - * @version $Id: XSSimpleTypeDecl.java 396205 2006-04-23 02:46:42Z mrglavas $ + * @version $Id: XSSimpleTypeDecl.java 469584 2006-10-31 17:57:34Z mrglavas $ */ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { @@ -1988,7 +1989,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { return content.toString(); } else if (norm_type == NORMALIZE_TRIM) { - return content.toString().trim(); + return XMLChar.trim(content.toString()); } } diff --git a/src/org/apache/xerces/impl/dv/xs/YearDV.java b/src/org/apache/xerces/impl/dv/xs/YearDV.java index 9eee41b..ea26217 100644 --- a/src/org/apache/xerces/impl/dv/xs/YearDV.java +++ b/src/org/apache/xerces/impl/dv/xs/YearDV.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Elena Litani * @author Gopal Sharma, SUN Microsystem Inc. * - * @version $Id: YearDV.java 320310 2005-05-06 15:31:15Z ankitp $ + * @version $Id: YearDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class YearDV extends AbstractDateTimeDV { diff --git a/src/org/apache/xerces/impl/dv/xs/YearMonthDV.java b/src/org/apache/xerces/impl/dv/xs/YearMonthDV.java index a3411a6..46b88d6 100644 --- a/src/org/apache/xerces/impl/dv/xs/YearMonthDV.java +++ b/src/org/apache/xerces/impl/dv/xs/YearMonthDV.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * @author Elena Litani * @author Gopal Sharma, SUN Microsystem Inc. * - * @version $Id: YearMonthDV.java 320310 2005-05-06 15:31:15Z ankitp $ + * @version $Id: YearMonthDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ public class YearMonthDV extends AbstractDateTimeDV{ diff --git a/src/org/apache/xerces/impl/dv/xs/YearMonthDurationDV.java b/src/org/apache/xerces/impl/dv/xs/YearMonthDurationDV.java index e10b4ef..8e9194f 100644 --- a/src/org/apache/xerces/impl/dv/xs/YearMonthDurationDV.java +++ b/src/org/apache/xerces/impl/dv/xs/YearMonthDurationDV.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.xerces.impl.dv.xs; import java.math.BigInteger; @@ -30,7 +32,7 @@ import org.apache.xerces.impl.dv.ValidationContext; * * @author Ankit Pasricha, IBM * - * @version $Id: YearMonthDurationDV.java 320310 2005-05-06 15:31:15Z ankitp $ + * @version $Id: YearMonthDurationDV.java 446745 2006-09-15 21:43:58Z mrglavas $ */ class YearMonthDurationDV extends DurationDV { diff --git a/src/org/apache/xerces/impl/io/ASCIIReader.java b/src/org/apache/xerces/impl/io/ASCIIReader.java index 5b40941..5d558f7 100644 --- a/src/org/apache/xerces/impl/io/ASCIIReader.java +++ b/src/org/apache/xerces/impl/io/ASCIIReader.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.apache.xerces.impl.msg.XMLMessageFormatter; * * @author Andy Clark, IBM * - * @version $Id: ASCIIReader.java 422572 2006-07-16 23:48:08Z mrglavas $ + * @version $Id: ASCIIReader.java 446716 2006-09-15 20:28:48Z mrglavas $ */ public class ASCIIReader extends Reader { diff --git a/src/org/apache/xerces/impl/io/Latin1Reader.java b/src/org/apache/xerces/impl/io/Latin1Reader.java index c8f4df3..73acac6 100644 --- a/src/org/apache/xerces/impl/io/Latin1Reader.java +++ b/src/org/apache/xerces/impl/io/Latin1Reader.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import java.io.Reader; * * @author Michael Glavassevich, IBM * - * @version $Id: Latin1Reader.java 422572 2006-07-16 23:48:08Z mrglavas $ + * @version $Id: Latin1Reader.java 446716 2006-09-15 20:28:48Z mrglavas $ */ public class Latin1Reader extends Reader { diff --git a/src/org/apache/xerces/impl/io/MalformedByteSequenceException.java b/src/org/apache/xerces/impl/io/MalformedByteSequenceException.java index 5d45be5..fd362b3 100644 --- a/src/org/apache/xerces/impl/io/MalformedByteSequenceException.java +++ b/src/org/apache/xerces/impl/io/MalformedByteSequenceException.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.util.MessageFormatter; * * @author Michael Glavassevich, IBM * - * @version $Id: MalformedByteSequenceException.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: MalformedByteSequenceException.java 446716 2006-09-15 20:28:48Z mrglavas $ */ public class MalformedByteSequenceException extends CharConversionException { diff --git a/src/org/apache/xerces/impl/io/UCSReader.java b/src/org/apache/xerces/impl/io/UCSReader.java index d51d630..2b52404 100644 --- a/src/org/apache/xerces/impl/io/UCSReader.java +++ b/src/org/apache/xerces/impl/io/UCSReader.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import java.io.Reader; * * @author Neil Graham, IBM * - * @version $Id: UCSReader.java 422572 2006-07-16 23:48:08Z mrglavas $ + * @version $Id: UCSReader.java 449317 2006-09-23 22:12:30Z mrglavas $ */ public class UCSReader extends Reader { @@ -124,29 +125,33 @@ public class UCSReader extends Reader { */ public int read() throws IOException { int b0 = fInputStream.read() & 0xff; - if (b0 == 0xff) + if (b0 == 0xff) { return -1; + } int b1 = fInputStream.read() & 0xff; - if (b1 == 0xff) + if (b1 == 0xff) { return -1; - if(fEncoding >=4) { + } + // UCS-4 + if (fEncoding >= 4) { int b2 = fInputStream.read() & 0xff; - if (b2 == 0xff) + if (b2 == 0xff) { return -1; + } int b3 = fInputStream.read() & 0xff; - if (b3 == 0xff) + if (b3 == 0xff) { return -1; - System.err.println("b0 is " + (b0 & 0xff) + " b1 " + (b1 & 0xff) + " b2 " + (b2 & 0xff) + " b3 " + (b3 & 0xff)); - if (fEncoding == UCS4BE) + } + if (fEncoding == UCS4BE) { return (b0<<24)+(b1<<16)+(b2<<8)+b3; - else - return (b3<<24)+(b2<<16)+(b1<<8)+b0; - } else { // UCS-2 - if (fEncoding == UCS2BE) - return (b0<<8)+b1; - else - return (b1<<8)+b0; + } + return (b3<<24)+(b2<<16)+(b1<<8)+b0; } + // UCS-2 + if (fEncoding == UCS2BE) { + return (b0<<8)+b1; + } + return (b1<<8)+b0; } // read():int /** @@ -169,30 +174,32 @@ public class UCSReader extends Reader { byteLength = fBuffer.length; } int count = fInputStream.read(fBuffer, 0, byteLength); - if(count == -1) return -1; + if (count == -1) return -1; // try and make count be a multiple of the number of bytes we're looking for - if(fEncoding >= 4) { // BigEndian + if (fEncoding >= 4) { // BigEndian // this looks ugly, but it avoids an if at any rate... int numToRead = (4 - (count & 3) & 3); - for(int i=0; i<numToRead; i++) { + for (int i = 0; i < numToRead; i++) { int charRead = fInputStream.read(); - if(charRead == -1) { // end of input; something likely went wrong!A Pad buffer with nulls. - for (int j = i;j<numToRead; j++) + if (charRead == -1) { // end of input; something likely went wrong!A Pad buffer with nulls. + for (int j = i; j < numToRead; j++) { fBuffer[count+j] = 0; + } break; - } else { - fBuffer[count+i] = (byte)charRead; } + fBuffer[count+i] = (byte)charRead; } count += numToRead; - } else { + } + else { int numToRead = count & 1; - if(numToRead != 0) { + if (numToRead != 0) { count++; int charRead = fInputStream.read(); - if(charRead == -1) { // end of input; something likely went wrong!A Pad buffer with nulls. + if (charRead == -1) { // end of input; something likely went wrong!A Pad buffer with nulls. fBuffer[count] = 0; - } else { + } + else { fBuffer[count] = (byte)charRead; } } @@ -204,18 +211,24 @@ public class UCSReader extends Reader { for (int i = 0; i < numChars; i++) { int b0 = fBuffer[curPos++] & 0xff; int b1 = fBuffer[curPos++] & 0xff; - if(fEncoding >=4) { + // UCS-4 + if (fEncoding >= 4) { int b2 = fBuffer[curPos++] & 0xff; int b3 = fBuffer[curPos++] & 0xff; - if (fEncoding == UCS4BE) + if (fEncoding == UCS4BE) { ch[offset+i] = (char)((b0<<24)+(b1<<16)+(b2<<8)+b3); - else + } + else { ch[offset+i] = (char)((b3<<24)+(b2<<16)+(b1<<8)+b0); - } else { // UCS-2 - if (fEncoding == UCS2BE) + } + } + else { // UCS-2 + if (fEncoding == UCS2BE) { ch[offset+i] = (char)((b0<<8)+b1); - else + } + else { ch[offset+i] = (char)((b1<<8)+b0); + } } } return numChars; diff --git a/src/org/apache/xerces/impl/io/UTF8Reader.java b/src/org/apache/xerces/impl/io/UTF8Reader.java index 10d3827..d734086 100644 --- a/src/org/apache/xerces/impl/io/UTF8Reader.java +++ b/src/org/apache/xerces/impl/io/UTF8Reader.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.apache.xerces.impl.msg.XMLMessageFormatter; * * @author Andy Clark, IBM * - * @version $Id: UTF8Reader.java 422572 2006-07-16 23:48:08Z mrglavas $ + * @version $Id: UTF8Reader.java 446716 2006-09-15 20:28:48Z mrglavas $ */ public class UTF8Reader extends Reader { diff --git a/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java b/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java index 810ad8a..923e8bd 100644 --- a/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java +++ b/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.util.MessageFormatter; * @xerces.internal * * @author Eric Ye, IBM - * @version $Id: XMLMessageFormatter.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: XMLMessageFormatter.java 446717 2006-09-15 20:29:45Z mrglavas $ * */ public class XMLMessageFormatter implements MessageFormatter { diff --git a/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties b/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties index 0009ebf..384be4d 100644 --- a/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties +++ b/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties @@ -1,7 +1,7 @@ # This file contains error and warning messages related to XML Schema # The messages are arranged in key and value tuples in a ListResourceBundle. # -# @version $Id: XMLSchemaMessages.properties 417122 2006-06-26 03:59:19Z mrglavas $ +# @version $Id: XMLSchemaMessages.properties 462861 2006-10-11 17:13:02Z mrglavas $ BadMessageKey = The error message corresponding to the message key can not be found. FormatFailed = An internal error occurred while formatting the following message:\n @@ -286,3 +286,10 @@ TargetNamespace.2 = TargetNamespace.2: Expecting no namespace, but the schema document has a target namespace of ''{1}''. UndeclaredEntity = UndeclaredEntity: Entity ''{0}'' is not declared. UndeclaredPrefix = UndeclaredPrefix: Cannot resolve ''{0}'' as a QName: the prefix ''{1}'' is not declared. + +# JAXP 1.2 schema source property errors + + jaxp12-schema-source-type.1 = The ''http://java.sun.com/xml/jaxp/properties/schemaSource'' property cannot have a value of type ''{0}''. Possible types of the value supported are String, File, InputStream, InputSource or an array of these types. + jaxp12-schema-source-type.2 = The ''http://java.sun.com/xml/jaxp/properties/schemaSource'' property cannot have an array value of type ''{0}''. Possible types of the array supported are Object, String, File, InputStream and InputSource. + jaxp12-schema-source-ns = When using an array of Objects as the value of the 'http://java.sun.com/xml/jaxp/properties/schemaSource' property, it is illegal to have two schemas that share the same target namespace. + diff --git a/src/org/apache/xerces/impl/validation/ConfigurableValidationState.java b/src/org/apache/xerces/impl/validation/ConfigurableValidationState.java index 6277fce..f03c531 100644 --- a/src/org/apache/xerces/impl/validation/ConfigurableValidationState.java +++ b/src/org/apache/xerces/impl/validation/ConfigurableValidationState.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ package org.apache.xerces.impl.validation; * @xerces.internal * * @author Peter McCracken, IBM - * @version $Id: ConfigurableValidationState.java 375197 2006-02-06 05:52:13Z mrglavas $ + * @version $Id: ConfigurableValidationState.java 449320 2006-09-23 22:37:56Z mrglavas $ */ public final class ConfigurableValidationState extends ValidationState { @@ -50,7 +51,7 @@ public final class ConfigurableValidationState extends ValidationState { /** * Turns checking for ID/IDREF errors on and off. - * @param setting: true to turn on error checking + * @param setting true to turn on error checking, * false to turn off error checking */ public void setIdIdrefChecking(boolean setting) { @@ -59,7 +60,7 @@ public final class ConfigurableValidationState extends ValidationState { /** * Turns checking for unparsed entity errors on and off. - * @param setting: true to turn on error checking + * @param setting true to turn on error checking, * false to turn off error checking */ public void setUnparsedEntityChecking(boolean setting) { @@ -104,7 +105,7 @@ public final class ConfigurableValidationState extends ValidationState { /** * Adds the ID, if ID/IDREF checking is enabled. - * @param the ID to add + * @param name the ID to add */ public void addId(String name) { if (fIdIdrefChecking) { @@ -114,7 +115,7 @@ public final class ConfigurableValidationState extends ValidationState { /** * Adds the IDREF, if ID/IDREF checking is enabled. - * @param the IDREF to add + * @param name the IDREF to add */ public void addIdRef(String name) { if (fIdIdrefChecking) { diff --git a/src/org/apache/xerces/impl/validation/EntityState.java b/src/org/apache/xerces/impl/validation/EntityState.java index 4213de2..3831df7 100644 --- a/src/org/apache/xerces/impl/validation/EntityState.java +++ b/src/org/apache/xerces/impl/validation/EntityState.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ package org.apache.xerces.impl.validation; * @xerces.internal * * @author Elena Litani, IBM - * @version $Id: EntityState.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: EntityState.java 446719 2006-09-15 20:32:39Z mrglavas $ */ public interface EntityState { /** diff --git a/src/org/apache/xerces/impl/validation/ValidationManager.java b/src/org/apache/xerces/impl/validation/ValidationManager.java index cde7682..e21fba2 100644 --- a/src/org/apache/xerces/impl/validation/ValidationManager.java +++ b/src/org/apache/xerces/impl/validation/ValidationManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import java.util.Vector; * @xerces.internal * * @author Elena Litani, IBM - * @version $Id: ValidationManager.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: ValidationManager.java 446719 2006-09-15 20:32:39Z mrglavas $ */ public class ValidationManager { diff --git a/src/org/apache/xerces/impl/validation/ValidationState.java b/src/org/apache/xerces/impl/validation/ValidationState.java index 71c465f..f07361e 100644 --- a/src/org/apache/xerces/impl/validation/ValidationState.java +++ b/src/org/apache/xerces/impl/validation/ValidationState.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import java.util.Enumeration; * @xerces.internal * * @author Elena Litani, IBM - * @version $Id: ValidationState.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: ValidationState.java 446719 2006-09-15 20:32:39Z mrglavas $ */ public class ValidationState implements ValidationContext { diff --git a/src/org/apache/xerces/impl/xpath/XPath.java b/src/org/apache/xerces/impl/xpath/XPath.java index 7b09aa5..483968c 100644 --- a/src/org/apache/xerces/impl/xpath/XPath.java +++ b/src/org/apache/xerces/impl/xpath/XPath.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.apache.xerces.xni.QName; * @xerces.internal * * @author Andy Clark, IBM - * @version $Id: XPath.java 388860 2006-03-25 23:50:16Z mrglavas $ + * @version $Id: XPath.java 470937 2006-11-03 18:34:03Z mrglavas $ */ public class XPath { @@ -160,7 +161,10 @@ public class XPath { token == XPath.Tokens.EXPRTOKEN_NAMETEST_ANY || token == XPath.Tokens.EXPRTOKEN_NAMETEST_NAMESPACE || token == XPath.Tokens.EXPRTOKEN_OPERATOR_DOUBLE_SLASH || - token == XPath.Tokens.EXPRTOKEN_OPERATOR_UNION + token == XPath.Tokens.EXPRTOKEN_OPERATOR_UNION || + token == XPath.Tokens.EXPRTOKEN_AXISNAME_CHILD || + token == XPath.Tokens.EXPRTOKEN_AXISNAME_ATTRIBUTE || + token == XPath.Tokens.EXPRTOKEN_DOUBLE_COLON // ) { super.addToken(tokens, token); @@ -189,7 +193,7 @@ public class XPath { // 'abc' '/' '/' 'def' 'ghi' boolean expectingStep = true; - while(xtokens.hasMore()) { + while (xtokens.hasMore()) { final int token = xtokens.nextToken(); switch (token) { @@ -199,7 +203,6 @@ public class XPath { expectingStep=true; break; } - case XPath.Tokens.EXPRTOKEN_ATSIGN: { check(expectingStep); Step step = new Step( @@ -209,6 +212,19 @@ public class XPath { expectingStep=false; break; } + case XPath.Tokens.EXPRTOKEN_AXISNAME_ATTRIBUTE: { + check(expectingStep); + // If we got here we're expecting attribute:: + if (xtokens.nextToken() != XPath.Tokens.EXPRTOKEN_DOUBLE_COLON) { + throw new XPathException("c-general-xpath"); + } + Step step = new Step( + new Axis(Axis.ATTRIBUTE), + parseNodeTest(xtokens.nextToken(),xtokens,context)); + stepsVector.addElement(step); + expectingStep = false; + break; + } case XPath.Tokens.EXPRTOKEN_NAMETEST_ANY: case XPath.Tokens.EXPRTOKEN_NAMETEST_NAMESPACE: case XPath.Tokens.EXPRTOKEN_NAMETEST_QNAME: { @@ -220,7 +236,19 @@ public class XPath { expectingStep=false; break; } - + case XPath.Tokens.EXPRTOKEN_AXISNAME_CHILD: { + check(expectingStep); + // If we got here we're expecting child:: + if (xtokens.nextToken() != XPath.Tokens.EXPRTOKEN_DOUBLE_COLON) { + throw new XPathException("c-general-xpath"); + } + Step step = new Step( + new Axis(Axis.CHILD), + parseNodeTest(xtokens.nextToken(),xtokens,context)); + stepsVector.addElement(step); + expectingStep = false; + break; + } case XPath.Tokens.EXPRTOKEN_PERIOD: { check(expectingStep); expectingStep=false; @@ -252,13 +280,18 @@ public class XPath { } break; } - case XPath.Tokens.EXPRTOKEN_OPERATOR_DOUBLE_SLASH:{ - // this cannot appear in arbitrary position. + // this cannot appear in an arbitrary position. // it is only allowed right after '.' when // '.' is the first token of a location path. throw new XPathException("c-general-xpath"); } + case XPath.Tokens.EXPRTOKEN_DOUBLE_COLON: { + // :: cannot appear in an arbitrary position. + // We only expect this token if the xpath + // contains child:: or attribute:: + throw new XPathException("c-general-xpath"); + } case XPath.Tokens.EXPRTOKEN_OPERATOR_SLASH: { check(!expectingStep); expectingStep=true; @@ -317,8 +350,7 @@ public class XPath { return new NodeTest(new QName(prefix, localpart, rawname, uri)); default: - // assertion error - throw new InternalError(); + throw new XPathException("c-general-xpath"); } } @@ -651,7 +683,7 @@ public class XPath { * @author Glenn Marcy, IBM * @author Andy Clark, IBM * - * @version $Id: XPath.java 388860 2006-03-25 23:50:16Z mrglavas $ + * @version $Id: XPath.java 470937 2006-11-03 18:34:03Z mrglavas $ */ private static final class Tokens { @@ -1184,7 +1216,7 @@ public class XPath { * @author Glenn Marcy, IBM * @author Andy Clark, IBM * - * @version $Id: XPath.java 388860 2006-03-25 23:50:16Z mrglavas $ + * @version $Id: XPath.java 470937 2006-11-03 18:34:03Z mrglavas $ */ private static class Scanner { diff --git a/src/org/apache/xerces/impl/xpath/XPathException.java b/src/org/apache/xerces/impl/xpath/XPathException.java index 4b652ee..5a8ba24 100644 --- a/src/org/apache/xerces/impl/xpath/XPathException.java +++ b/src/org/apache/xerces/impl/xpath/XPathException.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ package org.apache.xerces.impl.xpath; * * @author Andy Clark, IBM * - * @version $Id: XPathException.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: XPathException.java 446721 2006-09-15 20:35:34Z mrglavas $ */ public class XPathException extends Exception { diff --git a/src/org/apache/xerces/impl/xpath/regex/BMPattern.java b/src/org/apache/xerces/impl/xpath/regex/BMPattern.java index 713d7a9..9d05cf3 100644 --- a/src/org/apache/xerces/impl/xpath/regex/BMPattern.java +++ b/src/org/apache/xerces/impl/xpath/regex/BMPattern.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import java.text.CharacterIterator; * * @xerces.internal * - * @version $Id: BMPattern.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: BMPattern.java 446721 2006-09-15 20:35:34Z mrglavas $ */ public class BMPattern { char[] pattern; diff --git a/src/org/apache/xerces/impl/xpath/regex/Match.java b/src/org/apache/xerces/impl/xpath/regex/Match.java index fafe553..96c7d5c 100644 --- a/src/org/apache/xerces/impl/xpath/regex/Match.java +++ b/src/org/apache/xerces/impl/xpath/regex/Match.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import java.text.CharacterIterator; * @see RegularExpression#matches(java.lang.String, int, int, Match) * @see RegularExpression#matches(java.lang.String, Match) * @author TAMURA Kent <kent@trl.ibm.co.jp> - * @version $Id: Match.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: Match.java 446721 2006-09-15 20:35:34Z mrglavas $ */ public class Match implements Cloneable { int[] beginpos = null; diff --git a/src/org/apache/xerces/impl/xpath/regex/Op.java b/src/org/apache/xerces/impl/xpath/regex/Op.java index c2e5738..c190696 100644 --- a/src/org/apache/xerces/impl/xpath/regex/Op.java +++ b/src/org/apache/xerces/impl/xpath/regex/Op.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import java.util.Vector; /** * @xerces.internal * - * @version $Id: Op.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: Op.java 446721 2006-09-15 20:35:34Z mrglavas $ */ class Op { static final int DOT = 0; diff --git a/src/org/apache/xerces/impl/xpath/regex/ParseException.java b/src/org/apache/xerces/impl/xpath/regex/ParseException.java index 0b5a9d0..328e012 100644 --- a/src/org/apache/xerces/impl/xpath/regex/ParseException.java +++ b/src/org/apache/xerces/impl/xpath/regex/ParseException.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,7 +21,7 @@ package org.apache.xerces.impl.xpath.regex; * @xerces.internal * * @author TAMURA Kent <kent@trl.ibm.co.jp> - * @version $Id: ParseException.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: ParseException.java 446721 2006-09-15 20:35:34Z mrglavas $ */ public class ParseException extends RuntimeException { diff --git a/src/org/apache/xerces/impl/xpath/regex/ParserForXMLSchema.java b/src/org/apache/xerces/impl/xpath/regex/ParserForXMLSchema.java index 485e1a8..789acba 100644 --- a/src/org/apache/xerces/impl/xpath/regex/ParserForXMLSchema.java +++ b/src/org/apache/xerces/impl/xpath/regex/ParserForXMLSchema.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import java.util.Locale; * @xerces.internal * * @author TAMURA Kent <kent@trl.ibm.co.jp> - * @version $Id: ParserForXMLSchema.java 320524 2005-06-23 15:55:18Z mrglavas $ + * @version $Id: ParserForXMLSchema.java 449424 2006-09-24 16:22:30Z mrglavas $ */ class ParserForXMLSchema extends RegexParser { @@ -158,8 +159,8 @@ class ParserForXMLSchema extends RegexParser { * c-c-subtraction ::= (positive-c-group | negative-c-group) subtraction * subtraction ::= '-' c-c-expression * c-range ::= single-range | from-to-range - * single-range ::= multi-c-escape | category-c-escape | block-c-escape | <any XML char> - * cc-normal-c ::= <any character except [, ], \> + * single-range ::= multi-c-escape | category-c-escape | block-c-escape | <any XML char> + * cc-normal-c ::= <any character except [, ], \> * from-to-range ::= cc-normal-c '-' cc-normal-c * * @param useNrage Ignored. diff --git a/src/org/apache/xerces/impl/xpath/regex/REUtil.java b/src/org/apache/xerces/impl/xpath/regex/REUtil.java index 903ff4d..599f2fc 100644 --- a/src/org/apache/xerces/impl/xpath/regex/REUtil.java +++ b/src/org/apache/xerces/impl/xpath/regex/REUtil.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import java.text.CharacterIterator; /** * @xerces.internal * - * @version $Id: REUtil.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: REUtil.java 446721 2006-09-15 20:35:34Z mrglavas $ */ public final class REUtil { private REUtil() { diff --git a/src/org/apache/xerces/impl/xpath/regex/RangeToken.java b/src/org/apache/xerces/impl/xpath/regex/RangeToken.java index ec617a0..92fd6ad 100644 --- a/src/org/apache/xerces/impl/xpath/regex/RangeToken.java +++ b/src/org/apache/xerces/impl/xpath/regex/RangeToken.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.xerces.impl.xpath.regex; * * @xerces.internal * - * @version $Id: RangeToken.java 329261 2005-10-28 18:24:59Z mrglavas $ + * @version $Id: RangeToken.java 446721 2006-09-15 20:35:34Z mrglavas $ */ final class RangeToken extends Token implements java.io.Serializable { diff --git a/src/org/apache/xerces/impl/xpath/regex/RegexParser.java b/src/org/apache/xerces/impl/xpath/regex/RegexParser.java index 62f5e30..6974e94 100644 --- a/src/org/apache/xerces/impl/xpath/regex/RegexParser.java +++ b/src/org/apache/xerces/impl/xpath/regex/RegexParser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import java.util.Vector; * * @xerces.internal * - * @version $Id: RegexParser.java 320091 2004-10-04 22:07:41Z mrglavas $ + * @version $Id: RegexParser.java 469061 2006-10-30 04:16:15Z mrglavas $ */ class RegexParser { static final int T_CHAR = 0; @@ -205,8 +206,22 @@ class RegexParser { case ')': ret = T_RPAREN; break; case '.': ret = T_DOT; break; case '[': ret = T_LBRACKET; break; - case '^': ret = T_CARET; break; - case '$': ret = T_DOLLAR; break; + case '^': + if (this.isSet(RegularExpression.XMLSCHEMA_MODE)) { + ret = T_CHAR; + } + else { + ret = T_CARET; + } + break; + case '$': + if (this.isSet(RegularExpression.XMLSCHEMA_MODE)) { + ret = T_CHAR; + } + else { + ret = T_DOLLAR; + } + break; case '(': ret = T_LPAREN; if (this.offset >= this.regexlen) diff --git a/src/org/apache/xerces/impl/xpath/regex/RegularExpression.java b/src/org/apache/xerces/impl/xpath/regex/RegularExpression.java index 69b1304..6e96e88 100644 --- a/src/org/apache/xerces/impl/xpath/regex/RegularExpression.java +++ b/src/org/apache/xerces/impl/xpath/regex/RegularExpression.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -478,7 +479,7 @@ import java.text.CharacterIterator; * @xerces.internal * * @author TAMURA Kent <kent@trl.ibm.co.jp> - * @version $Id: RegularExpression.java 320585 2005-09-30 22:09:34Z mrglavas $ + * @version $Id: RegularExpression.java 446721 2006-09-15 20:35:34Z mrglavas $ */ public class RegularExpression implements java.io.Serializable { diff --git a/src/org/apache/xerces/impl/xpath/regex/Token.java b/src/org/apache/xerces/impl/xpath/regex/Token.java index ad7c9d7..b3c4667 100644 --- a/src/org/apache/xerces/impl/xpath/regex/Token.java +++ b/src/org/apache/xerces/impl/xpath/regex/Token.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import java.util.Hashtable; * * @xerces.internal * - * @version $Id: Token.java 415788 2006-06-20 19:59:13Z mrglavas $ + * @version $Id: Token.java 446721 2006-09-15 20:35:34Z mrglavas $ */ class Token implements java.io.Serializable { diff --git a/src/org/apache/xerces/impl/xs/AttributePSVImpl.java b/src/org/apache/xerces/impl/xs/AttributePSVImpl.java index 57bd48d..c82f92c 100644 --- a/src/org/apache/xerces/impl/xs/AttributePSVImpl.java +++ b/src/org/apache/xerces/impl/xs/AttributePSVImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import org.apache.xerces.xs.XSConstants; * @xerces.internal * * @author Elena Litani IBM - * @version $Id: AttributePSVImpl.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: AttributePSVImpl.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class AttributePSVImpl implements AttributePSVI { diff --git a/src/org/apache/xerces/impl/xs/ElementPSVImpl.java b/src/org/apache/xerces/impl/xs/ElementPSVImpl.java index 38e7281..091412b 100644 --- a/src/org/apache/xerces/impl/xs/ElementPSVImpl.java +++ b/src/org/apache/xerces/impl/xs/ElementPSVImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -39,7 +40,7 @@ import org.apache.xerces.xs.XSConstants; * @xerces.internal * * @author Elena Litani IBM - * @version $Id: ElementPSVImpl.java 320403 2005-05-25 04:33:07Z mrglavas $ + * @version $Id: ElementPSVImpl.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class ElementPSVImpl implements ElementPSVI { diff --git a/src/org/apache/xerces/impl/xs/SchemaGrammar.java b/src/org/apache/xerces/impl/xs/SchemaGrammar.java index 843a3a2..eaa17ba 100644 --- a/src/org/apache/xerces/impl/xs/SchemaGrammar.java +++ b/src/org/apache/xerces/impl/xs/SchemaGrammar.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -68,7 +69,7 @@ import org.xml.sax.SAXException; * @author Sandy Gao, IBM * @author Elena Litani, IBM * - * @version $Id: SchemaGrammar.java 348887 2005-11-25 06:13:12Z mrglavas $ + * @version $Id: SchemaGrammar.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class SchemaGrammar implements XSGrammar, XSNamespaceItem { diff --git a/src/org/apache/xerces/impl/xs/SchemaNamespaceSupport.java b/src/org/apache/xerces/impl/xs/SchemaNamespaceSupport.java index 51f9fb7..36794ec 100644 --- a/src/org/apache/xerces/impl/xs/SchemaNamespaceSupport.java +++ b/src/org/apache/xerces/impl/xs/SchemaNamespaceSupport.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.w3c.dom.Node; * * @author Neil Graham, IBM * - * @version $Id: SchemaNamespaceSupport.java 320573 2005-09-08 01:48:39Z mrglavas $ + * @version $Id: SchemaNamespaceSupport.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class SchemaNamespaceSupport extends NamespaceSupport { diff --git a/src/org/apache/xerces/impl/xs/SchemaSymbols.java b/src/org/apache/xerces/impl/xs/SchemaSymbols.java index e72ccde..d3f8807 100644 --- a/src/org/apache/xerces/impl/xs/SchemaSymbols.java +++ b/src/org/apache/xerces/impl/xs/SchemaSymbols.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ package org.apache.xerces.impl.xs; * @xerces.internal * * @author jeffrey rodriguez - * @version $Id: SchemaSymbols.java 320121 2004-10-29 05:05:13Z mrglavas $ + * @version $Id: SchemaSymbols.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public final class SchemaSymbols { diff --git a/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java b/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java index f16a4bb..ed167d3 100644 --- a/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java +++ b/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import java.util.Vector; * * @author Sandy Gao, IBM * - * @version $Id: SubstitutionGroupHandler.java 320216 2005-02-04 03:36:57Z mrglavas $ + * @version $Id: SubstitutionGroupHandler.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class SubstitutionGroupHandler { diff --git a/src/org/apache/xerces/impl/xs/XMLSchemaException.java b/src/org/apache/xerces/impl/xs/XMLSchemaException.java index 8a9bfad..056d561 100644 --- a/src/org/apache/xerces/impl/xs/XMLSchemaException.java +++ b/src/org/apache/xerces/impl/xs/XMLSchemaException.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.xerces.impl.xs; /** @@ -22,7 +24,7 @@ package org.apache.xerces.impl.xs; * * @author Elena Litani, IBM * - * @version $Id: XMLSchemaException.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XMLSchemaException.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class XMLSchemaException extends Exception { diff --git a/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java b/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java index f0d7a9c..aff565e 100644 --- a/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java +++ b/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,6 +30,7 @@ import java.util.Hashtable; import java.util.Locale; import java.util.StringTokenizer; import java.util.Vector; +import java.util.WeakHashMap; import org.apache.xerces.dom.DOMErrorImpl; import org.apache.xerces.dom.DOMMessageFormatter; @@ -43,6 +45,7 @@ import org.apache.xerces.impl.xs.traversers.XSDHandler; import org.apache.xerces.util.DOMEntityResolverWrapper; import org.apache.xerces.util.DOMErrorHandlerWrapper; import org.apache.xerces.util.DefaultErrorHandler; +import org.apache.xerces.util.MessageFormatter; import org.apache.xerces.util.ParserConfigurationSettings; import org.apache.xerces.util.SymbolTable; import org.apache.xerces.util.XMLSymbols; @@ -86,9 +89,8 @@ import org.xml.sax.InputSource; * @xerces.internal * * @author Neil Graham, IBM - * @version $Id: XMLSchemaLoader.java 388860 2006-03-25 23:50:16Z mrglavas $ + * @version $Id: XMLSchemaLoader.java 462925 2006-10-11 20:11:16Z mrglavas $ */ - public class XMLSchemaLoader implements XMLGrammarLoader, XMLComponent, // XML Component API XSLoader, DOMConfiguration { @@ -204,7 +206,6 @@ XSLoader, DOMConfiguration { // features and properties private ParserConfigurationSettings fLoaderConfig = new ParserConfigurationSettings(); - private SymbolTable fSymbolTable = null; private XMLErrorReporter fErrorReporter = new XMLErrorReporter (); private XMLEntityManager fEntityManager = null; private XMLEntityResolver fUserEntityResolver = null; @@ -228,7 +229,7 @@ XSLoader, DOMConfiguration { private CMBuilder fCMBuilder; private XSDDescription fXSDDescription = new XSDDescription(); - private Hashtable fJAXPCache; + private WeakHashMap fJAXPCache; private Locale fLocale = Locale.getDefault(); // XSLoader attributes @@ -316,7 +317,7 @@ XSLoader, DOMConfiguration { fCMBuilder = builder; fSchemaHandler = new XSDHandler(fGrammarBucket); fDeclPool = new XSDeclarationPool(); - fJAXPCache = new Hashtable(); + fJAXPCache = new WeakHashMap(); fSettingsChanged = true; } @@ -473,7 +474,7 @@ XSLoader, DOMConfiguration { * Returns a Grammar object by parsing the contents of the * entities pointed to by sources. * - * @param source[] the locations of the entity which forms + * @param source the locations of the entity which forms * the staring point of the grammars to be constructed * @throws IOException when a problem is encounted reading the entity * @throws XNIException when a condition arises (such as a FatalError) that requires parsing @@ -555,7 +556,8 @@ XSLoader, DOMConfiguration { return grammar; } // loadSchema(XSDDescription, XMLInputSource): SchemaGrammar - /** This method tries to resolve location of the given schema. + /** + * This method tries to resolve location of the given schema. * The loader stores the namespace/location pairs in a hashtable (use "" as the * namespace of absent namespace). When resolving an entity, loader first tries * to find in the hashtable whether there is a value for that namespace, @@ -564,7 +566,7 @@ XSLoader, DOMConfiguration { * @param desc * @param locationPairs * @param entityResolver - * @return + * @return the XMLInputSource * @throws IOException */ public static XMLInputSource resolveDocument(XSDDescription desc, Hashtable locationPairs, @@ -693,10 +695,10 @@ XSLoader, DOMConfiguration { String sid = null; if (componentType == null) { // Not an array - if(fJAXPSource instanceof InputStream || + if (fJAXPSource instanceof InputStream || fJAXPSource instanceof InputSource) { SchemaGrammar g = (SchemaGrammar)fJAXPCache.get(fJAXPSource); - if(g != null) { + if (g != null) { fGrammarBucket.putGrammar(g); return; } @@ -713,38 +715,43 @@ XSLoader, DOMConfiguration { } SchemaGrammar g = loadSchema(fXSDDescription, xis, locationPairs); // it is possible that we won't be able to resolve JAXP schema-source location - if (g != null){ - if(fJAXPSource instanceof InputStream || + if (g != null) { + if (fJAXPSource instanceof InputStream || fJAXPSource instanceof InputSource) { fJAXPCache.put(fJAXPSource, g); - if(fIsCheckedFully) { + if (fIsCheckedFully) { XSConstraints.fullSchemaChecking(fGrammarBucket, fSubGroupHandler, fCMBuilder, fErrorReporter); } } fGrammarBucket.putGrammar(g); } - return ; - } else if ( (componentType != Object.class) && + return; + } + else if ( (componentType != Object.class) && (componentType != String.class) && (componentType != File.class) && (componentType != InputStream.class) && - (componentType != InputSource.class) + (componentType != InputSource.class) && + !File.class.isAssignableFrom(componentType) && + !InputStream.class.isAssignableFrom(componentType) && + !InputSource.class.isAssignableFrom(componentType) && + !componentType.isInterface() ) { // Not an Object[], String[], File[], InputStream[], InputSource[] + MessageFormatter mf = fErrorReporter.getMessageFormatter(XSMessageFormatter.SCHEMA_DOMAIN); throw new XMLConfigurationException( - XMLConfigurationException.NOT_SUPPORTED, "\""+JAXP_SCHEMA_SOURCE+ - "\" property cannot have an array of type {"+componentType.getName()+ - "}. Possible types of the array supported are Object, String, File, "+ - "InputStream, InputSource."); + XMLConfigurationException.NOT_SUPPORTED, + mf.formatMessage(fErrorReporter.getLocale(), "jaxp12-schema-source-type.2", + new Object [] {componentType.getName()})); } // JAXP spec. allow []s of type String, File, InputStream, // InputSource also, apart from [] of type Object. Object[] objArr = (Object[]) fJAXPSource; - //make local vector for storing targetn namespaces of schemasources specified in object arrays. + // make local vector for storing target namespaces of schemasources specified in object arrays. ArrayList jaxpSchemaSourceNamespaces = new ArrayList(); for (int i = 0; i < objArr.length; i++) { - if(objArr[i] instanceof InputStream || + if (objArr[i] instanceof InputStream || objArr[i] instanceof InputSource) { SchemaGrammar g = (SchemaGrammar)fJAXPCache.get(objArr[i]); if (g != null) { @@ -766,35 +773,33 @@ XSLoader, DOMConfiguration { // load schema SchemaGrammar grammar = fSchemaHandler.parseSchema(xis,fXSDDescription, locationPairs); - if(fIsCheckedFully) { + if (fIsCheckedFully) { XSConstraints.fullSchemaChecking(fGrammarBucket, fSubGroupHandler, fCMBuilder, fErrorReporter); } - if(grammar != null){ - targetNamespace = grammar.getTargetNamespace() ; - if(jaxpSchemaSourceNamespaces.contains(targetNamespace)){ - //when an array of objects is passed it is illegal to have two schemas that share same namespace. - throw new java.lang.IllegalArgumentException( - " When using array of Objects as the value of SCHEMA_SOURCE property , " + - "no two Schemas should share the same targetNamespace. " ); + if (grammar != null) { + targetNamespace = grammar.getTargetNamespace(); + if (jaxpSchemaSourceNamespaces.contains(targetNamespace)) { + // when an array of objects is passed it is illegal to have two schemas that share same namespace. + MessageFormatter mf = fErrorReporter.getMessageFormatter(XSMessageFormatter.SCHEMA_DOMAIN); + throw new java.lang.IllegalArgumentException(mf.formatMessage(fErrorReporter.getLocale(), + "jaxp12-schema-source-ns", null)); } - else{ + else { jaxpSchemaSourceNamespaces.add(targetNamespace) ; } - if(objArr[i] instanceof InputStream || + if (objArr[i] instanceof InputStream || objArr[i] instanceof InputSource) { fJAXPCache.put(objArr[i], grammar); } fGrammarBucket.putGrammar(grammar); } - else{ + else { //REVISIT: What should be the acutal behavior if grammar can't be loaded as specified in schema source? } } }//processJAXPSchemaSource - private XMLInputSource xsdToXMLInputSource( - Object val) - { + private XMLInputSource xsdToXMLInputSource(Object val) { if (val instanceof String) { // String value is treated as a URI that is passed through the // EntityResolver @@ -804,7 +809,8 @@ XSLoader, DOMConfiguration { XMLInputSource xis = null; try { xis = fEntityManager.resolveEntity(fXSDDescription); - } catch (IOException ex) { + } + catch (IOException ex) { fErrorReporter.reportError(XSMessageFormatter.SCHEMA_DOMAIN, "schema_reference.4", new Object[] { loc }, XMLErrorReporter.SEVERITY_ERROR); @@ -815,12 +821,15 @@ XSLoader, DOMConfiguration { return new XMLInputSource(null, loc, null); } return xis; - } else if (val instanceof InputSource) { + } + else if (val instanceof InputSource) { return saxToXMLInputSource((InputSource) val); - } else if (val instanceof InputStream) { + } + else if (val instanceof InputStream) { return new XMLInputSource(null, null, null, (InputStream) val, null); - } else if (val instanceof File) { + } + else if (val instanceof File) { File file = (File) val; InputStream is = null; try { @@ -832,11 +841,11 @@ XSLoader, DOMConfiguration { } return new XMLInputSource(null, null, null, is, null); } + MessageFormatter mf = fErrorReporter.getMessageFormatter(XSMessageFormatter.SCHEMA_DOMAIN); throw new XMLConfigurationException( - XMLConfigurationException.NOT_SUPPORTED, "\""+JAXP_SCHEMA_SOURCE+ - "\" property cannot have a value of type {"+val.getClass().getName()+ - "}. Possible types of the value supported are String, File, InputStream, "+ - "InputSource OR an array of these types."); + XMLConfigurationException.NOT_SUPPORTED, + mf.formatMessage(fErrorReporter.getLocale(), "jaxp12-schema-source-type.1", + new Object [] {val != null ? val.getClass().getName() : "null"})); } diff --git a/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java b/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java index ced4c5e..fde90ff 100644 --- a/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java +++ b/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -76,8 +77,6 @@ import org.apache.xerces.xs.ShortList; import org.apache.xerces.xs.XSConstants; import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSTypeDefinition; -import org.xml.sax.SAXNotRecognizedException; -import org.xml.sax.SAXNotSupportedException; /** * The XML Schema validator. The validator implements a document @@ -101,7 +100,7 @@ import org.xml.sax.SAXNotSupportedException; * @author Elena Litani IBM * @author Andy Clark IBM * @author Neeraj Bajaj, Sun Microsystems, inc. - * @version $Id: XMLSchemaValidator.java 426369 2006-07-28 03:17:09Z mrglavas $ + * @version $Id: XMLSchemaValidator.java 469584 2006-10-31 17:57:34Z mrglavas $ */ public class XMLSchemaValidator implements XMLComponent, XMLDocumentFilter, FieldActivator, RevalidationHandler { @@ -305,6 +304,12 @@ public class XMLSchemaValidator // we expect an element to have. It's almost // never > 1; so leave it at that. protected static final int ID_CONSTRAINT_NUM = 1; + + // xsi:* attribute declarations + static final XSAttributeDecl XSI_TYPE = SchemaGrammar.SG_XSI.getGlobalAttributeDecl(SchemaSymbols.XSI_TYPE); + static final XSAttributeDecl XSI_NIL = SchemaGrammar.SG_XSI.getGlobalAttributeDecl(SchemaSymbols.XSI_NIL); + static final XSAttributeDecl XSI_SCHEMALOCATION = SchemaGrammar.SG_XSI.getGlobalAttributeDecl(SchemaSymbols.XSI_SCHEMALOCATION); + static final XSAttributeDecl XSI_NONAMESPACESCHEMALOCATION = SchemaGrammar.SG_XSI.getGlobalAttributeDecl(SchemaSymbols.XSI_NONAMESPACESCHEMALOCATION); // // Data @@ -2654,7 +2659,7 @@ public class XMLSchemaValidator // 3.2 If {nillable} is true and there is such an attribute information item and its actual value is true , then all of the following must be true: // 3.2.2 There must be no fixed {value constraint}. else { - String value = xsiNil.trim(); + String value = XMLChar.trim(xsiNil); if (value.equals(SchemaSymbols.ATTVAL_TRUE) || value.equals(SchemaSymbols.ATTVAL_TRUE_1)) { if (fCurrentElemDecl != null @@ -2730,18 +2735,18 @@ public class XMLSchemaValidator // for the 4 xsi attributes, get appropriate decl, and validate if (fTempQName.uri == SchemaSymbols.URI_XSI) { XSAttributeDecl attrDecl = null; - if (fTempQName.localpart == SchemaSymbols.XSI_SCHEMALOCATION) - attrDecl = - SchemaGrammar.SG_XSI.getGlobalAttributeDecl( - SchemaSymbols.XSI_SCHEMALOCATION); - else if (fTempQName.localpart == SchemaSymbols.XSI_NONAMESPACESCHEMALOCATION) - attrDecl = - SchemaGrammar.SG_XSI.getGlobalAttributeDecl( - SchemaSymbols.XSI_NONAMESPACESCHEMALOCATION); - else if (fTempQName.localpart == SchemaSymbols.XSI_NIL) - attrDecl = SchemaGrammar.SG_XSI.getGlobalAttributeDecl(SchemaSymbols.XSI_NIL); - else if (fTempQName.localpart == SchemaSymbols.XSI_TYPE) - attrDecl = SchemaGrammar.SG_XSI.getGlobalAttributeDecl(SchemaSymbols.XSI_TYPE); + if (fTempQName.localpart == SchemaSymbols.XSI_TYPE) { + attrDecl = XSI_TYPE; + } + else if (fTempQName.localpart == SchemaSymbols.XSI_NIL) { + attrDecl = XSI_NIL; + } + else if (fTempQName.localpart == SchemaSymbols.XSI_SCHEMALOCATION) { + attrDecl = XSI_SCHEMALOCATION; + } + else if (fTempQName.localpart == SchemaSymbols.XSI_NONAMESPACESCHEMALOCATION) { + attrDecl = XSI_NONAMESPACESCHEMALOCATION; + } if (attrDecl != null) { processOneAttribute(element, attributes, index, attrDecl, null, attrPSVI); continue; diff --git a/src/org/apache/xerces/impl/xs/XSAnnotationImpl.java b/src/org/apache/xerces/impl/xs/XSAnnotationImpl.java index 52d14a4..a27ca56 100644 --- a/src/org/apache/xerces/impl/xs/XSAnnotationImpl.java +++ b/src/org/apache/xerces/impl/xs/XSAnnotationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import java.io.IOException; * * @xerces.internal * - * @version $Id: XSAnnotationImpl.java 443059 2006-09-13 18:26:56Z mrglavas $ + * @version $Id: XSAnnotationImpl.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class XSAnnotationImpl implements XSAnnotation { diff --git a/src/org/apache/xerces/impl/xs/XSAttributeDecl.java b/src/org/apache/xerces/impl/xs/XSAttributeDecl.java index 763a63e..9043b2c 100644 --- a/src/org/apache/xerces/impl/xs/XSAttributeDecl.java +++ b/src/org/apache/xerces/impl/xs/XSAttributeDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,13 +24,13 @@ import org.apache.xerces.impl.xs.util.XSObjectListImpl; /** * The XML representation for an attribute declaration - * schema component is an <attribute> element information item + * schema component is an <attribute> element information item * * @xerces.internal * * @author Elena Litani, IBM * @author Sandy Gao, IBM - * @version $Id: XSAttributeDecl.java 388853 2006-03-25 23:05:56Z mrglavas $ + * @version $Id: XSAttributeDecl.java 449424 2006-09-24 16:22:30Z mrglavas $ */ public class XSAttributeDecl implements XSAttributeDeclaration { diff --git a/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java b/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java index eae7d44..5fec139 100644 --- a/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java +++ b/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004, 2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,14 +29,14 @@ import org.apache.xerces.impl.xs.util.XSObjectListImpl; /** * The XML representation for an attribute group declaration - * schema component is a global <attributeGroup> element information item + * schema component is a global <attributeGroup> element information item * * @xerces.internal * * @author Sandy Gao, IBM * @author Rahul Srivastava, Sun Microsystems Inc. * - * @version $Id: XSAttributeGroupDecl.java 388853 2006-03-25 23:05:56Z mrglavas $ + * @version $Id: XSAttributeGroupDecl.java 449424 2006-09-24 16:22:30Z mrglavas $ */ public class XSAttributeGroupDecl implements XSAttributeGroupDefinition { diff --git a/src/org/apache/xerces/impl/xs/XSAttributeUseImpl.java b/src/org/apache/xerces/impl/xs/XSAttributeUseImpl.java index 5899035..082e506 100644 --- a/src/org/apache/xerces/impl/xs/XSAttributeUseImpl.java +++ b/src/org/apache/xerces/impl/xs/XSAttributeUseImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,12 +28,12 @@ import org.apache.xerces.xs.XSObjectList; /** * The XML representation for an attribute use - * schema component is a local <attribute> element information item + * schema component is a local <attribute> element information item * * @xerces.internal * * @author Sandy Gao, IBM - * @version $Id: XSAttributeUseImpl.java 388853 2006-03-25 23:05:56Z mrglavas $ + * @version $Id: XSAttributeUseImpl.java 449424 2006-09-24 16:22:30Z mrglavas $ */ public class XSAttributeUseImpl implements XSAttributeUse { diff --git a/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java b/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java index 49961c5..222c7be 100644 --- a/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java +++ b/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,13 +27,13 @@ import org.w3c.dom.TypeInfo; /** * The XML representation for a complexType - * schema component is a <complexType> element information item + * schema component is a <complexType> element information item * * @xerces.internal * * @author Elena Litani, IBM * @author Sandy Gao, IBM - * @version $Id: XSComplexTypeDecl.java 388853 2006-03-25 23:05:56Z mrglavas $ + * @version $Id: XSComplexTypeDecl.java 449487 2006-09-24 21:11:28Z mrglavas $ */ public class XSComplexTypeDecl implements XSComplexTypeDefinition, TypeInfo { @@ -240,7 +241,7 @@ public class XSComplexTypeDecl implements XSComplexTypeDefinition, TypeInfo { * The namspace of the ancestor type declaration * @param ancestorName * The name of the ancestor type declaration - * @param derivation + * @param derivationMethod * The derivation method * * @return boolean True if the ancestor type is derived from the reference diff --git a/src/org/apache/xerces/impl/xs/XSConstraints.java b/src/org/apache/xerces/impl/xs/XSConstraints.java index 354070f..7f3c16e 100644 --- a/src/org/apache/xerces/impl/xs/XSConstraints.java +++ b/src/org/apache/xerces/impl/xs/XSConstraints.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,22 +29,64 @@ import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSTypeDefinition; import org.apache.xerces.impl.dv.ValidationContext; import org.apache.xerces.util.SymbolHash; + +import java.util.Collections; +import java.util.Comparator; import java.util.Vector; /** - * Constaints shared by traversers and validator - * - * @xerces.internal + * Constraints shared by traversers and validator + * + * @xerces.internal * * @author Sandy Gao, IBM * - * @version $Id: XSConstraints.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XSConstraints.java 477862 2006-11-21 20:06:52Z mrglavas $ */ public class XSConstraints { + // IHR: Visited on 2006-11-17 + // Added a boolean return value to particleValidRestriction (it was a void function) + // to help the checkRecurseLax to know when expansion has happened and no order is required + // (IHR@xbrl.org) (Ignacio@Hernandez-Ros.com) + static final int OCCURRENCE_UNKNOWN = SchemaSymbols.OCCURRENCE_UNBOUNDED-1; static final XSSimpleType STRING_TYPE = (XSSimpleType)SchemaGrammar.SG_SchemaNS.getGlobalTypeDecl(SchemaSymbols.ATTVAL_STRING); + private static final Comparator ELEMENT_PARTICLE_COMPARATOR = new Comparator() { + + public int compare(Object o1, Object o2) { + XSParticleDecl pDecl1 = (XSParticleDecl) o1; + XSParticleDecl pDecl2 = (XSParticleDecl) o2; + XSElementDecl decl1 = (XSElementDecl) pDecl1.fValue; + XSElementDecl decl2 = (XSElementDecl) pDecl2.fValue; + + String namespace1 = decl1.getNamespace(); + String namespace2 = decl2.getNamespace(); + String name1 = decl1.getName(); + String name2 = decl2.getName(); + + boolean sameNamespace = (namespace1 == namespace2); + int namespaceComparison = 0; + + if (!sameNamespace) { + if (namespace1 != null) { + if (namespace2 != null){ + namespaceComparison = namespace1.compareTo(namespace2); + } + else { + namespaceComparison = 1; + } + } + else { + namespaceComparison = -1; + } + } + //This assumes that the names are never null. + return namespaceComparison != 0 ? namespaceComparison : name1.compareTo(name2); + } + }; + /** * check whether derived is valid derived from base, given a subset * of {restriction, extension}.B @@ -71,8 +114,9 @@ public class XSConstraints { return false; } return checkSimpleDerivation((XSSimpleType)derived, - (XSSimpleType)base, block); - } else { + (XSSimpleType)base, block); + } + else { return checkComplexDerivation((XSComplexTypeDecl)derived, base, block); } } @@ -99,7 +143,7 @@ public class XSConstraints { return false; } return checkSimpleDerivation((XSSimpleType)derived, - (XSSimpleType)base, block); + (XSSimpleType)base, block); } /** @@ -126,7 +170,7 @@ public class XSConstraints { // 2 All of the following must be true: // 2.1 restriction is not in the subset, or in the {final} of its own {base type definition}; if ((block & XSConstants.DERIVATION_RESTRICTION) != 0 || - (derived.getBaseType().getFinal() & XSConstants.DERIVATION_RESTRICTION) != 0) { + (derived.getBaseType().getFinal() & XSConstants.DERIVATION_RESTRICTION) != 0) { return false; } @@ -138,14 +182,14 @@ public class XSConstraints { // 2.2.2 D's base type definition is not the simple ur-type definition and is validly derived from B given the subset, as defined by this constraint. if (directBase != SchemaGrammar.fAnySimpleType && - checkSimpleDerivation(directBase, base, block)) { + checkSimpleDerivation(directBase, base, block)) { return true; } // 2.2.3 D's {variety} is list or union and B is the simple ur-type definition. if ((derived.getVariety() == XSSimpleType.VARIETY_LIST || - derived.getVariety() == XSSimpleType.VARIETY_UNION) && - base == SchemaGrammar.fAnySimpleType) { + derived.getVariety() == XSSimpleType.VARIETY_UNION) && + base == SchemaGrammar.fAnySimpleType) { return true; } @@ -186,7 +230,7 @@ public class XSConstraints { // 2.3 All of the following must be true: // 2.3.1 D's {base type definition} must not be the ur-type definition. if (directBase == SchemaGrammar.fAnyType || - directBase == SchemaGrammar.fAnySimpleType) { + directBase == SchemaGrammar.fAnySimpleType) { return false; } @@ -207,7 +251,7 @@ public class XSConstraints { return false; } return checkSimpleDerivation((XSSimpleType)directBase, - (XSSimpleType)base, block); + (XSSimpleType)base, block); } return false; @@ -270,15 +314,15 @@ public class XSConstraints { } static void reportSchemaError(XMLErrorReporter errorReporter, - SimpleLocator loc, - String key, Object[] args) { + SimpleLocator loc, + String key, Object[] args) { if (loc != null) { errorReporter.reportError(loc, XSMessageFormatter.SCHEMA_DOMAIN, - key, args, XMLErrorReporter.SEVERITY_ERROR); + key, args, XMLErrorReporter.SEVERITY_ERROR); } else { errorReporter.reportError(XSMessageFormatter.SCHEMA_DOMAIN, - key, args, XMLErrorReporter.SEVERITY_ERROR); + key, args, XMLErrorReporter.SEVERITY_ERROR); } } @@ -289,9 +333,9 @@ public class XSConstraints { * Element Declrations Consistent. */ public static void fullSchemaChecking(XSGrammarBucket grammarBucket, - SubstitutionGroupHandler SGHandler, - CMBuilder cmBuilder, - XMLErrorReporter errorReporter) { + SubstitutionGroupHandler SGHandler, + CMBuilder cmBuilder, + XMLErrorReporter errorReporter) { // get all grammars, and put all substitution group information // in the substitution group handler SchemaGrammar[] grammars = grammarBucket.getGrammars(); @@ -316,8 +360,8 @@ public class XSConstraints { if(baseMG == null) { if(derivedMG != null) { // can't be a restriction! reportSchemaError(errorReporter, rgLocators[i/2-1], - "src-redefine.6.2.2", - new Object[]{derivedGrp.fName, "rcase-Recurse.2"}); + "src-redefine.6.2.2", + new Object[]{derivedGrp.fName, "rcase-Recurse.2"}); } } else { fakeDerived.fValue = derivedMG; @@ -327,11 +371,11 @@ public class XSConstraints { } catch (XMLSchemaException e) { String key = e.getKey(); reportSchemaError(errorReporter, rgLocators[i/2-1], - key, - e.getArgs()); + key, + e.getArgs()); reportSchemaError(errorReporter, rgLocators[i/2-1], - "src-redefine.6.2.2", - new Object[]{derivedGrp.fName, key}); + "src-redefine.6.2.2", + new Object[]{derivedGrp.fName, key}); } } } @@ -352,7 +396,7 @@ public class XSConstraints { // i: grammar; j: type; k: error // for all grammars SymbolHash elemTable = new SymbolHash(); - for (int i = grammars.length-1, j, k; i >= 0; i--) { + for (int i = grammars.length-1, j; i >= 0; i--) { // get whether to skip EDC, and types need to be checked keepType = 0; fullChecked = grammars[i].fFullChecked; @@ -363,58 +407,58 @@ public class XSConstraints { // if we've already full-checked this grammar, then // skip the EDC constraint if (!fullChecked) { - // 1. Element Decl Consistent - if (types[j].fParticle!=null) { - elemTable.clear(); - try { - checkElementDeclsConsistent(types[j], types[j].fParticle, - elemTable, SGHandler); - } - catch (XMLSchemaException e) { - reportSchemaError(errorReporter, ctLocators[j], - e.getKey(), - e.getArgs()); + // 1. Element Decl Consistent + if (types[j].fParticle!=null) { + elemTable.clear(); + try { + checkElementDeclsConsistent(types[j], types[j].fParticle, + elemTable, SGHandler); + } + catch (XMLSchemaException e) { + reportSchemaError(errorReporter, ctLocators[j], + e.getKey(), + e.getArgs()); + } } - } } // 2. Particle Derivation if (types[j].fBaseType != null && - types[j].fBaseType != SchemaGrammar.fAnyType && - types[j].fDerivedBy == XSConstants.DERIVATION_RESTRICTION && - (types[j].fBaseType instanceof XSComplexTypeDecl)) { - - XSParticleDecl derivedParticle=types[j].fParticle; - XSParticleDecl baseParticle= - ((XSComplexTypeDecl)(types[j].fBaseType)).fParticle; - if (derivedParticle==null) { - if (baseParticle!=null && !baseParticle.emptiable()) { - reportSchemaError(errorReporter,ctLocators[j], - "derivation-ok-restriction.5.3.2", - new Object[]{types[j].fName, types[j].fBaseType.getName()}); - } - } - else if (baseParticle!=null) { - try { - particleValidRestriction(types[j].fParticle, - SGHandler, - ((XSComplexTypeDecl)(types[j].fBaseType)).fParticle, - SGHandler); - } catch (XMLSchemaException e) { - reportSchemaError(errorReporter, ctLocators[j], - e.getKey(), - e.getArgs()); - reportSchemaError(errorReporter, ctLocators[j], - "derivation-ok-restriction.5.4.2", - new Object[]{types[j].fName}); - } - } - else { - reportSchemaError(errorReporter, ctLocators[j], - "derivation-ok-restriction.5.4.2", - new Object[]{types[j].fName}); - } + types[j].fBaseType != SchemaGrammar.fAnyType && + types[j].fDerivedBy == XSConstants.DERIVATION_RESTRICTION && + (types[j].fBaseType instanceof XSComplexTypeDecl)) { + + XSParticleDecl derivedParticle=types[j].fParticle; + XSParticleDecl baseParticle= + ((XSComplexTypeDecl)(types[j].fBaseType)).fParticle; + if (derivedParticle==null) { + if (baseParticle!=null && !baseParticle.emptiable()) { + reportSchemaError(errorReporter,ctLocators[j], + "derivation-ok-restriction.5.3.2", + new Object[]{types[j].fName, types[j].fBaseType.getName()}); + } + } + else if (baseParticle!=null) { + try { + particleValidRestriction(types[j].fParticle, + SGHandler, + ((XSComplexTypeDecl)(types[j].fBaseType)).fParticle, + SGHandler); + } catch (XMLSchemaException e) { + reportSchemaError(errorReporter, ctLocators[j], + e.getKey(), + e.getArgs()); + reportSchemaError(errorReporter, ctLocators[j], + "derivation-ok-restriction.5.4.2", + new Object[]{types[j].fName}); + } + } + else { + reportSchemaError(errorReporter, ctLocators[j], + "derivation-ok-restriction.5.4.2", + new Object[]{types[j].fName}); + } } // 3. UPA // get the content model and check UPA @@ -425,8 +469,8 @@ public class XSConstraints { further = cm.checkUniqueParticleAttribution(SGHandler); } catch (XMLSchemaException e) { reportSchemaError(errorReporter, ctLocators[j], - e.getKey(), - e.getArgs()); + e.getKey(), + e.getArgs()); } } // now report all errors @@ -459,905 +503,920 @@ public class XSConstraints { /* Check that a given particle is a valid restriction of a base particle. - */ + */ public static void checkElementDeclsConsistent(XSComplexTypeDecl type, - XSParticleDecl particle, - SymbolHash elemDeclHash, - SubstitutionGroupHandler sgHandler) - throws XMLSchemaException { - - // check for elements in the tree with the same name and namespace - - int pType = particle.fType; - - if (pType == XSParticleDecl.PARTICLE_WILDCARD) - return; - - if (pType == XSParticleDecl.PARTICLE_ELEMENT) { - XSElementDecl elem = (XSElementDecl)(particle.fValue); - findElemInTable(type, elem, elemDeclHash); - - if (elem.fScope == XSConstants.SCOPE_GLOBAL) { - // Check for subsitution groups. - XSElementDecl[] subGroup = sgHandler.getSubstitutionGroup(elem); - for (int i = 0; i < subGroup.length; i++) { - findElemInTable(type, subGroup[i], elemDeclHash); - } - } - return; - } - - XSModelGroupImpl group = (XSModelGroupImpl)particle.fValue; - for (int i = 0; i < group.fParticleCount; i++) - checkElementDeclsConsistent(type, group.fParticles[i], elemDeclHash, sgHandler); + XSParticleDecl particle, + SymbolHash elemDeclHash, + SubstitutionGroupHandler sgHandler) + throws XMLSchemaException { + + // check for elements in the tree with the same name and namespace + + int pType = particle.fType; + + if (pType == XSParticleDecl.PARTICLE_WILDCARD) + return; + + if (pType == XSParticleDecl.PARTICLE_ELEMENT) { + XSElementDecl elem = (XSElementDecl)(particle.fValue); + findElemInTable(type, elem, elemDeclHash); + + if (elem.fScope == XSConstants.SCOPE_GLOBAL) { + // Check for subsitution groups. + XSElementDecl[] subGroup = sgHandler.getSubstitutionGroup(elem); + for (int i = 0; i < subGroup.length; i++) { + findElemInTable(type, subGroup[i], elemDeclHash); + } + } + return; + } + + XSModelGroupImpl group = (XSModelGroupImpl)particle.fValue; + for (int i = 0; i < group.fParticleCount; i++) + checkElementDeclsConsistent(type, group.fParticles[i], elemDeclHash, sgHandler); } public static void findElemInTable(XSComplexTypeDecl type, XSElementDecl elem, - SymbolHash elemDeclHash) - throws XMLSchemaException { + SymbolHash elemDeclHash) + throws XMLSchemaException { // How can we avoid this concat? LM. String name = elem.fName + "," + elem.fTargetNamespace; XSElementDecl existingElem = null; if ((existingElem = (XSElementDecl)(elemDeclHash.get(name))) == null) { - // just add it in - elemDeclHash.put(name, elem); + // just add it in + elemDeclHash.put(name, elem); } else { - // If this is the same check element, we're O.K. - if (elem == existingElem) - return; + // If this is the same check element, we're O.K. + if (elem == existingElem) + return; - if (elem.fType != existingElem.fType) { - // Types are not the same - throw new XMLSchemaException("cos-element-consistent", - new Object[] {type.fName, elem.fName}); + if (elem.fType != existingElem.fType) { + // Types are not the same + throw new XMLSchemaException("cos-element-consistent", + new Object[] {type.fName, elem.fName}); - } + } } } - /* - Check that a given particle is a valid restriction of a base particle. - */ - private static void particleValidRestriction(XSParticleDecl dParticle, - SubstitutionGroupHandler dSGHandler, - XSParticleDecl bParticle, - SubstitutionGroupHandler bSGHandler) - throws XMLSchemaException { - particleValidRestriction(dParticle, dSGHandler, bParticle, bSGHandler, true); + // Check that a given particle is a valid restriction of a base particle. + // + // IHR: 2006/11/17 + // Returns a boolean indicating if there has been expansion of substitution group + // in the bParticle. + // With this information the checkRecurseLax function knows when is + // to keep the order and when to ignore it. + private static boolean particleValidRestriction(XSParticleDecl dParticle, + SubstitutionGroupHandler dSGHandler, + XSParticleDecl bParticle, + SubstitutionGroupHandler bSGHandler) + throws XMLSchemaException { + return particleValidRestriction(dParticle, dSGHandler, bParticle, bSGHandler, true); } - private static void particleValidRestriction(XSParticleDecl dParticle, - SubstitutionGroupHandler dSGHandler, - XSParticleDecl bParticle, - SubstitutionGroupHandler bSGHandler, - boolean checkWCOccurrence) - throws XMLSchemaException { - - Vector dChildren = null; - Vector bChildren = null; - int dMinEffectiveTotalRange=OCCURRENCE_UNKNOWN; - int dMaxEffectiveTotalRange=OCCURRENCE_UNKNOWN; - - - // Check for empty particles. If either base or derived particle is empty, - // (and the other isn't) it's an error. - if (dParticle.isEmpty() && !bParticle.emptiable()) { - throw new XMLSchemaException("cos-particle-restrict.a", null); - } - else if (!dParticle.isEmpty() && bParticle.isEmpty()) { - throw new XMLSchemaException("cos-particle-restrict.b", null); - } - - // - // Do setup prior to invoking the Particle (Restriction) cases. - // This involves: - // - removing pointless occurrences for groups, and retrieving a vector of - // non-pointless children - // - turning top-level elements with substitution groups into CHOICE groups. - // - - short dType = dParticle.fType; - // - // Handle pointless groups for the derived particle - // - if (dType == XSParticleDecl.PARTICLE_MODELGROUP) { - dType = ((XSModelGroupImpl)dParticle.fValue).fCompositor; - - // Find a group, starting with this particle, with more than 1 child. There - // may be none, and the particle of interest trivially becomes an element or - // wildcard. - XSParticleDecl dtmp = getNonUnaryGroup(dParticle); - if (dtmp != dParticle) { - // Particle has been replaced. Retrieve new type info. - dParticle = dtmp; - dType = dParticle.fType; - if (dType == XSParticleDecl.PARTICLE_MODELGROUP) - dType = ((XSModelGroupImpl)dParticle.fValue).fCompositor; - } - - // Fill in a vector with the children of the particle, removing any - // pointless model groups in the process. - dChildren = removePointlessChildren(dParticle); - } - - int dMinOccurs = dParticle.fMinOccurs; - int dMaxOccurs = dParticle.fMaxOccurs; - - // - // For elements which are the heads of substitution groups, treat as CHOICE - // - if (dSGHandler != null && dType == XSParticleDecl.PARTICLE_ELEMENT) { - XSElementDecl dElement = (XSElementDecl)dParticle.fValue; - - if (dElement.fScope == XSConstants.SCOPE_GLOBAL) { - // Check for subsitution groups. Treat any element that has a - // subsitution group as a choice. Fill in the children vector with the - // members of the substitution group - XSElementDecl[] subGroup = dSGHandler.getSubstitutionGroup(dElement); - if (subGroup.length >0 ) { - // Now, set the type to be CHOICE. The "group" will have the same - // occurrence information as the original particle. - dType = XSModelGroupImpl.MODELGROUP_CHOICE; - dMinEffectiveTotalRange = dMinOccurs; - dMaxEffectiveTotalRange = dMaxOccurs; - - // Fill in the vector of children - dChildren = new Vector(subGroup.length+1); - for (int i = 0; i < subGroup.length; i++) { - addElementToParticleVector(dChildren, subGroup[i]); + private static boolean particleValidRestriction(XSParticleDecl dParticle, + SubstitutionGroupHandler dSGHandler, + XSParticleDecl bParticle, + SubstitutionGroupHandler bSGHandler, + boolean checkWCOccurrence) + throws XMLSchemaException { + + Vector dChildren = null; + Vector bChildren = null; + int dMinEffectiveTotalRange=OCCURRENCE_UNKNOWN; + int dMaxEffectiveTotalRange=OCCURRENCE_UNKNOWN; + + // By default there has been no expansion + boolean bExpansionHappened = false; + + // Check for empty particles. If either base or derived particle is empty, + // (and the other isn't) it's an error. + if (dParticle.isEmpty() && !bParticle.emptiable()) { + throw new XMLSchemaException("cos-particle-restrict.a", null); + } + else if (!dParticle.isEmpty() && bParticle.isEmpty()) { + throw new XMLSchemaException("cos-particle-restrict.b", null); + } + + // + // Do setup prior to invoking the Particle (Restriction) cases. + // This involves: + // - removing pointless occurrences for groups, and retrieving a vector of + // non-pointless children + // - turning top-level elements with substitution groups into CHOICE groups. + // + + short dType = dParticle.fType; + // + // Handle pointless groups for the derived particle + // + if (dType == XSParticleDecl.PARTICLE_MODELGROUP) { + dType = ((XSModelGroupImpl)dParticle.fValue).fCompositor; + + // Find a group, starting with this particle, with more than 1 child. There + // may be none, and the particle of interest trivially becomes an element or + // wildcard. + XSParticleDecl dtmp = getNonUnaryGroup(dParticle); + if (dtmp != dParticle) { + // Particle has been replaced. Retrieve new type info. + dParticle = dtmp; + dType = dParticle.fType; + if (dType == XSParticleDecl.PARTICLE_MODELGROUP) + dType = ((XSModelGroupImpl)dParticle.fValue).fCompositor; + } + + // Fill in a vector with the children of the particle, removing any + // pointless model groups in the process. + dChildren = removePointlessChildren(dParticle); + } + + int dMinOccurs = dParticle.fMinOccurs; + int dMaxOccurs = dParticle.fMaxOccurs; + + // + // For elements which are the heads of substitution groups, treat as CHOICE + // + if (dSGHandler != null && dType == XSParticleDecl.PARTICLE_ELEMENT) { + XSElementDecl dElement = (XSElementDecl)dParticle.fValue; + + if (dElement.fScope == XSConstants.SCOPE_GLOBAL) { + // Check for subsitution groups. Treat any element that has a + // subsitution group as a choice. Fill in the children vector with the + // members of the substitution group + XSElementDecl[] subGroup = dSGHandler.getSubstitutionGroup(dElement); + if (subGroup.length >0 ) { + // Now, set the type to be CHOICE. The "group" will have the same + // occurrence information as the original particle. + dType = XSModelGroupImpl.MODELGROUP_CHOICE; + dMinEffectiveTotalRange = dMinOccurs; + dMaxEffectiveTotalRange = dMaxOccurs; + + // Fill in the vector of children + dChildren = new Vector(subGroup.length+1); + for (int i = 0; i < subGroup.length; i++) { + addElementToParticleVector(dChildren, subGroup[i]); + } + addElementToParticleVector(dChildren, dElement); + Collections.sort(dChildren, ELEMENT_PARTICLE_COMPARATOR); + + // Set the handler to null, to indicate that we've finished handling + // substitution groups for this particle. + dSGHandler = null; } - addElementToParticleVector(dChildren, dElement); - - // Set the handler to null, to indicate that we've finished handling - // substitution groups for this particle. - dSGHandler = null; - } - } - } - - short bType = bParticle.fType; - // - // Handle pointless groups for the base particle - // - if (bType == XSParticleDecl.PARTICLE_MODELGROUP) { - bType = ((XSModelGroupImpl)bParticle.fValue).fCompositor; - - // Find a group, starting with this particle, with more than 1 child. There - // may be none, and the particle of interest trivially becomes an element or - // wildcard. - XSParticleDecl btmp = getNonUnaryGroup(bParticle); - if (btmp != bParticle) { - // Particle has been replaced. Retrieve new type info. - bParticle = btmp; - bType = bParticle.fType; - if (bType == XSParticleDecl.PARTICLE_MODELGROUP) - bType = ((XSModelGroupImpl)bParticle.fValue).fCompositor; - } - - // Fill in a vector with the children of the particle, removing any - // pointless model groups in the process. - bChildren = removePointlessChildren(bParticle); - } - - int bMinOccurs = bParticle.fMinOccurs; - int bMaxOccurs = bParticle.fMaxOccurs; - - if (bSGHandler != null && bType == XSParticleDecl.PARTICLE_ELEMENT) { - XSElementDecl bElement = (XSElementDecl)bParticle.fValue; - - if (bElement.fScope == XSConstants.SCOPE_GLOBAL) { - // Check for subsitution groups. Treat any element that has a - // subsitution group as a choice. Fill in the children vector with the - // members of the substitution group - XSElementDecl[] bsubGroup = bSGHandler.getSubstitutionGroup(bElement); - if (bsubGroup.length >0 ) { - // Now, set the type to be CHOICE - bType = XSModelGroupImpl.MODELGROUP_CHOICE; - - bChildren = new Vector(bsubGroup.length+1); - for (int i = 0; i < bsubGroup.length; i++) { - addElementToParticleVector(bChildren, bsubGroup[i]); + } + } + + short bType = bParticle.fType; + // + // Handle pointless groups for the base particle + // + if (bType == XSParticleDecl.PARTICLE_MODELGROUP) { + bType = ((XSModelGroupImpl)bParticle.fValue).fCompositor; + + // Find a group, starting with this particle, with more than 1 child. There + // may be none, and the particle of interest trivially becomes an element or + // wildcard. + XSParticleDecl btmp = getNonUnaryGroup(bParticle); + if (btmp != bParticle) { + // Particle has been replaced. Retrieve new type info. + bParticle = btmp; + bType = bParticle.fType; + if (bType == XSParticleDecl.PARTICLE_MODELGROUP) + bType = ((XSModelGroupImpl)bParticle.fValue).fCompositor; + } + + // Fill in a vector with the children of the particle, removing any + // pointless model groups in the process. + bChildren = removePointlessChildren(bParticle); + } + + int bMinOccurs = bParticle.fMinOccurs; + int bMaxOccurs = bParticle.fMaxOccurs; + + if (bSGHandler != null && bType == XSParticleDecl.PARTICLE_ELEMENT) { + XSElementDecl bElement = (XSElementDecl)bParticle.fValue; + + if (bElement.fScope == XSConstants.SCOPE_GLOBAL) { + // Check for subsitution groups. Treat any element that has a + // subsitution group as a choice. Fill in the children vector with the + // members of the substitution group + XSElementDecl[] bsubGroup = bSGHandler.getSubstitutionGroup(bElement); + if (bsubGroup.length >0 ) { + // Now, set the type to be CHOICE + bType = XSModelGroupImpl.MODELGROUP_CHOICE; + + bChildren = new Vector(bsubGroup.length+1); + for (int i = 0; i < bsubGroup.length; i++) { + addElementToParticleVector(bChildren, bsubGroup[i]); + } + addElementToParticleVector(bChildren, bElement); + Collections.sort(bChildren, ELEMENT_PARTICLE_COMPARATOR); + // Set the handler to null, to indicate that we've finished handling + // substitution groups for this particle. + bSGHandler = null; + + // if we are here expansion of bParticle happened + bExpansionHappened = true; } - addElementToParticleVector(bChildren, bElement); - // Set the handler to null, to indicate that we've finished handling - // substitution groups for this particle. - bSGHandler = null; - } - } - } - - // - // O.K. - Figure out which particle derivation rule applies and call it - // - switch (dType) { - case XSParticleDecl.PARTICLE_ELEMENT: - { - switch (bType) { - - // Elt:Elt NameAndTypeOK - case XSParticleDecl.PARTICLE_ELEMENT: - { - checkNameAndTypeOK((XSElementDecl)dParticle.fValue,dMinOccurs,dMaxOccurs, - (XSElementDecl)bParticle.fValue,bMinOccurs,bMaxOccurs); - return; - } - - // Elt:Any NSCompat - case XSParticleDecl.PARTICLE_WILDCARD: - { - checkNSCompat((XSElementDecl)dParticle.fValue,dMinOccurs,dMaxOccurs, - (XSWildcardDecl)bParticle.fValue,bMinOccurs,bMaxOccurs, - checkWCOccurrence); - return; - } - - // Elt:All RecurseAsIfGroup - case XSModelGroupImpl.MODELGROUP_CHOICE: - { - // Treat the element as if it were in a group of the same type - // as the base Particle - dChildren = new Vector(); - dChildren.addElement(dParticle); - - checkRecurseLax(dChildren, 1, 1, dSGHandler, - bChildren, bMinOccurs, bMaxOccurs, bSGHandler); - return; - } - case XSModelGroupImpl.MODELGROUP_SEQUENCE: - case XSModelGroupImpl.MODELGROUP_ALL: - { - // Treat the element as if it were in a group of the same type - // as the base Particle - dChildren = new Vector(); - dChildren.addElement(dParticle); - - checkRecurse(dChildren, 1, 1, dSGHandler, - bChildren, bMinOccurs, bMaxOccurs, bSGHandler); - return; - } - - default: - { - throw new XMLSchemaException("Internal-Error", - new Object[]{"in particleValidRestriction"}); - } } - } - - case XSParticleDecl.PARTICLE_WILDCARD: - { - switch (bType) { - - // Any:Any NSSubset - case XSParticleDecl.PARTICLE_WILDCARD: - { - checkNSSubset((XSWildcardDecl)dParticle.fValue, dMinOccurs, dMaxOccurs, - (XSWildcardDecl)bParticle.fValue, bMinOccurs, bMaxOccurs); - return; - } - - case XSModelGroupImpl.MODELGROUP_CHOICE: - case XSModelGroupImpl.MODELGROUP_SEQUENCE: - case XSModelGroupImpl.MODELGROUP_ALL: - case XSParticleDecl.PARTICLE_ELEMENT: - { - throw new XMLSchemaException("cos-particle-restrict.2", - new Object[]{"any:choice,sequence,all,elt"}); - } - - default: - { - throw new XMLSchemaException("Internal-Error", - new Object[]{"in particleValidRestriction"}); - } + } + + // + // O.K. - Figure out which particle derivation rule applies and call it + // + switch (dType) { + case XSParticleDecl.PARTICLE_ELEMENT: + { + switch (bType) { + + // Elt:Elt NameAndTypeOK + case XSParticleDecl.PARTICLE_ELEMENT: + { + checkNameAndTypeOK((XSElementDecl)dParticle.fValue,dMinOccurs,dMaxOccurs, + (XSElementDecl)bParticle.fValue,bMinOccurs,bMaxOccurs); + return bExpansionHappened; + } + + // Elt:Any NSCompat + case XSParticleDecl.PARTICLE_WILDCARD: + { + checkNSCompat((XSElementDecl)dParticle.fValue,dMinOccurs,dMaxOccurs, + (XSWildcardDecl)bParticle.fValue,bMinOccurs,bMaxOccurs, + checkWCOccurrence); + return bExpansionHappened; + } + + // Elt:All RecurseAsIfGroup + case XSModelGroupImpl.MODELGROUP_CHOICE: + { + // Treat the element as if it were in a group of the same type + // as the base Particle + dChildren = new Vector(); + dChildren.addElement(dParticle); + + checkRecurseLax(dChildren, 1, 1, dSGHandler, + bChildren, bMinOccurs, bMaxOccurs, bSGHandler); + return bExpansionHappened; + } + case XSModelGroupImpl.MODELGROUP_SEQUENCE: + case XSModelGroupImpl.MODELGROUP_ALL: + { + // Treat the element as if it were in a group of the same type + // as the base Particle + dChildren = new Vector(); + dChildren.addElement(dParticle); + + checkRecurse(dChildren, 1, 1, dSGHandler, + bChildren, bMinOccurs, bMaxOccurs, bSGHandler); + return bExpansionHappened; + } + + default: + { + throw new XMLSchemaException("Internal-Error", + new Object[]{"in particleValidRestriction"}); + } + } } - } - - case XSModelGroupImpl.MODELGROUP_ALL: - { - switch (bType) { - - // All:Any NSRecurseCheckCardinality - case XSParticleDecl.PARTICLE_WILDCARD: - { - if (dMinEffectiveTotalRange == OCCURRENCE_UNKNOWN) - dMinEffectiveTotalRange = dParticle.minEffectiveTotalRange(); - if (dMaxEffectiveTotalRange == OCCURRENCE_UNKNOWN) - dMaxEffectiveTotalRange = dParticle.maxEffectiveTotalRange(); - - checkNSRecurseCheckCardinality(dChildren, dMinEffectiveTotalRange, - dMaxEffectiveTotalRange, - dSGHandler, - bParticle,bMinOccurs,bMaxOccurs, - checkWCOccurrence); - - return; - } - - case XSModelGroupImpl.MODELGROUP_ALL: - { - checkRecurse(dChildren, dMinOccurs, dMaxOccurs, dSGHandler, - bChildren, bMinOccurs, bMaxOccurs, bSGHandler); - return; - } - - case XSModelGroupImpl.MODELGROUP_CHOICE: - case XSModelGroupImpl.MODELGROUP_SEQUENCE: - case XSParticleDecl.PARTICLE_ELEMENT: - { - throw new XMLSchemaException("cos-particle-restrict.2", - new Object[]{"all:choice,sequence,elt"}); - } - - default: - { - throw new XMLSchemaException("Internal-Error", - new Object[]{"in particleValidRestriction"}); - } + + case XSParticleDecl.PARTICLE_WILDCARD: + { + switch (bType) { + + // Any:Any NSSubset + case XSParticleDecl.PARTICLE_WILDCARD: + { + checkNSSubset((XSWildcardDecl)dParticle.fValue, dMinOccurs, dMaxOccurs, + (XSWildcardDecl)bParticle.fValue, bMinOccurs, bMaxOccurs); + return bExpansionHappened; + } + + case XSModelGroupImpl.MODELGROUP_CHOICE: + case XSModelGroupImpl.MODELGROUP_SEQUENCE: + case XSModelGroupImpl.MODELGROUP_ALL: + case XSParticleDecl.PARTICLE_ELEMENT: + { + throw new XMLSchemaException("cos-particle-restrict.2", + new Object[]{"any:choice,sequence,all,elt"}); + } + + default: + { + throw new XMLSchemaException("Internal-Error", + new Object[]{"in particleValidRestriction"}); + } + } + } + + case XSModelGroupImpl.MODELGROUP_ALL: + { + switch (bType) { + + // All:Any NSRecurseCheckCardinality + case XSParticleDecl.PARTICLE_WILDCARD: + { + if (dMinEffectiveTotalRange == OCCURRENCE_UNKNOWN) + dMinEffectiveTotalRange = dParticle.minEffectiveTotalRange(); + if (dMaxEffectiveTotalRange == OCCURRENCE_UNKNOWN) + dMaxEffectiveTotalRange = dParticle.maxEffectiveTotalRange(); + + checkNSRecurseCheckCardinality(dChildren, dMinEffectiveTotalRange, + dMaxEffectiveTotalRange, + dSGHandler, + bParticle,bMinOccurs,bMaxOccurs, + checkWCOccurrence); + + return bExpansionHappened; + } + + case XSModelGroupImpl.MODELGROUP_ALL: + { + checkRecurse(dChildren, dMinOccurs, dMaxOccurs, dSGHandler, + bChildren, bMinOccurs, bMaxOccurs, bSGHandler); + return bExpansionHappened; + } + + case XSModelGroupImpl.MODELGROUP_CHOICE: + case XSModelGroupImpl.MODELGROUP_SEQUENCE: + case XSParticleDecl.PARTICLE_ELEMENT: + { + throw new XMLSchemaException("cos-particle-restrict.2", + new Object[]{"all:choice,sequence,elt"}); + } + + default: + { + throw new XMLSchemaException("Internal-Error", + new Object[]{"in particleValidRestriction"}); + } + } } - } - - case XSModelGroupImpl.MODELGROUP_CHOICE: - { - switch (bType) { - - // Choice:Any NSRecurseCheckCardinality - case XSParticleDecl.PARTICLE_WILDCARD: - { - if (dMinEffectiveTotalRange == OCCURRENCE_UNKNOWN) - dMinEffectiveTotalRange = dParticle.minEffectiveTotalRange(); - if (dMaxEffectiveTotalRange == OCCURRENCE_UNKNOWN) - dMaxEffectiveTotalRange = dParticle.maxEffectiveTotalRange(); - - checkNSRecurseCheckCardinality(dChildren, dMinEffectiveTotalRange, - dMaxEffectiveTotalRange, - dSGHandler, - bParticle,bMinOccurs,bMaxOccurs, - checkWCOccurrence); - return; - } - - case XSModelGroupImpl.MODELGROUP_CHOICE: - { - checkRecurseLax(dChildren, dMinOccurs, dMaxOccurs, dSGHandler, - bChildren, bMinOccurs, bMaxOccurs, bSGHandler); - return; - } - - case XSModelGroupImpl.MODELGROUP_ALL: - case XSModelGroupImpl.MODELGROUP_SEQUENCE: - case XSParticleDecl.PARTICLE_ELEMENT: - { - throw new XMLSchemaException("cos-particle-restrict.2", - new Object[]{"choice:all,sequence,elt"}); - } - - default: - { - throw new XMLSchemaException("Internal-Error", - new Object[]{"in particleValidRestriction"}); - } + + case XSModelGroupImpl.MODELGROUP_CHOICE: + { + switch (bType) { + + // Choice:Any NSRecurseCheckCardinality + case XSParticleDecl.PARTICLE_WILDCARD: + { + if (dMinEffectiveTotalRange == OCCURRENCE_UNKNOWN) + dMinEffectiveTotalRange = dParticle.minEffectiveTotalRange(); + if (dMaxEffectiveTotalRange == OCCURRENCE_UNKNOWN) + dMaxEffectiveTotalRange = dParticle.maxEffectiveTotalRange(); + + checkNSRecurseCheckCardinality(dChildren, dMinEffectiveTotalRange, + dMaxEffectiveTotalRange, + dSGHandler, + bParticle,bMinOccurs,bMaxOccurs, + checkWCOccurrence); + return bExpansionHappened; + } + + case XSModelGroupImpl.MODELGROUP_CHOICE: + { + checkRecurseLax(dChildren, dMinOccurs, dMaxOccurs, dSGHandler, + bChildren, bMinOccurs, bMaxOccurs, bSGHandler); + return bExpansionHappened; + } + + case XSModelGroupImpl.MODELGROUP_ALL: + case XSModelGroupImpl.MODELGROUP_SEQUENCE: + case XSParticleDecl.PARTICLE_ELEMENT: + { + throw new XMLSchemaException("cos-particle-restrict.2", + new Object[]{"choice:all,sequence,elt"}); + } + + default: + { + throw new XMLSchemaException("Internal-Error", + new Object[]{"in particleValidRestriction"}); + } + } } - } - - - case XSModelGroupImpl.MODELGROUP_SEQUENCE: - { - switch (bType) { - - // Choice:Any NSRecurseCheckCardinality - case XSParticleDecl.PARTICLE_WILDCARD: - { - if (dMinEffectiveTotalRange == OCCURRENCE_UNKNOWN) - dMinEffectiveTotalRange = dParticle.minEffectiveTotalRange(); - if (dMaxEffectiveTotalRange == OCCURRENCE_UNKNOWN) - dMaxEffectiveTotalRange = dParticle.maxEffectiveTotalRange(); - - checkNSRecurseCheckCardinality(dChildren, dMinEffectiveTotalRange, - dMaxEffectiveTotalRange, - dSGHandler, - bParticle,bMinOccurs,bMaxOccurs, - checkWCOccurrence); - return; - } - - case XSModelGroupImpl.MODELGROUP_ALL: - { - checkRecurseUnordered(dChildren, dMinOccurs, dMaxOccurs, dSGHandler, - bChildren, bMinOccurs, bMaxOccurs, bSGHandler); - return; - } - - case XSModelGroupImpl.MODELGROUP_SEQUENCE: - { - checkRecurse(dChildren, dMinOccurs, dMaxOccurs, dSGHandler, - bChildren, bMinOccurs, bMaxOccurs, bSGHandler); - return; - } - - case XSModelGroupImpl.MODELGROUP_CHOICE: - { - int min1 = dMinOccurs * dChildren.size(); - int max1 = (dMaxOccurs == SchemaSymbols.OCCURRENCE_UNBOUNDED)? - dMaxOccurs : dMaxOccurs * dChildren.size(); - checkMapAndSum(dChildren, min1, max1, dSGHandler, + + + case XSModelGroupImpl.MODELGROUP_SEQUENCE: + { + switch (bType) { + + // Choice:Any NSRecurseCheckCardinality + case XSParticleDecl.PARTICLE_WILDCARD: + { + if (dMinEffectiveTotalRange == OCCURRENCE_UNKNOWN) + dMinEffectiveTotalRange = dParticle.minEffectiveTotalRange(); + if (dMaxEffectiveTotalRange == OCCURRENCE_UNKNOWN) + dMaxEffectiveTotalRange = dParticle.maxEffectiveTotalRange(); + + checkNSRecurseCheckCardinality(dChildren, dMinEffectiveTotalRange, + dMaxEffectiveTotalRange, + dSGHandler, + bParticle,bMinOccurs,bMaxOccurs, + checkWCOccurrence); + return bExpansionHappened; + } + + case XSModelGroupImpl.MODELGROUP_ALL: + { + checkRecurseUnordered(dChildren, dMinOccurs, dMaxOccurs, dSGHandler, + bChildren, bMinOccurs, bMaxOccurs, bSGHandler); + return bExpansionHappened; + } + + case XSModelGroupImpl.MODELGROUP_SEQUENCE: + { + checkRecurse(dChildren, dMinOccurs, dMaxOccurs, dSGHandler, bChildren, bMinOccurs, bMaxOccurs, bSGHandler); - return; - } - - case XSParticleDecl.PARTICLE_ELEMENT: - { - throw new XMLSchemaException("cos-particle-restrict.2", - new Object[]{"seq:elt"}); - } - - default: - { - throw new XMLSchemaException("Internal-Error", - new Object[]{"in particleValidRestriction"}); - } + return bExpansionHappened; + } + + case XSModelGroupImpl.MODELGROUP_CHOICE: + { + int min1 = dMinOccurs * dChildren.size(); + int max1 = (dMaxOccurs == SchemaSymbols.OCCURRENCE_UNBOUNDED)? + dMaxOccurs : dMaxOccurs * dChildren.size(); + checkMapAndSum(dChildren, min1, max1, dSGHandler, + bChildren, bMinOccurs, bMaxOccurs, bSGHandler); + return bExpansionHappened; + } + + case XSParticleDecl.PARTICLE_ELEMENT: + { + throw new XMLSchemaException("cos-particle-restrict.2", + new Object[]{"seq:elt"}); + } + + default: + { + throw new XMLSchemaException("Internal-Error", + new Object[]{"in particleValidRestriction"}); + } + } } - } - } + } + + return bExpansionHappened; } private static void addElementToParticleVector (Vector v, XSElementDecl d) { - XSParticleDecl p = new XSParticleDecl(); - p.fValue = d; - p.fType = XSParticleDecl.PARTICLE_ELEMENT; - v.addElement(p); + XSParticleDecl p = new XSParticleDecl(); + p.fValue = d; + p.fType = XSParticleDecl.PARTICLE_ELEMENT; + v.addElement(p); } private static XSParticleDecl getNonUnaryGroup(XSParticleDecl p) { - if (p.fType == XSParticleDecl.PARTICLE_ELEMENT || - p.fType == XSParticleDecl.PARTICLE_WILDCARD) - return p; + if (p.fType == XSParticleDecl.PARTICLE_ELEMENT || + p.fType == XSParticleDecl.PARTICLE_WILDCARD) + return p; - if (p.fMinOccurs==1 && p.fMaxOccurs==1 && - p.fValue!=null && ((XSModelGroupImpl)p.fValue).fParticleCount == 1) - return getNonUnaryGroup(((XSModelGroupImpl)p.fValue).fParticles[0]); - else - return p; + if (p.fMinOccurs==1 && p.fMaxOccurs==1 && + p.fValue!=null && ((XSModelGroupImpl)p.fValue).fParticleCount == 1) + return getNonUnaryGroup(((XSModelGroupImpl)p.fValue).fParticles[0]); + else + return p; } private static Vector removePointlessChildren(XSParticleDecl p) { + if (p.fType == XSParticleDecl.PARTICLE_ELEMENT || + p.fType == XSParticleDecl.PARTICLE_WILDCARD) + return null; - if (p.fType == XSParticleDecl.PARTICLE_ELEMENT || - p.fType == XSParticleDecl.PARTICLE_WILDCARD) - return null; - - Vector children = new Vector(); + Vector children = new Vector(); - XSModelGroupImpl group = (XSModelGroupImpl)p.fValue; - for (int i = 0; i < group.fParticleCount; i++) - gatherChildren(group.fCompositor, group.fParticles[i], children); + XSModelGroupImpl group = (XSModelGroupImpl)p.fValue; + for (int i = 0; i < group.fParticleCount; i++) + gatherChildren(group.fCompositor, group.fParticles[i], children); - return children; + return children; } private static void gatherChildren(int parentType, XSParticleDecl p, Vector children) { - int min = p.fMinOccurs; - int max = p.fMaxOccurs; - int type = p.fType; - if (type == XSParticleDecl.PARTICLE_MODELGROUP) - type = ((XSModelGroupImpl)p.fValue).fCompositor; - - if (type == XSParticleDecl.PARTICLE_ELEMENT || - type== XSParticleDecl.PARTICLE_WILDCARD) { - children.addElement(p); - return; - } - - if (! (min==1 && max==1)) { - children.addElement(p); - } - else if (parentType == type) { - XSModelGroupImpl group = (XSModelGroupImpl)p.fValue; - for (int i = 0; i < group.fParticleCount; i++) - gatherChildren(type, group.fParticles[i], children); - } - else if (!p.isEmpty()) { - children.addElement(p); - } + int min = p.fMinOccurs; + int max = p.fMaxOccurs; + int type = p.fType; + if (type == XSParticleDecl.PARTICLE_MODELGROUP) + type = ((XSModelGroupImpl)p.fValue).fCompositor; + + if (type == XSParticleDecl.PARTICLE_ELEMENT || + type== XSParticleDecl.PARTICLE_WILDCARD) { + children.addElement(p); + return; + } + + if (! (min==1 && max==1)) { + children.addElement(p); + } + else if (parentType == type) { + XSModelGroupImpl group = (XSModelGroupImpl)p.fValue; + for (int i = 0; i < group.fParticleCount; i++) + gatherChildren(type, group.fParticles[i], children); + } + else if (!p.isEmpty()) { + children.addElement(p); + } } private static void checkNameAndTypeOK(XSElementDecl dElement, int dMin, int dMax, - XSElementDecl bElement, int bMin, int bMax) - throws XMLSchemaException { - - - // - // Check that the names are the same - // - if (dElement.fName != bElement.fName || - dElement.fTargetNamespace != bElement.fTargetNamespace) { - throw new XMLSchemaException( - "rcase-NameAndTypeOK.1",new Object[]{dElement.fName, - dElement.fTargetNamespace, bElement.fName, bElement.fTargetNamespace}); - } - - // - // Check nillable - // - if (!bElement.getNillable() && dElement.getNillable()) { - throw new XMLSchemaException("rcase-NameAndTypeOK.2", - new Object[]{dElement.fName}); - } - - // - // Check occurrence range - // - if (!checkOccurrenceRange(dMin, dMax, bMin, bMax)) { - throw new XMLSchemaException("rcase-NameAndTypeOK.3", - new Object[]{ - dElement.fName, - Integer.toString(dMin), - dMax==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(dMax), - Integer.toString(bMin), - bMax==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(bMax)}); - } - - // - // Check for consistent fixed values - // - if (bElement.getConstraintType() == XSConstants.VC_FIXED) { - // derived one has to have a fixed value - if (dElement.getConstraintType() != XSConstants.VC_FIXED) { - throw new XMLSchemaException("rcase-NameAndTypeOK.4.a", - new Object[]{dElement.fName, bElement.fDefault.stringValue()}); - } - - // get simple type - boolean isSimple = false; - if (dElement.fType.getTypeCategory() == XSTypeDefinition.SIMPLE_TYPE || - ((XSComplexTypeDecl)dElement.fType).fContentType == XSComplexTypeDecl.CONTENTTYPE_SIMPLE) { - isSimple = true; - } - - // if there is no simple type, then compare based on string - if (!isSimple && !bElement.fDefault.normalizedValue.equals(dElement.fDefault.normalizedValue) || - isSimple && !bElement.fDefault.actualValue.equals(dElement.fDefault.actualValue)) { - throw new XMLSchemaException("rcase-NameAndTypeOK.4.b", - new Object[]{dElement.fName, - dElement.fDefault.stringValue(), - bElement.fDefault.stringValue()}); - } - } - - // - // Check identity constraints - // - checkIDConstraintRestriction(dElement, bElement); - - // - // Check for disallowed substitutions - // - int blockSet1 = dElement.fBlock; - int blockSet2 = bElement.fBlock; - if (((blockSet1 & blockSet2)!=blockSet2) || - (blockSet1==XSConstants.DERIVATION_NONE && blockSet2!=XSConstants.DERIVATION_NONE)) - throw new XMLSchemaException("rcase-NameAndTypeOK.6", - new Object[]{dElement.fName}); - - - // - // Check that the derived element's type is derived from the base's. - // - if (!checkTypeDerivationOk(dElement.fType, bElement.fType, - (short)(XSConstants.DERIVATION_EXTENSION|XSConstants.DERIVATION_LIST|XSConstants.DERIVATION_UNION))) { - throw new XMLSchemaException("rcase-NameAndTypeOK.7", - new Object[]{dElement.fName, dElement.fType.getName(), bElement.fType.getName()}); - } + XSElementDecl bElement, int bMin, int bMax) + throws XMLSchemaException { + + + // + // Check that the names are the same + // + if (dElement.fName != bElement.fName || + dElement.fTargetNamespace != bElement.fTargetNamespace) { + throw new XMLSchemaException( + "rcase-NameAndTypeOK.1",new Object[]{dElement.fName, + dElement.fTargetNamespace, bElement.fName, bElement.fTargetNamespace}); + } + + // + // Check nillable + // + if (!bElement.getNillable() && dElement.getNillable()) { + throw new XMLSchemaException("rcase-NameAndTypeOK.2", + new Object[]{dElement.fName}); + } + + // + // Check occurrence range + // + if (!checkOccurrenceRange(dMin, dMax, bMin, bMax)) { + throw new XMLSchemaException("rcase-NameAndTypeOK.3", + new Object[]{ + dElement.fName, + Integer.toString(dMin), + dMax==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(dMax), + Integer.toString(bMin), + bMax==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(bMax)}); + } + + // + // Check for consistent fixed values + // + if (bElement.getConstraintType() == XSConstants.VC_FIXED) { + // derived one has to have a fixed value + if (dElement.getConstraintType() != XSConstants.VC_FIXED) { + throw new XMLSchemaException("rcase-NameAndTypeOK.4.a", + new Object[]{dElement.fName, bElement.fDefault.stringValue()}); + } + + // get simple type + boolean isSimple = false; + if (dElement.fType.getTypeCategory() == XSTypeDefinition.SIMPLE_TYPE || + ((XSComplexTypeDecl)dElement.fType).fContentType == XSComplexTypeDecl.CONTENTTYPE_SIMPLE) { + isSimple = true; + } + + // if there is no simple type, then compare based on string + if (!isSimple && !bElement.fDefault.normalizedValue.equals(dElement.fDefault.normalizedValue) || + isSimple && !bElement.fDefault.actualValue.equals(dElement.fDefault.actualValue)) { + throw new XMLSchemaException("rcase-NameAndTypeOK.4.b", + new Object[]{dElement.fName, + dElement.fDefault.stringValue(), + bElement.fDefault.stringValue()}); + } + } + + // + // Check identity constraints + // + checkIDConstraintRestriction(dElement, bElement); + + // + // Check for disallowed substitutions + // + int blockSet1 = dElement.fBlock; + int blockSet2 = bElement.fBlock; + if (((blockSet1 & blockSet2)!=blockSet2) || + (blockSet1==XSConstants.DERIVATION_NONE && blockSet2!=XSConstants.DERIVATION_NONE)) + throw new XMLSchemaException("rcase-NameAndTypeOK.6", + new Object[]{dElement.fName}); + + + // + // Check that the derived element's type is derived from the base's. + // + if (!checkTypeDerivationOk(dElement.fType, bElement.fType, + (short)(XSConstants.DERIVATION_EXTENSION|XSConstants.DERIVATION_LIST|XSConstants.DERIVATION_UNION))) { + throw new XMLSchemaException("rcase-NameAndTypeOK.7", + new Object[]{dElement.fName, dElement.fType.getName(), bElement.fType.getName()}); + } } private static void checkIDConstraintRestriction(XSElementDecl derivedElemDecl, - XSElementDecl baseElemDecl) - throws XMLSchemaException { + XSElementDecl baseElemDecl) + throws XMLSchemaException { // TODO } // checkIDConstraintRestriction private static boolean checkOccurrenceRange(int min1, int max1, int min2, int max2) { - if ((min1 >= min2) && - ((max2==SchemaSymbols.OCCURRENCE_UNBOUNDED) || - (max1!=SchemaSymbols.OCCURRENCE_UNBOUNDED && max1<=max2))) - return true; - else - return false; + if ((min1 >= min2) && + ((max2==SchemaSymbols.OCCURRENCE_UNBOUNDED) || + (max1!=SchemaSymbols.OCCURRENCE_UNBOUNDED && max1<=max2))) + return true; + else + return false; } private static void checkNSCompat(XSElementDecl elem, int min1, int max1, - XSWildcardDecl wildcard, int min2, int max2, - boolean checkWCOccurrence) - throws XMLSchemaException { - - // check Occurrence ranges - if (checkWCOccurrence && !checkOccurrenceRange(min1,max1,min2,max2)) { - throw new XMLSchemaException("rcase-NSCompat.2", - new Object[]{ - elem.fName, - Integer.toString(min1), - max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), - Integer.toString(min2), - max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); - } - - // check wildcard allows namespace of element - if (!wildcard.allowNamespace(elem.fTargetNamespace)) { - throw new XMLSchemaException("rcase-NSCompat.1", - new Object[]{elem.fName,elem.fTargetNamespace}); - } + XSWildcardDecl wildcard, int min2, int max2, + boolean checkWCOccurrence) + throws XMLSchemaException { + + // check Occurrence ranges + if (checkWCOccurrence && !checkOccurrenceRange(min1,max1,min2,max2)) { + throw new XMLSchemaException("rcase-NSCompat.2", + new Object[]{ + elem.fName, + Integer.toString(min1), + max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), + Integer.toString(min2), + max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); + } + + // check wildcard allows namespace of element + if (!wildcard.allowNamespace(elem.fTargetNamespace)) { + throw new XMLSchemaException("rcase-NSCompat.1", + new Object[]{elem.fName,elem.fTargetNamespace}); + } } private static void checkNSSubset(XSWildcardDecl dWildcard, int min1, int max1, - XSWildcardDecl bWildcard, int min2, int max2) - throws XMLSchemaException { - - // check Occurrence ranges - if (!checkOccurrenceRange(min1,max1,min2,max2)) { - throw new XMLSchemaException("rcase-NSSubset.2", new Object[]{ - Integer.toString(min1), - max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), - Integer.toString(min2), - max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); - } - - // check wildcard subset - if (!dWildcard.isSubsetOf(bWildcard)) { - throw new XMLSchemaException("rcase-NSSubset.1", null); - } - - if (dWildcard.weakerProcessContents(bWildcard)) { - throw new XMLSchemaException("rcase-NSSubset.3", - new Object[]{dWildcard.getProcessContentsAsString(), - bWildcard.getProcessContentsAsString()}); - } + XSWildcardDecl bWildcard, int min2, int max2) + throws XMLSchemaException { + + // check Occurrence ranges + if (!checkOccurrenceRange(min1,max1,min2,max2)) { + throw new XMLSchemaException("rcase-NSSubset.2", new Object[]{ + Integer.toString(min1), + max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), + Integer.toString(min2), + max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); + } + + // check wildcard subset + if (!dWildcard.isSubsetOf(bWildcard)) { + throw new XMLSchemaException("rcase-NSSubset.1", null); + } + + if (dWildcard.weakerProcessContents(bWildcard)) { + throw new XMLSchemaException("rcase-NSSubset.3", + new Object[]{dWildcard.getProcessContentsAsString(), + bWildcard.getProcessContentsAsString()}); + } } private static void checkNSRecurseCheckCardinality(Vector children, int min1, int max1, - SubstitutionGroupHandler dSGHandler, - XSParticleDecl wildcard, int min2, int max2, - boolean checkWCOccurrence) - throws XMLSchemaException { - - - // check Occurrence ranges - if (checkWCOccurrence && !checkOccurrenceRange(min1,max1,min2,max2)) { - throw new XMLSchemaException("rcase-NSRecurseCheckCardinality.2", new Object[]{ - Integer.toString(min1), - max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), - Integer.toString(min2), - max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); - } - - // Check that each member of the group is a valid restriction of the wildcard - int count = children.size(); - try { - for (int i = 0; i < count; i++) { - XSParticleDecl particle1 = (XSParticleDecl)children.elementAt(i); - particleValidRestriction(particle1, dSGHandler, wildcard, null, false); + SubstitutionGroupHandler dSGHandler, + XSParticleDecl wildcard, int min2, int max2, + boolean checkWCOccurrence) + throws XMLSchemaException { + + + // check Occurrence ranges + if (checkWCOccurrence && !checkOccurrenceRange(min1,max1,min2,max2)) { + throw new XMLSchemaException("rcase-NSRecurseCheckCardinality.2", new Object[]{ + Integer.toString(min1), + max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), + Integer.toString(min2), + max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); + } + // Check that each member of the group is a valid restriction of the wildcard + int count = children.size(); + try { + for (int i = 0; i < count; i++) { + XSParticleDecl particle1 = (XSParticleDecl)children.elementAt(i); + particleValidRestriction(particle1, dSGHandler, wildcard, null, false); + + } + } + // REVISIT: should we really just ignore original cause of this error? + // how can we report it? + catch (XMLSchemaException e) { + throw new XMLSchemaException("rcase-NSRecurseCheckCardinality.1", null); } - } - // REVISIT: should we really just ignore original cause of this error? - // how can we report it? - catch (XMLSchemaException e) { - throw new XMLSchemaException("rcase-NSRecurseCheckCardinality.1", null); - } } private static void checkRecurse(Vector dChildren, int min1, int max1, - SubstitutionGroupHandler dSGHandler, - Vector bChildren, int min2, int max2, - SubstitutionGroupHandler bSGHandler) - throws XMLSchemaException { - - // check Occurrence ranges - if (!checkOccurrenceRange(min1,max1,min2,max2)) { - throw new XMLSchemaException("rcase-Recurse.1", new Object[]{ - Integer.toString(min1), - max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), - Integer.toString(min2), - max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); - } - - int count1= dChildren.size(); - int count2= bChildren.size(); - - int current = 0; - label: for (int i = 0; i<count1; i++) { - - XSParticleDecl particle1 = (XSParticleDecl)dChildren.elementAt(i); - for (int j = current; j<count2; j++) { - XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); - current +=1; - try { - particleValidRestriction(particle1, dSGHandler, particle2, bSGHandler); - continue label; - } - catch (XMLSchemaException e) { - if (!particle2.emptiable()) - throw new XMLSchemaException("rcase-Recurse.2", null); - } + SubstitutionGroupHandler dSGHandler, + Vector bChildren, int min2, int max2, + SubstitutionGroupHandler bSGHandler) + throws XMLSchemaException { + + // check Occurrence ranges + if (!checkOccurrenceRange(min1,max1,min2,max2)) { + throw new XMLSchemaException("rcase-Recurse.1", new Object[]{ + Integer.toString(min1), + max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), + Integer.toString(min2), + max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); } - throw new XMLSchemaException("rcase-Recurse.2", null); - } - - // Now, see if there are some elements in the base we didn't match up - for (int j=current; j < count2; j++) { - XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); - if (!particle2.emptiable()) { - throw new XMLSchemaException("rcase-Recurse.2", null); + + int count1= dChildren.size(); + int count2= bChildren.size(); + + int current = 0; + label: for (int i = 0; i<count1; i++) { + + XSParticleDecl particle1 = (XSParticleDecl)dChildren.elementAt(i); + for (int j = current; j<count2; j++) { + XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); + current +=1; + try { + particleValidRestriction(particle1, dSGHandler, particle2, bSGHandler); + continue label; + } + catch (XMLSchemaException e) { + if (!particle2.emptiable()) + throw new XMLSchemaException("rcase-Recurse.2", null); + } + } + throw new XMLSchemaException("rcase-Recurse.2", null); + } + + // Now, see if there are some elements in the base we didn't match up + for (int j=current; j < count2; j++) { + XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); + if (!particle2.emptiable()) { + throw new XMLSchemaException("rcase-Recurse.2", null); + } } - } } private static void checkRecurseUnordered(Vector dChildren, int min1, int max1, - SubstitutionGroupHandler dSGHandler, - Vector bChildren, int min2, int max2, - SubstitutionGroupHandler bSGHandler) - throws XMLSchemaException { - - - // check Occurrence ranges - if (!checkOccurrenceRange(min1,max1,min2,max2)) { - throw new XMLSchemaException("rcase-RecurseUnordered.1", new Object[]{ - Integer.toString(min1), - max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), - Integer.toString(min2), - max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); - } - - int count1= dChildren.size(); - int count2 = bChildren.size(); - - boolean foundIt[] = new boolean[count2]; - - label: for (int i = 0; i<count1; i++) { - XSParticleDecl particle1 = (XSParticleDecl)dChildren.elementAt(i); - - for (int j = 0; j<count2; j++) { - XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); - try { - particleValidRestriction(particle1, dSGHandler, particle2, bSGHandler); - if (foundIt[j]) - throw new XMLSchemaException("rcase-RecurseUnordered.2", null); - else - foundIt[j]=true; + SubstitutionGroupHandler dSGHandler, + Vector bChildren, int min2, int max2, + SubstitutionGroupHandler bSGHandler) + throws XMLSchemaException { + + + // check Occurrence ranges + if (!checkOccurrenceRange(min1,max1,min2,max2)) { + throw new XMLSchemaException("rcase-RecurseUnordered.1", new Object[]{ + Integer.toString(min1), + max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), + Integer.toString(min2), + max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); + } + + int count1= dChildren.size(); + int count2 = bChildren.size(); - continue label; - } - catch (XMLSchemaException e) { - } + boolean foundIt[] = new boolean[count2]; + + label: for (int i = 0; i<count1; i++) { + XSParticleDecl particle1 = (XSParticleDecl)dChildren.elementAt(i); + + for (int j = 0; j<count2; j++) { + XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); + try { + particleValidRestriction(particle1, dSGHandler, particle2, bSGHandler); + if (foundIt[j]) + throw new XMLSchemaException("rcase-RecurseUnordered.2", null); + else + foundIt[j]=true; + + continue label; + } + catch (XMLSchemaException e) { + } + } + // didn't find a match. Detect an error + throw new XMLSchemaException("rcase-RecurseUnordered.2", null); } - // didn't find a match. Detect an error - throw new XMLSchemaException("rcase-RecurseUnordered.2", null); - } - - // Now, see if there are some elements in the base we didn't match up - for (int j=0; j < count2; j++) { - XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); - if (!foundIt[j] && !particle2.emptiable()) { - throw new XMLSchemaException("rcase-RecurseUnordered.2", null); + + // Now, see if there are some elements in the base we didn't match up + for (int j=0; j < count2; j++) { + XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); + if (!foundIt[j] && !particle2.emptiable()) { + throw new XMLSchemaException("rcase-RecurseUnordered.2", null); + } } - } } private static void checkRecurseLax(Vector dChildren, int min1, int max1, - SubstitutionGroupHandler dSGHandler, - Vector bChildren, int min2, int max2, - SubstitutionGroupHandler bSGHandler) - throws XMLSchemaException { - - // check Occurrence ranges - if (!checkOccurrenceRange(min1,max1,min2,max2)) { - throw new XMLSchemaException("rcase-RecurseLax.1", new Object[]{ - Integer.toString(min1), - max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), - Integer.toString(min2), - max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); - } - - int count1= dChildren.size(); - int count2 = bChildren.size(); - - int current = 0; - label: for (int i = 0; i<count1; i++) { - - XSParticleDecl particle1 = (XSParticleDecl)dChildren.elementAt(i); - for (int j = current; j<count2; j++) { - XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); - current +=1; - try { - particleValidRestriction(particle1, dSGHandler, particle2, bSGHandler); - continue label; - } - catch (XMLSchemaException e) { - } + SubstitutionGroupHandler dSGHandler, + Vector bChildren, int min2, int max2, + SubstitutionGroupHandler bSGHandler) + throws XMLSchemaException { + + // check Occurrence ranges + if (!checkOccurrenceRange(min1,max1,min2,max2)) { + throw new XMLSchemaException("rcase-RecurseLax.1", new Object[]{ + Integer.toString(min1), + max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), + Integer.toString(min2), + max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); } - // didn't find a match. Detect an error - throw new XMLSchemaException("rcase-RecurseLax.2", null); - } + int count1= dChildren.size(); + int count2 = bChildren.size(); + + int current = 0; + label: for (int i = 0; i<count1; i++) { + + XSParticleDecl particle1 = (XSParticleDecl)dChildren.elementAt(i); + for (int j = current; j<count2; j++) { + XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); + current +=1; + try { + // IHR: go back one element on b list because the next element may match + // this as well. + if (particleValidRestriction(particle1, dSGHandler, particle2, bSGHandler)) + current--; + continue label; + } + catch (XMLSchemaException e) { + } + } + // didn't find a match. Detect an error + throw new XMLSchemaException("rcase-RecurseLax.2", null); + + } } private static void checkMapAndSum(Vector dChildren, int min1, int max1, - SubstitutionGroupHandler dSGHandler, - Vector bChildren, int min2, int max2, - SubstitutionGroupHandler bSGHandler) - throws XMLSchemaException { - - // See if the sequence group is a valid restriction of the choice - - // Here is an example of a valid restriction: - // <choice minOccurs="2"> - // <a/> - // <b/> - // <c/> - // </choice> - // - // <sequence> - // <b/> - // <a/> - // </sequence> - - // check Occurrence ranges - if (!checkOccurrenceRange(min1,max1,min2,max2)) { - throw new XMLSchemaException("rcase-MapAndSum.2", - new Object[]{Integer.toString(min1), - max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), - Integer.toString(min2), - max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); - } - - int count1 = dChildren.size(); - int count2 = bChildren.size(); - - label: for (int i = 0; i<count1; i++) { - - XSParticleDecl particle1 = (XSParticleDecl)dChildren.elementAt(i); - for (int j = 0; j<count2; j++) { - XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); - try { - particleValidRestriction(particle1, dSGHandler, particle2, bSGHandler); - continue label; - } - catch (XMLSchemaException e) { - } + SubstitutionGroupHandler dSGHandler, + Vector bChildren, int min2, int max2, + SubstitutionGroupHandler bSGHandler) + throws XMLSchemaException { + + // See if the sequence group is a valid restriction of the choice + + // Here is an example of a valid restriction: + // <choice minOccurs="2"> + // <a/> + // <b/> + // <c/> + // </choice> + // + // <sequence> + // <b/> + // <a/> + // </sequence> + + // check Occurrence ranges + if (!checkOccurrenceRange(min1,max1,min2,max2)) { + throw new XMLSchemaException("rcase-MapAndSum.2", + new Object[]{Integer.toString(min1), + max1==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max1), + Integer.toString(min2), + max2==SchemaSymbols.OCCURRENCE_UNBOUNDED?"unbounded":Integer.toString(max2)}); + } + + int count1 = dChildren.size(); + int count2 = bChildren.size(); + + label: for (int i = 0; i<count1; i++) { + + XSParticleDecl particle1 = (XSParticleDecl)dChildren.elementAt(i); + for (int j = 0; j<count2; j++) { + XSParticleDecl particle2 = (XSParticleDecl)bChildren.elementAt(j); + try { + particleValidRestriction(particle1, dSGHandler, particle2, bSGHandler); + continue label; + } + catch (XMLSchemaException e) { + } + } + // didn't find a match. Detect an error + throw new XMLSchemaException("rcase-MapAndSum.1", null); } - // didn't find a match. Detect an error - throw new XMLSchemaException("rcase-MapAndSum.1", null); - } } // to check whether two element overlap, as defined in constraint UPA public static boolean overlapUPA(XSElementDecl element1, - XSElementDecl element2, - SubstitutionGroupHandler sgHandler) { + XSElementDecl element2, + SubstitutionGroupHandler sgHandler) { // if the two element have the same name and namespace, if (element1.fName == element2.fName && - element1.fTargetNamespace == element2.fTargetNamespace) { + element1.fTargetNamespace == element2.fTargetNamespace) { return true; } @@ -1366,7 +1425,7 @@ public class XSConstraints { XSElementDecl[] subGroup = sgHandler.getSubstitutionGroup(element1); for (int i = subGroup.length-1; i >= 0; i--) { if (subGroup[i].fName == element2.fName && - subGroup[i].fTargetNamespace == element2.fTargetNamespace) { + subGroup[i].fTargetNamespace == element2.fTargetNamespace) { return true; } } @@ -1376,7 +1435,7 @@ public class XSConstraints { subGroup = sgHandler.getSubstitutionGroup(element2); for (int i = subGroup.length-1; i >= 0; i--) { if (subGroup[i].fName == element1.fName && - subGroup[i].fTargetNamespace == element1.fTargetNamespace) { + subGroup[i].fTargetNamespace == element1.fTargetNamespace) { return true; } } @@ -1387,8 +1446,8 @@ public class XSConstraints { // to check whether an element overlaps with a wildcard, // as defined in constraint UPA public static boolean overlapUPA(XSElementDecl element, - XSWildcardDecl wildcard, - SubstitutionGroupHandler sgHandler) { + XSWildcardDecl wildcard, + SubstitutionGroupHandler sgHandler) { // if the wildcard allows the element if (wildcard.allowNamespace(element.fTargetNamespace)) return true; @@ -1404,12 +1463,12 @@ public class XSConstraints { } public static boolean overlapUPA(XSWildcardDecl wildcard1, - XSWildcardDecl wildcard2) { + XSWildcardDecl wildcard2) { // if the intersection of the two wildcard is not empty list XSWildcardDecl intersect = wildcard1.performIntersectionWith(wildcard2, wildcard1.fProcessContents); if (intersect == null || - intersect.fType != XSWildcardDecl.NSCONSTRAINT_LIST || - intersect.fNamespaceList.length != 0) { + intersect.fType != XSWildcardDecl.NSCONSTRAINT_LIST || + intersect.fNamespaceList.length != 0) { return true; } @@ -1418,25 +1477,28 @@ public class XSConstraints { // call one of the above methods according to the type of decls public static boolean overlapUPA(Object decl1, Object decl2, - SubstitutionGroupHandler sgHandler) { + SubstitutionGroupHandler sgHandler) { if (decl1 instanceof XSElementDecl) { if (decl2 instanceof XSElementDecl) { return overlapUPA((XSElementDecl)decl1, - (XSElementDecl)decl2, - sgHandler); - } else { + (XSElementDecl)decl2, + sgHandler); + } + else { return overlapUPA((XSElementDecl)decl1, - (XSWildcardDecl)decl2, - sgHandler); + (XSWildcardDecl)decl2, + sgHandler); } - } else { + } + else { if (decl2 instanceof XSElementDecl) { return overlapUPA((XSElementDecl)decl2, - (XSWildcardDecl)decl1, - sgHandler); - } else { + (XSWildcardDecl)decl1, + sgHandler); + } + else { return overlapUPA((XSWildcardDecl)decl1, - (XSWildcardDecl)decl2); + (XSWildcardDecl)decl2); } } } diff --git a/src/org/apache/xerces/impl/xs/XSDDescription.java b/src/org/apache/xerces/impl/xs/XSDDescription.java index 5f832ec..d35c4d4 100644 --- a/src/org/apache/xerces/impl/xs/XSDDescription.java +++ b/src/org/apache/xerces/impl/xs/XSDDescription.java @@ -1,9 +1,10 @@ /* - * Copyright 2002, 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.xni.grammars.XMLSchemaDescription; * @author Neil Graham, IBM * @author Neeraj Bajaj, SUN Microsystems. * - * @version $Id: XSDDescription.java 320107 2004-10-14 03:49:33Z mrglavas $ + * @version $Id: XSDDescription.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class XSDDescription extends XMLResourceIdentifierImpl implements XMLSchemaDescription { diff --git a/src/org/apache/xerces/impl/xs/XSDeclarationPool.java b/src/org/apache/xerces/impl/xs/XSDeclarationPool.java index 480fa1f..8edcb6e 100644 --- a/src/org/apache/xerces/impl/xs/XSDeclarationPool.java +++ b/src/org/apache/xerces/impl/xs/XSDeclarationPool.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.impl.dv.xs.XSSimpleTypeDecl; * @xerces.internal * * @author Elena Litani, IBM - * @version $Id: XSDeclarationPool.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XSDeclarationPool.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public final class XSDeclarationPool { /** Chunk shift (8). */ diff --git a/src/org/apache/xerces/impl/xs/XSElementDecl.java b/src/org/apache/xerces/impl/xs/XSElementDecl.java index ea5de8a..9798303 100644 --- a/src/org/apache/xerces/impl/xs/XSElementDecl.java +++ b/src/org/apache/xerces/impl/xs/XSElementDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,13 +33,13 @@ import org.apache.xerces.impl.xs.util.XSObjectListImpl; /** * The XML representation for an element declaration - * schema component is an <element> element information item + * schema component is an <element> element information item * * @xerces.internal * * @author Elena Litani, IBM * @author Sandy Gao, IBM - * @version $Id: XSElementDecl.java 388853 2006-03-25 23:05:56Z mrglavas $ + * @version $Id: XSElementDecl.java 449424 2006-09-24 16:22:30Z mrglavas $ */ public class XSElementDecl implements XSElementDeclaration { diff --git a/src/org/apache/xerces/impl/xs/XSGrammarBucket.java b/src/org/apache/xerces/impl/xs/XSGrammarBucket.java index 7ea57c3..2f20940 100644 --- a/src/org/apache/xerces/impl/xs/XSGrammarBucket.java +++ b/src/org/apache/xerces/impl/xs/XSGrammarBucket.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import java.util.Vector; * @xerces.internal * * @author Sandy Gao, IBM - * @version $Id: XSGrammarBucket.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XSGrammarBucket.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class XSGrammarBucket { diff --git a/src/org/apache/xerces/impl/xs/XSGroupDecl.java b/src/org/apache/xerces/impl/xs/XSGroupDecl.java index de22e26..58bb034 100644 --- a/src/org/apache/xerces/impl/xs/XSGroupDecl.java +++ b/src/org/apache/xerces/impl/xs/XSGroupDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,12 +22,12 @@ import org.apache.xerces.xs.*; /** * The XML representation for a group declaration - * schema component is a global <group> element information item + * schema component is a global <group> element information item * * @xerces.internal * * @author Sandy Gao, IBM - * @version $Id: XSGroupDecl.java 388853 2006-03-25 23:05:56Z mrglavas $ + * @version $Id: XSGroupDecl.java 449424 2006-09-24 16:22:30Z mrglavas $ */ public class XSGroupDecl implements XSModelGroupDefinition { diff --git a/src/org/apache/xerces/impl/xs/XSImplementationImpl.java b/src/org/apache/xerces/impl/xs/XSImplementationImpl.java index 782f5f5..123f633 100644 --- a/src/org/apache/xerces/impl/xs/XSImplementationImpl.java +++ b/src/org/apache/xerces/impl/xs/XSImplementationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,7 +35,7 @@ import org.w3c.dom.DOMImplementation; * @xerces.internal * * @author Elena Litani, IBM - * @version $Id: XSImplementationImpl.java 320158 2004-12-08 22:49:05Z mrglavas $ + * @version $Id: XSImplementationImpl.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class XSImplementationImpl extends CoreDOMImplementationImpl implements XSImplementation { diff --git a/src/org/apache/xerces/impl/xs/XSLoaderImpl.java b/src/org/apache/xerces/impl/xs/XSLoaderImpl.java index 7476ccb..4684f4b 100644 --- a/src/org/apache/xerces/impl/xs/XSLoaderImpl.java +++ b/src/org/apache/xerces/impl/xs/XSLoaderImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -42,7 +43,7 @@ import org.w3c.dom.ls.LSInput; * * @author Michael Glavassevich, IBM * - * @version $Id: XSLoaderImpl.java 406145 2006-05-13 19:39:24Z mrglavas $ + * @version $Id: XSLoaderImpl.java 449487 2006-09-24 21:11:28Z mrglavas $ */ public final class XSLoaderImpl implements XSLoader, DOMConfiguration { @@ -94,7 +95,7 @@ public final class XSLoaderImpl implements XSLoader, DOMConfiguration { * Parses the content of XML Schema documents specified as the list of URI * references. If the URI contains a fragment identifier, the behavior * is not defined by this specification. - * @param uri The list of URI locations. + * @param uriList The list of URI locations. * @return An XSModel representing the schema documents. */ public XSModel loadURIList(StringList uriList) { diff --git a/src/org/apache/xerces/impl/xs/XSMessageFormatter.java b/src/org/apache/xerces/impl/xs/XSMessageFormatter.java index de8cf15..be41b0a 100644 --- a/src/org/apache/xerces/impl/xs/XSMessageFormatter.java +++ b/src/org/apache/xerces/impl/xs/XSMessageFormatter.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.util.MessageFormatter; * @xerces.internal * * @author Elena Litani, IBM - * @version $Id: XSMessageFormatter.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XSMessageFormatter.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class XSMessageFormatter implements MessageFormatter { /** diff --git a/src/org/apache/xerces/impl/xs/XSModelGroupImpl.java b/src/org/apache/xerces/impl/xs/XSModelGroupImpl.java index 65df4bf..60e81ae 100644 --- a/src/org/apache/xerces/impl/xs/XSModelGroupImpl.java +++ b/src/org/apache/xerces/impl/xs/XSModelGroupImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2002-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.impl.xs.util.XSObjectListImpl; * * @author Sandy Gao, IBM * - * @version $Id: XSModelGroupImpl.java 388853 2006-03-25 23:05:56Z mrglavas $ + * @version $Id: XSModelGroupImpl.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class XSModelGroupImpl implements XSModelGroup { diff --git a/src/org/apache/xerces/impl/xs/XSModelImpl.java b/src/org/apache/xerces/impl/xs/XSModelImpl.java index dbacb78..f625442 100644 --- a/src/org/apache/xerces/impl/xs/XSModelImpl.java +++ b/src/org/apache/xerces/impl/xs/XSModelImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2002-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -46,7 +47,7 @@ import org.apache.xerces.util.XMLSymbols; * * @author Sandy Gao, IBM * - * @version $Id: XSModelImpl.java 427010 2006-07-31 04:08:07Z mrglavas $ + * @version $Id: XSModelImpl.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class XSModelImpl implements XSModel { diff --git a/src/org/apache/xerces/impl/xs/XSNotationDecl.java b/src/org/apache/xerces/impl/xs/XSNotationDecl.java index 123d934..290633d 100644 --- a/src/org/apache/xerces/impl/xs/XSNotationDecl.java +++ b/src/org/apache/xerces/impl/xs/XSNotationDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,12 +26,12 @@ import org.apache.xerces.xs.XSObjectList; /** * The XML representation for a NOTATION declaration - * schema component is a global <notation> element information item + * schema component is a global <notation> element information item * * @xerces.internal * * @author Rahul Srivastava, Sun Microsystems Inc. - * @version $Id: XSNotationDecl.java 388853 2006-03-25 23:05:56Z mrglavas $ + * @version $Id: XSNotationDecl.java 449424 2006-09-24 16:22:30Z mrglavas $ */ public class XSNotationDecl implements XSNotationDeclaration { diff --git a/src/org/apache/xerces/impl/xs/XSParticleDecl.java b/src/org/apache/xerces/impl/xs/XSParticleDecl.java index 0185145..a68c47c 100644 --- a/src/org/apache/xerces/impl/xs/XSParticleDecl.java +++ b/src/org/apache/xerces/impl/xs/XSParticleDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.xs.XSTerm; * * @author Sandy Gao, IBM * - * @version $Id: XSParticleDecl.java 388853 2006-03-25 23:05:56Z mrglavas $ + * @version $Id: XSParticleDecl.java 446734 2006-09-15 20:51:23Z mrglavas $ */ public class XSParticleDecl implements XSParticle { diff --git a/src/org/apache/xerces/impl/xs/XSWildcardDecl.java b/src/org/apache/xerces/impl/xs/XSWildcardDecl.java index 2b7aa60..e109ebc 100644 --- a/src/org/apache/xerces/impl/xs/XSWildcardDecl.java +++ b/src/org/apache/xerces/impl/xs/XSWildcardDecl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,14 +28,14 @@ import org.apache.xerces.impl.xs.util.XSObjectListImpl; /** * The XML representation for a wildcard declaration - * schema component is an <any> or <anyAttribute> element information item + * schema component is an <any> or <anyAttribute> element information item * * @xerces.internal * * @author Sandy Gao, IBM * @author Rahul Srivastava, Sun Microsystems Inc. * - * @version $Id: XSWildcardDecl.java 388853 2006-03-25 23:05:56Z mrglavas $ + * @version $Id: XSWildcardDecl.java 449424 2006-09-24 16:22:30Z mrglavas $ */ public class XSWildcardDecl implements XSWildcard { diff --git a/src/org/apache/xerces/impl/xs/identity/Field.java b/src/org/apache/xerces/impl/xs/identity/Field.java index 8faa6de..aeeb313 100644 --- a/src/org/apache/xerces/impl/xs/identity/Field.java +++ b/src/org/apache/xerces/impl/xs/identity/Field.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import org.apache.xerces.xs.XSTypeDefinition; * @xerces.internal * * @author Andy Clark, IBM - * @version $Id: Field.java 381385 2006-02-27 17:09:34Z mrglavas $ + * @version $Id: Field.java 446732 2006-09-15 20:47:34Z mrglavas $ */ public class Field { diff --git a/src/org/apache/xerces/impl/xs/identity/FieldActivator.java b/src/org/apache/xerces/impl/xs/identity/FieldActivator.java index 6290897..099967b 100644 --- a/src/org/apache/xerces/impl/xs/identity/FieldActivator.java +++ b/src/org/apache/xerces/impl/xs/identity/FieldActivator.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ package org.apache.xerces.impl.xs.identity; * * @author Andy Clark, IBM * - * @version $Id: FieldActivator.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: FieldActivator.java 446732 2006-09-15 20:47:34Z mrglavas $ */ public interface FieldActivator { diff --git a/src/org/apache/xerces/impl/xs/identity/IdentityConstraint.java b/src/org/apache/xerces/impl/xs/identity/IdentityConstraint.java index fc22284..68b0ce1 100644 --- a/src/org/apache/xerces/impl/xs/identity/IdentityConstraint.java +++ b/src/org/apache/xerces/impl/xs/identity/IdentityConstraint.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.apache.xerces.impl.xs.XSAnnotationImpl; * @xerces.internal * * @author Andy Clark, IBM - * @version $Id: IdentityConstraint.java 320527 2005-06-23 19:16:20Z mrglavas $ + * @version $Id: IdentityConstraint.java 446732 2006-09-15 20:47:34Z mrglavas $ */ public abstract class IdentityConstraint implements XSIDCDefinition { diff --git a/src/org/apache/xerces/impl/xs/identity/KeyRef.java b/src/org/apache/xerces/impl/xs/identity/KeyRef.java index 40e6ae6..1144e24 100644 --- a/src/org/apache/xerces/impl/xs/identity/KeyRef.java +++ b/src/org/apache/xerces/impl/xs/identity/KeyRef.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.apache.xerces.xs.XSIDCDefinition; * @xerces.internal * * @author Andy Clark, IBM - * @version $Id: KeyRef.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: KeyRef.java 446732 2006-09-15 20:47:34Z mrglavas $ */ public class KeyRef extends IdentityConstraint { diff --git a/src/org/apache/xerces/impl/xs/identity/Selector.java b/src/org/apache/xerces/impl/xs/identity/Selector.java index 376e85b..8b030df 100644 --- a/src/org/apache/xerces/impl/xs/identity/Selector.java +++ b/src/org/apache/xerces/impl/xs/identity/Selector.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -18,6 +19,7 @@ package org.apache.xerces.impl.xs.identity; import org.apache.xerces.impl.xpath.XPathException; import org.apache.xerces.util.SymbolTable; +import org.apache.xerces.util.XMLChar; import org.apache.xerces.xni.NamespaceContext; import org.apache.xerces.xni.QName; import org.apache.xerces.xni.XMLAttributes; @@ -30,7 +32,7 @@ import org.apache.xerces.xs.XSTypeDefinition; * @xerces.internal * * @author Andy Clark, IBM - * @version $Id: Selector.java 320342 2005-05-09 21:03:33Z ankitp $ + * @version $Id: Selector.java 469584 2006-10-31 17:57:34Z mrglavas $ */ public class Selector { @@ -101,7 +103,7 @@ public class Selector { * Schema identity constraint selector XPath expression. * * @author Andy Clark, IBM - * @version $Id: Selector.java 320342 2005-05-09 21:03:33Z ankitp $ + * @version $Id: Selector.java 469584 2006-10-31 17:57:34Z mrglavas $ */ public static class XPath extends org.apache.xerces.impl.xpath.XPath { @@ -136,7 +138,7 @@ public class Selector { StringBuffer modifiedXPath = new StringBuffer(xpath.length()+5); int unionIndex = -1; do { - if(!(xpath.trim().startsWith("/") ||xpath.trim().startsWith("."))) { + if(!(XMLChar.trim(xpath).startsWith("/") || XMLChar.trim(xpath).startsWith("."))) { modifiedXPath.append("./"); } unionIndex = xpath.indexOf('|'); diff --git a/src/org/apache/xerces/impl/xs/identity/UniqueOrKey.java b/src/org/apache/xerces/impl/xs/identity/UniqueOrKey.java index 3ae411e..e8048e6 100644 --- a/src/org/apache/xerces/impl/xs/identity/UniqueOrKey.java +++ b/src/org/apache/xerces/impl/xs/identity/UniqueOrKey.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ package org.apache.xerces.impl.xs.identity; * @xerces.internal * * @author Andy Clark, IBM - * @version $Id: UniqueOrKey.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: UniqueOrKey.java 446732 2006-09-15 20:47:34Z mrglavas $ */ public class UniqueOrKey extends IdentityConstraint { diff --git a/src/org/apache/xerces/impl/xs/identity/ValueStore.java b/src/org/apache/xerces/impl/xs/identity/ValueStore.java index ca275b8..6e658d3 100644 --- a/src/org/apache/xerces/impl/xs/identity/ValueStore.java +++ b/src/org/apache/xerces/impl/xs/identity/ValueStore.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.apache.xerces.xs.ShortList; * * @author Andy Clark, IBM * - * @version $Id: ValueStore.java 320342 2005-05-09 21:03:33Z ankitp $ + * @version $Id: ValueStore.java 446732 2006-09-15 20:47:34Z mrglavas $ */ public interface ValueStore { diff --git a/src/org/apache/xerces/impl/xs/identity/XPathMatcher.java b/src/org/apache/xerces/impl/xs/identity/XPathMatcher.java index d145141..b9b04ab 100644 --- a/src/org/apache/xerces/impl/xs/identity/XPathMatcher.java +++ b/src/org/apache/xerces/impl/xs/identity/XPathMatcher.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,7 +35,7 @@ import org.xml.sax.SAXException; * * @author Andy Clark, IBM * - * @version $Id: XPathMatcher.java 320342 2005-05-09 21:03:33Z ankitp $ + * @version $Id: XPathMatcher.java 471030 2006-11-03 22:43:26Z mrglavas $ */ public class XPathMatcher { @@ -202,7 +203,7 @@ public class XPathMatcher { * * @throws SAXException Thrown by handler to signal an error. */ - public void startElement(QName element, XMLAttributes attributes){ + public void startElement(QName element, XMLAttributes attributes) { if (DEBUG_METHODS2) { System.out.println(toString()+"#startElement("+ "element={"+element+"},"+ @@ -210,7 +211,7 @@ public class XPathMatcher { ")"); } - for(int i = 0; i < fLocationPaths.length; i++) { + for (int i = 0; i < fLocationPaths.length; i++) { // push context int startStep = fCurrentStep[i]; fStepIndexes[i].push(startStep); @@ -278,18 +279,16 @@ public class XPathMatcher { if (DEBUG_MATCH) { System.out.println(toString()+" [CHILD] before"); } - if (nodeTest.type == XPath.NodeTest.QNAME) { - if (!nodeTest.name.equals(element)) { - if(fCurrentStep[i] > descendantStep) { - fCurrentStep[i] = descendantStep; - continue; - } - fNoMatchDepth[i]++; - if (DEBUG_MATCH) { - System.out.println(toString()+" [CHILD] after NO MATCH"); - } + if (!matches(nodeTest, element)) { + if (fCurrentStep[i] > descendantStep) { + fCurrentStep[i] = descendantStep; continue; } + fNoMatchDepth[i]++; + if (DEBUG_MATCH) { + System.out.println(toString()+" [CHILD] after NO MATCH"); + } + continue; } fCurrentStep[i]++; if (DEBUG_MATCH) { @@ -297,10 +296,11 @@ public class XPathMatcher { } } if (fCurrentStep[i] == steps.length) { - if(sawDescendant) { + if (sawDescendant) { fCurrentStep[i] = descendantStep; fMatched[i] = MATCHED_DESCENDANT; - } else { + } + else { fMatched[i] = MATCHED; } continue; @@ -318,14 +318,13 @@ public class XPathMatcher { for (int aIndex = 0; aIndex < attrCount; aIndex++) { attributes.getName(aIndex, fQName); - if (nodeTest.type != XPath.NodeTest.QNAME || - nodeTest.name.equals(fQName)) { + if (matches(nodeTest, fQName)) { fCurrentStep[i]++; if (fCurrentStep[i] == steps.length) { fMatched[i] = MATCHED_ATTRIBUTE; - int j=0; - for(; j<i && ((fMatched[j] & MATCHED) != MATCHED); j++); - if(j==i) { + int j = 0; + for(; j < i && ((fMatched[j] & MATCHED) != MATCHED); j++); + if (j == i) { AttributePSVI attrPSVI = (AttributePSVI)attributes.getAugmentations(aIndex).getItem(Constants.ATTRIBUTE_PSVI); fMatchedString = attrPSVI.getActualNormalizedValue(); matched(fMatchedString, attrPSVI.getActualNormalizedValueType(), attrPSVI.getItemValueTypes(), false); @@ -375,7 +374,7 @@ public class XPathMatcher { "element={"+element+"},"+ ")"); } - for(int i = 0; i<fLocationPaths.length; i++) { + for (int i = 0; i < fLocationPaths.length; i++) { // go back a step fCurrentStep[i] = fStepIndexes[i].pop(); @@ -386,9 +385,9 @@ public class XPathMatcher { // signal match, if appropriate else { - int j=0; - for(; j<i && ((fMatched[j] & MATCHED) != MATCHED); j++); - if ((j<i) || (fMatched[j] == 0) || + int j = 0; + for(; j < i && ((fMatched[j] & MATCHED) != MATCHED); j++); + if ((j < i) || (fMatched[j] == 0) || ((fMatched[j] & MATCHED_ATTRIBUTE) == MATCHED_ATTRIBUTE)) { continue; } @@ -466,6 +465,18 @@ public class XPathMatcher { } return str.toString(); } // normalize(String):String + + /** Returns true if the given QName matches the node test. **/ + private static boolean matches(XPath.NodeTest nodeTest, QName value) { + if (nodeTest.type == XPath.NodeTest.QNAME) { + return nodeTest.name.equals(value); + } + if (nodeTest.type == XPath.NodeTest.NAMESPACE) { + return nodeTest.name.uri == value.uri; + } + // XPath.NodeTest.WILDCARD + return true; + } // matches(XPath.NodeTest,QName):boolean // // MAIN diff --git a/src/org/apache/xerces/impl/xs/models/CMBuilder.java b/src/org/apache/xerces/impl/xs/models/CMBuilder.java index f42f7bf..fdebea1 100644 --- a/src/org/apache/xerces/impl/xs/models/CMBuilder.java +++ b/src/org/apache/xerces/impl/xs/models/CMBuilder.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import org.apache.xerces.impl.xs.XSParticleDecl; * @author Elena Litani, IBM * @author Sandy Gao, IBM * - * @version $Id: CMBuilder.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: CMBuilder.java 446729 2006-09-15 20:44:44Z mrglavas $ */ public class CMBuilder { diff --git a/src/org/apache/xerces/impl/xs/models/CMNodeFactory.java b/src/org/apache/xerces/impl/xs/models/CMNodeFactory.java index 614202d..6258f2a 100644 --- a/src/org/apache/xerces/impl/xs/models/CMNodeFactory.java +++ b/src/org/apache/xerces/impl/xs/models/CMNodeFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,8 @@ import org.apache.xerces.impl.Constants; * @xerces.internal * * @author Neeraj Bajaj - * + * + * @version $Id: CMNodeFactory.java 476309 2006-11-17 20:49:31Z mrglavas $ */ public class CMNodeFactory { diff --git a/src/org/apache/xerces/impl/xs/models/XSAllCM.java b/src/org/apache/xerces/impl/xs/models/XSAllCM.java index b6ccec2..3f419fa 100644 --- a/src/org/apache/xerces/impl/xs/models/XSAllCM.java +++ b/src/org/apache/xerces/impl/xs/models/XSAllCM.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,12 +26,12 @@ import org.apache.xerces.impl.xs.XSConstraints; import java.util.Vector; /** - * XSAllCM implements XSCMValidator and handles <all> + * XSAllCM implements XSCMValidator and handles <all>. * * @xerces.internal * * @author Pavani Mukthipudi, Sun Microsystems Inc. - * @version $Id: XSAllCM.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XSAllCM.java 449424 2006-09-24 16:22:30Z mrglavas $ */ public class XSAllCM implements XSCMValidator { diff --git a/src/org/apache/xerces/impl/xs/models/XSCMBinOp.java b/src/org/apache/xerces/impl/xs/models/XSCMBinOp.java index 92c5cb9..47b0c96 100644 --- a/src/org/apache/xerces/impl/xs/models/XSCMBinOp.java +++ b/src/org/apache/xerces/impl/xs/models/XSCMBinOp.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.impl.xs.XSModelGroupImpl; * @xerces.internal * * @author Neil Graham, IBM - * @version $$ + * @version $Id: XSCMBinOp.java 476309 2006-11-17 20:49:31Z mrglavas $ */ public class XSCMBinOp extends CMNode { // ------------------------------------------------------------------- diff --git a/src/org/apache/xerces/impl/xs/models/XSCMLeaf.java b/src/org/apache/xerces/impl/xs/models/XSCMLeaf.java index a4100dc..43bbc5a 100644 --- a/src/org/apache/xerces/impl/xs/models/XSCMLeaf.java +++ b/src/org/apache/xerces/impl/xs/models/XSCMLeaf.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import org.apache.xerces.impl.dtd.models.CMStateSet; * @xerces.internal * * @author Neil Graham, IBM - * @version $$ + * @version $Id: XSCMLeaf.java 476309 2006-11-17 20:49:31Z mrglavas $ */ public class XSCMLeaf extends CMNode { diff --git a/src/org/apache/xerces/impl/xs/models/XSCMUniOp.java b/src/org/apache/xerces/impl/xs/models/XSCMUniOp.java index 2c7fbc7..beda608 100644 --- a/src/org/apache/xerces/impl/xs/models/XSCMUniOp.java +++ b/src/org/apache/xerces/impl/xs/models/XSCMUniOp.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.impl.xs.XSParticleDecl; * @xerces.internal * * @author Neil Graham, IBM - * @version $$ + * @version $Id: XSCMUniOp.java 476309 2006-11-17 20:49:31Z mrglavas $ */ public class XSCMUniOp extends CMNode { // ------------------------------------------------------------------- diff --git a/src/org/apache/xerces/impl/xs/models/XSCMValidator.java b/src/org/apache/xerces/impl/xs/models/XSCMValidator.java index d4afe58..efb8bf3 100644 --- a/src/org/apache/xerces/impl/xs/models/XSCMValidator.java +++ b/src/org/apache/xerces/impl/xs/models/XSCMValidator.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import java.util.Vector; * * @author Sandy Gao, IBM * @author Elena Litani, IBM - * @version $Id: XSCMValidator.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XSCMValidator.java 446729 2006-09-15 20:44:44Z mrglavas $ */ public interface XSCMValidator { diff --git a/src/org/apache/xerces/impl/xs/models/XSDFACM.java b/src/org/apache/xerces/impl/xs/models/XSDFACM.java index bbd72cf..73672e0 100644 --- a/src/org/apache/xerces/impl/xs/models/XSDFACM.java +++ b/src/org/apache/xerces/impl/xs/models/XSDFACM.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -39,7 +40,7 @@ import org.apache.xerces.xni.QName; * @xerces.internal * * @author Neil Graham, IBM - * @version $Id: XSDFACM.java 388860 2006-03-25 23:50:16Z mrglavas $ + * @version $Id: XSDFACM.java 446729 2006-09-15 20:44:44Z mrglavas $ */ public class XSDFACM implements XSCMValidator { diff --git a/src/org/apache/xerces/impl/xs/models/XSEmptyCM.java b/src/org/apache/xerces/impl/xs/models/XSEmptyCM.java index c4bd200..da615e2 100644 --- a/src/org/apache/xerces/impl/xs/models/XSEmptyCM.java +++ b/src/org/apache/xerces/impl/xs/models/XSEmptyCM.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import java.util.Vector; * * @author Elena Litani, Lisa Martin * @author IBM - * @version $Id: XSEmptyCM.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XSEmptyCM.java 446729 2006-09-15 20:44:44Z mrglavas $ */ public class XSEmptyCM implements XSCMValidator { diff --git a/src/org/apache/xerces/impl/xs/opti/AttrImpl.java b/src/org/apache/xerces/impl/xs/opti/AttrImpl.java index ee2a22d..f112ae4 100644 --- a/src/org/apache/xerces/impl/xs/opti/AttrImpl.java +++ b/src/org/apache/xerces/impl/xs/opti/AttrImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.w3c.dom.DOMException; * * @author Rahul Srivastava, Sun Microsystems Inc. * - * @version $Id: AttrImpl.java 320295 2005-05-02 22:02:22Z mrglavas $ + * @version $Id: AttrImpl.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class AttrImpl extends NodeImpl implements Attr { diff --git a/src/org/apache/xerces/impl/xs/opti/DefaultDocument.java b/src/org/apache/xerces/impl/xs/opti/DefaultDocument.java index 97ea9de..380434d 100644 --- a/src/org/apache/xerces/impl/xs/opti/DefaultDocument.java +++ b/src/org/apache/xerces/impl/xs/opti/DefaultDocument.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -39,7 +40,7 @@ import org.w3c.dom.DOMException; * * @author Rahul Srivastava, Sun Microsystems Inc. * - * @version $Id: DefaultDocument.java 320295 2005-05-02 22:02:22Z mrglavas $ + * @version $Id: DefaultDocument.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class DefaultDocument extends NodeImpl implements Document { diff --git a/src/org/apache/xerces/impl/xs/opti/DefaultElement.java b/src/org/apache/xerces/impl/xs/opti/DefaultElement.java index 2c2ab2b..d69dec4 100644 --- a/src/org/apache/xerces/impl/xs/opti/DefaultElement.java +++ b/src/org/apache/xerces/impl/xs/opti/DefaultElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.w3c.dom.DOMException; * * @author Rahul Srivastava, Sun Microsystems Inc. * - * @version $Id: DefaultElement.java 320295 2005-05-02 22:02:22Z mrglavas $ + * @version $Id: DefaultElement.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class DefaultElement extends NodeImpl implements Element { diff --git a/src/org/apache/xerces/impl/xs/opti/DefaultNode.java b/src/org/apache/xerces/impl/xs/opti/DefaultNode.java index dc312e8..131fd44 100644 --- a/src/org/apache/xerces/impl/xs/opti/DefaultNode.java +++ b/src/org/apache/xerces/impl/xs/opti/DefaultNode.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.w3c.dom.DOMException; * * @author Rahul Srivastava, Sun Microsystems Inc. * - * @version $Id: DefaultNode.java 320295 2005-05-02 22:02:22Z mrglavas $ + * @version $Id: DefaultNode.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class DefaultNode implements Node { diff --git a/src/org/apache/xerces/impl/xs/opti/DefaultText.java b/src/org/apache/xerces/impl/xs/opti/DefaultText.java index a87e7fd..87bd6f5 100644 --- a/src/org/apache/xerces/impl/xs/opti/DefaultText.java +++ b/src/org/apache/xerces/impl/xs/opti/DefaultText.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,10 +20,6 @@ package org.apache.xerces.impl.xs.opti; import org.w3c.dom.Text; import org.w3c.dom.DOMException; -/* - * @author Neil Graham, IBM - * @version $Id: DefaultText.java 320098 2004-10-06 15:14:55Z mrglavas $ - */ /** * The <code>Text</code> interface inherits from <code>CharacterData</code> * and represents the textual content (termed character data in XML) of an @@ -45,7 +42,11 @@ import org.w3c.dom.DOMException; * * This is an empty implementation. * - * @xerces.internal + * @xerces.internal + * + * @author Neil Graham, IBM + * + * @version $Id: DefaultText.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class DefaultText extends NodeImpl implements Text { diff --git a/src/org/apache/xerces/impl/xs/opti/DefaultXMLDocumentHandler.java b/src/org/apache/xerces/impl/xs/opti/DefaultXMLDocumentHandler.java index 4d2d5c6..4914878 100644 --- a/src/org/apache/xerces/impl/xs/opti/DefaultXMLDocumentHandler.java +++ b/src/org/apache/xerces/impl/xs/opti/DefaultXMLDocumentHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -38,7 +39,7 @@ import org.apache.xerces.xni.XNIException; * @author Rahul Srivastava, Sun Microsystems Inc. * @author Sandy Gao, IBM * - * @version $Id: DefaultXMLDocumentHandler.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: DefaultXMLDocumentHandler.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class DefaultXMLDocumentHandler implements XMLDocumentHandler, XMLDTDHandler, diff --git a/src/org/apache/xerces/impl/xs/opti/ElementImpl.java b/src/org/apache/xerces/impl/xs/opti/ElementImpl.java index 406be41..144e51f 100644 --- a/src/org/apache/xerces/impl/xs/opti/ElementImpl.java +++ b/src/org/apache/xerces/impl/xs/opti/ElementImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001,2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.w3c.dom.Node; * @author Rahul Srivastava, Sun Microsystems Inc. * @author Sandy Gao, IBM * - * @version $Id: ElementImpl.java 320582 2005-09-15 22:08:26Z mrglavas $ + * @version $Id: ElementImpl.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class ElementImpl extends DefaultElement { diff --git a/src/org/apache/xerces/impl/xs/opti/NamedNodeMapImpl.java b/src/org/apache/xerces/impl/xs/opti/NamedNodeMapImpl.java index aff1846..cfeaf94 100644 --- a/src/org/apache/xerces/impl/xs/opti/NamedNodeMapImpl.java +++ b/src/org/apache/xerces/impl/xs/opti/NamedNodeMapImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.w3c.dom.DOMException; * * @author Rahul Srivastava, Sun Microsystems Inc. * - * @version $Id: NamedNodeMapImpl.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: NamedNodeMapImpl.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class NamedNodeMapImpl implements NamedNodeMap { diff --git a/src/org/apache/xerces/impl/xs/opti/NodeImpl.java b/src/org/apache/xerces/impl/xs/opti/NodeImpl.java index 3752c70..7b53054 100644 --- a/src/org/apache/xerces/impl/xs/opti/NodeImpl.java +++ b/src/org/apache/xerces/impl/xs/opti/NodeImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.xerces.impl.xs.opti; * * @author Rahul Srivastava, Sun Microsystems Inc. * - * @version $Id: NodeImpl.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: NodeImpl.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class NodeImpl extends DefaultNode { diff --git a/src/org/apache/xerces/impl/xs/opti/SchemaDOM.java b/src/org/apache/xerces/impl/xs/opti/SchemaDOM.java index 3d7cd8c..91806ac 100644 --- a/src/org/apache/xerces/impl/xs/opti/SchemaDOM.java +++ b/src/org/apache/xerces/impl/xs/opti/SchemaDOM.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -35,7 +36,7 @@ import org.w3c.dom.Node; * @author Rahul Srivastava, Sun Microsystems Inc. * @author Sandy Gao, IBM * - * @version $Id: SchemaDOM.java 388860 2006-03-25 23:50:16Z mrglavas $ + * @version $Id: SchemaDOM.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class SchemaDOM extends DefaultDocument { diff --git a/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java b/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java index 032f014..7718735 100644 --- a/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java +++ b/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -42,7 +43,7 @@ import org.w3c.dom.Document; * @author Rahul Srivastava, Sun Microsystems Inc. * @author Sandy Gao, IBM * - * @version $Id: SchemaDOMParser.java 381533 2006-02-28 01:36:10Z mrglavas $ + * @version $Id: SchemaDOMParser.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class SchemaDOMParser extends DefaultXMLDocumentHandler { diff --git a/src/org/apache/xerces/impl/xs/opti/SchemaParsingConfig.java b/src/org/apache/xerces/impl/xs/opti/SchemaParsingConfig.java index a4afa31..6a55695 100644 --- a/src/org/apache/xerces/impl/xs/opti/SchemaParsingConfig.java +++ b/src/org/apache/xerces/impl/xs/opti/SchemaParsingConfig.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,10 +21,14 @@ import java.io.IOException; import java.util.Locale; import org.apache.xerces.impl.Constants; +import org.apache.xerces.impl.XML11DTDScannerImpl; +import org.apache.xerces.impl.XML11NSDocumentScannerImpl; import org.apache.xerces.impl.XMLDTDScannerImpl; +import org.apache.xerces.impl.XMLEntityHandler; import org.apache.xerces.impl.XMLEntityManager; import org.apache.xerces.impl.XMLErrorReporter; import org.apache.xerces.impl.XMLNSDocumentScannerImpl; +import org.apache.xerces.impl.XMLVersionDetector; import org.apache.xerces.impl.dv.DTDDVFactory; import org.apache.xerces.impl.msg.XMLMessageFormatter; import org.apache.xerces.impl.validation.ValidationManager; @@ -42,21 +47,23 @@ import org.apache.xerces.xni.parser.XMLInputSource; import org.apache.xerces.xni.parser.XMLPullParserConfiguration; import org.w3c.dom.Document; - /** * @xerces.internal * * @author Rahul Srivastava, Sun Microsystems Inc. * - * @version $Id: SchemaParsingConfig.java 320175 2004-12-16 16:45:20Z ankitp $ + * @version $Id: SchemaParsingConfig.java 467849 2006-10-26 03:16:00Z mrglavas $ */ public class SchemaParsingConfig extends BasicParserConfiguration -implements XMLPullParserConfiguration { + implements XMLPullParserConfiguration { // // Constants // + protected final static String XML11_DATATYPE_VALIDATOR_FACTORY = + "org.apache.xerces.impl.dv.dtd.XML11DTDDVFactoryImpl"; + // feature identifiers /** Feature identifier: warn on duplicate attribute definition. */ @@ -90,18 +97,16 @@ implements XMLPullParserConfiguration { protected static final String NOTIFY_CHAR_REFS = Constants.XERCES_FEATURE_PREFIX + Constants.NOTIFY_CHAR_REFS_FEATURE; - /** Feature identifier: expose schema normalized value */ protected static final String NORMALIZE_DATA = Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_NORMALIZED_VALUE; - /** Feature identifier: send element default value via characters() */ protected static final String SCHEMA_ELEMENT_DEFAULT = Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_ELEMENT_DEFAULT; /** Feature identifier: generate synthetic annotations. */ - protected static final String GENERATE_SYNTHETIC_ANNOTATION = + protected static final String GENERATE_SYNTHETIC_ANNOTATIONS = Constants.XERCES_FEATURE_PREFIX + Constants.GENERATE_SYNTHETIC_ANNOTATIONS_FEATURE; @@ -156,35 +161,63 @@ implements XMLPullParserConfiguration { // Data // - // components (non-configurable) + // + // XML 1.0 components + // + + /** The XML 1.0 Datatype validator factory. */ + protected final DTDDVFactory fDatatypeValidatorFactory; + + /** The XML 1.0 Document scanner. */ + protected final XMLNSDocumentScannerImpl fNamespaceScanner; + + /** The XML 1.0 DTD scanner. */ + protected final XMLDTDScannerImpl fDTDScanner; + + // + // XML 1.1 components + // + + /** The XML 1.1 Datatype validator factory. */ + protected DTDDVFactory fXML11DatatypeFactory = null; + + /** The XML 1.1 Document scanner. */ + protected XML11NSDocumentScannerImpl fXML11NSDocScanner = null; + + /** The XML 1.1 DTD scanner. **/ + protected XML11DTDScannerImpl fXML11DTDScanner = null; + + // common components (non-configurable) + + /** Current Datatype validator factory. */ + protected DTDDVFactory fCurrentDVFactory; + + /** Current scanner */ + protected XMLDocumentScanner fCurrentScanner; + + /** Current DTD scanner. */ + protected XMLDTDScanner fCurrentDTDScanner; /** Grammar pool. */ protected XMLGrammarPool fGrammarPool; - /** Datatype validator factory. */ - protected DTDDVFactory fDatatypeValidatorFactory; + /** XML version detector. */ + protected final XMLVersionDetector fVersionDetector; - // components (configurable) + // common components (configurable) /** Error reporter. */ - protected XMLErrorReporter fErrorReporter; + protected final XMLErrorReporter fErrorReporter; /** Entity manager. */ - protected XMLEntityManager fEntityManager; - - /** Document scanner. */ - protected XMLDocumentScanner fScanner; + protected final XMLEntityManager fEntityManager; /** Input Source */ protected XMLInputSource fInputSource; - /** DTD scanner. */ - protected XMLDTDScanner fDTDScanner; - - protected SchemaDOMParser fSchemaDOMParser; - protected ValidationManager fValidationManager; + protected final ValidationManager fValidationManager; // state /** Locator */ @@ -197,6 +230,15 @@ implements XMLPullParserConfiguration { */ protected boolean fParseInProgress = false; + /** + * fConfigUpdated is set to true if there has been any change to the configuration settings, + * i.e a feature or a property was changed. + */ + protected boolean fConfigUpdated = false; + + /** Flag indiciating whether XML11 components have been initialized. */ + private boolean f11Initialized = false; + // // Constructors // @@ -253,7 +295,7 @@ implements XMLPullParserConfiguration { PARSER_SETTINGS, WARN_ON_DUPLICATE_ATTDEF, WARN_ON_UNDECLARED_ELEMDEF, ALLOW_JAVA_ENCODINGS, CONTINUE_AFTER_FATAL_ERROR, LOAD_EXTERNAL_DTD, NOTIFY_BUILTIN_REFS, - NOTIFY_CHAR_REFS, GENERATE_SYNTHETIC_ANNOTATION + NOTIFY_CHAR_REFS, GENERATE_SYNTHETIC_ANNOTATIONS }; addRecognizedFeatures(recognizedFeatures); fFeatures.put(PARSER_SETTINGS, Boolean.TRUE); @@ -266,7 +308,7 @@ implements XMLPullParserConfiguration { fFeatures.put(LOAD_EXTERNAL_DTD, Boolean.TRUE); fFeatures.put(NOTIFY_BUILTIN_REFS, Boolean.FALSE); fFeatures.put(NOTIFY_CHAR_REFS, Boolean.FALSE); - fFeatures.put(GENERATE_SYNTHETIC_ANNOTATION, Boolean.FALSE); + fFeatures.put(GENERATE_SYNTHETIC_ANNOTATIONS, Boolean.FALSE); // add default recognized properties final String[] recognizedProperties = { @@ -279,12 +321,12 @@ implements XMLPullParserConfiguration { XMLGRAMMAR_POOL, DATATYPE_VALIDATOR_FACTORY, VALIDATION_MANAGER, - GENERATE_SYNTHETIC_ANNOTATION + GENERATE_SYNTHETIC_ANNOTATIONS }; addRecognizedProperties(recognizedProperties); fGrammarPool = grammarPool; - if(fGrammarPool != null){ + if (fGrammarPool != null) { setProperty(XMLGRAMMAR_POOL, fGrammarPool); } @@ -297,22 +339,23 @@ implements XMLPullParserConfiguration { fProperties.put(ERROR_REPORTER, fErrorReporter); addComponent(fErrorReporter); - fScanner = new XMLNSDocumentScannerImpl(); - fProperties.put(DOCUMENT_SCANNER, fScanner); - addComponent((XMLComponent)fScanner); + fNamespaceScanner = new XMLNSDocumentScannerImpl(); + fProperties.put(DOCUMENT_SCANNER, fNamespaceScanner); + addRecognizedParamsAndSetDefaults(fNamespaceScanner); fDTDScanner = new XMLDTDScannerImpl(); fProperties.put(DTD_SCANNER, fDTDScanner); - addComponent((XMLComponent)fDTDScanner); + addRecognizedParamsAndSetDefaults(fDTDScanner); - - fDatatypeValidatorFactory = DTDDVFactory.getInstance();; + fDatatypeValidatorFactory = DTDDVFactory.getInstance(); fProperties.put(DATATYPE_VALIDATOR_FACTORY, fDatatypeValidatorFactory); fValidationManager = new ValidationManager(); fProperties.put(VALIDATION_MANAGER, fValidationManager); + fVersionDetector = new XMLVersionDetector(); + // add message formatters if (fErrorReporter.getMessageFormatter(XMLMessageFormatter.XML_DOMAIN) == null) { XMLMessageFormatter xmft = new XMLMessageFormatter(); @@ -341,6 +384,103 @@ implements XMLPullParserConfiguration { // /** + * Returns the state of a feature. + * + * @param featureId The feature identifier. + * @return true if the feature is supported + * + * @throws XMLConfigurationException Thrown for configuration error. + * In general, components should + * only throw this exception if + * it is <strong>really</strong> + * a critical error. + */ + public boolean getFeature(String featureId) + throws XMLConfigurationException { + // make this feature special + if (featureId.equals(PARSER_SETTINGS)) { + return fConfigUpdated; + } + return super.getFeature(featureId); + + } // getFeature(String):boolean + + /** + * Set the state of a feature. + * + * Set the state of any feature in a SAX2 parser. The parser + * might not recognize the feature, and if it does recognize + * it, it might not be able to fulfill the request. + * + * @param featureId The unique identifier (URI) of the feature. + * @param state The requested state of the feature (true or false). + * + * @exception org.apache.xerces.xni.parser.XMLConfigurationException If the + * requested feature is not known. + */ + public void setFeature(String featureId, boolean state) + throws XMLConfigurationException { + + fConfigUpdated = true; + + // forward to every XML 1.0 component + fNamespaceScanner.setFeature(featureId, state); + fDTDScanner.setFeature(featureId, state); + + // forward to every XML 1.1 component + if (f11Initialized) { + try { + fXML11DTDScanner.setFeature(featureId, state); + } + // ignore the exception. + catch (Exception e) {} + try { + fXML11NSDocScanner.setFeature(featureId, state); + } + // ignore the exception + catch (Exception e) {} + } + + // save state if noone "objects" + super.setFeature(featureId, state); + + } // setFeature(String,boolean) + + /** + * setProperty + * + * @param propertyId + * @param value + */ + public void setProperty(String propertyId, Object value) + throws XMLConfigurationException { + + fConfigUpdated = true; + + // forward to every XML 1.0 component + fNamespaceScanner.setProperty(propertyId, value); + fDTDScanner.setProperty(propertyId, value); + + // forward to every XML 1.1 component + if (f11Initialized) { + try { + fXML11DTDScanner.setProperty(propertyId, value); + } + // ignore the exception. + catch (Exception e) {} + try { + fXML11NSDocScanner.setProperty(propertyId, value); + } + // ignore the exception + catch (Exception e) {} + } + + // store value if noone "objects" + super.setProperty(propertyId, value); + + } // setProperty(String,Object) + + /** * Set the locale to use for messages. * * @param locale The locale object to use for localization of messages. @@ -402,11 +542,34 @@ implements XMLPullParserConfiguration { public boolean parse(boolean complete) throws XNIException, IOException { // // reset and configure pipeline and set InputSource. - if (fInputSource !=null) { + if (fInputSource != null) { try { - // resets and sets the pipeline. + fValidationManager.reset(); + fVersionDetector.reset(this); reset(); - fScanner.setInputSource(fInputSource); + + short version = fVersionDetector.determineDocVersion(fInputSource); + // XML 1.0 + if (version == Constants.XML_VERSION_1_0) { + configurePipeline(); + resetXML10(); + } + // XML 1.1 + else if (version == Constants.XML_VERSION_1_1) { + initXML11Components(); + configureXML11Pipeline(); + resetXML11(); + } + // Unrecoverable error reported during version detection + else { + return false; + } + + // mark configuration as fixed + fConfigUpdated = false; + + // resets and sets the pipeline. + fVersionDetector.startDocumentParsing((XMLEntityHandler) fCurrentScanner, version); fInputSource = null; } catch (XNIException ex) { @@ -432,7 +595,7 @@ implements XMLPullParserConfiguration { } try { - return fScanner.scanDocument(complete); + return fCurrentScanner.scanDocument(complete); } catch (XNIException ex) { if (PRINT_EXCEPTION_STACK_TRACE) @@ -530,35 +693,90 @@ implements XMLPullParserConfiguration { public void reset() throws XNIException { // set handlers - if (fSchemaDOMParser == null) + if (fSchemaDOMParser == null) { fSchemaDOMParser = new SchemaDOMParser(this); + } fDocumentHandler = fSchemaDOMParser; fDTDHandler = fSchemaDOMParser; fDTDContentModelHandler = fSchemaDOMParser; - // configure the pipeline and initialize the components - configurePipeline(); + // initialize the common components super.reset(); } // reset() - /** Configures the pipeline. */ + /** Configures the XML 1.0 pipeline. */ protected void configurePipeline() { + if (fCurrentDVFactory != fDatatypeValidatorFactory) { + fCurrentDVFactory = fDatatypeValidatorFactory; + // use XML 1.0 datatype library + setProperty(DATATYPE_VALIDATOR_FACTORY, fCurrentDVFactory); + } + // setup document pipeline - fScanner.setDocumentHandler(fDocumentHandler); - fDocumentHandler.setDocumentSource(fScanner); - fLastComponent = fScanner; + if (fCurrentScanner != fNamespaceScanner) { + fCurrentScanner = fNamespaceScanner; + setProperty(DOCUMENT_SCANNER, fCurrentScanner); + } + fNamespaceScanner.setDocumentHandler(fDocumentHandler); + if (fDocumentHandler != null) { + fDocumentHandler.setDocumentSource(fNamespaceScanner); + } + fLastComponent = fNamespaceScanner; // setup dtd pipeline - if (fDTDScanner != null) { - fDTDScanner.setDTDHandler(fDTDHandler); - fDTDScanner.setDTDContentModelHandler(fDTDContentModelHandler); + if (fCurrentDTDScanner != fDTDScanner) { + fCurrentDTDScanner = fDTDScanner; + setProperty(DTD_SCANNER, fCurrentDTDScanner); } - + fDTDScanner.setDTDHandler(fDTDHandler); + if (fDTDHandler != null) { + fDTDHandler.setDTDSource(fDTDScanner); + } + fDTDScanner.setDTDContentModelHandler(fDTDContentModelHandler); + if (fDTDContentModelHandler != null) { + fDTDContentModelHandler.setDTDContentModelSource(fDTDScanner); + } } // configurePipeline() + /** Configures the XML 1.1 pipeline. */ + protected void configureXML11Pipeline() { + + if (fCurrentDVFactory != fXML11DatatypeFactory) { + fCurrentDVFactory = fXML11DatatypeFactory; + // use XML 1.1 datatype library + setProperty(DATATYPE_VALIDATOR_FACTORY, fCurrentDVFactory); + } + + // setup document pipeline + if (fCurrentScanner != fXML11NSDocScanner) { + fCurrentScanner = fXML11NSDocScanner; + setProperty(DOCUMENT_SCANNER, fCurrentScanner); + } + fXML11NSDocScanner.setDocumentHandler(fDocumentHandler); + if (fDocumentHandler != null) { + fDocumentHandler.setDocumentSource(fXML11NSDocScanner); + } + fLastComponent = fXML11NSDocScanner; + + // setup dtd pipeline + if (fCurrentDTDScanner != fXML11DTDScanner) { + fCurrentDTDScanner = fXML11DTDScanner; + setProperty(DTD_SCANNER, fCurrentDTDScanner); + } + fXML11DTDScanner.setDTDHandler(fDTDHandler); + if (fDTDHandler != null) { + fDTDHandler.setDTDSource(fXML11DTDScanner); + } + fXML11DTDScanner.setDTDContentModelHandler(fDTDContentModelHandler); + if (fDTDContentModelHandler != null) { + fDTDContentModelHandler.setDTDContentModelSource(fXML11DTDScanner); + } + + } // configureXML11Pipeline() + // features and properties /** @@ -574,7 +792,7 @@ implements XMLPullParserConfiguration { * a critical error. */ protected void checkFeature(String featureId) - throws XMLConfigurationException { + throws XMLConfigurationException { // // Xerces Features @@ -658,7 +876,7 @@ implements XMLPullParserConfiguration { * a critical error. */ protected void checkProperty(String propertyId) - throws XMLConfigurationException { + throws XMLConfigurationException { // // Xerces Properties @@ -690,7 +908,79 @@ implements XMLPullParserConfiguration { } // checkProperty(String) + /** + * Adds all of the component's recognized features and properties + * to the list of default recognized features and properties, and + * sets default values on the configuration for features and + * properties which were previously absent from the configuration. + * + * @param component The component whose recognized features + * and properties will be added to the configuration + */ + private void addRecognizedParamsAndSetDefaults(XMLComponent component) { + + // register component's recognized features + String[] recognizedFeatures = component.getRecognizedFeatures(); + addRecognizedFeatures(recognizedFeatures); + + // register component's recognized properties + String[] recognizedProperties = component.getRecognizedProperties(); + addRecognizedProperties(recognizedProperties); + + // set default values + if (recognizedFeatures != null) { + for (int i = 0; i < recognizedFeatures.length; ++i) { + String featureId = recognizedFeatures[i]; + Boolean state = component.getFeatureDefault(featureId); + if (state != null) { + // Do not overwrite values already set on the configuration. + if (!fFeatures.containsKey(featureId)) { + fFeatures.put(featureId, state); + // For newly added components who recognize this feature + // but did not offer a default value, we need to make + // sure these components will get an opportunity to read + // the value before parsing begins. + fConfigUpdated = true; + } + } + } + } + if (recognizedProperties != null) { + for (int i = 0; i < recognizedProperties.length; ++i) { + String propertyId = recognizedProperties[i]; + Object value = component.getPropertyDefault(propertyId); + if (value != null) { + // Do not overwrite values already set on the configuration. + if (!fProperties.containsKey(propertyId)) { + fProperties.put(propertyId, value); + // For newly added components who recognize this property + // but did not offer a default value, we need to make + // sure these components will get an opportunity to read + // the value before parsing begins. + fConfigUpdated = true; + } + } + } + } + } + + /** + * Reset all XML 1.0 components before parsing + */ + protected final void resetXML10() throws XNIException { + // Reset XML 1.0 components + fNamespaceScanner.reset(this); + fDTDScanner.reset(this); + } // resetXML10() + /** + * Reset all XML 1.1 components before parsing + */ + protected final void resetXML11() throws XNIException { + // Reset XML 1.1 components + fXML11NSDocScanner.reset(this); + fXML11DTDScanner.reset(this); + } // resetXML11() // // other methods @@ -706,4 +996,21 @@ implements XMLPullParserConfiguration { // REVISIT: to implement: introduce a node pool to reuse DTM nodes. // reset this pool here. } + + private void initXML11Components() { + if (!f11Initialized) { + // create datatype factory + fXML11DatatypeFactory = DTDDVFactory.getInstance(XML11_DATATYPE_VALIDATOR_FACTORY); + + // setup XML 1.1 DTD pipeline + fXML11DTDScanner = new XML11DTDScannerImpl(); + addRecognizedParamsAndSetDefaults(fXML11DTDScanner); + + // setup XML 1.1. document pipeline - namespace aware + fXML11NSDocScanner = new XML11NSDocumentScannerImpl(); + addRecognizedParamsAndSetDefaults(fXML11NSDocScanner); + + f11Initialized = true; + } + } } diff --git a/src/org/apache/xerces/impl/xs/opti/TextImpl.java b/src/org/apache/xerces/impl/xs/opti/TextImpl.java index ea6f4f0..3e137e9 100644 --- a/src/org/apache/xerces/impl/xs/opti/TextImpl.java +++ b/src/org/apache/xerces/impl/xs/opti/TextImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import org.w3c.dom.Node; * @xerces.internal * * @author Neil Graham, IBM - * @version $Id: TextImpl.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: TextImpl.java 446728 2006-09-15 20:43:46Z mrglavas $ */ public class TextImpl extends DefaultText { diff --git a/src/org/apache/xerces/impl/xs/traversers/SchemaContentHandler.java b/src/org/apache/xerces/impl/xs/traversers/SchemaContentHandler.java index a33ca1d..359e129 100644 --- a/src/org/apache/xerces/impl/xs/traversers/SchemaContentHandler.java +++ b/src/org/apache/xerces/impl/xs/traversers/SchemaContentHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,6 +22,7 @@ import org.apache.xerces.util.NamespaceSupport; import org.apache.xerces.util.SAXLocatorWrapper; import org.apache.xerces.util.SymbolTable; import org.apache.xerces.util.XMLAttributesImpl; +import org.apache.xerces.util.XMLStringBuffer; import org.apache.xerces.util.XMLSymbols; import org.apache.xerces.xni.NamespaceContext; import org.apache.xerces.xni.QName; @@ -44,7 +46,7 @@ import org.xml.sax.helpers.LocatorImpl; * @author Michael Glavassevich, IBM * @author Jack Z. Wang, IBM * - * @version $Id: SchemaContentHandler.java 320411 2005-05-30 03:20:40Z mrglavas $ + * @version $Id: SchemaContentHandler.java 450980 2006-09-28 19:37:19Z mrglavas $ */ final class SchemaContentHandler implements ContentHandler { @@ -74,6 +76,7 @@ final class SchemaContentHandler implements ContentHandler { private final QName fAttributeQName = new QName(); private final XMLAttributesImpl fAttributes = new XMLAttributesImpl(); private final XMLString fTempString = new XMLString(); + private final XMLStringBuffer fStringBuffer = new XMLStringBuffer(); /** * <p>Constructs an SchemaContentHandler.</p> @@ -322,7 +325,11 @@ final class SchemaContentHandler implements ContentHandler { if (nsPrefix.length() > 0) { prefix = XMLSymbols.PREFIX_XMLNS; localpart = nsPrefix; - rawname = fSymbolTable.addSymbol(prefix + ":" + localpart); + fStringBuffer.clear(); + fStringBuffer.append(prefix); + fStringBuffer.append(':'); + fStringBuffer.append(localpart); + rawname = fSymbolTable.addSymbol(fStringBuffer.ch, fStringBuffer.offset, fStringBuffer.length); } else { prefix = XMLSymbols.EMPTY_STRING; diff --git a/src/org/apache/xerces/impl/xs/traversers/XSAnnotationInfo.java b/src/org/apache/xerces/impl/xs/traversers/XSAnnotationInfo.java index cf8d33a..7ee6ae2 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSAnnotationInfo.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSAnnotationInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.impl.xs.opti.ElementImpl; * @xerces.internal * * @author Michael Glavassevich, IBM - * @version $Id: XSAnnotationInfo.java 320167 2004-12-15 23:48:48Z mrglavas $ + * @version $Id: XSAnnotationInfo.java 446725 2006-09-15 20:40:10Z mrglavas $ */ final class XSAnnotationInfo { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java b/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java index e977ee7..cd8e44b 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,6 +34,7 @@ import org.apache.xerces.impl.xs.util.XInt; import org.apache.xerces.impl.xs.util.XIntPool; import org.apache.xerces.util.DOMUtil; import org.apache.xerces.util.SymbolTable; +import org.apache.xerces.util.XMLChar; import org.apache.xerces.util.XMLSymbols; import org.apache.xerces.xni.QName; import org.apache.xerces.xs.XSConstants; @@ -61,7 +63,7 @@ import org.w3c.dom.Element; * @xerces.internal * * @author Sandy Gao, IBM - * @version $Id: XSAttributeChecker.java 348859 2005-11-25 03:21:32Z sandygao $ + * @version $Id: XSAttributeChecker.java 471890 2006-11-06 22:00:18Z mrglavas $ */ public class XSAttributeChecker { @@ -502,7 +504,7 @@ public class XSAttributeChecker { attrList = Container.getContainer(10); // abstract = boolean : false attrList.put(SchemaSymbols.ATT_ABSTRACT, allAttrs[ATT_ABSTRACT_D]); - // block = (#all | List of (substitution | extension | restriction | list | union)) + // block = (#all | List of (extension | restriction | substitution)) attrList.put(SchemaSymbols.ATT_BLOCK, allAttrs[ATT_BLOCK_N]); // default = string attrList.put(SchemaSymbols.ATT_DEFAULT, allAttrs[ATT_DEFAULT_N]); @@ -524,7 +526,7 @@ public class XSAttributeChecker { // for element "element" - local name attrList = Container.getContainer(10); - // block = (#all | List of (substitution | extension | restriction | list | union)) + // block = (#all | List of (extension | restriction | substitution)) attrList.put(SchemaSymbols.ATT_BLOCK, allAttrs[ATT_BLOCK_N]); // default = string attrList.put(SchemaSymbols.ATT_DEFAULT, allAttrs[ATT_DEFAULT_N]); @@ -808,7 +810,7 @@ public class XSAttributeChecker { attrList = Container.getContainer(8); // attributeFormDefault = (qualified | unqualified) : unqualified attrList.put(SchemaSymbols.ATT_ATTRIBUTEFORMDEFAULT, allAttrs[ATT_ATTRIBUTE_FD_D]); - // blockDefault = (#all | List of (substitution | extension | restriction | list | union)) : '' + // blockDefault = (#all | List of (extension | restriction | substitution)) : '' attrList.put(SchemaSymbols.ATT_BLOCKDEFAULT, allAttrs[ATT_BLOCK_D_D]); // elementFormDefault = (qualified | unqualified) : unqualified attrList.put(SchemaSymbols.ATT_ELEMENTFORMDEFAULT, allAttrs[ATT_ELEMENT_FD_D]); @@ -1187,14 +1189,8 @@ public class XSAttributeChecker { // strings. We only need to remove the whitespace from both ends. // In some special cases (list types), StringTokenizer can correctly // process the un-normalized whitespace. - /** - * REVISIT: Trim removes all leading and trailing characters less - * than or equal to U+0020. This is okay for XML 1.0 since all - * of the valid characters in that range are white space but - * in XML 1.1 control chars are allowed. We shouldn't be trimming - * those. -- mrglavas - */ - String value = ivalue.trim(); + + String value = XMLChar.trim(ivalue); Object retValue = null; Vector memberType; int choice; @@ -1234,7 +1230,7 @@ public class XSAttributeChecker { throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.1", new Object[]{value, "positiveInteger"}); break; case DT_BLOCK: - // block = (#all | List of (substitution | extension | restriction | list | union)) + // block = (#all | List of (extension | restriction | substitution)) choice = 0; if (value.equals (SchemaSymbols.ATTVAL_POUNDALL)) { choice = XSConstants.DERIVATION_SUBSTITUTION|XSConstants.DERIVATION_EXTENSION| @@ -1242,28 +1238,21 @@ public class XSAttributeChecker { XSConstants.DERIVATION_UNION; } else { - // use the default \t\r\n\f delimiters - StringTokenizer t = new StringTokenizer(value); + StringTokenizer t = new StringTokenizer(value, " \n\t\r"); while (t.hasMoreTokens()) { String token = t.nextToken (); - if (token.equals (SchemaSymbols.ATTVAL_SUBSTITUTION)) { - choice |= XSConstants.DERIVATION_SUBSTITUTION; - } - else if (token.equals (SchemaSymbols.ATTVAL_EXTENSION)) { + if (token.equals (SchemaSymbols.ATTVAL_EXTENSION)) { choice |= XSConstants.DERIVATION_EXTENSION; } else if (token.equals (SchemaSymbols.ATTVAL_RESTRICTION)) { choice |= XSConstants.DERIVATION_RESTRICTION; } - else if (token.equals (SchemaSymbols.ATTVAL_LIST)) { - choice |= XSConstants.DERIVATION_LIST; - } - else if (token.equals (SchemaSymbols.ATTVAL_UNION)) { - choice |= XSConstants.DERIVATION_RESTRICTION; + else if (token.equals (SchemaSymbols.ATTVAL_SUBSTITUTION)) { + choice |= XSConstants.DERIVATION_SUBSTITUTION; } else { - throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.3", new Object[]{value, "(#all | List of (substitution | extension | restriction | list | union))"}); + throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.3", new Object[]{value, "(#all | List of (extension | restriction | substitution))"}); } } } @@ -1291,8 +1280,7 @@ public class XSAttributeChecker { XSConstants.DERIVATION_UNION; } else { - // use the default \t\r\n\f delimiters - StringTokenizer t = new StringTokenizer(value); + StringTokenizer t = new StringTokenizer(value, " \n\t\r"); while (t.hasMoreTokens()) { String token = t.nextToken (); @@ -1324,8 +1312,7 @@ public class XSAttributeChecker { XSConstants.DERIVATION_UNION; } else { - // use the default \t\r\n\f delimiters - StringTokenizer t = new StringTokenizer(value); + StringTokenizer t = new StringTokenizer(value, " \n\t\r"); while (t.hasMoreTokens()) { String token = t.nextToken (); @@ -1360,8 +1347,7 @@ public class XSAttributeChecker { XSConstants.DERIVATION_UNION; } else { - // use the default \t\r\n\f delimiters - StringTokenizer t = new StringTokenizer(value); + StringTokenizer t = new StringTokenizer(value, " \n\t\r"); while (t.hasMoreTokens()) { String token = t.nextToken (); @@ -1418,8 +1404,7 @@ public class XSAttributeChecker { // memberTypes = List of QName memberType = new Vector(); try { - // use the default \t\r\n\f delimiters - StringTokenizer t = new StringTokenizer(value); + StringTokenizer t = new StringTokenizer(value, " \n\t\r"); while (t.hasMoreTokens()) { String token = t.nextToken (); QName qname = (QName)fExtraDVs[DT_QNAME].validate(token, schemaDoc.fValidationContext, null); @@ -1463,8 +1448,7 @@ public class XSAttributeChecker { fNamespaceList.removeAllElements(); // tokenize - // use the default \t\r\n\f delimiters - StringTokenizer tokens = new StringTokenizer(value); + StringTokenizer tokens = new StringTokenizer(value, " \n\t\r"); String token; String tempNamespace; try { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java index cb02cee..1403c90 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,6 +23,7 @@ import org.apache.xerces.impl.xs.identity.Field; import org.apache.xerces.impl.xs.identity.IdentityConstraint; import org.apache.xerces.impl.xs.identity.Selector; import org.apache.xerces.util.DOMUtil; +import org.apache.xerces.util.XMLChar; import org.w3c.dom.Element; /** @@ -31,7 +33,7 @@ import org.w3c.dom.Element; * * @xerces.internal * - * @version $Id: XSDAbstractIDConstraintTraverser.java 320183 2004-12-20 05:43:36Z mrglavas $ + * @version $Id: XSDAbstractIDConstraintTraverser.java 469584 2006-10-31 17:57:34Z mrglavas $ */ class XSDAbstractIDConstraintTraverser extends XSDAbstractTraverser { @@ -106,7 +108,7 @@ class XSDAbstractIDConstraintTraverser extends XSDAbstractTraverser { reportSchemaError("s4s-att-must-appear", new Object [] {SchemaSymbols.ELT_SELECTOR, SchemaSymbols.ATT_XPATH}, sElem); return; } - sText = sText.trim(); + sText = XMLChar.trim(sText); Selector.XPath sXpath = null; try { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java index 0bf0b42..29a25b0 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.w3c.dom.Element; * * @author Elena Litani, IBM * @author Sandy Gao, IBM - * @version $Id: XSDAbstractParticleTraverser.java 441999 2006-09-10 20:16:03Z mrglavas $ + * @version $Id: XSDAbstractParticleTraverser.java 449424 2006-09-24 16:22:30Z mrglavas $ */ abstract class XSDAbstractParticleTraverser extends XSDAbstractTraverser { @@ -46,12 +47,12 @@ abstract class XSDAbstractParticleTraverser extends XSDAbstractTraverser { * * Traverse the "All" declaration * - * <all + * <all * id = ID * maxOccurs = 1 : 1 - * minOccurs = (0 | 1) : 1> + * minOccurs = (0 | 1) : 1> * Content: (annotation? , element*) - * </all> + * </all> **/ XSParticleDecl traverseAll(Element allDecl, XSDocumentInfo schemaDoc, diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java index e0fd168..0ddc98d 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -52,7 +53,7 @@ import org.w3c.dom.Element; * @author Rahul Srivastava, Sun Microsystems Inc. * @author Neeraj Bajaj, Sun Microsystems Inc. * - * @version $Id: XSDAbstractTraverser.java 442081 2006-09-11 03:19:57Z mrglavas $ + * @version $Id: XSDAbstractTraverser.java 446725 2006-09-15 20:40:10Z mrglavas $ */ abstract class XSDAbstractTraverser { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java index 5a3b775..3bac80f 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,20 +30,20 @@ import org.w3c.dom.Element; /** * The attribute group definition schema component traverser. * - * <attributeGroup + * <attributeGroup * id = ID * name = NCName * ref = QName - * {any attributes with non-schema namespace . . .}> + * {any attributes with non-schema namespace . . .}> * Content: (annotation?, ((attribute | attributeGroup)*, anyAttribute?)) - * </attributeGroup> + * </attributeGroup> * * @xerces.internal * * @author Rahul Srivastava, Sun Microsystems Inc. * @author Sandy Gao, IBM * - * @version $Id: XSDAttributeGroupTraverser.java 379204 2006-02-20 19:21:23Z nddelima $ + * @version $Id: XSDAttributeGroupTraverser.java 449424 2006-09-24 16:22:30Z mrglavas $ */ class XSDAttributeGroupTraverser extends XSDAbstractTraverser { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java index 40f36d4..390b611 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -38,7 +39,7 @@ import org.w3c.dom.Element; /** * The attribute declaration schema component traverser. * - * <attribute + * <attribute * default = string * fixed = string * form = (qualified | unqualified) @@ -47,15 +48,15 @@ import org.w3c.dom.Element; * ref = QName * type = QName * use = (optional | prohibited | required) : optional - * {any attributes with non-schema namespace . . .}> + * {any attributes with non-schema namespace . . .}> * Content: (annotation?, (simpleType?)) - * </attribute> + * </attribute> * * @xerces.internal * * @author Sandy Gao, IBM * @author Neeraj Bajaj, Sun Microsystems, inc. - * @version $Id: XSDAttributeTraverser.java 379204 2006-02-20 19:21:23Z nddelima $ + * @version $Id: XSDAttributeTraverser.java 449424 2006-09-24 16:22:30Z mrglavas $ */ class XSDAttributeTraverser extends XSDAbstractTraverser { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java index 3f0db5d..ce0e6c4 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -57,7 +58,7 @@ import org.w3c.dom.Element; * * @xerces.internal * - * @version $Id: XSDComplexTypeTraverser.java 383214 2006-03-04 22:20:48Z nddelima $ + * @version $Id: XSDComplexTypeTraverser.java 446725 2006-09-15 20:40:10Z mrglavas $ */ class XSDComplexTypeTraverser extends XSDAbstractParticleTraverser { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java index e24ffc6..0770c4b 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,6 +34,7 @@ import org.apache.xerces.impl.xs.util.XInt; import org.apache.xerces.impl.xs.util.XSObjectListImpl; import org.apache.xerces.util.DOMUtil; import org.apache.xerces.util.SymbolTable; +import org.apache.xerces.util.XMLChar; import org.apache.xerces.xni.QName; import org.w3c.dom.Element; import org.w3c.dom.Attr; @@ -62,7 +64,7 @@ import org.w3c.dom.Attr; * * @author Sandy Gao, IBM * - * @version $Id: XSDElementTraverser.java 442099 2006-09-11 05:01:27Z mrglavas $ + * @version $Id: XSDElementTraverser.java 469584 2006-10-31 17:57:34Z mrglavas $ */ class XSDElementTraverser extends XSDAbstractTraverser { @@ -102,7 +104,7 @@ class XSDElementTraverser extends XSDAbstractTraverser { } else { particle = new XSParticleDecl(); } - if(fDeferTraversingLocalElements) { + if (fDeferTraversingLocalElements) { // The only thing we care about now is whether this element has // minOccurs=0. This affects (if the element appears in a complex // type) whether a type has emptiable content. @@ -111,7 +113,7 @@ class XSDElementTraverser extends XSDAbstractTraverser { if (attr != null) { String min = attr.getValue(); try { - int m = Integer.parseInt(min.trim()); + int m = Integer.parseInt(XMLChar.trim(min)); if (m >= 0) particle.fMinOccurs = m; } @@ -402,7 +404,7 @@ class XSDElementTraverser extends XSDAbstractTraverser { childName.equals(SchemaSymbols.ELT_UNIQUE)) { // need to set <key>/<unique> to hidden before traversing it, // because it has global scope - DOMUtil.setHidden(child); + DOMUtil.setHidden(child, fSchemaHandler.fHiddenNodes); fSchemaHandler.fUniqueOrKeyTraverser.traverse(child, element, schemaDoc, grammar); if(DOMUtil.getAttrValue(child, SchemaSymbols.ATT_NAME).length() != 0 ) { fSchemaHandler.checkForDuplicateNames( diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java index 3af1a10..0ae018b 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -43,7 +44,7 @@ import org.w3c.dom.Element; * @author Rahul Srivastava, Sun Microsystems Inc. * @author Elena Litani, IBM * @author Lisa Martin, IBM - * @version $Id: XSDGroupTraverser.java 442099 2006-09-11 05:01:27Z mrglavas $ + * @version $Id: XSDGroupTraverser.java 446725 2006-09-15 20:40:10Z mrglavas $ */ class XSDGroupTraverser extends XSDAbstractParticleTraverser { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java b/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java index 243dcae..70d90c5 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -88,7 +89,7 @@ import org.xml.sax.helpers.XMLReaderFactory; * @author Neil Graham, IBM * @author Pavani Mukthipudi, Sun Microsystems * - * @version $Id: XSDHandler.java 417123 2006-06-26 04:01:34Z mrglavas $ + * @version $Id: XSDHandler.java 449487 2006-09-24 21:11:28Z mrglavas $ */ public class XSDHandler { @@ -244,9 +245,8 @@ public class XSDHandler { private Hashtable fLocationPairs = null; private static final Hashtable EMPTY_TABLE = new Hashtable(); - //this hashtable is keyded on by DOM node objects. - //The table stores the hidden nodes - private Hashtable fHiddenNodes = null; + // Records which nodes are hidden when the input is a DOMInputSource. + Hashtable fHiddenNodes = null; // convenience methods private String null2EmptyString(String ns) { @@ -405,7 +405,7 @@ public class XSDHandler { * @param is * @param desc * @param locationPairs - * @return + * @return the SchemaGrammar * @throws IOException */ public SchemaGrammar parseSchema(XMLInputSource is, XSDDescription desc, diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDKeyrefTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDKeyrefTraverser.java index fcaec7b..9a06182 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDKeyrefTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDKeyrefTraverser.java @@ -1,12 +1,13 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,7 +32,7 @@ import org.w3c.dom.Element; * @xerces.internal * * @author Neil Graham, IBM - * @version $Id: XSDKeyrefTraverser.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XSDKeyrefTraverser.java 446725 2006-09-15 20:40:10Z mrglavas $ */ class XSDKeyrefTraverser extends XSDAbstractIDConstraintTraverser { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDNotationTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDNotationTraverser.java index 3da55bc..c416b72 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDNotationTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDNotationTraverser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -41,7 +42,7 @@ import org.w3c.dom.Element; * * @author Rahul Srivastava, Sun Microsystems Inc. * @author Elena Litani, IBM - * @version $Id: XSDNotationTraverser.java 379204 2006-02-20 19:21:23Z nddelima $ + * @version $Id: XSDNotationTraverser.java 446725 2006-09-15 20:40:10Z mrglavas $ */ class XSDNotationTraverser extends XSDAbstractTraverser { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDSimpleTypeTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDSimpleTypeTraverser.java index 8ddfa90..eb7f684 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDSimpleTypeTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDSimpleTypeTraverser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -73,7 +74,7 @@ import org.w3c.dom.Element; * @author Neeraj Bajaj, Sun Microsystems, Inc. * @author Sandy Gao, IBM * - * @version $Id: XSDSimpleTypeTraverser.java 320407 2005-05-28 02:03:58Z mrglavas $ + * @version $Id: XSDSimpleTypeTraverser.java 446725 2006-09-15 20:40:10Z mrglavas $ */ class XSDSimpleTypeTraverser extends XSDAbstractTraverser { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDUniqueOrKeyTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDUniqueOrKeyTraverser.java index d61d37d..cad60b0 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDUniqueOrKeyTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDUniqueOrKeyTraverser.java @@ -1,12 +1,13 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,7 +32,7 @@ import org.w3c.dom.Element; * @xerces.internal * * @author Neil Graham, IBM - * @version $Id: XSDUniqueOrKeyTraverser.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XSDUniqueOrKeyTraverser.java 446725 2006-09-15 20:40:10Z mrglavas $ */ class XSDUniqueOrKeyTraverser extends XSDAbstractIDConstraintTraverser { diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDWildcardTraverser.java b/src/org/apache/xerces/impl/xs/traversers/XSDWildcardTraverser.java index fdb5692..5ab1723 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDWildcardTraverser.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDWildcardTraverser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,30 +31,30 @@ import org.w3c.dom.Element; /** * The wildcard schema component traverser. * - * <any + * <any * id = ID * maxOccurs = (nonNegativeInteger | unbounded) : 1 * minOccurs = nonNegativeInteger : 1 * namespace = ((##any | ##other) | List of (anyURI | (##targetNamespace | ##local)) ) : ##any * processContents = (lax | skip | strict) : strict - * {any attributes with non-schema namespace . . .}> + * {any attributes with non-schema namespace . . .}> * Content: (annotation?) - * </any> + * </any> * - * <anyAttribute + * <anyAttribute * id = ID * namespace = ((##any | ##other) | List of (anyURI | (##targetNamespace | ##local)) ) : ##any * processContents = (lax | skip | strict) : strict - * {any attributes with non-schema namespace . . .}> + * {any attributes with non-schema namespace . . .}> * Content: (annotation?) - * </anyAttribute> + * </anyAttribute> * * @xerces.internal * * @author Rahul Srivastava, Sun Microsystems Inc. * @author Sandy Gao, IBM * - * @version $Id: XSDWildcardTraverser.java 379204 2006-02-20 19:21:23Z nddelima $ + * @version $Id: XSDWildcardTraverser.java 449424 2006-09-24 16:22:30Z mrglavas $ */ class XSDWildcardTraverser extends XSDAbstractTraverser { @@ -71,7 +72,7 @@ class XSDWildcardTraverser extends XSDAbstractTraverser { /** - * Traverse <any> + * Traverse <any> * * @param elmNode * @param schemaDoc @@ -112,7 +113,7 @@ class XSDWildcardTraverser extends XSDAbstractTraverser { /** - * Traverse <anyAttribute> + * Traverse <anyAttribute> * * @param elmNode * @param schemaDoc diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDocumentInfo.java b/src/org/apache/xerces/impl/xs/traversers/XSDocumentInfo.java index e8c02e1..321acf7 100644 --- a/src/org/apache/xerces/impl/xs/traversers/XSDocumentInfo.java +++ b/src/org/apache/xerces/impl/xs/traversers/XSDocumentInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import org.w3c.dom.Element; * @xerces.internal * * @author Neil Graham, IBM - * @version $Id: XSDocumentInfo.java 320572 2005-09-08 01:48:22Z mrglavas $ + * @version $Id: XSDocumentInfo.java 446725 2006-09-15 20:40:10Z mrglavas $ */ class XSDocumentInfo { diff --git a/src/org/apache/xerces/impl/xs/util/NSItemListImpl.java b/src/org/apache/xerces/impl/xs/util/NSItemListImpl.java index 57ffa16..ecdfbd8 100644 --- a/src/org/apache/xerces/impl/xs/util/NSItemListImpl.java +++ b/src/org/apache/xerces/impl/xs/util/NSItemListImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.xs.XSNamespaceItemList; * * @author Sandy Gao, IBM * - * @version $Id: NSItemListImpl.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: NSItemListImpl.java 446723 2006-09-15 20:37:45Z mrglavas $ */ public class NSItemListImpl implements XSNamespaceItemList { diff --git a/src/org/apache/xerces/impl/xs/util/ShortListImpl.java b/src/org/apache/xerces/impl/xs/util/ShortListImpl.java index e7c7942..952b707 100644 --- a/src/org/apache/xerces/impl/xs/util/ShortListImpl.java +++ b/src/org/apache/xerces/impl/xs/util/ShortListImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.xs.XSException; * * @author Sandy Gao, IBM * - * @version $Id: ShortListImpl.java 396205 2006-04-23 02:46:42Z mrglavas $ + * @version $Id: ShortListImpl.java 446723 2006-09-15 20:37:45Z mrglavas $ */ public class ShortListImpl implements ShortList { diff --git a/src/org/apache/xerces/impl/xs/util/SimpleLocator.java b/src/org/apache/xerces/impl/xs/util/SimpleLocator.java index afff942..20b8755 100644 --- a/src/org/apache/xerces/impl/xs/util/SimpleLocator.java +++ b/src/org/apache/xerces/impl/xs/util/SimpleLocator.java @@ -1,9 +1,10 @@ /* - * Copyright 2002, 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.apache.xerces.xni.XMLLocator; * @xerces.internal * * @author Sandy Gao, IBM - * @version $Id: SimpleLocator.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: SimpleLocator.java 449487 2006-09-24 21:11:28Z mrglavas $ */ public class SimpleLocator implements XMLLocator { @@ -86,16 +87,11 @@ public class SimpleLocator implements XMLLocator { public String getBaseSystemId() { return null; } - /** - * @see org.apache.xerces.xni.XMLLocator#setColumnNumber(int) - */ + public void setColumnNumber(int col) { this.column = col; } - /** - * @see org.apache.xerces.xni.XMLLocator#setLineNumber(int) - */ public void setLineNumber(int line) { this.line = line; } @@ -128,7 +124,8 @@ public class SimpleLocator implements XMLLocator { */ public void setPublicId(String publicId) {} - /** Returns the encoding of the current entity. + /** + * Returns the encoding of the current entity. * Since these locators are used in the construction of * XMLParseExceptions, which know nothing about encodings, there is * no point in having this object deal intelligently diff --git a/src/org/apache/xerces/impl/xs/util/StringListImpl.java b/src/org/apache/xerces/impl/xs/util/StringListImpl.java index fe9282d..12c3ccb 100644 --- a/src/org/apache/xerces/impl/xs/util/StringListImpl.java +++ b/src/org/apache/xerces/impl/xs/util/StringListImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2003-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import java.util.Vector; * * @author Sandy Gao, IBM * - * @version $Id: StringListImpl.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: StringListImpl.java 446723 2006-09-15 20:37:45Z mrglavas $ */ public class StringListImpl implements StringList { diff --git a/src/org/apache/xerces/impl/xs/util/XInt.java b/src/org/apache/xerces/impl/xs/util/XInt.java index bd0e36b..aaa1624 100644 --- a/src/org/apache/xerces/impl/xs/util/XInt.java +++ b/src/org/apache/xerces/impl/xs/util/XInt.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,7 +21,7 @@ package org.apache.xerces.impl.xs.util; * @xerces.internal * * @author Henry Zongaro, IBM - * @version $Id: XInt.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XInt.java 446723 2006-09-15 20:37:45Z mrglavas $ */ public final class XInt { diff --git a/src/org/apache/xerces/impl/xs/util/XIntPool.java b/src/org/apache/xerces/impl/xs/util/XIntPool.java index d24fc5e..d55acc3 100644 --- a/src/org/apache/xerces/impl/xs/util/XIntPool.java +++ b/src/org/apache/xerces/impl/xs/util/XIntPool.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,7 +21,7 @@ package org.apache.xerces.impl.xs.util; * @xerces.internal * * @author Henry Zongaro, IBM - * @version $Id: XIntPool.java 320098 2004-10-06 15:14:55Z mrglavas $ + * @version $Id: XIntPool.java 446723 2006-09-15 20:37:45Z mrglavas $ */ public final class XIntPool { private static final short POOL_SIZE = 10; diff --git a/src/org/apache/xerces/impl/xs/util/XSGrammarPool.java b/src/org/apache/xerces/impl/xs/util/XSGrammarPool.java index 71e7279..b418b18 100644 --- a/src/org/apache/xerces/impl/xs/util/XSGrammarPool.java +++ b/src/org/apache/xerces/impl/xs/util/XSGrammarPool.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.xs.XSModel; * * @xerces.internal * - * @version $Id: XSGrammarPool.java 388860 2006-03-25 23:50:16Z mrglavas $ + * @version $Id: XSGrammarPool.java 446723 2006-09-15 20:37:45Z mrglavas $ */ public class XSGrammarPool extends XMLGrammarPoolImpl { /** diff --git a/src/org/apache/xerces/impl/xs/util/XSNamedMap4Types.java b/src/org/apache/xerces/impl/xs/util/XSNamedMap4Types.java index 5f6a4cb..9041e5a 100644 --- a/src/org/apache/xerces/impl/xs/util/XSNamedMap4Types.java +++ b/src/org/apache/xerces/impl/xs/util/XSNamedMap4Types.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.util.SymbolHash; * * @author Sandy Gao, IBM * - * @version $Id: XSNamedMap4Types.java 381260 2006-02-27 04:47:44Z mrglavas $ + * @version $Id: XSNamedMap4Types.java 446723 2006-09-15 20:37:45Z mrglavas $ */ public class XSNamedMap4Types extends XSNamedMapImpl { diff --git a/src/org/apache/xerces/impl/xs/util/XSNamedMapImpl.java b/src/org/apache/xerces/impl/xs/util/XSNamedMapImpl.java index 11bef59..8fae707 100644 --- a/src/org/apache/xerces/impl/xs/util/XSNamedMapImpl.java +++ b/src/org/apache/xerces/impl/xs/util/XSNamedMapImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.xs.*; * * @author Sandy Gao, IBM * - * @version $Id: XSNamedMapImpl.java 381269 2006-02-27 06:31:20Z mrglavas $ + * @version $Id: XSNamedMapImpl.java 446723 2006-09-15 20:37:45Z mrglavas $ */ public class XSNamedMapImpl implements XSNamedMap { diff --git a/src/org/apache/xerces/impl/xs/util/XSObjectListImpl.java b/src/org/apache/xerces/impl/xs/util/XSObjectListImpl.java index 8fee918..4f488dd 100644 --- a/src/org/apache/xerces/impl/xs/util/XSObjectListImpl.java +++ b/src/org/apache/xerces/impl/xs/util/XSObjectListImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2003-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.xs.XSObjectList; * * @author Sandy Gao, IBM * - * @version $Id: XSObjectListImpl.java 320154 2004-12-03 15:50:44Z mrglavas $ + * @version $Id: XSObjectListImpl.java 446723 2006-09-15 20:37:45Z mrglavas $ */ public class XSObjectListImpl implements XSObjectList { diff --git a/src/org/apache/xerces/jaxp/DefaultValidationErrorHandler.java b/src/org/apache/xerces/jaxp/DefaultValidationErrorHandler.java index f5d5f8e..702504f 100644 --- a/src/org/apache/xerces/jaxp/DefaultValidationErrorHandler.java +++ b/src/org/apache/xerces/jaxp/DefaultValidationErrorHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; /** - * @version $Id: DefaultValidationErrorHandler.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: DefaultValidationErrorHandler.java 447237 2006-09-18 05:03:10Z mrglavas $ */ class DefaultValidationErrorHandler extends DefaultHandler { diff --git a/src/org/apache/xerces/jaxp/DocumentBuilderFactoryImpl.java b/src/org/apache/xerces/jaxp/DocumentBuilderFactoryImpl.java index 40fa60b..09dc214 100644 --- a/src/org/apache/xerces/jaxp/DocumentBuilderFactoryImpl.java +++ b/src/org/apache/xerces/jaxp/DocumentBuilderFactoryImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,7 +35,7 @@ import org.xml.sax.SAXNotSupportedException; /** * @author Rajiv Mordani * @author Edwin Goei - * @version $Id: DocumentBuilderFactoryImpl.java 439173 2006-09-01 04:31:20Z mrglavas $ + * @version $Id: DocumentBuilderFactoryImpl.java 447237 2006-09-18 05:03:10Z mrglavas $ */ public class DocumentBuilderFactoryImpl extends DocumentBuilderFactory { diff --git a/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java b/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java index 043dd58..1c985ce 100644 --- a/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java +++ b/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -50,7 +51,7 @@ import org.xml.sax.SAXNotSupportedException; /** * @author Rajiv Mordani * @author Edwin Goei - * @version $Id: DocumentBuilderImpl.java 443059 2006-09-13 18:26:56Z mrglavas $ + * @version $Id: DocumentBuilderImpl.java 447237 2006-09-18 05:03:10Z mrglavas $ */ public class DocumentBuilderImpl extends DocumentBuilder implements JAXPConstants diff --git a/src/org/apache/xerces/jaxp/JAXPConstants.java b/src/org/apache/xerces/jaxp/JAXPConstants.java index 9c38160..09bf40c 100644 --- a/src/org/apache/xerces/jaxp/JAXPConstants.java +++ b/src/org/apache/xerces/jaxp/JAXPConstants.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ package org.apache.xerces.jaxp; * in future JAXP spec versions, this interface can be removed. * * @author Edwin Goei - * @version $Id: JAXPConstants.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: JAXPConstants.java 447237 2006-09-18 05:03:10Z mrglavas $ */ public interface JAXPConstants { static final String JAXP_SCHEMA_LANGUAGE = diff --git a/src/org/apache/xerces/jaxp/JAXPValidatorComponent.java b/src/org/apache/xerces/jaxp/JAXPValidatorComponent.java index 85f8c2c..eecbde1 100644 --- a/src/org/apache/xerces/jaxp/JAXPValidatorComponent.java +++ b/src/org/apache/xerces/jaxp/JAXPValidatorComponent.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -78,7 +79,7 @@ import org.xml.sax.helpers.DefaultHandler; * and other events go the 2nd direct route. * * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) - * @version $Id: JAXPValidatorComponent.java 320517 2005-06-22 02:03:40Z mrglavas $ + * @version $Id: JAXPValidatorComponent.java 447237 2006-09-18 05:03:10Z mrglavas $ */ final class JAXPValidatorComponent extends TeeXMLDocumentFilterImpl implements XMLComponent { diff --git a/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java b/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java index fe3ca26..232c19c 100644 --- a/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java +++ b/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.xml.sax.SAXNotSupportedException; * @author Rajiv Mordani * @author Edwin Goei * - * @version $Id: SAXParserFactoryImpl.java 439017 2006-08-31 19:18:44Z mrglavas $ + * @version $Id: SAXParserFactoryImpl.java 447237 2006-09-18 05:03:10Z mrglavas $ */ public class SAXParserFactoryImpl extends SAXParserFactory { diff --git a/src/org/apache/xerces/jaxp/SAXParserImpl.java b/src/org/apache/xerces/jaxp/SAXParserImpl.java index d6de06e..ca962c0 100644 --- a/src/org/apache/xerces/jaxp/SAXParserImpl.java +++ b/src/org/apache/xerces/jaxp/SAXParserImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -60,7 +61,7 @@ import org.xml.sax.helpers.DefaultHandler; * @author Rajiv Mordani * @author Edwin Goei * - * @version $Id: SAXParserImpl.java 381441 2006-02-27 21:06:42Z mrglavas $ + * @version $Id: SAXParserImpl.java 447237 2006-09-18 05:03:10Z mrglavas $ */ public class SAXParserImpl extends javax.xml.parsers.SAXParser implements JAXPConstants, PSVIProvider { diff --git a/src/org/apache/xerces/jaxp/SchemaValidatorConfiguration.java b/src/org/apache/xerces/jaxp/SchemaValidatorConfiguration.java index a47dc84..b6a91b5 100644 --- a/src/org/apache/xerces/jaxp/SchemaValidatorConfiguration.java +++ b/src/org/apache/xerces/jaxp/SchemaValidatorConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.xni.parser.XMLConfigurationException; /** * <p>Parser configuration for Xerces' XMLSchemaValidator.</p> * - * @version $Id: SchemaValidatorConfiguration.java 320517 2005-06-22 02:03:40Z mrglavas $ + * @version $Id: SchemaValidatorConfiguration.java 447237 2006-09-18 05:03:10Z mrglavas $ */ final class SchemaValidatorConfiguration implements XMLComponentManager { diff --git a/src/org/apache/xerces/jaxp/TeeXMLDocumentFilterImpl.java b/src/org/apache/xerces/jaxp/TeeXMLDocumentFilterImpl.java index cb06be3..f1a369d 100644 --- a/src/org/apache/xerces/jaxp/TeeXMLDocumentFilterImpl.java +++ b/src/org/apache/xerces/jaxp/TeeXMLDocumentFilterImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import org.apache.xerces.xni.parser.XMLDocumentSource; * <p>XMLDocumentHandler which forks the pipeline to two other components.</p> * * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) - * @version $Id: TeeXMLDocumentFilterImpl.java 320512 2005-06-21 15:53:38Z mrglavas $ + * @version $Id: TeeXMLDocumentFilterImpl.java 447237 2006-09-18 05:03:10Z mrglavas $ */ class TeeXMLDocumentFilterImpl implements XMLDocumentFilter { diff --git a/src/org/apache/xerces/jaxp/UnparsedEntityHandler.java b/src/org/apache/xerces/jaxp/UnparsedEntityHandler.java index d531c8c..26eb649 100644 --- a/src/org/apache/xerces/jaxp/UnparsedEntityHandler.java +++ b/src/org/apache/xerces/jaxp/UnparsedEntityHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -35,7 +36,7 @@ import org.apache.xerces.xni.parser.XMLDTDSource; * Events are forwarded to the registered XMLDTDHandler without modification.</p> * * @author Michael Glavassevich, IBM - * @version $Id: UnparsedEntityHandler.java 320517 2005-06-22 02:03:40Z mrglavas $ + * @version $Id: UnparsedEntityHandler.java 447237 2006-09-18 05:03:10Z mrglavas $ */ final class UnparsedEntityHandler implements XMLDTDFilter, EntityState { diff --git a/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java b/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java index 396e364..a7152db 100644 --- a/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java +++ b/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -16,10 +17,11 @@ package org.apache.xerces.jaxp.datatype; -import java.math.BigInteger; import java.math.BigDecimal; +import java.math.BigInteger; import java.util.GregorianCalendar; +import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; @@ -54,7 +56,7 @@ import javax.xml.datatype.XMLGregorianCalendar; * * @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a> * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a> - * @version $Id: DatatypeFactoryImpl.java 320429 2005-06-06 04:45:59Z mrglavas $ + * @version $Id: DatatypeFactoryImpl.java 449487 2006-09-24 21:11:28Z mrglavas $ */ public class DatatypeFactoryImpl extends DatatypeFactory { diff --git a/src/org/apache/xerces/jaxp/datatype/DurationImpl.java b/src/org/apache/xerces/jaxp/datatype/DurationImpl.java index 5860e8a..c8e0bec 100644 --- a/src/org/apache/xerces/jaxp/datatype/DurationImpl.java +++ b/src/org/apache/xerces/jaxp/datatype/DurationImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -93,7 +94,7 @@ import org.apache.xerces.util.DatatypeMessageFormatter; * * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a> * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a> - * @version $Id: DurationImpl.java 327940 2005-10-24 03:22:51Z mrglavas $ + * @version $Id: DurationImpl.java 447236 2006-09-18 05:02:28Z mrglavas $ * @see XMLGregorianCalendar#add(Duration) */ class DurationImpl diff --git a/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java b/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java index 1023326..0de37ab 100644 --- a/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java +++ b/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -172,7 +173,7 @@ import org.apache.xerces.util.DatatypeMessageFormatter; * * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a> * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a> - * @version $Id: XMLGregorianCalendarImpl.java 320570 2005-09-07 02:44:18Z mrglavas $ + * @version $Id: XMLGregorianCalendarImpl.java 447236 2006-09-18 05:02:28Z mrglavas $ * @see javax.xml.datatype.Duration */ diff --git a/src/org/apache/xerces/jaxp/validation/AbstractXMLSchema.java b/src/org/apache/xerces/jaxp/validation/AbstractXMLSchema.java index 113167b..da72122 100644 --- a/src/org/apache/xerces/jaxp/validation/AbstractXMLSchema.java +++ b/src/org/apache/xerces/jaxp/validation/AbstractXMLSchema.java @@ -1,9 +1,10 @@ /* - * Copyright 2005,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import javax.xml.validation.ValidatorHandler; * <p>Abstract implementation of Schema for W3C XML Schemas.</p> * * @author Michael Glavassevich, IBM - * @version $Id: AbstractXMLSchema.java 381134 2006-02-26 18:20:57Z mrglavas $ + * @version $Id: AbstractXMLSchema.java 447235 2006-09-18 05:01:44Z mrglavas $ */ abstract class AbstractXMLSchema extends Schema implements XSGrammarPoolContainer { diff --git a/src/org/apache/xerces/jaxp/validation/DOMDocumentHandler.java b/src/org/apache/xerces/jaxp/validation/DOMDocumentHandler.java index 66428e4..a4e10b4 100644 --- a/src/org/apache/xerces/jaxp/validation/DOMDocumentHandler.java +++ b/src/org/apache/xerces/jaxp/validation/DOMDocumentHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.w3c.dom.Text; * <p>An extension to XMLDocumentHandler for building DOM structures.</p> * * @author Michael Glavassevich, IBM - * @version $Id: DOMDocumentHandler.java 320386 2005-05-22 20:08:07Z mrglavas $ + * @version $Id: DOMDocumentHandler.java 447235 2006-09-18 05:01:44Z mrglavas $ */ interface DOMDocumentHandler extends XMLDocumentHandler { diff --git a/src/org/apache/xerces/jaxp/validation/DOMResultAugmentor.java b/src/org/apache/xerces/jaxp/validation/DOMResultAugmentor.java index 54d1c74..31e2ebf 100644 --- a/src/org/apache/xerces/jaxp/validation/DOMResultAugmentor.java +++ b/src/org/apache/xerces/jaxp/validation/DOMResultAugmentor.java @@ -1,9 +1,10 @@ /* - * Copyright 2005,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -53,7 +54,7 @@ import org.w3c.dom.Text; * <p>DOM result augmentor.</p> * * @author Michael Glavassevich, IBM - * @version $Id: DOMResultAugmentor.java 381159 2006-02-26 20:19:21Z mrglavas $ + * @version $Id: DOMResultAugmentor.java 476292 2006-11-17 20:09:26Z mrglavas $ */ final class DOMResultAugmentor implements DOMDocumentHandler { @@ -157,6 +158,7 @@ final class DOMResultAugmentor implements DOMDocumentHandler { AttrImpl attr = (AttrImpl) fDocumentImpl.createAttributeNS(fAttributeQName.uri, fAttributeQName.rawname, fAttributeQName.localpart); attr.setValue(attributes.getValue(i)); + currentElement.setAttributeNodeNS(attr); // write type information to this attribute AttributePSVI attrPSVI = (AttributePSVI) attributes.getAugmentations(i).getItem (Constants.ATTRIBUTE_PSVI); @@ -166,7 +168,6 @@ final class DOMResultAugmentor implements DOMDocumentHandler { } } attr.setSpecified(false); - currentElement.setAttributeNodeNS(attr); } } } diff --git a/src/org/apache/xerces/jaxp/validation/DOMResultBuilder.java b/src/org/apache/xerces/jaxp/validation/DOMResultBuilder.java index 3d7b1dc..cfba8d6 100644 --- a/src/org/apache/xerces/jaxp/validation/DOMResultBuilder.java +++ b/src/org/apache/xerces/jaxp/validation/DOMResultBuilder.java @@ -1,9 +1,10 @@ /* - * Copyright 2005,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -63,7 +64,7 @@ import org.w3c.dom.Text; * <p>DOM result builder.</p> * * @author Michael Glavassevich, IBM - * @version $Id: DOMResultBuilder.java 381159 2006-02-26 20:19:21Z mrglavas $ + * @version $Id: DOMResultBuilder.java 476292 2006-11-17 20:09:26Z mrglavas $ */ final class DOMResultBuilder implements DOMDocumentHandler { @@ -236,6 +237,7 @@ final class DOMResultBuilder implements DOMDocumentHandler { AttrImpl attr = (AttrImpl) fDocumentImpl.createAttributeNS(fAttributeQName.uri, fAttributeQName.rawname, fAttributeQName.localpart); attr.setValue(attributes.getValue(i)); + elem.setAttributeNodeNS(attr); // write type information to this attribute AttributePSVI attrPSVI = (AttributePSVI) attributes.getAugmentations(i).getItem (Constants.ATTRIBUTE_PSVI); @@ -261,7 +263,6 @@ final class DOMResultBuilder implements DOMDocumentHandler { } } attr.setSpecified(attributes.isSpecified(i)); - elem.setAttributeNodeNS(attr); } } append(elem); diff --git a/src/org/apache/xerces/jaxp/validation/DOMValidatorHelper.java b/src/org/apache/xerces/jaxp/validation/DOMValidatorHelper.java index 5fcbc6f..99a33a8 100644 --- a/src/org/apache/xerces/jaxp/validation/DOMValidatorHelper.java +++ b/src/org/apache/xerces/jaxp/validation/DOMValidatorHelper.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -59,7 +60,7 @@ import org.xml.sax.SAXException; * <p>A validator helper for <code>DOMSource</code>s.</p> * * @author Michael Glavassevich, IBM - * @version $Id: DOMValidatorHelper.java 320522 2005-06-23 05:38:35Z mrglavas $ + * @version $Id: DOMValidatorHelper.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class DOMValidatorHelper implements ValidatorHelper, EntityState { diff --git a/src/org/apache/xerces/jaxp/validation/DraconianErrorHandler.java b/src/org/apache/xerces/jaxp/validation/DraconianErrorHandler.java index 9e08df9..d55b854 100644 --- a/src/org/apache/xerces/jaxp/validation/DraconianErrorHandler.java +++ b/src/org/apache/xerces/jaxp/validation/DraconianErrorHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.xml.sax.SAXParseException; * {@link ErrorHandler} that throws all errors and fatal errors. * * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) - * @version $Id: DraconianErrorHandler.java 320355 2005-05-14 19:54:15Z mrglavas $ + * @version $Id: DraconianErrorHandler.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class DraconianErrorHandler implements ErrorHandler { diff --git a/src/org/apache/xerces/jaxp/validation/EmptyXMLSchema.java b/src/org/apache/xerces/jaxp/validation/EmptyXMLSchema.java index bdfa3e0..aef1cf2 100644 --- a/src/org/apache/xerces/jaxp/validation/EmptyXMLSchema.java +++ b/src/org/apache/xerces/jaxp/validation/EmptyXMLSchema.java @@ -1,9 +1,10 @@ /* - * Copyright 2005,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import org.apache.xerces.xni.grammars.XMLGrammarPool; * which contains no schema components.</p> * * @author Michael Glavassevich, IBM - * @version $Id: EmptyXMLSchema.java 381134 2006-02-26 18:20:57Z mrglavas $ + * @version $Id: EmptyXMLSchema.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class EmptyXMLSchema extends AbstractXMLSchema implements XMLGrammarPool { diff --git a/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java b/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java index 515d55d..25fdf43 100644 --- a/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java +++ b/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import java.util.PropertyResourceBundle; * <p>Used to format JAXP Validation API error messages using a specified locale.</p> * * @author Michael Glavassevich, IBM - * @version $Id: JAXPValidationMessageFormatter.java 320423 2005-06-05 19:23:52Z mrglavas $ + * @version $Id: JAXPValidationMessageFormatter.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class JAXPValidationMessageFormatter { diff --git a/src/org/apache/xerces/jaxp/validation/ReadOnlyGrammarPool.java b/src/org/apache/xerces/jaxp/validation/ReadOnlyGrammarPool.java index def0a13..8c7cf6a 100644 --- a/src/org/apache/xerces/jaxp/validation/ReadOnlyGrammarPool.java +++ b/src/org/apache/xerces/jaxp/validation/ReadOnlyGrammarPool.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import org.apache.xerces.xni.grammars.XMLGrammarPool; * read-only view of the underlying pool.</p> * * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) - * @version $Id: ReadOnlyGrammarPool.java 320356 2005-05-14 20:01:26Z mrglavas $ + * @version $Id: ReadOnlyGrammarPool.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class ReadOnlyGrammarPool implements XMLGrammarPool { diff --git a/src/org/apache/xerces/jaxp/validation/SimpleXMLSchema.java b/src/org/apache/xerces/jaxp/validation/SimpleXMLSchema.java index 43ad119..3ee4c44 100644 --- a/src/org/apache/xerces/jaxp/validation/SimpleXMLSchema.java +++ b/src/org/apache/xerces/jaxp/validation/SimpleXMLSchema.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import org.apache.xerces.xni.grammars.XMLGrammarPool; * contains schema components from one target namespace.</p> * * @author Michael Glavassevich, IBM - * @version $Id: SimpleXMLSchema.java 320359 2005-05-14 20:37:18Z mrglavas $ + * @version $Id: SimpleXMLSchema.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class SimpleXMLSchema extends AbstractXMLSchema implements XMLGrammarPool { diff --git a/src/org/apache/xerces/jaxp/validation/SoftReferenceGrammarPool.java b/src/org/apache/xerces/jaxp/validation/SoftReferenceGrammarPool.java index 9512de3..fdd0976 100644 --- a/src/org/apache/xerces/jaxp/validation/SoftReferenceGrammarPool.java +++ b/src/org/apache/xerces/jaxp/validation/SoftReferenceGrammarPool.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.apache.xerces.xni.grammars.XMLGrammarPool; * the target namespace for the schema and schema location.</p> * * @author Michael Glavassevich, IBM - * @version $Id: SoftReferenceGrammarPool.java 320408 2005-05-28 02:06:59Z mrglavas $ + * @version $Id: SoftReferenceGrammarPool.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class SoftReferenceGrammarPool implements XMLGrammarPool { diff --git a/src/org/apache/xerces/jaxp/validation/StreamValidatorHelper.java b/src/org/apache/xerces/jaxp/validation/StreamValidatorHelper.java index 4483aa9..68edb62 100644 --- a/src/org/apache/xerces/jaxp/validation/StreamValidatorHelper.java +++ b/src/org/apache/xerces/jaxp/validation/StreamValidatorHelper.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -38,7 +39,7 @@ import org.xml.sax.SAXException; * <p>A validator helper for <code>StreamSource</code>s.</p> * * @author Michael Glavassevich, IBM - * @version $Id: StreamValidatorHelper.java 320552 2005-07-24 23:36:14Z mrglavas $ + * @version $Id: StreamValidatorHelper.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class StreamValidatorHelper implements ValidatorHelper { diff --git a/src/org/apache/xerces/jaxp/validation/Util.java b/src/org/apache/xerces/jaxp/validation/Util.java index 9944f57..bd562c1 100644 --- a/src/org/apache/xerces/jaxp/validation/Util.java +++ b/src/org/apache/xerces/jaxp/validation/Util.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.xml.sax.SAXParseException; * <p>Static utility methods for the Validation API implementation.</p> * * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) - * @version $Id: Util.java 320424 2005-06-05 19:24:56Z mrglavas $ + * @version $Id: Util.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class Util { diff --git a/src/org/apache/xerces/jaxp/validation/ValidatorHandlerImpl.java b/src/org/apache/xerces/jaxp/validation/ValidatorHandlerImpl.java index 488c66b..2d2c50c 100644 --- a/src/org/apache/xerces/jaxp/validation/ValidatorHandlerImpl.java +++ b/src/org/apache/xerces/jaxp/validation/ValidatorHandlerImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2005,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -87,7 +88,7 @@ import org.xml.sax.ext.LexicalHandler; * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) * @author Michael Glavassevich, IBM * - * @version $Id: ValidatorHandlerImpl.java 374971 2006-02-05 04:52:41Z mrglavas $ + * @version $Id: ValidatorHandlerImpl.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class ValidatorHandlerImpl extends ValidatorHandler implements DTDHandler, EntityState, PSVIProvider, ValidatorHelper, XMLDocumentHandler { diff --git a/src/org/apache/xerces/jaxp/validation/ValidatorHelper.java b/src/org/apache/xerces/jaxp/validation/ValidatorHelper.java index 6845a36..ecf1851 100644 --- a/src/org/apache/xerces/jaxp/validation/ValidatorHelper.java +++ b/src/org/apache/xerces/jaxp/validation/ValidatorHelper.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.xml.sax.SAXException; * specific source and result types.</p> * * @author Michael Glavassevich, IBM - * @version $Id: ValidatorHelper.java 320385 2005-05-22 20:02:15Z mrglavas $ + * @version $Id: ValidatorHelper.java 447235 2006-09-18 05:01:44Z mrglavas $ */ interface ValidatorHelper { diff --git a/src/org/apache/xerces/jaxp/validation/ValidatorImpl.java b/src/org/apache/xerces/jaxp/validation/ValidatorImpl.java index 0087451..115b633 100644 --- a/src/org/apache/xerces/jaxp/validation/ValidatorImpl.java +++ b/src/org/apache/xerces/jaxp/validation/ValidatorImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2005,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -44,7 +45,7 @@ import org.xml.sax.SAXNotSupportedException; * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a> * @author Michael Glavassevich, IBM * - * @version $Id: ValidatorImpl.java 380997 2006-02-25 21:26:43Z mrglavas $ + * @version $Id: ValidatorImpl.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class ValidatorImpl extends Validator implements PSVIProvider { diff --git a/src/org/apache/xerces/jaxp/validation/WeakReferenceXMLSchema.java b/src/org/apache/xerces/jaxp/validation/WeakReferenceXMLSchema.java index c16d820..a425a06 100644 --- a/src/org/apache/xerces/jaxp/validation/WeakReferenceXMLSchema.java +++ b/src/org/apache/xerces/jaxp/validation/WeakReferenceXMLSchema.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.xni.grammars.XMLGrammarPool; * its memory.</p> * * @author Michael Glavassevich, IBM - * @version $Id: WeakReferenceXMLSchema.java 320359 2005-05-14 20:37:18Z mrglavas $ + * @version $Id: WeakReferenceXMLSchema.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class WeakReferenceXMLSchema extends AbstractXMLSchema { diff --git a/src/org/apache/xerces/jaxp/validation/XMLSchema.java b/src/org/apache/xerces/jaxp/validation/XMLSchema.java index fc5e0a1..39741ce 100644 --- a/src/org/apache/xerces/jaxp/validation/XMLSchema.java +++ b/src/org/apache/xerces/jaxp/validation/XMLSchema.java @@ -1,9 +1,10 @@ /* - * Copyright 2005,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,7 +23,7 @@ import org.apache.xerces.xni.grammars.XMLGrammarPool; * <p>Implementation of Schema for W3C XML Schemas.</p> * * @author Michael Glavassevich, IBM - * @version $Id: XMLSchema.java 371617 2006-01-23 18:41:49Z mrglavas $ + * @version $Id: XMLSchema.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class XMLSchema extends AbstractXMLSchema { diff --git a/src/org/apache/xerces/jaxp/validation/XMLSchemaFactory.java b/src/org/apache/xerces/jaxp/validation/XMLSchemaFactory.java index 97758cf..c7fc183 100644 --- a/src/org/apache/xerces/jaxp/validation/XMLSchemaFactory.java +++ b/src/org/apache/xerces/jaxp/validation/XMLSchemaFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2005,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -57,7 +58,7 @@ import org.xml.sax.SAXParseException; * {@link SchemaFactory} for XML Schema. * * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) - * @version $Id: XMLSchemaFactory.java 381134 2006-02-26 18:20:57Z mrglavas $ + * @version $Id: XMLSchemaFactory.java 450930 2006-09-28 17:17:16Z mrglavas $ */ public final class XMLSchemaFactory extends SchemaFactory { @@ -222,7 +223,9 @@ public final class XMLSchemaFactory extends SchemaFactory { catch (IOException e) { // this hasn't been reported, so do so now. SAXParseException se = new SAXParseException(e.getMessage(),null,e); - fErrorHandler.error(se); + if (fErrorHandler != null) { + fErrorHandler.error(se); + } throw se; // and we must throw it. } diff --git a/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java b/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java index 25093e5..891fbf3 100644 --- a/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java +++ b/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java @@ -1,9 +1,10 @@ /* - * Copyright 2005,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -46,7 +47,7 @@ import org.xml.sax.ErrorHandler; * <p>An implementation of XMLComponentManager for a schema validator.</p> * * @author Michael Glavassevich, IBM - * @version $Id: XMLSchemaValidatorComponentManager.java 381134 2006-02-26 18:20:57Z mrglavas $ + * @version $Id: XMLSchemaValidatorComponentManager.java 447235 2006-09-18 05:01:44Z mrglavas $ */ final class XMLSchemaValidatorComponentManager extends ParserConfigurationSettings implements XMLComponentManager { diff --git a/src/org/apache/xerces/jaxp/validation/XSGrammarPoolContainer.java b/src/org/apache/xerces/jaxp/validation/XSGrammarPoolContainer.java index 1b08877..82a27e1 100644 --- a/src/org/apache/xerces/jaxp/validation/XSGrammarPoolContainer.java +++ b/src/org/apache/xerces/jaxp/validation/XSGrammarPoolContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 2005,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,7 +23,7 @@ import org.apache.xerces.xni.grammars.XMLGrammarPool; * <p>A container for grammar pools which only contain schema grammars.</p> * * @author Michael Glavassevich, IBM - * @version $Id: XSGrammarPoolContainer.java 381134 2006-02-26 18:20:57Z mrglavas $ + * @version $Id: XSGrammarPoolContainer.java 447235 2006-09-18 05:01:44Z mrglavas $ */ public interface XSGrammarPoolContainer { diff --git a/src/org/apache/xerces/parsers/AbstractDOMParser.java b/src/org/apache/xerces/parsers/AbstractDOMParser.java index b4b10df..07d47a6 100644 --- a/src/org/apache/xerces/parsers/AbstractDOMParser.java +++ b/src/org/apache/xerces/parsers/AbstractDOMParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -80,7 +81,7 @@ import org.xml.sax.SAXException; * @author Andy Clark, IBM * @author Elena Litani, IBM * - * @version $Id: AbstractDOMParser.java 443059 2006-09-13 18:26:56Z mrglavas $ + * @version $Id: AbstractDOMParser.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class AbstractDOMParser extends AbstractXMLDocumentParser { diff --git a/src/org/apache/xerces/parsers/AbstractSAXParser.java b/src/org/apache/xerces/parsers/AbstractSAXParser.java index d67869a..c0a47f2 100644 --- a/src/org/apache/xerces/parsers/AbstractSAXParser.java +++ b/src/org/apache/xerces/parsers/AbstractSAXParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -73,7 +74,7 @@ import org.xml.sax.helpers.LocatorImpl; * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * - * @version $Id: AbstractSAXParser.java 390944 2006-04-03 02:46:45Z mrglavas $ + * @version $Id: AbstractSAXParser.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public abstract class AbstractSAXParser extends AbstractXMLDocumentParser diff --git a/src/org/apache/xerces/parsers/AbstractXMLDocumentParser.java b/src/org/apache/xerces/parsers/AbstractXMLDocumentParser.java index 971bc50..eeaed2a 100644 --- a/src/org/apache/xerces/parsers/AbstractXMLDocumentParser.java +++ b/src/org/apache/xerces/parsers/AbstractXMLDocumentParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -42,7 +43,7 @@ import org.apache.xerces.xni.parser.XMLParserConfiguration; * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * - * @version $Id: AbstractXMLDocumentParser.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: AbstractXMLDocumentParser.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public abstract class AbstractXMLDocumentParser extends XMLParser diff --git a/src/org/apache/xerces/parsers/BasicParserConfiguration.java b/src/org/apache/xerces/parsers/BasicParserConfiguration.java index c049695..97623c5 100644 --- a/src/org/apache/xerces/parsers/BasicParserConfiguration.java +++ b/src/org/apache/xerces/parsers/BasicParserConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -87,7 +88,7 @@ import org.apache.xerces.xni.parser.XMLParserConfiguration; * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * - * @version $Id: BasicParserConfiguration.java 319881 2004-04-12 21:56:02Z mrglavas $ + * @version $Id: BasicParserConfiguration.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public abstract class BasicParserConfiguration extends ParserConfigurationSettings diff --git a/src/org/apache/xerces/parsers/CachingParserPool.java b/src/org/apache/xerces/parsers/CachingParserPool.java index 61035ad..3473876 100644 --- a/src/org/apache/xerces/parsers/CachingParserPool.java +++ b/src/org/apache/xerces/parsers/CachingParserPool.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -54,7 +55,7 @@ import org.apache.xerces.util.SynchronizedSymbolTable; * * @author Andy Clark, IBM * - * @version $Id: CachingParserPool.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: CachingParserPool.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class CachingParserPool { diff --git a/src/org/apache/xerces/parsers/DOMASBuilderImpl.java b/src/org/apache/xerces/parsers/DOMASBuilderImpl.java index ee1bc33..126af1a 100644 --- a/src/org/apache/xerces/parsers/DOMASBuilderImpl.java +++ b/src/org/apache/xerces/parsers/DOMASBuilderImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -40,7 +41,7 @@ import org.w3c.dom.ls.LSInput; * @deprecated * @author Pavani Mukthipudi, Sun Microsystems Inc. * @author Neil Graham, IBM - * @version $Id: DOMASBuilderImpl.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: DOMASBuilderImpl.java 447239 2006-09-18 05:08:26Z mrglavas $ * */ diff --git a/src/org/apache/xerces/parsers/DOMParser.java b/src/org/apache/xerces/parsers/DOMParser.java index 6f60bee..a020428 100644 --- a/src/org/apache/xerces/parsers/DOMParser.java +++ b/src/org/apache/xerces/parsers/DOMParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -51,7 +52,7 @@ import org.xml.sax.helpers.LocatorImpl; * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * - * @version $Id: DOMParser.java 320531 2005-06-24 02:33:43Z mrglavas $ + * @version $Id: DOMParser.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class DOMParser extends AbstractDOMParser { diff --git a/src/org/apache/xerces/parsers/DOMParserImpl.java b/src/org/apache/xerces/parsers/DOMParserImpl.java index 2a239ec..fa767d8 100644 --- a/src/org/apache/xerces/parsers/DOMParserImpl.java +++ b/src/org/apache/xerces/parsers/DOMParserImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -73,7 +74,7 @@ import org.xml.sax.SAXException; * @author Pavani Mukthipudi, Sun Microsystems Inc. * @author Elena Litani, IBM * @author Rahul Srivastava, Sun Microsystems Inc. - * @version $Id: DOMParserImpl.java 443059 2006-09-13 18:26:56Z mrglavas $ + * @version $Id: DOMParserImpl.java 466933 2006-10-23 04:52:32Z mrglavas $ */ public class DOMParserImpl extends AbstractDOMParser implements LSParser, DOMConfiguration { @@ -82,39 +83,42 @@ public class DOMParserImpl /** Feature identifier: namespaces. */ protected static final String NAMESPACES = - Constants.SAX_FEATURE_PREFIX + Constants.NAMESPACES_FEATURE; + Constants.SAX_FEATURE_PREFIX + Constants.NAMESPACES_FEATURE; /** Feature id: validation. */ protected static final String VALIDATION_FEATURE = - Constants.SAX_FEATURE_PREFIX+Constants.VALIDATION_FEATURE; + Constants.SAX_FEATURE_PREFIX+Constants.VALIDATION_FEATURE; /** XML Schema validation */ protected static final String XMLSCHEMA = - Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_VALIDATION_FEATURE; + Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_VALIDATION_FEATURE; /** XML Schema full checking */ protected static final String XMLSCHEMA_FULL_CHECKING = - Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_FULL_CHECKING; + Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_FULL_CHECKING; /** Dynamic validation */ protected static final String DYNAMIC_VALIDATION = - Constants.XERCES_FEATURE_PREFIX + Constants.DYNAMIC_VALIDATION_FEATURE; + Constants.XERCES_FEATURE_PREFIX + Constants.DYNAMIC_VALIDATION_FEATURE; /** Feature identifier: expose schema normalized value */ protected static final String NORMALIZE_DATA = - Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_NORMALIZED_VALUE; + Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_NORMALIZED_VALUE; /** Feature identifier: disallow docType Decls. */ protected static final String DISALLOW_DOCTYPE_DECL_FEATURE = Constants.XERCES_FEATURE_PREFIX + Constants.DISALLOW_DOCTYPE_DECL_FEATURE; + + /** Feature identifier: honour all schemaLocations */ + protected static final String HONOUR_ALL_SCHEMALOCATIONS = + Constants.XERCES_FEATURE_PREFIX + Constants.HONOUR_ALL_SCHEMALOCATIONS_FEATURE; // internal properties protected static final String SYMBOL_TABLE = - Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY; + Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY; protected static final String PSVI_AUGMENT = - Constants.XERCES_FEATURE_PREFIX +Constants.SCHEMA_AUGMENT_PSVI; - + Constants.XERCES_FEATURE_PREFIX +Constants.SCHEMA_AUGMENT_PSVI; // // Data @@ -339,8 +343,8 @@ public class DOMParserImpl public void setParameter (String name, Object value) throws DOMException { // set features - if(value instanceof Boolean){ - boolean state = ((Boolean)value).booleanValue (); + if (value instanceof Boolean) { + boolean state = ((Boolean)value).booleanValue(); try { if (name.equalsIgnoreCase (Constants.DOM_COMMENTS)) { fConfiguration.setFeature (INCLUDE_COMMENTS_FEATURE, state); @@ -438,7 +442,16 @@ public class DOMParserImpl // Constants.DOM_CHARSET_OVERRIDES_XML_ENCODING feature, // Constants.DOM_SPLIT_CDATA feature, // or any Xerces feature - fConfiguration.setFeature (name.toLowerCase(Locale.ENGLISH), state); + String normalizedName; + // The honour-all-schemaLocations feature is + // mixed case so requires special treatment. + if (name.equalsIgnoreCase(HONOUR_ALL_SCHEMALOCATIONS)) { + normalizedName = HONOUR_ALL_SCHEMALOCATIONS; + } + else { + normalizedName = name.toLowerCase(Locale.ENGLISH); + } + fConfiguration.setFeature(normalizedName, state); } } @@ -583,13 +596,38 @@ public class DOMParserImpl fConfiguration.setProperty (DOCUMENT_CLASS_NAME, value); } else { - // REVISIT: check if this is a boolean parameter -- type mismatch should be thrown. - //parameter is not recognized + // Try to set the property. + String normalizedName = name.toLowerCase(Locale.ENGLISH); + try { + fConfiguration.setProperty(normalizedName, value); + return; + } + catch (XMLConfigurationException e) {} + + // If this is a boolean parameter a type mismatch should be thrown. + try { + // The honour-all-schemaLocations feature is + // mixed case so requires special treatment. + if (name.equalsIgnoreCase(HONOUR_ALL_SCHEMALOCATIONS)) { + normalizedName = HONOUR_ALL_SCHEMALOCATIONS; + } + fConfiguration.getFeature(normalizedName); + String msg = + DOMMessageFormatter.formatMessage ( + DOMMessageFormatter.DOM_DOMAIN, + "TYPE_MISMATCH_ERR", + new Object[] { name }); + throw new DOMException (DOMException.TYPE_MISMATCH_ERR, msg); + + } + catch (XMLConfigurationException e) {} + + // Parameter is not recognized String msg = - DOMMessageFormatter.formatMessage ( - DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_FOUND", - new Object[] { name }); + DOMMessageFormatter.formatMessage ( + DOMMessageFormatter.DOM_DOMAIN, + "FEATURE_NOT_FOUND", + new Object[] { name }); throw new DOMException (DOMException.NOT_FOUND_ERR, msg); } } @@ -659,7 +697,7 @@ public class DOMParserImpl ? Boolean.TRUE : Boolean.FALSE; } else if (name.equalsIgnoreCase(Constants.DOM_CHECK_CHAR_NORMALIZATION ) || - name.equalsIgnoreCase(Constants.DOM_NORMALIZE_CHARACTERS)){ + name.equalsIgnoreCase(Constants.DOM_NORMALIZE_CHARACTERS)) { return Boolean.FALSE; } else if (name.equalsIgnoreCase(Constants.DOM_NAMESPACE_DECLARATIONS) @@ -684,12 +722,12 @@ public class DOMParserImpl XMLEntityResolver entityResolver = (XMLEntityResolver) fConfiguration.getProperty (ENTITY_RESOLVER); if (entityResolver != null - && entityResolver instanceof DOMEntityResolverWrapper) { - return ((DOMEntityResolverWrapper) entityResolver).getEntityResolver (); + && entityResolver instanceof DOMEntityResolverWrapper) { + return ((DOMEntityResolverWrapper) entityResolver).getEntityResolver(); } - return null; } catch (XMLConfigurationException e) {} + return null; } else if (name.equalsIgnoreCase (Constants.DOM_SCHEMA_TYPE)) { return fConfiguration.getProperty ( @@ -698,30 +736,52 @@ public class DOMParserImpl else if (name.equalsIgnoreCase (Constants.DOM_SCHEMA_LOCATION)) { return fSchemaLocation; } - else if (name.equalsIgnoreCase (SYMBOL_TABLE)){ + else if (name.equalsIgnoreCase (SYMBOL_TABLE)) { return fConfiguration.getProperty (SYMBOL_TABLE); } else if (name.equalsIgnoreCase (DOCUMENT_CLASS_NAME)) { return fConfiguration.getProperty (DOCUMENT_CLASS_NAME); } else { + // This could be a recognized feature or property. + String normalizedName; + + // The honour-all-schemaLocations feature is + // mixed case so requires special treatment. + if (name.equalsIgnoreCase(HONOUR_ALL_SCHEMALOCATIONS)) { + normalizedName = HONOUR_ALL_SCHEMALOCATIONS; + } + else { + normalizedName = name.toLowerCase(Locale.ENGLISH); + } + try { + return fConfiguration.getFeature(normalizedName) + ? Boolean.TRUE : Boolean.FALSE; + } + catch (XMLConfigurationException e) {} + + // This isn't a feature; perhaps it's a property + try { + return fConfiguration.getProperty(normalizedName); + } + catch (XMLConfigurationException e) {} + String msg = - DOMMessageFormatter.formatMessage ( - DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_FOUND", - new Object[] { name }); + DOMMessageFormatter.formatMessage ( + DOMMessageFormatter.DOM_DOMAIN, + "FEATURE_NOT_FOUND", + new Object[] { name }); throw new DOMException (DOMException.NOT_FOUND_ERR, msg); } - return null; } public boolean canSetParameter (String name, Object value) { - if (value == null){ - return true; - } - - if(value instanceof Boolean){ - boolean state = ((Boolean)value).booleanValue (); + if (value == null) { + return true; + } + + if (value instanceof Boolean) { + boolean state = ((Boolean)value).booleanValue(); if ( name.equalsIgnoreCase (Constants.DOM_SUPPORTED_MEDIATYPES_ONLY) || name.equalsIgnoreCase(Constants.DOM_NORMALIZE_CHARACTERS) || name.equalsIgnoreCase(Constants.DOM_CHECK_CHAR_NORMALIZATION ) @@ -752,7 +812,16 @@ public class DOMParserImpl // Recognize Xerces features. try { - fConfiguration.getFeature(name.toLowerCase(Locale.ENGLISH)); + String normalizedName; + // The honour-all-schemaLocations feature is + // mixed case so requires special treatment. + if (name.equalsIgnoreCase(HONOUR_ALL_SCHEMALOCATIONS)) { + normalizedName = HONOUR_ALL_SCHEMALOCATIONS; + } + else { + normalizedName = name.toLowerCase(Locale.ENGLISH); + } + fConfiguration.getFeature(normalizedName); return true; } catch (XMLConfigurationException e) { @@ -785,10 +854,18 @@ public class DOMParserImpl return true; return false; } - else if (name.equalsIgnoreCase (DOCUMENT_CLASS_NAME)){ + else if (name.equalsIgnoreCase (DOCUMENT_CLASS_NAME)) { + return true; + } + + // Recognize Xerces properties. + try { + fConfiguration.getProperty(name.toLowerCase(Locale.ENGLISH)); return true; } - return false; + catch (XMLConfigurationException e) { + return false; + } } } @@ -1053,7 +1130,7 @@ public class DOMParserImpl } /** - * @see org.w3c.dom.ls.DOMParser#abort() + * @see org.w3c.dom.ls.LSParser#abort() */ public void abort () { // If parse operation is in progress then reset it diff --git a/src/org/apache/xerces/parsers/DTDConfiguration.java b/src/org/apache/xerces/parsers/DTDConfiguration.java index 9499fb1..b048d0b 100644 --- a/src/org/apache/xerces/parsers/DTDConfiguration.java +++ b/src/org/apache/xerces/parsers/DTDConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -79,7 +80,7 @@ import org.apache.xerces.xni.parser.XMLPullParserConfiguration; * @author Andy Clark, IBM * @author Neil Graham, IBM * - * @version $Id: DTDConfiguration.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: DTDConfiguration.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class DTDConfiguration extends BasicParserConfiguration diff --git a/src/org/apache/xerces/parsers/DTDParser.java b/src/org/apache/xerces/parsers/DTDParser.java index 2af6633..e24f142 100644 --- a/src/org/apache/xerces/parsers/DTDParser.java +++ b/src/org/apache/xerces/parsers/DTDParser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.xni.parser.XMLDTDScanner; import org.apache.xerces.xni.XMLResourceIdentifier; /** - * @version $Id: DTDParser.java 319864 2004-03-25 04:03:23Z mrglavas $ + * @version $Id: DTDParser.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public abstract class DTDParser extends XMLGrammarParser diff --git a/src/org/apache/xerces/parsers/IntegratedParserConfiguration.java b/src/org/apache/xerces/parsers/IntegratedParserConfiguration.java index 19fefdc..3e60a48 100644 --- a/src/org/apache/xerces/parsers/IntegratedParserConfiguration.java +++ b/src/org/apache/xerces/parsers/IntegratedParserConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -64,7 +65,7 @@ import org.apache.xerces.xni.parser.XMLDocumentScanner; * * @author Elena Litani, IBM * - * @version $Id: IntegratedParserConfiguration.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: IntegratedParserConfiguration.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class IntegratedParserConfiguration extends StandardParserConfiguration { diff --git a/src/org/apache/xerces/parsers/NonValidatingConfiguration.java b/src/org/apache/xerces/parsers/NonValidatingConfiguration.java index 2a10295..0c5983a 100644 --- a/src/org/apache/xerces/parsers/NonValidatingConfiguration.java +++ b/src/org/apache/xerces/parsers/NonValidatingConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -51,7 +52,7 @@ import org.apache.xerces.xni.parser.XMLPullParserConfiguration; * include the replacement text of internal entities, and supply default attribute values". * * @author Elena Litani, IBM - * @version $Id: NonValidatingConfiguration.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: NonValidatingConfiguration.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class NonValidatingConfiguration extends BasicParserConfiguration diff --git a/src/org/apache/xerces/parsers/ObjectFactory.java b/src/org/apache/xerces/parsers/ObjectFactory.java index 8012df0..db3f003 100644 --- a/src/org/apache/xerces/parsers/ObjectFactory.java +++ b/src/org/apache/xerces/parsers/ObjectFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import java.io.InputStreamReader; * when bundled as part of the JDK. * <p> * - * @version $Id: ObjectFactory.java 320285 2005-04-18 04:15:35Z mrglavas $ + * @version $Id: ObjectFactory.java 447239 2006-09-18 05:08:26Z mrglavas $ */ final class ObjectFactory { diff --git a/src/org/apache/xerces/parsers/SAXParser.java b/src/org/apache/xerces/parsers/SAXParser.java index 5c267ba..aad6748 100644 --- a/src/org/apache/xerces/parsers/SAXParser.java +++ b/src/org/apache/xerces/parsers/SAXParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.xni.parser.XMLParserConfiguration; * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * - * @version $Id: SAXParser.java 320306 2005-05-04 03:56:45Z mrglavas $ + * @version $Id: SAXParser.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class SAXParser extends AbstractSAXParser { diff --git a/src/org/apache/xerces/parsers/SecurityConfiguration.java b/src/org/apache/xerces/parsers/SecurityConfiguration.java index f880d90..7e8421d 100644 --- a/src/org/apache/xerces/parsers/SecurityConfiguration.java +++ b/src/org/apache/xerces/parsers/SecurityConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -40,7 +41,7 @@ import org.apache.xerces.util.SymbolTable; * * @author Neil Graham, IBM * - * @version $Id: SecurityConfiguration.java 320306 2005-05-04 03:56:45Z mrglavas $ + * @version $Id: SecurityConfiguration.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class SecurityConfiguration extends XIncludeAwareParserConfiguration { diff --git a/src/org/apache/xerces/parsers/SecuritySupport.java b/src/org/apache/xerces/parsers/SecuritySupport.java index 231d8f4..c2daa83 100644 --- a/src/org/apache/xerces/parsers/SecuritySupport.java +++ b/src/org/apache/xerces/parsers/SecuritySupport.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/parsers/SoftReferenceSymbolTableConfiguration.java b/src/org/apache/xerces/parsers/SoftReferenceSymbolTableConfiguration.java new file mode 100644 index 0000000..9fcc588 --- /dev/null +++ b/src/org/apache/xerces/parsers/SoftReferenceSymbolTableConfiguration.java @@ -0,0 +1,84 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.xerces.parsers; + +import org.apache.xerces.util.SoftReferenceSymbolTable; +import org.apache.xerces.util.SymbolTable; +import org.apache.xerces.xni.grammars.XMLGrammarPool; +import org.apache.xerces.xni.parser.XMLComponentManager; + +/** + * This parser configuration extends the default configuration allowing Xerces to + * handle usage scenarios where the names in the XML documents being parsed are mostly + * unique by installing a memory sensitive <code>SymbolTable</code>. The internalized + * strings stored in this <code>SymbolTable</code> are softly reachable and may be + * cleared by the garbage collector in response to memory demand. + * + * @see org.apache.xerces.util.SoftReferenceSymbolTable + * + * @author Peter McCracken, IBM + * + * @version $Id: SoftReferenceSymbolTableConfiguration.java 478344 2006-11-22 22:19:56Z mrglavas $ + */ +public class SoftReferenceSymbolTableConfiguration extends + XIncludeAwareParserConfiguration { + + /** Default constructor. */ + public SoftReferenceSymbolTableConfiguration() { + this(new SoftReferenceSymbolTable(), null, null); + } // <init>() + + /** + * Constructs a parser configuration using the specified symbol table. + * + * @param symbolTable The symbol table to use. + */ + public SoftReferenceSymbolTableConfiguration(SymbolTable symbolTable) { + this(symbolTable, null, null); + } // <init>(SymbolTable) + + /** + * Constructs a parser configuration using the specified symbol table and + * grammar pool. + * <p> + * + * @param symbolTable The symbol table to use. + * @param grammarPool The grammar pool to use. + */ + public SoftReferenceSymbolTableConfiguration( + SymbolTable symbolTable, + XMLGrammarPool grammarPool) { + this(symbolTable, grammarPool, null); + } // <init>(SymbolTable,XMLGrammarPool) + + /** + * Constructs a parser configuration using the specified symbol table, + * grammar pool, and parent settings. + * <p> + * + * @param symbolTable The symbol table to use. + * @param grammarPool The grammar pool to use. + * @param parentSettings The parent settings. + */ + public SoftReferenceSymbolTableConfiguration( + SymbolTable symbolTable, + XMLGrammarPool grammarPool, + XMLComponentManager parentSettings) { + super(symbolTable, grammarPool, parentSettings); + } +} diff --git a/src/org/apache/xerces/parsers/StandardParserConfiguration.java b/src/org/apache/xerces/parsers/StandardParserConfiguration.java index 6550296..5dccc99 100644 --- a/src/org/apache/xerces/parsers/StandardParserConfiguration.java +++ b/src/org/apache/xerces/parsers/StandardParserConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -57,7 +58,7 @@ import org.apache.xerces.xni.parser.XMLConfigurationException; * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * - * @version $Id: StandardParserConfiguration.java 371617 2006-01-23 18:41:49Z mrglavas $ + * @version $Id: StandardParserConfiguration.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class StandardParserConfiguration extends DTDConfiguration { diff --git a/src/org/apache/xerces/parsers/XIncludeAwareParserConfiguration.java b/src/org/apache/xerces/parsers/XIncludeAwareParserConfiguration.java index 8f12836..ab465cd 100644 --- a/src/org/apache/xerces/parsers/XIncludeAwareParserConfiguration.java +++ b/src/org/apache/xerces/parsers/XIncludeAwareParserConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,7 +35,7 @@ import org.apache.xerces.xni.parser.XMLDocumentSource; * * @author Michael Glavassevich, IBM * - * @version $Id: XIncludeAwareParserConfiguration.java 320336 2005-05-09 02:08:10Z mrglavas $ + * @version $Id: XIncludeAwareParserConfiguration.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class XIncludeAwareParserConfiguration extends XML11Configuration { diff --git a/src/org/apache/xerces/parsers/XIncludeParserConfiguration.java b/src/org/apache/xerces/parsers/XIncludeParserConfiguration.java index 56ac8b3..8c09df6 100644 --- a/src/org/apache/xerces/parsers/XIncludeParserConfiguration.java +++ b/src/org/apache/xerces/parsers/XIncludeParserConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/parsers/XML11Configurable.java b/src/org/apache/xerces/parsers/XML11Configurable.java index bef7b36..068321e 100644 --- a/src/org/apache/xerces/parsers/XML11Configurable.java +++ b/src/org/apache/xerces/parsers/XML11Configurable.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,7 +23,7 @@ package org.apache.xerces.parsers; * * @author Michael Glavassevich, IBM * - * @version $Id: XML11Configurable.java 319996 2004-07-22 21:15:20Z mrglavas $ + * @version $Id: XML11Configurable.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public interface XML11Configurable {} diff --git a/src/org/apache/xerces/parsers/XML11Configuration.java b/src/org/apache/xerces/parsers/XML11Configuration.java index 80c6aca..a93fb0b 100644 --- a/src/org/apache/xerces/parsers/XML11Configuration.java +++ b/src/org/apache/xerces/parsers/XML11Configuration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -69,7 +70,7 @@ import org.apache.xerces.xni.parser.XMLPullParserConfiguration; * @author Neil Graham, IBM * @author Michael Glavassevich, IBM * - * @version $Id: XML11Configuration.java 371617 2006-01-23 18:41:49Z mrglavas $ + * @version $Id: XML11Configuration.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class XML11Configuration extends ParserConfigurationSettings implements XMLPullParserConfiguration, XML11Configurable { diff --git a/src/org/apache/xerces/parsers/XML11DTDConfiguration.java b/src/org/apache/xerces/parsers/XML11DTDConfiguration.java index 4649025..2e636b4 100644 --- a/src/org/apache/xerces/parsers/XML11DTDConfiguration.java +++ b/src/org/apache/xerces/parsers/XML11DTDConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -96,7 +97,7 @@ import org.apache.xerces.xni.parser.XMLPullParserConfiguration; * @author Michael Glavassevich, IBM * @author John Kim, IBM * - * @version $Id: XML11DTDConfiguration.java 331696 2005-11-08 05:48:24Z mrglavas $ + * @version $Id: XML11DTDConfiguration.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class XML11DTDConfiguration extends ParserConfigurationSettings implements XMLPullParserConfiguration, XML11Configurable { diff --git a/src/org/apache/xerces/parsers/XML11NonValidatingConfiguration.java b/src/org/apache/xerces/parsers/XML11NonValidatingConfiguration.java index 32906dc..325db9f 100644 --- a/src/org/apache/xerces/parsers/XML11NonValidatingConfiguration.java +++ b/src/org/apache/xerces/parsers/XML11NonValidatingConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -67,7 +68,7 @@ import org.apache.xerces.xni.parser.XMLPullParserConfiguration; * @author John Kim, IBM * @author Michael Glavassevich, IBM * - * @version $Id: XML11NonValidatingConfiguration.java 331696 2005-11-08 05:48:24Z mrglavas $ + * @version $Id: XML11NonValidatingConfiguration.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class XML11NonValidatingConfiguration extends ParserConfigurationSettings implements XMLPullParserConfiguration, XML11Configurable { diff --git a/src/org/apache/xerces/parsers/XMLDocumentParser.java b/src/org/apache/xerces/parsers/XMLDocumentParser.java index acb50fa..9a78fef 100644 --- a/src/org/apache/xerces/parsers/XMLDocumentParser.java +++ b/src/org/apache/xerces/parsers/XMLDocumentParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.xni.parser.XMLParserConfiguration; * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * - * @version $Id: XMLDocumentParser.java 320308 2005-05-04 04:23:46Z mrglavas $ + * @version $Id: XMLDocumentParser.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class XMLDocumentParser extends AbstractXMLDocumentParser { diff --git a/src/org/apache/xerces/parsers/XMLGrammarCachingConfiguration.java b/src/org/apache/xerces/parsers/XMLGrammarCachingConfiguration.java index 9f77988..347d712 100644 --- a/src/org/apache/xerces/parsers/XMLGrammarCachingConfiguration.java +++ b/src/org/apache/xerces/parsers/XMLGrammarCachingConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -58,7 +59,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * * @author Neil Graham, IBM * - * @version $Id: XMLGrammarCachingConfiguration.java 320308 2005-05-04 04:23:46Z mrglavas $ + * @version $Id: XMLGrammarCachingConfiguration.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class XMLGrammarCachingConfiguration extends XIncludeAwareParserConfiguration { diff --git a/src/org/apache/xerces/parsers/XMLGrammarParser.java b/src/org/apache/xerces/parsers/XMLGrammarParser.java index 6769765..b0db646 100644 --- a/src/org/apache/xerces/parsers/XMLGrammarParser.java +++ b/src/org/apache/xerces/parsers/XMLGrammarParser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,7 +23,7 @@ import org.apache.xerces.util.SymbolTable; import org.apache.xerces.xni.parser.XMLParserConfiguration; /** - * @version $Id: XMLGrammarParser.java 320308 2005-05-04 04:23:46Z mrglavas $ + * @version $Id: XMLGrammarParser.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public abstract class XMLGrammarParser extends XMLParser { diff --git a/src/org/apache/xerces/parsers/XMLGrammarPreparser.java b/src/org/apache/xerces/parsers/XMLGrammarPreparser.java index 49803c4..5c77123 100644 --- a/src/org/apache/xerces/parsers/XMLGrammarPreparser.java +++ b/src/org/apache/xerces/parsers/XMLGrammarPreparser.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -44,7 +45,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * * @author Neil Graham, IBM * - * @version $Id: XMLGrammarPreparser.java 319864 2004-03-25 04:03:23Z mrglavas $ + * @version $Id: XMLGrammarPreparser.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public class XMLGrammarPreparser { diff --git a/src/org/apache/xerces/parsers/XMLParser.java b/src/org/apache/xerces/parsers/XMLParser.java index 43bf888..105a2c9 100644 --- a/src/org/apache/xerces/parsers/XMLParser.java +++ b/src/org/apache/xerces/parsers/XMLParser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -40,7 +41,7 @@ import org.apache.xerces.xni.parser.XMLParserConfiguration; * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * - * @version $Id: XMLParser.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLParser.java 447239 2006-09-18 05:08:26Z mrglavas $ */ public abstract class XMLParser { diff --git a/src/org/apache/xerces/parsers/XPointerParserConfiguration.java b/src/org/apache/xerces/parsers/XPointerParserConfiguration.java index 3418b07..de4e88b 100644 --- a/src/org/apache/xerces/parsers/XPointerParserConfiguration.java +++ b/src/org/apache/xerces/parsers/XPointerParserConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/util/AttributesProxy.java b/src/org/apache/xerces/util/AttributesProxy.java index 47e67c6..4eb8aa8 100644 --- a/src/org/apache/xerces/util/AttributesProxy.java +++ b/src/org/apache/xerces/util/AttributesProxy.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,12 +24,12 @@ import org.xml.sax.ext.Attributes2; /** * Wraps {@link XMLAttributes} and makes it look like - * {@link AttributeList} and {@link Attributes}. + * {@link AttributeList} and {@link Attributes2}. * * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * - * @version $Id: AttributesProxy.java 320451 2005-06-13 18:19:45Z mrglavas $ + * @version $Id: AttributesProxy.java 449487 2006-09-24 21:11:28Z mrglavas $ */ public final class AttributesProxy implements AttributeList, Attributes2 { diff --git a/src/org/apache/xerces/util/AugmentationsImpl.java b/src/org/apache/xerces/util/AugmentationsImpl.java index c23ec29..71c4035 100644 --- a/src/org/apache/xerces/util/AugmentationsImpl.java +++ b/src/org/apache/xerces/util/AugmentationsImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.xni.Augmentations; * <p> * * @author Elena Litani, IBM - * @version $Id: AugmentationsImpl.java 327940 2005-10-24 03:22:51Z mrglavas $ + * @version $Id: AugmentationsImpl.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class AugmentationsImpl implements Augmentations { diff --git a/src/org/apache/xerces/util/DOMEntityResolverWrapper.java b/src/org/apache/xerces/util/DOMEntityResolverWrapper.java index 9d67e25..bd909c9 100644 --- a/src/org/apache/xerces/util/DOMEntityResolverWrapper.java +++ b/src/org/apache/xerces/util/DOMEntityResolverWrapper.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -40,7 +41,7 @@ import java.io.StringReader; * @author Gopal Sharma, SUN MicroSystems Inc. * @author Elena Litani, IBM * @author Ramesh Mandava, Sun Microsystems - * @version $Id: DOMEntityResolverWrapper.java 319924 2004-05-27 12:26:56Z mrglavas $ + * @version $Id: DOMEntityResolverWrapper.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class DOMEntityResolverWrapper implements XMLEntityResolver { diff --git a/src/org/apache/xerces/util/DOMErrorHandlerWrapper.java b/src/org/apache/xerces/util/DOMErrorHandlerWrapper.java index 36d3156..8a6c0a2 100644 --- a/src/org/apache/xerces/util/DOMErrorHandlerWrapper.java +++ b/src/org/apache/xerces/util/DOMErrorHandlerWrapper.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002, 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import java.util.Hashtable; * @see DOMErrorHandler * * @author Gopal Sharma, SUN Microsystems Inc. - * @version $Id: DOMErrorHandlerWrapper.java 320294 2005-05-02 21:48:51Z mrglavas $ + * @version $Id: DOMErrorHandlerWrapper.java 447241 2006-09-18 05:12:57Z mrglavas $ */ // REVISIT: current implementations wraps error several times: diff --git a/src/org/apache/xerces/util/DOMInputSource.java b/src/org/apache/xerces/util/DOMInputSource.java index ea091ab..2d900ac 100644 --- a/src/org/apache/xerces/util/DOMInputSource.java +++ b/src/org/apache/xerces/util/DOMInputSource.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,7 +23,7 @@ import org.w3c.dom.Node; /** * <p>An <code>XMLInputSource</code> analogue to <code>javax.xml.transform.dom.DOMSource</code>.</p> * - * @version $Id: DOMInputSource.java 320365 2005-05-15 20:01:26Z mrglavas $ + * @version $Id: DOMInputSource.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public final class DOMInputSource extends XMLInputSource { diff --git a/src/org/apache/xerces/util/DOMUtil.java b/src/org/apache/xerces/util/DOMUtil.java index 693e11a..bda142d 100644 --- a/src/org/apache/xerces/util/DOMUtil.java +++ b/src/org/apache/xerces/util/DOMUtil.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -38,7 +39,7 @@ import org.w3c.dom.ls.LSException; * (such as a DTM), we should easily be able to convert our schema * parsing to utilize it. * - * @version $Id: DOMUtil.java 377647 2006-02-14 06:37:04Z mrglavas $ + * @version $Id: DOMUtil.java 447948 2006-09-19 20:20:53Z mrglavas $ */ public class DOMUtil { @@ -316,12 +317,12 @@ public class DOMUtil { // set this Node as being hidden, overloaded method public static void setHidden(Node node, Hashtable hiddenNodes) { - if (node instanceof org.apache.xerces.impl.xs.opti.NodeImpl) + if (node instanceof org.apache.xerces.impl.xs.opti.NodeImpl) { ((org.apache.xerces.impl.xs.opti.NodeImpl)node).setReadOnly(true, false); - else if (node instanceof org.apache.xerces.dom.NodeImpl) - ((org.apache.xerces.dom.NodeImpl)node).setReadOnly(true, false); - else + } + else { hiddenNodes.put(node, ""); + } } // setHidden(node):void // set this Node as being visible @@ -334,12 +335,12 @@ public class DOMUtil { // set this Node as being visible, overloaded method public static void setVisible(Node node, Hashtable hiddenNodes) { - if (node instanceof org.apache.xerces.impl.xs.opti.NodeImpl) - ((org.apache.xerces.impl.xs.opti.NodeImpl)node).setReadOnly(false, false); - else if (node instanceof org.apache.xerces.dom.NodeImpl) - ((org.apache.xerces.dom.NodeImpl)node).setReadOnly(false, false); - else - hiddenNodes.remove(node); + if (node instanceof org.apache.xerces.impl.xs.opti.NodeImpl) { + ((org.apache.xerces.impl.xs.opti.NodeImpl)node).setReadOnly(false, false); + } + else { + hiddenNodes.remove(node); + } } // setVisible(node):void // is this node hidden? @@ -353,12 +354,12 @@ public class DOMUtil { // is this node hidden? overloaded method public static boolean isHidden(Node node, Hashtable hiddenNodes) { - if (node instanceof org.apache.xerces.impl.xs.opti.NodeImpl) + if (node instanceof org.apache.xerces.impl.xs.opti.NodeImpl) { return ((org.apache.xerces.impl.xs.opti.NodeImpl)node).getReadOnly(); - else if (node instanceof org.apache.xerces.dom.NodeImpl) - return ((org.apache.xerces.dom.NodeImpl)node).getReadOnly(); - else - return hiddenNodes.containsKey(node); + } + else { + return hiddenNodes.containsKey(node); + } } // isHidden(Node):boolean /** Finds and returns the first child node with the given name. */ diff --git a/src/org/apache/xerces/util/DatatypeMessageFormatter.java b/src/org/apache/xerces/util/DatatypeMessageFormatter.java index 43e29cd..f8dc263 100644 --- a/src/org/apache/xerces/util/DatatypeMessageFormatter.java +++ b/src/org/apache/xerces/util/DatatypeMessageFormatter.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import java.util.ResourceBundle; * <p>Used to format JAXP 1.3 Datatype API error messages using a specified locale.</p> * * @author Neeraj Bajaj, Sun Microsystems - * @version $Id: DatatypeMessageFormatter.java 320313 2005-05-06 16:06:56Z mrglavas $ + * @version $Id: DatatypeMessageFormatter.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class DatatypeMessageFormatter { diff --git a/src/org/apache/xerces/util/DefaultErrorHandler.java b/src/org/apache/xerces/util/DefaultErrorHandler.java index 6c748a5..5574e13 100644 --- a/src/org/apache/xerces/util/DefaultErrorHandler.java +++ b/src/org/apache/xerces/util/DefaultErrorHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.xni.parser.XMLParseException; * * @author Andy Clark, IBM * - * @version $Id: DefaultErrorHandler.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: DefaultErrorHandler.java 449104 2006-09-22 22:03:29Z mrglavas $ */ public class DefaultErrorHandler implements XMLErrorHandler { @@ -53,7 +54,7 @@ public class DefaultErrorHandler /** * Constructs an error handler that prints error messages to the - * specified <code>PrintWriter</code. + * specified <code>PrintWriter</code>. */ public DefaultErrorHandler(PrintWriter out) { fOut = out; diff --git a/src/org/apache/xerces/util/EncodingMap.java b/src/org/apache/xerces/util/EncodingMap.java index 9e09c94..a7205a7 100644 --- a/src/org/apache/xerces/util/EncodingMap.java +++ b/src/org/apache/xerces/util/EncodingMap.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -465,7 +466,7 @@ import java.util.Hashtable; * @author TAMURA Kent, IBM * @author Andy Clark, IBM * - * @version $Id: EncodingMap.java 441623 2006-09-08 19:31:46Z mrglavas $ + * @version $Id: EncodingMap.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class EncodingMap { diff --git a/src/org/apache/xerces/util/EntityResolver2Wrapper.java b/src/org/apache/xerces/util/EntityResolver2Wrapper.java index 033ad92..55e6e94 100644 --- a/src/org/apache/xerces/util/EntityResolver2Wrapper.java +++ b/src/org/apache/xerces/util/EntityResolver2Wrapper.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import org.xml.sax.SAXException; * * @author Michael Glavassevich, IBM * - * @version $Id: EntityResolver2Wrapper.java 320293 2005-05-02 21:44:37Z mrglavas $ + * @version $Id: EntityResolver2Wrapper.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class EntityResolver2Wrapper implements ExternalSubsetResolver { diff --git a/src/org/apache/xerces/util/EntityResolverWrapper.java b/src/org/apache/xerces/util/EntityResolverWrapper.java index 1a57c7a..1e76931 100644 --- a/src/org/apache/xerces/util/EntityResolverWrapper.java +++ b/src/org/apache/xerces/util/EntityResolverWrapper.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import org.xml.sax.SAXException; * * @author Andy Clark, IBM * - * @version $Id: EntityResolverWrapper.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: EntityResolverWrapper.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class EntityResolverWrapper implements XMLEntityResolver { diff --git a/src/org/apache/xerces/util/ErrorHandlerProxy.java b/src/org/apache/xerces/util/ErrorHandlerProxy.java index bcac039..95fb787 100644 --- a/src/org/apache/xerces/util/ErrorHandlerProxy.java +++ b/src/org/apache/xerces/util/ErrorHandlerProxy.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.xml.sax.SAXParseException; * * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) * - * @version $Id: ErrorHandlerProxy.java 320519 2005-06-22 03:58:12Z mrglavas $ + * @version $Id: ErrorHandlerProxy.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public abstract class ErrorHandlerProxy implements ErrorHandler { diff --git a/src/org/apache/xerces/util/ErrorHandlerWrapper.java b/src/org/apache/xerces/util/ErrorHandlerWrapper.java index 73312f9..dd14b8a 100644 --- a/src/org/apache/xerces/util/ErrorHandlerWrapper.java +++ b/src/org/apache/xerces/util/ErrorHandlerWrapper.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import org.xml.sax.SAXParseException; * * @author Andy Clark, IBM * - * @version $Id: ErrorHandlerWrapper.java 320037 2004-09-01 03:06:08Z mrglavas $ + * @version $Id: ErrorHandlerWrapper.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class ErrorHandlerWrapper implements XMLErrorHandler { diff --git a/src/org/apache/xerces/util/HTTPInputSource.java b/src/org/apache/xerces/util/HTTPInputSource.java index c68d768..672ff3d 100644 --- a/src/org/apache/xerces/util/HTTPInputSource.java +++ b/src/org/apache/xerces/util/HTTPInputSource.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * * @author Michael Glavassevich, IBM * - * @version $Id: HTTPInputSource.java 320365 2005-05-15 20:01:26Z mrglavas $ + * @version $Id: HTTPInputSource.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public final class HTTPInputSource extends XMLInputSource { diff --git a/src/org/apache/xerces/util/IntStack.java b/src/org/apache/xerces/util/IntStack.java index 1793d80..8cfbb62 100644 --- a/src/org/apache/xerces/util/IntStack.java +++ b/src/org/apache/xerces/util/IntStack.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ package org.apache.xerces.util; * XPathMatcher. * @author Andy Clark, IBM * - * @version $Id: IntStack.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: IntStack.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public final class IntStack { diff --git a/src/org/apache/xerces/util/JAXPNamespaceContextWrapper.java b/src/org/apache/xerces/util/JAXPNamespaceContextWrapper.java index 71c025b..c0ab64f 100644 --- a/src/org/apache/xerces/util/JAXPNamespaceContextWrapper.java +++ b/src/org/apache/xerces/util/JAXPNamespaceContextWrapper.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.xni.NamespaceContext; * * @author Michael Glavassevich, IBM * - * @version $Id: JAXPNamespaceContextWrapper.java 379351 2006-02-21 05:36:35Z mrglavas $ + * @version $Id: JAXPNamespaceContextWrapper.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public final class JAXPNamespaceContextWrapper implements NamespaceContext { diff --git a/src/org/apache/xerces/util/LocatorProxy.java b/src/org/apache/xerces/util/LocatorProxy.java index 0d0557b..55822dd 100644 --- a/src/org/apache/xerces/util/LocatorProxy.java +++ b/src/org/apache/xerces/util/LocatorProxy.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.xml.sax.ext.Locator2; * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * - * @version $Id: LocatorProxy.java 320498 2005-06-20 18:29:00Z mrglavas $ + * @version $Id: LocatorProxy.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class LocatorProxy implements Locator2 { diff --git a/src/org/apache/xerces/util/MessageFormatter.java b/src/org/apache/xerces/util/MessageFormatter.java index de9a804..c079383 100644 --- a/src/org/apache/xerces/util/MessageFormatter.java +++ b/src/org/apache/xerces/util/MessageFormatter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import java.util.MissingResourceException; * * @author Andy Clark * - * @version $Id: MessageFormatter.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: MessageFormatter.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public interface MessageFormatter { diff --git a/src/org/apache/xerces/util/NamespaceSupport.java b/src/org/apache/xerces/util/NamespaceSupport.java index 63ff246..67018ae 100644 --- a/src/org/apache/xerces/util/NamespaceSupport.java +++ b/src/org/apache/xerces/util/NamespaceSupport.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.xni.NamespaceContext; * * @author Andy Clark, IBM * - * @version $Id: NamespaceSupport.java 320523 2005-06-23 05:39:17Z mrglavas $ + * @version $Id: NamespaceSupport.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class NamespaceSupport implements NamespaceContext { diff --git a/src/org/apache/xerces/util/ParserConfigurationSettings.java b/src/org/apache/xerces/util/ParserConfigurationSettings.java index a83fe7a..4dbba97 100644 --- a/src/org/apache/xerces/util/ParserConfigurationSettings.java +++ b/src/org/apache/xerces/util/ParserConfigurationSettings.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -36,7 +37,7 @@ import org.apache.xerces.xni.parser.XMLConfigurationException; * * @author Andy Clark, IBM * - * @version $Id: ParserConfigurationSettings.java 319903 2004-04-25 05:05:50Z mrglavas $ + * @version $Id: ParserConfigurationSettings.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class ParserConfigurationSettings implements XMLComponentManager { diff --git a/src/org/apache/xerces/util/SAXInputSource.java b/src/org/apache/xerces/util/SAXInputSource.java index 2f88000..9d184f2 100644 --- a/src/org/apache/xerces/util/SAXInputSource.java +++ b/src/org/apache/xerces/util/SAXInputSource.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.xml.sax.XMLReader; /** * <p>An <code>XMLInputSource</code> analogue to <code>javax.xml.transform.sax.SAXSource</code>.</p> * - * @version $Id: SAXInputSource.java 320364 2005-05-15 19:54:21Z mrglavas $ + * @version $Id: SAXInputSource.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public final class SAXInputSource extends XMLInputSource { diff --git a/src/org/apache/xerces/util/SAXLocatorWrapper.java b/src/org/apache/xerces/util/SAXLocatorWrapper.java index e2979ef..37ef863 100644 --- a/src/org/apache/xerces/util/SAXLocatorWrapper.java +++ b/src/org/apache/xerces/util/SAXLocatorWrapper.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.xni.XMLLocator; * * @author Michael Glavassevich, IBM * - * @version $Id: SAXLocatorWrapper.java 320411 2005-05-30 03:20:40Z mrglavas $ + * @version $Id: SAXLocatorWrapper.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public final class SAXLocatorWrapper implements XMLLocator { diff --git a/src/org/apache/xerces/util/SAXMessageFormatter.java b/src/org/apache/xerces/util/SAXMessageFormatter.java index 6b26045..8e79b47 100644 --- a/src/org/apache/xerces/util/SAXMessageFormatter.java +++ b/src/org/apache/xerces/util/SAXMessageFormatter.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import java.util.PropertyResourceBundle; * * @author Michael Glavassevich, IBM * - * @version $Id: SAXMessageFormatter.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: SAXMessageFormatter.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class SAXMessageFormatter { diff --git a/src/org/apache/xerces/util/SecurityManager.java b/src/org/apache/xerces/util/SecurityManager.java index 8750474..2172630 100644 --- a/src/org/apache/xerces/util/SecurityManager.java +++ b/src/org/apache/xerces/util/SecurityManager.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ package org.apache.xerces.util; * * @author Neil Graham, IBM * - * @version $Id: SecurityManager.java 319859 2004-03-23 01:23:41Z mrglavas $ + * @version $Id: SecurityManager.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public final class SecurityManager { diff --git a/src/org/apache/xerces/util/ShadowedSymbolTable.java b/src/org/apache/xerces/util/ShadowedSymbolTable.java index 1a84257..b3db70b 100644 --- a/src/org/apache/xerces/util/ShadowedSymbolTable.java +++ b/src/org/apache/xerces/util/ShadowedSymbolTable.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ package org.apache.xerces.util; * to the component using this table. * * @author Andy Clark IBM - * @version $Id: ShadowedSymbolTable.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: ShadowedSymbolTable.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public final class ShadowedSymbolTable diff --git a/src/org/apache/xerces/util/SoftReferenceSymbolTable.java b/src/org/apache/xerces/util/SoftReferenceSymbolTable.java new file mode 100644 index 0000000..afc3a9b --- /dev/null +++ b/src/org/apache/xerces/util/SoftReferenceSymbolTable.java @@ -0,0 +1,388 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.xerces.util; + +import java.lang.ref.ReferenceQueue; +import java.lang.ref.SoftReference; + +/** + * This symbol table uses SoftReferences to its String entries, which means that table entries + * that have no references to them can be garbage collected when memory is needed. Thus, in + * documents with very very large numbers of unique strings, using this SymbolTable will prevent + * an out of memory error from occuring. + * + * @see SymbolTable + * + * @author Peter McCracken, IBM + * + * @version $Id: SoftReferenceSymbolTable.java 477799 2006-11-21 18:18:19Z mrglavas $ + */ +/* + * This class extends SymbolTable. Logically, it would make more sense if it and SymbolTable + * shared a common interface, because despite almost identical logic, SoftReferenceSymbolTable + * shares almost no code with SymbolTable (because of necessary checks for null table entries + * in the code). I've chosen to avoid making the interface because we don't want to slow down + * the vastly more common case of using the regular SymbolTable. We also don't want to change + * SymbolTable, since it's a public class that's probably commonly in use by many applications. + * -PJM + */ +public class SoftReferenceSymbolTable extends SymbolTable { + + /* + * This variable masks the fBuckets variable used by SymbolTable. + */ + protected SREntry[] fBuckets = null; + + private ReferenceQueue fReferenceQueue; + + // + // Constructors + // + + /** + * Constructs a new, empty SymbolTable with the specified initial + * capacity and the specified load factor. + * + * @param initialCapacity the initial capacity of the SymbolTable. + * @param loadFactor the load factor of the SymbolTable. + * @throws IllegalArgumentException if the initial capacity is less + * than zero, or if the load factor is nonpositive. + */ + public SoftReferenceSymbolTable(int initialCapacity, float loadFactor) { + /* + * Not calling super() because we don't want to initialize the Entry buckets + * used by the base class. + */ + if (initialCapacity < 0) { + throw new IllegalArgumentException("Illegal Capacity: " + initialCapacity); + } + + if (loadFactor <= 0 || Float.isNaN(loadFactor)) { + throw new IllegalArgumentException("Illegal Load: " + loadFactor); + } + + if (initialCapacity == 0) { + initialCapacity = 1; + } + + fLoadFactor = loadFactor; + fTableSize = initialCapacity; + fBuckets = new SREntry[fTableSize]; + fThreshold = (int)(fTableSize * loadFactor); + fCount = 0; + + fReferenceQueue = new ReferenceQueue(); + } + + /** + * Constructs a new, empty SymbolTable with the specified initial capacity + * and default load factor, which is <tt>0.75</tt>. + * + * @param initialCapacity the initial capacity of the hashtable. + * @throws IllegalArgumentException if the initial capacity is less + * than zero. + */ + public SoftReferenceSymbolTable(int initialCapacity) { + this(initialCapacity, 0.75f); + } + + /** + * Constructs a new, empty SymbolTable with a default initial capacity (101) + * and load factor, which is <tt>0.75</tt>. + */ + public SoftReferenceSymbolTable() { + this(TABLE_SIZE, 0.75f); + } + + // + // Public methods + // + + /** + * Adds the specified symbol to the symbol table and returns a + * reference to the unique symbol. If the symbol already exists, + * the previous symbol reference is returned instead, in order + * guarantee that symbol references remain unique. + * + * @param symbol The new symbol. + */ + public String addSymbol(String symbol) { + clean(); + // search for identical symbol + int bucket = hash(symbol) % fTableSize; + for (SREntry entry = fBuckets[bucket]; entry != null; entry = entry.next) { + SREntryData data = (SREntryData)entry.get(); + if (data == null) { + continue; + } + if (data.symbol.equals(symbol)) { + return data.symbol; + } + } + + if (fCount >= fThreshold) { + // Rehash the table if the threshold is exceeded + rehash(); + bucket = hash(symbol) % fTableSize; + } + + // add new entry + symbol = symbol.intern(); + SREntry entry = new SREntry(symbol, fBuckets[bucket], bucket, fReferenceQueue); + fBuckets[bucket] = entry; + ++fCount; + return symbol; + } // addSymbol(String):String + + /** + * Adds the specified symbol to the symbol table and returns a + * reference to the unique symbol. If the symbol already exists, + * the previous symbol reference is returned instead, in order + * guarantee that symbol references remain unique. + * + * @param buffer The buffer containing the new symbol. + * @param offset The offset into the buffer of the new symbol. + * @param length The length of the new symbol in the buffer. + */ + public String addSymbol(char[] buffer, int offset, int length) { + clean(); + // search for identical symbol + int bucket = hash(buffer, offset, length) % fTableSize; + OUTER: for (SREntry entry = fBuckets[bucket]; entry != null; entry = entry.next) { + SREntryData data = (SREntryData)entry.get(); + if (data == null) { + continue; + } + if (length == data.characters.length) { + for (int i = 0; i < length; i++) { + if (buffer[offset + i] != data.characters[i]) { + continue OUTER; + } + } + return data.symbol; + } + } + + if (fCount >= fThreshold) { + // Rehash the table if the threshold is exceeded + rehash(); + bucket = hash(buffer, offset, length) % fTableSize; + } + + // add new entry + String symbol = new String(buffer, offset, length).intern(); + SREntry entry = new SREntry(symbol, buffer, offset, length, fBuckets[bucket], bucket, fReferenceQueue); + fBuckets[bucket] = entry; + ++fCount; + return symbol; + } // addSymbol(char[],int,int):String + + /** + * Increases the capacity of and internally reorganizes this + * SymbolTable, in order to accommodate and access its entries more + * efficiently. This method is called automatically when the + * number of keys in the SymbolTable exceeds this hashtable's capacity + * and load factor. + */ + protected void rehash() { + + int oldCapacity = fBuckets.length; + SREntry[] oldTable = fBuckets; + + int newCapacity = oldCapacity * 2 + 1; + SREntry[] newTable = new SREntry[newCapacity]; + + fThreshold = (int)(newCapacity * fLoadFactor); + fBuckets = newTable; + fTableSize = fBuckets.length; + + for (int i = oldCapacity ; i-- > 0 ;) { + for (SREntry old = oldTable[i] ; old != null ; ) { + SREntry e = old; + old = old.next; + + SREntryData data = (SREntryData)e.get(); + if (data != null) { + int index = hash(data.characters, 0, data.characters.length) % newCapacity; + if (newTable[index] != null) { + newTable[index].prev = e; + } + e.next = newTable[index]; + newTable[index] = e; + } + else { + fCount--; + } + } + } + } + + /** + * Returns true if the symbol table already contains the specified + * symbol. + * + * @param symbol The symbol to look for. + */ + public boolean containsSymbol(String symbol) { + + // search for identical symbol + int bucket = hash(symbol) % fTableSize; + int length = symbol.length(); + OUTER: for (SREntry entry = fBuckets[bucket]; entry != null; entry = entry.next) { + SREntryData data = (SREntryData)entry.get(); + if (data == null) { + continue; + } + if (length == data.characters.length) { + for (int i = 0; i < length; i++) { + if (symbol.charAt(i) != data.characters[i]) { + continue OUTER; + } + } + return true; + } + } + + return false; + + } // containsSymbol(String):boolean + + /** + * Returns true if the symbol table already contains the specified + * symbol. + * + * @param buffer The buffer containing the symbol to look for. + * @param offset The offset into the buffer. + * @param length The length of the symbol in the buffer. + */ + public boolean containsSymbol(char[] buffer, int offset, int length) { + + // search for identical symbol + int bucket = hash(buffer, offset, length) % fTableSize; + OUTER: for (SREntry entry = fBuckets[bucket]; entry != null; entry = entry.next) { + SREntryData data = (SREntryData)entry.get(); + if (data == null) { + continue; + } + if (length == data.characters.length) { + for (int i = 0; i < length; i++) { + if (buffer[offset + i] != data.characters[i]) { + continue OUTER; + } + } + return true; + } + } + + return false; + + } // containsSymbol(char[],int,int):boolean + + private void removeEntry(SREntry entry) { + if (entry.next != null) { + entry.next.prev = entry.prev; + } + if (entry.prev != null) { + entry.prev.next = entry.next; + } + else { + fBuckets[entry.bucket] = entry.next; + } + fCount--; + } + + /** + * Removes stale symbols from the table. + */ + private void clean() { + SREntry entry = (SREntry)fReferenceQueue.poll(); + while (entry != null) { + removeEntry(entry); + entry = (SREntry)fReferenceQueue.poll(); + } + } + + // + // Classes + // + + /** + * This class is a symbol table entry. Each entry acts as a node + * in a doubly-linked list. + * + * The "SR" stands for SoftReference. + */ + protected static final class SREntry extends SoftReference { + + /** The next entry. */ + public SREntry next; + + /** The previous entry. */ + public SREntry prev; + + public int bucket; + + // + // Constructors + // + + /** + * Constructs a new entry from the specified symbol and next entry + * reference. + */ + public SREntry(String internedSymbol, SREntry next, int bucket, ReferenceQueue q) { + super(new SREntryData(internedSymbol), q); + initialize(next, bucket); + } + + /** + * Constructs a new entry from the specified symbol information and + * next entry reference. + */ + public SREntry(String internedSymbol, char[] ch, int offset, int length, SREntry next, int bucket, ReferenceQueue q) { + super(new SREntryData(internedSymbol, ch, offset, length), q); + initialize(next, bucket); + } + + private void initialize(SREntry next, int bucket) { + this.next = next; + if (next != null) { + next.prev = this; + } + this.prev = null; + this.bucket = bucket; + } + } // class Entry + + protected static final class SREntryData { + public String symbol; + public char[] characters; + + public SREntryData(String internedSymbol) { + this.symbol = internedSymbol; + characters = new char[symbol.length()]; + symbol.getChars(0, characters.length, characters, 0); + } + + public SREntryData(String internedSymbol, char[] ch, int offset, int length) { + this.symbol = internedSymbol; + characters = new char[length]; + System.arraycopy(ch, offset, characters, 0, length); + } + } +} // class SoftReferenceSymbolTable diff --git a/src/org/apache/xerces/util/SymbolHash.java b/src/org/apache/xerces/util/SymbolHash.java index c8673ed..2d1ceb7 100644 --- a/src/org/apache/xerces/util/SymbolHash.java +++ b/src/org/apache/xerces/util/SymbolHash.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ package org.apache.xerces.util; * The hash code uses the same algorithm as SymbolTable class. * * @author Elena Litani - * @version $Id: SymbolHash.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: SymbolHash.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class SymbolHash { diff --git a/src/org/apache/xerces/util/SymbolTable.java b/src/org/apache/xerces/util/SymbolTable.java index ece15ed..481ace3 100644 --- a/src/org/apache/xerces/util/SymbolTable.java +++ b/src/org/apache/xerces/util/SymbolTable.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -73,7 +74,7 @@ package org.apache.xerces.util; * @author Andy Clark * @author John Kim, IBM * - * @version $Id: SymbolTable.java 320244 2005-03-14 23:09:35Z mrglavas $ + * @version $Id: SymbolTable.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class SymbolTable { diff --git a/src/org/apache/xerces/util/SynchronizedSymbolTable.java b/src/org/apache/xerces/util/SynchronizedSymbolTable.java index 06e7b55..00f6772 100644 --- a/src/org/apache/xerces/util/SynchronizedSymbolTable.java +++ b/src/org/apache/xerces/util/SynchronizedSymbolTable.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ package org.apache.xerces.util; * other classes (CachingParserPool, XMLGrammarCachingConfiguration). * * @author Andy Clark, IBM - * @version $Id: SynchronizedSymbolTable.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: SynchronizedSymbolTable.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public final class SynchronizedSymbolTable diff --git a/src/org/apache/xerces/util/URI.java b/src/org/apache/xerces/util/URI.java index cee89d8..a639c9b 100644 --- a/src/org/apache/xerces/util/URI.java +++ b/src/org/apache/xerces/util/URI.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -51,7 +52,7 @@ import java.io.Serializable; * default port for a specific scheme). Rather, it only knows the * grammar and basic set of operations that can be applied to a URI. * -* @version $Id: URI.java 320529 2005-06-24 01:06:07Z mrglavas $ +* @version $Id: URI.java 447241 2006-09-18 05:12:57Z mrglavas $ * **********************************************************************/ public class URI implements Serializable { diff --git a/src/org/apache/xerces/util/XML11Char.java b/src/org/apache/xerces/util/XML11Char.java index 1235310..1efcbba 100644 --- a/src/org/apache/xerces/util/XML11Char.java +++ b/src/org/apache/xerces/util/XML11Char.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import java.util.Arrays; * @author Neil Graham, IBM * @author Michael Glavassevich, IBM * - * @version $Id: XML11Char.java 319864 2004-03-25 04:03:23Z mrglavas $ + * @version $Id: XML11Char.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class XML11Char { diff --git a/src/org/apache/xerces/util/XMLAttributesImpl.java b/src/org/apache/xerces/util/XMLAttributesImpl.java index eecf65d..ba5d4a7 100644 --- a/src/org/apache/xerces/util/XMLAttributesImpl.java +++ b/src/org/apache/xerces/util/XMLAttributesImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.apache.xerces.xni.XMLAttributes; * @author Elena Litani, IBM * @author Michael Glavassevich, IBM * - * @version $Id: XMLAttributesImpl.java 319864 2004-03-25 04:03:23Z mrglavas $ + * @version $Id: XMLAttributesImpl.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class XMLAttributesImpl implements XMLAttributes { diff --git a/src/org/apache/xerces/util/XMLCatalogResolver.java b/src/org/apache/xerces/util/XMLCatalogResolver.java index af4d87e..304ff1f 100644 --- a/src/org/apache/xerces/util/XMLCatalogResolver.java +++ b/src/org/apache/xerces/util/XMLCatalogResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -59,7 +60,7 @@ import org.apache.xml.resolver.readers.SAXCatalogReader; * * @author Michael Glavassevich, IBM * - * @version $Id: XMLCatalogResolver.java 320293 2005-05-02 21:44:37Z mrglavas $ + * @version $Id: XMLCatalogResolver.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class XMLCatalogResolver implements XMLEntityResolver, EntityResolver2, LSResourceResolver { diff --git a/src/org/apache/xerces/util/XMLChar.java b/src/org/apache/xerces/util/XMLChar.java index 6034e38..3971f3f 100644 --- a/src/org/apache/xerces/util/XMLChar.java +++ b/src/org/apache/xerces/util/XMLChar.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -40,7 +41,7 @@ import java.util.Arrays; * @author Michael Glavassevich, IBM * @author Rahul Srivastava, Sun Microsystems Inc. * - * @version $Id: XMLChar.java 319864 2004-03-25 04:03:23Z mrglavas $ + * @version $Id: XMLChar.java 469584 2006-10-31 17:57:34Z mrglavas $ */ public class XMLChar { @@ -1017,6 +1018,38 @@ public class XMLChar { } return false; } // isValidIANAEncoding(String):boolean - + + // other methods + + /** + * Trims space characters as defined by production [3] in + * the XML 1.0 specification from both ends of the given string. + * + * @param value the string to be trimmed + * @return the given string with the space characters trimmed + * from both ends + */ + public static String trim(String value) { + int start; + int end; + final int lengthMinusOne = value.length() - 1; + for (start = 0; start <= lengthMinusOne; ++start) { + if (!isSpace(value.charAt(start))) { + break; + } + } + for (end = lengthMinusOne; end >= start; --end) { + if (!isSpace(value.charAt(end))) { + break; + } + } + if (start == 0 && end == lengthMinusOne) { + return value; + } + if (start > lengthMinusOne) { + return ""; + } + return value.substring(start, end + 1); + } // trim(String):String } // class XMLChar diff --git a/src/org/apache/xerces/util/XMLEntityDescriptionImpl.java b/src/org/apache/xerces/util/XMLEntityDescriptionImpl.java index 031e4fd..dfc5adf 100644 --- a/src/org/apache/xerces/util/XMLEntityDescriptionImpl.java +++ b/src/org/apache/xerces/util/XMLEntityDescriptionImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.apache.xerces.impl.XMLEntityDescription; * * @author Michael Glavassevich, IBM * - * @version $Id: XMLEntityDescriptionImpl.java 319843 2004-03-16 22:03:22Z mrglavas $ + * @version $Id: XMLEntityDescriptionImpl.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class XMLEntityDescriptionImpl extends XMLResourceIdentifierImpl diff --git a/src/org/apache/xerces/util/XMLErrorCode.java b/src/org/apache/xerces/util/XMLErrorCode.java index 18007b3..163f666 100644 --- a/src/org/apache/xerces/util/XMLErrorCode.java +++ b/src/org/apache/xerces/util/XMLErrorCode.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -22,7 +23,7 @@ package org.apache.xerces.util; * * @author Naela Nissar, IBM * - * @version $Id: XMLErrorCode.java 320366 2005-05-15 20:07:38Z mrglavas $ + * @version $Id: XMLErrorCode.java 447241 2006-09-18 05:12:57Z mrglavas $ */ final class XMLErrorCode { diff --git a/src/org/apache/xerces/util/XMLGrammarPoolImpl.java b/src/org/apache/xerces/util/XMLGrammarPoolImpl.java index 9a9f174..f106870 100644 --- a/src/org/apache/xerces/util/XMLGrammarPoolImpl.java +++ b/src/org/apache/xerces/util/XMLGrammarPoolImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,7 +35,7 @@ import org.apache.xerces.xni.grammars.XMLGrammarPool; * @author Pavani Mukthipudi, Sun Microsystems * @author Neeraj Bajaj, SUN Microsystems * - * @version $Id: XMLGrammarPoolImpl.java 319864 2004-03-25 04:03:23Z mrglavas $ + * @version $Id: XMLGrammarPoolImpl.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class XMLGrammarPoolImpl implements XMLGrammarPool { diff --git a/src/org/apache/xerces/util/XMLResourceIdentifierImpl.java b/src/org/apache/xerces/util/XMLResourceIdentifierImpl.java index b9af20c..5b0e74d 100644 --- a/src/org/apache/xerces/util/XMLResourceIdentifierImpl.java +++ b/src/org/apache/xerces/util/XMLResourceIdentifierImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2002, 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import org.apache.xerces.xni.XMLResourceIdentifier; * * @author Andy Clark * - * @version $Id: XMLResourceIdentifierImpl.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLResourceIdentifierImpl.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class XMLResourceIdentifierImpl implements XMLResourceIdentifier { diff --git a/src/org/apache/xerces/util/XMLStringBuffer.java b/src/org/apache/xerces/util/XMLStringBuffer.java index d0d1d81..7251c95 100644 --- a/src/org/apache/xerces/util/XMLStringBuffer.java +++ b/src/org/apache/xerces/util/XMLStringBuffer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import org.apache.xerces.xni.XMLString; * @author Andy Clark, IBM * @author Eric Ye, IBM * - * @version $Id: XMLStringBuffer.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLStringBuffer.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class XMLStringBuffer extends XMLString { diff --git a/src/org/apache/xerces/util/XMLSymbols.java b/src/org/apache/xerces/util/XMLSymbols.java index 76ac679..5e6b95c 100644 --- a/src/org/apache/xerces/util/XMLSymbols.java +++ b/src/org/apache/xerces/util/XMLSymbols.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,7 +21,7 @@ package org.apache.xerces.util; * All internalized xml symbols. They can be compared using "==". * * @author Sandy Gao, IBM - * @version $Id: XMLSymbols.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLSymbols.java 447241 2006-09-18 05:12:57Z mrglavas $ */ public class XMLSymbols { diff --git a/src/org/apache/xerces/xinclude/MultipleScopeNamespaceSupport.java b/src/org/apache/xerces/xinclude/MultipleScopeNamespaceSupport.java index 4cc7aaa..c67e48f 100644 --- a/src/org/apache/xerces/xinclude/MultipleScopeNamespaceSupport.java +++ b/src/org/apache/xerces/xinclude/MultipleScopeNamespaceSupport.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.xerces.xinclude; import java.util.Enumeration; @@ -33,7 +35,7 @@ import org.apache.xerces.xni.NamespaceContext; * * @author Peter McCracken, IBM * - * @version $Id: MultipleScopeNamespaceSupport.java 320226 2005-02-17 06:08:16Z mrglavas $ + * @version $Id: MultipleScopeNamespaceSupport.java 447243 2006-09-18 05:15:27Z mrglavas $ */ public class MultipleScopeNamespaceSupport extends NamespaceSupport { diff --git a/src/org/apache/xerces/xinclude/ObjectFactory.java b/src/org/apache/xerces/xinclude/ObjectFactory.java index 8722cfb..edd2d01 100644 --- a/src/org/apache/xerces/xinclude/ObjectFactory.java +++ b/src/org/apache/xerces/xinclude/ObjectFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import java.io.InputStreamReader; * when bundled as part of the JDK. * <p> * - * @version $Id: ObjectFactory.java 320285 2005-04-18 04:15:35Z mrglavas $ + * @version $Id: ObjectFactory.java 447243 2006-09-18 05:15:27Z mrglavas $ */ final class ObjectFactory { diff --git a/src/org/apache/xerces/xinclude/SecuritySupport.java b/src/org/apache/xerces/xinclude/SecuritySupport.java index b90ab3a..daf3b6d 100644 --- a/src/org/apache/xerces/xinclude/SecuritySupport.java +++ b/src/org/apache/xerces/xinclude/SecuritySupport.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xinclude/XInclude11TextReader.java b/src/org/apache/xerces/xinclude/XInclude11TextReader.java index 0902230..651d781 100644 --- a/src/org/apache/xerces/xinclude/XInclude11TextReader.java +++ b/src/org/apache/xerces/xinclude/XInclude11TextReader.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.xerces.xinclude; import java.io.IOException; @@ -28,7 +30,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * * @author Michael Glavassevich, IBM * - * @version $Id: XInclude11TextReader.java 320201 2005-01-11 13:40:29Z mrglavas $ + * @version $Id: XInclude11TextReader.java 447243 2006-09-18 05:15:27Z mrglavas $ * * @see XIncludeHandler */ diff --git a/src/org/apache/xerces/xinclude/XIncludeHandler.java b/src/org/apache/xerces/xinclude/XIncludeHandler.java index 430e0c9..0a12ca3 100644 --- a/src/org/apache/xerces/xinclude/XIncludeHandler.java +++ b/src/org/apache/xerces/xinclude/XIncludeHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.xerces.xinclude; import java.io.CharConversionException; @@ -107,7 +109,7 @@ import org.apache.xerces.xpointer.XPointerProcessor; * @author Peter McCracken, IBM * @author Michael Glavassevich, IBM * - * @version $Id: XIncludeHandler.java 422545 2006-07-16 21:50:19Z mrglavas $ + * @version $Id: XIncludeHandler.java 462944 2006-10-11 21:10:37Z mrglavas $ * * @see XIncludeNamespaceSupport */ @@ -201,6 +203,10 @@ public class XIncludeHandler protected static final String XINCLUDE_FIXUP_LANGUAGE = Constants.XERCES_FEATURE_PREFIX + Constants.XINCLUDE_FIXUP_LANGUAGE_FEATURE; + /** Property identifier: JAXP schema language. */ + protected static final String JAXP_SCHEMA_LANGUAGE = + Constants.JAXP_PROPERTY_PREFIX + Constants.SCHEMA_LANGUAGE; + /** Property identifier: symbol table. */ protected static final String SYMBOL_TABLE = Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY; @@ -556,15 +562,21 @@ public class XIncludeHandler copyFeatures(componentManager, fSettings); // We don't want a schema validator on the new pipeline, - // so if it was enabled, we set the feature to false. If - // the validation feature was also enabled we turn on - // dynamic validation, so that DTD validation is performed - // on the included documents only if they have a DOCTYPE. - // This is consistent with the behaviour on the main pipeline. + // so if it was enabled, we set the feature to false. try { if (componentManager.getFeature(SCHEMA_VALIDATION)) { fSettings.setFeature(SCHEMA_VALIDATION, false); - if (componentManager.getFeature(VALIDATION)) { + // If the value of the JAXP 1.2 schema language property + // is http://www.w3.org/2001/XMLSchema we're only validating + // against XML schema so we disable validation on the new pipeline. + if (Constants.NS_XMLSCHEMA.equals(componentManager.getProperty(JAXP_SCHEMA_LANGUAGE))) { + fSettings.setFeature(VALIDATION, false); + } + // If the validation feature was also enabled we turn on + // dynamic validation, so that DTD validation is performed + // on the included documents only if they have a DOCTYPE. + // This is consistent with the behaviour on the main pipeline. + else if (componentManager.getFeature(VALIDATION)) { fSettings.setFeature(DYNAMIC_VALIDATION, true); } } @@ -1963,7 +1975,7 @@ public class XIncludeHandler * unparsed entities are processed as described in the spec, sections 4.5.1 and 4.5.2 * </ul> * @param attributes - * @return + * @return the processed XMLAttributes */ protected XMLAttributes processAttributes(XMLAttributes attributes) { if (isTopLevelIncludedItem()) { @@ -2338,7 +2350,7 @@ public class XIncludeHandler * as an ancestor of the current item. * * @param depth - * @return + * @return true if an include was seen at the given depth, false otherwise */ protected boolean getSawInclude(int depth) { if (depth >= fSawInclude.length) { @@ -2780,7 +2792,7 @@ public class XIncludeHandler /** * Saves the given language on the top of the stack. * - * @param lanaguage the language to push onto the stack. + * @param language the language to push onto the stack. */ protected void saveLanguage(String language) { fLanguageScope.push(fDepth); diff --git a/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java b/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java index bb8af02..0beafd7 100644 --- a/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java +++ b/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.util.MessageFormatter; * * @author Peter McCracken, IBM * - * @version $Id: XIncludeMessageFormatter.java 320201 2005-01-11 13:40:29Z mrglavas $ + * @version $Id: XIncludeMessageFormatter.java 447243 2006-09-18 05:15:27Z mrglavas $ */ public class XIncludeMessageFormatter implements MessageFormatter { diff --git a/src/org/apache/xerces/xinclude/XIncludeNamespaceSupport.java b/src/org/apache/xerces/xinclude/XIncludeNamespaceSupport.java index 4c31c50..51a3ba8 100644 --- a/src/org/apache/xerces/xinclude/XIncludeNamespaceSupport.java +++ b/src/org/apache/xerces/xinclude/XIncludeNamespaceSupport.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.xerces.xinclude; import org.apache.xerces.xni.NamespaceContext; @@ -25,7 +27,7 @@ import org.apache.xerces.xni.NamespaceContext; * * @author Peter McCracken, IBM * - * @version $Id: XIncludeNamespaceSupport.java 320201 2005-01-11 13:40:29Z mrglavas $ + * @version $Id: XIncludeNamespaceSupport.java 447243 2006-09-18 05:15:27Z mrglavas $ */ public class XIncludeNamespaceSupport extends MultipleScopeNamespaceSupport { diff --git a/src/org/apache/xerces/xinclude/XIncludeTextReader.java b/src/org/apache/xerces/xinclude/XIncludeTextReader.java index f1afb4b..1ece0cf 100644 --- a/src/org/apache/xerces/xinclude/XIncludeTextReader.java +++ b/src/org/apache/xerces/xinclude/XIncludeTextReader.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.xerces.xinclude; import java.io.BufferedInputStream; @@ -57,7 +59,7 @@ import org.apache.xerces.xni.parser.XMLInputSource; * @author Ankit Pasricha, IBM * @author Arun Yadav, Sun Microsystems Inc. * - * @version $Id: XIncludeTextReader.java 415440 2006-06-19 22:12:27Z mrglavas $ + * @version $Id: XIncludeTextReader.java 447243 2006-09-18 05:15:27Z mrglavas $ * * @see XIncludeHandler */ diff --git a/src/org/apache/xerces/xni/Augmentations.java b/src/org/apache/xerces/xni/Augmentations.java index 1a70474..eb1bc8d 100644 --- a/src/org/apache/xerces/xni/Augmentations.java +++ b/src/org/apache/xerces/xni/Augmentations.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -32,7 +33,7 @@ import java.util.Enumeration; * should not save any reference to the structure. * * @author Elena Litani, IBM - * @version $Id: Augmentations.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: Augmentations.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public interface Augmentations { diff --git a/src/org/apache/xerces/xni/NamespaceContext.java b/src/org/apache/xerces/xni/NamespaceContext.java index 898175f..f6b961d 100644 --- a/src/org/apache/xerces/xni/NamespaceContext.java +++ b/src/org/apache/xerces/xni/NamespaceContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import java.util.Enumeration; * * @author Andy Clark, IBM * - * @version $Id: NamespaceContext.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: NamespaceContext.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public interface NamespaceContext { diff --git a/src/org/apache/xerces/xni/QName.java b/src/org/apache/xerces/xni/QName.java index 3f3b32e..572d841 100644 --- a/src/org/apache/xerces/xni/QName.java +++ b/src/org/apache/xerces/xni/QName.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ package org.apache.xerces.xni; * * @author Andy Clark, IBM * - * @version $Id: QName.java 327940 2005-10-24 03:22:51Z mrglavas $ + * @version $Id: QName.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public class QName implements Cloneable { diff --git a/src/org/apache/xerces/xni/XMLAttributes.java b/src/org/apache/xerces/xni/XMLAttributes.java index 8fb47dd..4fac89d 100644 --- a/src/org/apache/xerces/xni/XMLAttributes.java +++ b/src/org/apache/xerces/xni/XMLAttributes.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ package org.apache.xerces.xni; * * @author Andy Clark, IBM * - * @version $Id: XMLAttributes.java 320086 2004-10-03 21:58:18Z mrglavas $ + * @version $Id: XMLAttributes.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public interface XMLAttributes { diff --git a/src/org/apache/xerces/xni/XMLDTDContentModelHandler.java b/src/org/apache/xerces/xni/XMLDTDContentModelHandler.java index 4ddbca5..9fe96b4 100644 --- a/src/org/apache/xerces/xni/XMLDTDContentModelHandler.java +++ b/src/org/apache/xerces/xni/XMLDTDContentModelHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.xni.parser.XMLDTDContentModelSource; * * @author Andy Clark, IBM * - * @version $Id: XMLDTDContentModelHandler.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDTDContentModelHandler.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public interface XMLDTDContentModelHandler { diff --git a/src/org/apache/xerces/xni/XMLDTDHandler.java b/src/org/apache/xerces/xni/XMLDTDHandler.java index af4af6c..1f2762d 100644 --- a/src/org/apache/xerces/xni/XMLDTDHandler.java +++ b/src/org/apache/xerces/xni/XMLDTDHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ import org.apache.xerces.xni.parser.XMLDTDSource; * * @author Andy Clark, IBM * - * @version $Id: XMLDTDHandler.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDTDHandler.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public interface XMLDTDHandler { diff --git a/src/org/apache/xerces/xni/XMLDocumentFragmentHandler.java b/src/org/apache/xerces/xni/XMLDocumentFragmentHandler.java index 5894865..d33e0e5 100644 --- a/src/org/apache/xerces/xni/XMLDocumentFragmentHandler.java +++ b/src/org/apache/xerces/xni/XMLDocumentFragmentHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ package org.apache.xerces.xni; * @see XMLDocumentHandler * * @author Andy Clark, IBM - * @version $Id: XMLDocumentFragmentHandler.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDocumentFragmentHandler.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public interface XMLDocumentFragmentHandler { diff --git a/src/org/apache/xerces/xni/XMLDocumentHandler.java b/src/org/apache/xerces/xni/XMLDocumentHandler.java index 071af9c..2695016 100644 --- a/src/org/apache/xerces/xni/XMLDocumentHandler.java +++ b/src/org/apache/xerces/xni/XMLDocumentHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.xni.parser.XMLDocumentSource; * * @author Andy Clark, IBM * - * @version $Id: XMLDocumentHandler.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDocumentHandler.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public interface XMLDocumentHandler { diff --git a/src/org/apache/xerces/xni/XMLLocator.java b/src/org/apache/xerces/xni/XMLLocator.java index af768ec..62db955 100644 --- a/src/org/apache/xerces/xni/XMLLocator.java +++ b/src/org/apache/xerces/xni/XMLLocator.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.xerces.xni; * * @author Andy Clark, IBM * - * @version $Id: XMLLocator.java 320036 2004-09-01 03:00:15Z mrglavas $ + * @version $Id: XMLLocator.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public interface XMLLocator { diff --git a/src/org/apache/xerces/xni/XMLResourceIdentifier.java b/src/org/apache/xerces/xni/XMLResourceIdentifier.java index 992787f..326467c 100644 --- a/src/org/apache/xerces/xni/XMLResourceIdentifier.java +++ b/src/org/apache/xerces/xni/XMLResourceIdentifier.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.xerces.xni; * XML resource (a Schema grammar, a DTD, a general entity etc.) </p> * * @author Neil Graham, IBM - * @version $Id: XMLResourceIdentifier.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLResourceIdentifier.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public interface XMLResourceIdentifier { diff --git a/src/org/apache/xerces/xni/XMLString.java b/src/org/apache/xerces/xni/XMLString.java index 5762cb6..5bc5a6c 100644 --- a/src/org/apache/xerces/xni/XMLString.java +++ b/src/org/apache/xerces/xni/XMLString.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -38,7 +39,7 @@ package org.apache.xerces.xni; * @author Eric Ye, IBM * @author Andy Clark, IBM * - * @version $Id: XMLString.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLString.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public class XMLString { diff --git a/src/org/apache/xerces/xni/XNIException.java b/src/org/apache/xerces/xni/XNIException.java index 43b148f..139ed46 100644 --- a/src/org/apache/xerces/xni/XNIException.java +++ b/src/org/apache/xerces/xni/XNIException.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,7 +29,7 @@ package org.apache.xerces.xni; * * @author Andy Clark, IBM * - * @version $Id: XNIException.java 320027 2004-08-15 21:22:16Z mrglavas $ + * @version $Id: XNIException.java 447247 2006-09-18 05:23:52Z mrglavas $ */ public class XNIException extends RuntimeException { diff --git a/src/org/apache/xerces/xni/grammars/Grammar.java b/src/org/apache/xerces/xni/grammars/Grammar.java index 4506577..0263e2c 100644 --- a/src/org/apache/xerces/xni/grammars/Grammar.java +++ b/src/org/apache/xerces/xni/grammars/Grammar.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -39,7 +40,7 @@ package org.apache.xerces.xni.grammars; * @author Andy Clark, IBM * @author Neil Graham, IBM * - * @version $Id: Grammar.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: Grammar.java 447245 2006-09-18 05:22:10Z mrglavas $ */ public interface Grammar { diff --git a/src/org/apache/xerces/xni/grammars/XMLDTDDescription.java b/src/org/apache/xerces/xni/grammars/XMLDTDDescription.java index 8306469..f82ca3b 100644 --- a/src/org/apache/xerces/xni/grammars/XMLDTDDescription.java +++ b/src/org/apache/xerces/xni/grammars/XMLDTDDescription.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,7 +21,7 @@ package org.apache.xerces.xni.grammars; * All information specific to DTD grammars. * * @author Sandy Gao, IBM - * @version $Id: XMLDTDDescription.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDTDDescription.java 447245 2006-09-18 05:22:10Z mrglavas $ */ public interface XMLDTDDescription extends XMLGrammarDescription { diff --git a/src/org/apache/xerces/xni/grammars/XMLGrammarDescription.java b/src/org/apache/xerces/xni/grammars/XMLGrammarDescription.java index 5110bfe..5975b3f 100644 --- a/src/org/apache/xerces/xni/grammars/XMLGrammarDescription.java +++ b/src/org/apache/xerces/xni/grammars/XMLGrammarDescription.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import org.apache.xerces.xni.XMLResourceIdentifier; * physical location and their type. </p> * * @author Neil Graham, IBM - * @version $Id: XMLGrammarDescription.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLGrammarDescription.java 447245 2006-09-18 05:22:10Z mrglavas $ */ public interface XMLGrammarDescription extends XMLResourceIdentifier { diff --git a/src/org/apache/xerces/xni/grammars/XMLGrammarLoader.java b/src/org/apache/xerces/xni/grammars/XMLGrammarLoader.java index 24f20aa..5222e28 100644 --- a/src/org/apache/xerces/xni/grammars/XMLGrammarLoader.java +++ b/src/org/apache/xerces/xni/grammars/XMLGrammarLoader.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import java.util.Locale; * will be provided for user applications to interact with these implementations. * * @author Neil Graham, IBM - * @version $Id: XMLGrammarLoader.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLGrammarLoader.java 447245 2006-09-18 05:22:10Z mrglavas $ */ public interface XMLGrammarLoader { diff --git a/src/org/apache/xerces/xni/grammars/XMLGrammarPool.java b/src/org/apache/xerces/xni/grammars/XMLGrammarPool.java index e70e885..89cccdc 100644 --- a/src/org/apache/xerces/xni/grammars/XMLGrammarPool.java +++ b/src/org/apache/xerces/xni/grammars/XMLGrammarPool.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -38,7 +39,7 @@ package org.apache.xerces.xni.grammars; * it may return some grammars that were retrieved from the GrammarPool in earlier operations). </li> </ul> </p> * * @author Neil Graham, IBM - * @version $Id: XMLGrammarPool.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLGrammarPool.java 447245 2006-09-18 05:22:10Z mrglavas $ */ public interface XMLGrammarPool { diff --git a/src/org/apache/xerces/xni/grammars/XMLSchemaDescription.java b/src/org/apache/xerces/xni/grammars/XMLSchemaDescription.java index 4f6ce50..d8ff4fa 100644 --- a/src/org/apache/xerces/xni/grammars/XMLSchemaDescription.java +++ b/src/org/apache/xerces/xni/grammars/XMLSchemaDescription.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.apache.xerces.xni.XMLAttributes; * * @author Sandy Gao, IBM * - * @version $Id: XMLSchemaDescription.java 429963 2006-08-09 05:01:34Z mrglavas $ + * @version $Id: XMLSchemaDescription.java 447245 2006-09-18 05:22:10Z mrglavas $ */ public interface XMLSchemaDescription extends XMLGrammarDescription { diff --git a/src/org/apache/xerces/xni/grammars/XSGrammar.java b/src/org/apache/xerces/xni/grammars/XSGrammar.java index 09e7d62..159a21a 100644 --- a/src/org/apache/xerces/xni/grammars/XSGrammar.java +++ b/src/org/apache/xerces/xni/grammars/XSGrammar.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.xs.XSModel; * * @author Sandy Gao, IBM * - * @version $Id: XSGrammar.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XSGrammar.java 447245 2006-09-18 05:22:10Z mrglavas $ */ public interface XSGrammar extends Grammar { diff --git a/src/org/apache/xerces/xni/parser/XMLComponent.java b/src/org/apache/xerces/xni/parser/XMLComponent.java index 71b0825..a2a1c3c 100644 --- a/src/org/apache/xerces/xni/parser/XMLComponent.java +++ b/src/org/apache/xerces/xni/parser/XMLComponent.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ package org.apache.xerces.xni.parser; * * @author Andy Clark, IBM * - * @version $Id: XMLComponent.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLComponent.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLComponent { diff --git a/src/org/apache/xerces/xni/parser/XMLComponentManager.java b/src/org/apache/xerces/xni/parser/XMLComponentManager.java index 91c7086..2679c5c 100644 --- a/src/org/apache/xerces/xni/parser/XMLComponentManager.java +++ b/src/org/apache/xerces/xni/parser/XMLComponentManager.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ package org.apache.xerces.xni.parser; * * @author Andy Clark, IBM * - * @version $Id: XMLComponentManager.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLComponentManager.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLComponentManager { diff --git a/src/org/apache/xerces/xni/parser/XMLConfigurationException.java b/src/org/apache/xerces/xni/parser/XMLConfigurationException.java index 976d2da..e9c3762 100644 --- a/src/org/apache/xerces/xni/parser/XMLConfigurationException.java +++ b/src/org/apache/xerces/xni/parser/XMLConfigurationException.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -25,7 +26,7 @@ import org.apache.xerces.xni.XNIException; * * @author Andy Clark, IBM * - * @version $Id: XMLConfigurationException.java 320027 2004-08-15 21:22:16Z mrglavas $ + * @version $Id: XMLConfigurationException.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public class XMLConfigurationException extends XNIException { diff --git a/src/org/apache/xerces/xni/parser/XMLDTDContentModelFilter.java b/src/org/apache/xerces/xni/parser/XMLDTDContentModelFilter.java index e1181c0..0380a84 100644 --- a/src/org/apache/xerces/xni/parser/XMLDTDContentModelFilter.java +++ b/src/org/apache/xerces/xni/parser/XMLDTDContentModelFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.apache.xerces.xni.XMLDTDContentModelHandler; * * @author Andy Clark, IBM * - * @version $Id: XMLDTDContentModelFilter.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDTDContentModelFilter.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLDTDContentModelFilter extends XMLDTDContentModelHandler, XMLDTDContentModelSource { diff --git a/src/org/apache/xerces/xni/parser/XMLDTDContentModelSource.java b/src/org/apache/xerces/xni/parser/XMLDTDContentModelSource.java index 2f88061..4b3a38d 100644 --- a/src/org/apache/xerces/xni/parser/XMLDTDContentModelSource.java +++ b/src/org/apache/xerces/xni/parser/XMLDTDContentModelSource.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.xni.XMLDTDContentModelHandler; * * @author Andy Clark, IBM * - * @version $Id: XMLDTDContentModelSource.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDTDContentModelSource.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLDTDContentModelSource { diff --git a/src/org/apache/xerces/xni/parser/XMLDTDFilter.java b/src/org/apache/xerces/xni/parser/XMLDTDFilter.java index 58795b7..cf04c3f 100644 --- a/src/org/apache/xerces/xni/parser/XMLDTDFilter.java +++ b/src/org/apache/xerces/xni/parser/XMLDTDFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.apache.xerces.xni.XMLDTDHandler; * * @author Andy Clark, IBM * - * @version $Id: XMLDTDFilter.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDTDFilter.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLDTDFilter extends XMLDTDHandler, XMLDTDSource { diff --git a/src/org/apache/xerces/xni/parser/XMLDTDScanner.java b/src/org/apache/xerces/xni/parser/XMLDTDScanner.java index f506a1c..384b9c5 100644 --- a/src/org/apache/xerces/xni/parser/XMLDTDScanner.java +++ b/src/org/apache/xerces/xni/parser/XMLDTDScanner.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,7 +35,7 @@ import org.apache.xerces.xni.XNIException; * * @author Andy Clark, IBM * - * @version $Id: XMLDTDScanner.java 320086 2004-10-03 21:58:18Z mrglavas $ + * @version $Id: XMLDTDScanner.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLDTDScanner extends XMLDTDSource, XMLDTDContentModelSource { diff --git a/src/org/apache/xerces/xni/parser/XMLDTDSource.java b/src/org/apache/xerces/xni/parser/XMLDTDSource.java index bebe295..ea3b975 100644 --- a/src/org/apache/xerces/xni/parser/XMLDTDSource.java +++ b/src/org/apache/xerces/xni/parser/XMLDTDSource.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.xni.XMLDTDHandler; * * @author Andy Clark, IBM * - * @version $Id: XMLDTDSource.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDTDSource.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLDTDSource { diff --git a/src/org/apache/xerces/xni/parser/XMLDocumentFilter.java b/src/org/apache/xerces/xni/parser/XMLDocumentFilter.java index 2f58cd8..26d6da0 100644 --- a/src/org/apache/xerces/xni/parser/XMLDocumentFilter.java +++ b/src/org/apache/xerces/xni/parser/XMLDocumentFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,7 +25,7 @@ import org.apache.xerces.xni.XMLDocumentHandler; * * @author Andy Clark, IBM * - * @version $Id: XMLDocumentFilter.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDocumentFilter.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLDocumentFilter extends XMLDocumentHandler, XMLDocumentSource { diff --git a/src/org/apache/xerces/xni/parser/XMLDocumentScanner.java b/src/org/apache/xerces/xni/parser/XMLDocumentScanner.java index 6bf9f3e..6a6a962 100644 --- a/src/org/apache/xerces/xni/parser/XMLDocumentScanner.java +++ b/src/org/apache/xerces/xni/parser/XMLDocumentScanner.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,7 +35,7 @@ import org.apache.xerces.xni.XNIException; * * @author Andy Clark, IBM * - * @version $Id: XMLDocumentScanner.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDocumentScanner.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLDocumentScanner extends XMLDocumentSource { diff --git a/src/org/apache/xerces/xni/parser/XMLDocumentSource.java b/src/org/apache/xerces/xni/parser/XMLDocumentSource.java index c471187..b4f2613 100644 --- a/src/org/apache/xerces/xni/parser/XMLDocumentSource.java +++ b/src/org/apache/xerces/xni/parser/XMLDocumentSource.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.xni.XMLDocumentHandler; * * @author Andy Clark, IBM * - * @version $Id: XMLDocumentSource.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLDocumentSource.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLDocumentSource { diff --git a/src/org/apache/xerces/xni/parser/XMLEntityResolver.java b/src/org/apache/xerces/xni/parser/XMLEntityResolver.java index 440160d..5a1d330 100644 --- a/src/org/apache/xerces/xni/parser/XMLEntityResolver.java +++ b/src/org/apache/xerces/xni/parser/XMLEntityResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.apache.xerces.xni.XMLResourceIdentifier; * * @author Andy Clark, IBM * - * @version $Id: XMLEntityResolver.java 320086 2004-10-03 21:58:18Z mrglavas $ + * @version $Id: XMLEntityResolver.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLEntityResolver { diff --git a/src/org/apache/xerces/xni/parser/XMLErrorHandler.java b/src/org/apache/xerces/xni/parser/XMLErrorHandler.java index 104ec62..07444d6 100644 --- a/src/org/apache/xerces/xni/parser/XMLErrorHandler.java +++ b/src/org/apache/xerces/xni/parser/XMLErrorHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.xni.XNIException; * * @author Andy Clark, IBM * - * @version $Id: XMLErrorHandler.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLErrorHandler.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLErrorHandler { diff --git a/src/org/apache/xerces/xni/parser/XMLInputSource.java b/src/org/apache/xerces/xni/parser/XMLInputSource.java index fb09f11..b858495 100644 --- a/src/org/apache/xerces/xni/parser/XMLInputSource.java +++ b/src/org/apache/xerces/xni/parser/XMLInputSource.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import java.io.Reader; * * @author Andy Clark, IBM * - * @version $Id: XMLInputSource.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLInputSource.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public class XMLInputSource { diff --git a/src/org/apache/xerces/xni/parser/XMLParseException.java b/src/org/apache/xerces/xni/parser/XMLParseException.java index 9f886f0..01c2bf5 100644 --- a/src/org/apache/xerces/xni/parser/XMLParseException.java +++ b/src/org/apache/xerces/xni/parser/XMLParseException.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.xni.XNIException; * * @author Andy Clark, IBM * - * @version $Id: XMLParseException.java 320039 2004-09-02 03:53:53Z mrglavas $ + * @version $Id: XMLParseException.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public class XMLParseException extends XNIException { diff --git a/src/org/apache/xerces/xni/parser/XMLParserConfiguration.java b/src/org/apache/xerces/xni/parser/XMLParserConfiguration.java index b05c7dc..40df68b 100644 --- a/src/org/apache/xerces/xni/parser/XMLParserConfiguration.java +++ b/src/org/apache/xerces/xni/parser/XMLParserConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -71,7 +72,7 @@ import org.apache.xerces.xni.XNIException; * @author Arnaud Le Hors, IBM * @author Andy Clark, IBM * - * @version $Id: XMLParserConfiguration.java 320086 2004-10-03 21:58:18Z mrglavas $ + * @version $Id: XMLParserConfiguration.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLParserConfiguration extends XMLComponentManager { diff --git a/src/org/apache/xerces/xni/parser/XMLPullParserConfiguration.java b/src/org/apache/xerces/xni/parser/XMLPullParserConfiguration.java index c73380a..59d24f4 100644 --- a/src/org/apache/xerces/xni/parser/XMLPullParserConfiguration.java +++ b/src/org/apache/xerces/xni/parser/XMLPullParserConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -40,7 +41,7 @@ import org.apache.xerces.xni.XNIException; * * @author Andy Clark, IBM * - * @version $Id: XMLPullParserConfiguration.java 319806 2004-02-24 23:15:58Z mrglavas $ + * @version $Id: XMLPullParserConfiguration.java 447244 2006-09-18 05:20:40Z mrglavas $ */ public interface XMLPullParserConfiguration extends XMLParserConfiguration { diff --git a/src/org/apache/xerces/xpointer/ElementSchemePointer.java b/src/org/apache/xerces/xpointer/ElementSchemePointer.java index c227513..4085826 100644 --- a/src/org/apache/xerces/xpointer/ElementSchemePointer.java +++ b/src/org/apache/xerces/xpointer/ElementSchemePointer.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.apache.xerces.xni.parser.XMLErrorHandler; * * @xerces.internal * - * @version $Id: ElementSchemePointer.java 415823 2006-06-20 22:00:24Z nddelima $ + * @version $Id: ElementSchemePointer.java 447248 2006-09-18 05:25:21Z mrglavas $ * */ class ElementSchemePointer implements XPointerPart { @@ -493,7 +494,7 @@ class ElementSchemePointer implements XPointerPart { * @xerces.internal * * @author Neil Delima, IBM - * @version $Id: ElementSchemePointer.java 415823 2006-06-20 22:00:24Z nddelima $ + * @version $Id: ElementSchemePointer.java 447248 2006-09-18 05:25:21Z mrglavas $ * */ private final class Tokens { @@ -659,7 +660,7 @@ class ElementSchemePointer implements XPointerPart { * * @xerces.internal * - * @version $Id: ElementSchemePointer.java 415823 2006-06-20 22:00:24Z nddelima $ + * @version $Id: ElementSchemePointer.java 447248 2006-09-18 05:25:21Z mrglavas $ */ private class Scanner { diff --git a/src/org/apache/xerces/xpointer/ShortHandPointer.java b/src/org/apache/xerces/xpointer/ShortHandPointer.java index a6f879c..c10ddba 100644 --- a/src/org/apache/xerces/xpointer/ShortHandPointer.java +++ b/src/org/apache/xerces/xpointer/ShortHandPointer.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -33,7 +34,7 @@ import org.apache.xerces.xs.XSTypeDefinition; * in document order that has a matching NCName as an identifier. * </p> * - * @version $Id: ShortHandPointer.java 327077 2005-10-21 02:44:57Z mrglavas $ + * @version $Id: ShortHandPointer.java 447248 2006-09-18 05:25:21Z mrglavas $ * */ class ShortHandPointer implements XPointerPart { diff --git a/src/org/apache/xerces/xpointer/XPointerErrorHandler.java b/src/org/apache/xerces/xpointer/XPointerErrorHandler.java index 24e61f1..566511c 100644 --- a/src/org/apache/xerces/xpointer/XPointerErrorHandler.java +++ b/src/org/apache/xerces/xpointer/XPointerErrorHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -26,7 +27,7 @@ import org.apache.xerces.xni.parser.XMLParseException; * XPointer error's are thrown so that they may be caught by the XInclude * implementation and reported as resource errors. * - * @version $Id: XPointerErrorHandler.java 320478 2005-06-17 22:00:21Z nddelima $ + * @version $Id: XPointerErrorHandler.java 447248 2006-09-18 05:25:21Z mrglavas $ */ class XPointerErrorHandler implements XMLErrorHandler { diff --git a/src/org/apache/xerces/xpointer/XPointerHandler.java b/src/org/apache/xerces/xpointer/XPointerHandler.java index 151c53e..730ddcc 100644 --- a/src/org/apache/xerces/xpointer/XPointerHandler.java +++ b/src/org/apache/xerces/xpointer/XPointerHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -57,7 +58,7 @@ import org.apache.xerces.xni.parser.XMLErrorHandler; * * @xerces.internal * - * @version $Id: XPointerHandler.java 320580 2005-09-15 17:51:14Z mrglavas $ + * @version $Id: XPointerHandler.java 447248 2006-09-18 05:25:21Z mrglavas $ */ public final class XPointerHandler extends XIncludeHandler implements XPointerProcessor { diff --git a/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java b/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java index 02b4916..88aee44 100644 --- a/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java +++ b/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,7 @@ import org.apache.xerces.util.MessageFormatter; * * @xerces.internal * - * @version $Id: XPointerMessageFormatter.java 320478 2005-06-17 22:00:21Z nddelima $ + * @version $Id: XPointerMessageFormatter.java 447248 2006-09-18 05:25:21Z mrglavas $ */ class XPointerMessageFormatter implements MessageFormatter { diff --git a/src/org/apache/xerces/xpointer/XPointerPart.java b/src/org/apache/xerces/xpointer/XPointerPart.java index 0772a49..c43d226 100644 --- a/src/org/apache/xerces/xpointer/XPointerPart.java +++ b/src/org/apache/xerces/xpointer/XPointerPart.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -29,7 +30,7 @@ import org.apache.xerces.xni.XNIException; * * @xerces.internal * - * @version $Id: XPointerPart.java 320478 2005-06-17 22:00:21Z nddelima $ + * @version $Id: XPointerPart.java 449487 2006-09-24 21:11:28Z mrglavas $ */ public interface XPointerPart { @@ -46,7 +47,7 @@ public interface XPointerPart { * Provides scheme specific parsing of a XPointer expression i.e. * the PointerPart or ShortHandPointer. * - * @param xpointer A String representing the PointerPart or ShortHandPointer. + * @param part A String representing the PointerPart or ShortHandPointer. * @throws XNIException Thrown if the PointerPart string does not conform to * the syntax defined by its scheme. * diff --git a/src/org/apache/xerces/xpointer/XPointerProcessor.java b/src/org/apache/xerces/xpointer/XPointerProcessor.java index 487d372..2acdd5a 100644 --- a/src/org/apache/xerces/xpointer/XPointerProcessor.java +++ b/src/org/apache/xerces/xpointer/XPointerProcessor.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -30,7 +31,7 @@ import org.apache.xerces.xni.XNIException; * * @xerces.internal * - * @version $Id: XPointerProcessor.java 320478 2005-06-17 22:00:21Z nddelima $ + * @version $Id: XPointerProcessor.java 447248 2006-09-18 05:25:21Z mrglavas $ * */ public interface XPointerProcessor { diff --git a/src/org/apache/xerces/xs/AttributePSVI.java b/src/org/apache/xerces/xs/AttributePSVI.java index 5df4de5..5e2b7da 100644 --- a/src/org/apache/xerces/xs/AttributePSVI.java +++ b/src/org/apache/xerces/xs/AttributePSVI.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/ElementPSVI.java b/src/org/apache/xerces/xs/ElementPSVI.java index 046f2cc..af7f279 100644 --- a/src/org/apache/xerces/xs/ElementPSVI.java +++ b/src/org/apache/xerces/xs/ElementPSVI.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/ItemPSVI.java b/src/org/apache/xerces/xs/ItemPSVI.java index 5e610a0..8843a19 100644 --- a/src/org/apache/xerces/xs/ItemPSVI.java +++ b/src/org/apache/xerces/xs/ItemPSVI.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/LSInputList.java b/src/org/apache/xerces/xs/LSInputList.java index 4713c46..78f193d 100644 --- a/src/org/apache/xerces/xs/LSInputList.java +++ b/src/org/apache/xerces/xs/LSInputList.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/PSVIProvider.java b/src/org/apache/xerces/xs/PSVIProvider.java index 576b673..668420e 100644 --- a/src/org/apache/xerces/xs/PSVIProvider.java +++ b/src/org/apache/xerces/xs/PSVIProvider.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/ShortList.java b/src/org/apache/xerces/xs/ShortList.java index 944eb6f..346cf01 100644 --- a/src/org/apache/xerces/xs/ShortList.java +++ b/src/org/apache/xerces/xs/ShortList.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/StringList.java b/src/org/apache/xerces/xs/StringList.java index 409edd0..dc1c668 100644 --- a/src/org/apache/xerces/xs/StringList.java +++ b/src/org/apache/xerces/xs/StringList.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSAnnotation.java b/src/org/apache/xerces/xs/XSAnnotation.java index d727c04..e49d2e8 100644 --- a/src/org/apache/xerces/xs/XSAnnotation.java +++ b/src/org/apache/xerces/xs/XSAnnotation.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSAttributeDeclaration.java b/src/org/apache/xerces/xs/XSAttributeDeclaration.java index 982245c..e787792 100644 --- a/src/org/apache/xerces/xs/XSAttributeDeclaration.java +++ b/src/org/apache/xerces/xs/XSAttributeDeclaration.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSAttributeGroupDefinition.java b/src/org/apache/xerces/xs/XSAttributeGroupDefinition.java index d9fd49a..860526e 100644 --- a/src/org/apache/xerces/xs/XSAttributeGroupDefinition.java +++ b/src/org/apache/xerces/xs/XSAttributeGroupDefinition.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSAttributeUse.java b/src/org/apache/xerces/xs/XSAttributeUse.java index f0a6024..2578d3f 100644 --- a/src/org/apache/xerces/xs/XSAttributeUse.java +++ b/src/org/apache/xerces/xs/XSAttributeUse.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSComplexTypeDefinition.java b/src/org/apache/xerces/xs/XSComplexTypeDefinition.java index 0d05317..975bd4f 100644 --- a/src/org/apache/xerces/xs/XSComplexTypeDefinition.java +++ b/src/org/apache/xerces/xs/XSComplexTypeDefinition.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSConstants.java b/src/org/apache/xerces/xs/XSConstants.java index 4f4d343..4ab421a 100644 --- a/src/org/apache/xerces/xs/XSConstants.java +++ b/src/org/apache/xerces/xs/XSConstants.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSElementDeclaration.java b/src/org/apache/xerces/xs/XSElementDeclaration.java index b1fab12..a2b351e 100644 --- a/src/org/apache/xerces/xs/XSElementDeclaration.java +++ b/src/org/apache/xerces/xs/XSElementDeclaration.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSException.java b/src/org/apache/xerces/xs/XSException.java index d1e1992..9e86770 100644 --- a/src/org/apache/xerces/xs/XSException.java +++ b/src/org/apache/xerces/xs/XSException.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSFacet.java b/src/org/apache/xerces/xs/XSFacet.java index 4541993..cad734d 100644 --- a/src/org/apache/xerces/xs/XSFacet.java +++ b/src/org/apache/xerces/xs/XSFacet.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSIDCDefinition.java b/src/org/apache/xerces/xs/XSIDCDefinition.java index c6a4f40..e29a852 100644 --- a/src/org/apache/xerces/xs/XSIDCDefinition.java +++ b/src/org/apache/xerces/xs/XSIDCDefinition.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSImplementation.java b/src/org/apache/xerces/xs/XSImplementation.java index 293b44c..e14a960 100644 --- a/src/org/apache/xerces/xs/XSImplementation.java +++ b/src/org/apache/xerces/xs/XSImplementation.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSLoader.java b/src/org/apache/xerces/xs/XSLoader.java index a35dbab..f916fcf 100644 --- a/src/org/apache/xerces/xs/XSLoader.java +++ b/src/org/apache/xerces/xs/XSLoader.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -54,7 +55,7 @@ public interface XSLoader { * Parses the content of XML Schema documents specified as the list of URI * references. If the URI contains a fragment identifier, the behavior * is not defined by this specification. - * @param uri The list of URI locations. + * @param uriList The list of URI locations. * @return An XSModel representing the schema documents. */ public XSModel loadURIList(StringList uriList); diff --git a/src/org/apache/xerces/xs/XSModel.java b/src/org/apache/xerces/xs/XSModel.java index 7dd5804..3d3d590 100644 --- a/src/org/apache/xerces/xs/XSModel.java +++ b/src/org/apache/xerces/xs/XSModel.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSModelGroup.java b/src/org/apache/xerces/xs/XSModelGroup.java index 24660ea..22b5ebd 100644 --- a/src/org/apache/xerces/xs/XSModelGroup.java +++ b/src/org/apache/xerces/xs/XSModelGroup.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSModelGroupDefinition.java b/src/org/apache/xerces/xs/XSModelGroupDefinition.java index b08110f..42ddab7 100644 --- a/src/org/apache/xerces/xs/XSModelGroupDefinition.java +++ b/src/org/apache/xerces/xs/XSModelGroupDefinition.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSMultiValueFacet.java b/src/org/apache/xerces/xs/XSMultiValueFacet.java index 945c479..a51cddb 100644 --- a/src/org/apache/xerces/xs/XSMultiValueFacet.java +++ b/src/org/apache/xerces/xs/XSMultiValueFacet.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSNamedMap.java b/src/org/apache/xerces/xs/XSNamedMap.java index 5a06cc8..93fa9e7 100644 --- a/src/org/apache/xerces/xs/XSNamedMap.java +++ b/src/org/apache/xerces/xs/XSNamedMap.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSNamespaceItem.java b/src/org/apache/xerces/xs/XSNamespaceItem.java index 0f1c2f5..aea0307 100644 --- a/src/org/apache/xerces/xs/XSNamespaceItem.java +++ b/src/org/apache/xerces/xs/XSNamespaceItem.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSNamespaceItemList.java b/src/org/apache/xerces/xs/XSNamespaceItemList.java index ef5eb2a..722f5c6 100644 --- a/src/org/apache/xerces/xs/XSNamespaceItemList.java +++ b/src/org/apache/xerces/xs/XSNamespaceItemList.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSNotationDeclaration.java b/src/org/apache/xerces/xs/XSNotationDeclaration.java index 2d9920a..381150b 100644 --- a/src/org/apache/xerces/xs/XSNotationDeclaration.java +++ b/src/org/apache/xerces/xs/XSNotationDeclaration.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSObject.java b/src/org/apache/xerces/xs/XSObject.java index 3e5acb0..fc981c7 100644 --- a/src/org/apache/xerces/xs/XSObject.java +++ b/src/org/apache/xerces/xs/XSObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSObjectList.java b/src/org/apache/xerces/xs/XSObjectList.java index 524fa59..ee11b71 100644 --- a/src/org/apache/xerces/xs/XSObjectList.java +++ b/src/org/apache/xerces/xs/XSObjectList.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSParticle.java b/src/org/apache/xerces/xs/XSParticle.java index b8118d8..a92b655 100644 --- a/src/org/apache/xerces/xs/XSParticle.java +++ b/src/org/apache/xerces/xs/XSParticle.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java b/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java index 3734f65..f2f1eb6 100644 --- a/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java +++ b/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSTerm.java b/src/org/apache/xerces/xs/XSTerm.java index 6478bbc..ece2d20 100644 --- a/src/org/apache/xerces/xs/XSTerm.java +++ b/src/org/apache/xerces/xs/XSTerm.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSTypeDefinition.java b/src/org/apache/xerces/xs/XSTypeDefinition.java index 608f1c2..5c021a0 100644 --- a/src/org/apache/xerces/xs/XSTypeDefinition.java +++ b/src/org/apache/xerces/xs/XSTypeDefinition.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/XSWildcard.java b/src/org/apache/xerces/xs/XSWildcard.java index fc92482..5714b51 100644 --- a/src/org/apache/xerces/xs/XSWildcard.java +++ b/src/org/apache/xerces/xs/XSWildcard.java @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/datatypes/ByteList.java b/src/org/apache/xerces/xs/datatypes/ByteList.java index 4521a6c..08623bf 100644 --- a/src/org/apache/xerces/xs/datatypes/ByteList.java +++ b/src/org/apache/xerces/xs/datatypes/ByteList.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import org.apache.xerces.xs.XSException; * * @author Ankit Pasricha, IBM * - * @version $Id: ByteList.java 320368 2005-05-15 20:37:23Z mrglavas $ + * @version $Id: ByteList.java 447250 2006-09-18 05:27:17Z mrglavas $ */ public interface ByteList { diff --git a/src/org/apache/xerces/xs/datatypes/ObjectList.java b/src/org/apache/xerces/xs/datatypes/ObjectList.java index 249ccf3..79993fe 100644 --- a/src/org/apache/xerces/xs/datatypes/ObjectList.java +++ b/src/org/apache/xerces/xs/datatypes/ObjectList.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ package org.apache.xerces.xs.datatypes; * * @author Ankit Pasricha, IBM * - * @version $Id: ObjectList.java 320368 2005-05-15 20:37:23Z mrglavas $ + * @version $Id: ObjectList.java 447250 2006-09-18 05:27:17Z mrglavas $ */ public interface ObjectList { diff --git a/src/org/apache/xerces/xs/datatypes/XSDateTime.java b/src/org/apache/xerces/xs/datatypes/XSDateTime.java index caaf7eb..af7a1cb 100644 --- a/src/org/apache/xerces/xs/datatypes/XSDateTime.java +++ b/src/org/apache/xerces/xs/datatypes/XSDateTime.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -201,7 +202,7 @@ import javax.xml.datatype.XMLGregorianCalendar; * * @author Ankit Pasricha, IBM * - * @version $Id: XSDateTime.java 320368 2005-05-15 20:37:23Z mrglavas $ + * @version $Id: XSDateTime.java 447250 2006-09-18 05:27:17Z mrglavas $ */ public interface XSDateTime { diff --git a/src/org/apache/xerces/xs/datatypes/XSDecimal.java b/src/org/apache/xerces/xs/datatypes/XSDecimal.java index 71f78ce..e925ef5 100644 --- a/src/org/apache/xerces/xs/datatypes/XSDecimal.java +++ b/src/org/apache/xerces/xs/datatypes/XSDecimal.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,7 @@ import java.math.BigInteger; * * @author Naela Nissar, IBM * - * @version $Id: XSDecimal.java 320369 2005-05-15 20:38:40Z mrglavas $ + * @version $Id: XSDecimal.java 447250 2006-09-18 05:27:17Z mrglavas $ */ public interface XSDecimal { diff --git a/src/org/apache/xerces/xs/datatypes/XSDouble.java b/src/org/apache/xerces/xs/datatypes/XSDouble.java index 0f7c476..a8042d3 100644 --- a/src/org/apache/xerces/xs/datatypes/XSDouble.java +++ b/src/org/apache/xerces/xs/datatypes/XSDouble.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,7 +21,7 @@ package org.apache.xerces.xs.datatypes; * * @author Ankit Pasricha, IBM * - * @version $Id: XSDouble.java 320368 2005-05-15 20:37:23Z mrglavas $ + * @version $Id: XSDouble.java 447250 2006-09-18 05:27:17Z mrglavas $ */ public interface XSDouble { diff --git a/src/org/apache/xerces/xs/datatypes/XSFloat.java b/src/org/apache/xerces/xs/datatypes/XSFloat.java index 51f23cf..e46d712 100644 --- a/src/org/apache/xerces/xs/datatypes/XSFloat.java +++ b/src/org/apache/xerces/xs/datatypes/XSFloat.java @@ -1,9 +1,10 @@ /* - * Copyright 2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -20,7 +21,7 @@ package org.apache.xerces.xs.datatypes; * * @author Ankit Pasricha, IBM * - * @version $Id: XSFloat.java 320368 2005-05-15 20:37:23Z mrglavas $ + * @version $Id: XSFloat.java 447250 2006-09-18 05:27:17Z mrglavas $ */ public interface XSFloat { diff --git a/src/org/apache/xerces/xs/datatypes/XSQName.java b/src/org/apache/xerces/xs/datatypes/XSQName.java index 880bf9c..b40a2fa 100644 --- a/src/org/apache/xerces/xs/datatypes/XSQName.java +++ b/src/org/apache/xerces/xs/datatypes/XSQName.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xerces/xs/datatypes/package.html b/src/org/apache/xerces/xs/datatypes/package.html index 3eda7ff..a343690 100644 --- a/src/org/apache/xerces/xs/datatypes/package.html +++ b/src/org/apache/xerces/xs/datatypes/package.html @@ -3,12 +3,13 @@ <head > <!-- - Copyright 2005 The Apache Software Foundation. + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software diff --git a/src/org/apache/xml/serialize/BaseMarkupSerializer.java b/src/org/apache/xml/serialize/BaseMarkupSerializer.java index a85db13..952d3d5 100644 --- a/src/org/apache/xml/serialize/BaseMarkupSerializer.java +++ b/src/org/apache/xml/serialize/BaseMarkupSerializer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -50,18 +51,15 @@ import org.apache.xerces.dom.DOMErrorImpl; import org.apache.xerces.dom.DOMLocatorImpl; import org.apache.xerces.dom.DOMMessageFormatter; import org.apache.xerces.util.XMLChar; -import org.w3c.dom.DOMImplementation; +import org.w3c.dom.DOMError; +import org.w3c.dom.DOMErrorHandler; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; import org.w3c.dom.DocumentType; -import org.w3c.dom.DOMError; -import org.w3c.dom.DOMErrorHandler; import org.w3c.dom.Element; -import org.w3c.dom.Entity; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import org.w3c.dom.Notation; import org.w3c.dom.ls.LSException; +import org.w3c.dom.ls.LSSerializer; import org.w3c.dom.ls.LSSerializerFilter; import org.w3c.dom.traversal.NodeFilter; import org.xml.sax.ContentHandler; @@ -113,13 +111,16 @@ import org.xml.sax.ext.LexicalHandler; * last child of an element, or immediate following or preceding * another element. * - * - * @version $Revision: 410017 $ $Date: 2006-05-28 23:53:02 -0400 (Sun, 28 May 2006) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML. See the Xerces documentation for more + * information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a> * @author Elena Litani, IBM * @see Serializer - * @see LSSerializer + * @see org.w3c.dom.ls.LSSerializer */ public abstract class BaseMarkupSerializer implements ContentHandler, DocumentHandler, LexicalHandler, @@ -413,7 +414,7 @@ public abstract class BaseMarkupSerializer * writer and output format. Throws an exception only if * an I/O exception occured while serializing. * - * @param elem The element to serialize + * @param frag The document fragment to serialize * @throws IOException An I/O exception occured while * serializing */ @@ -508,19 +509,19 @@ public abstract class BaseMarkupSerializer surrogates(ch, chars[index], true); } else { - fatalError("The character '"+(char)ch+"' is an invalid XML character"); + fatalError("The character '"+ch+"' is an invalid XML character"); } continue; - } else { - if ( ( ch >= ' ' && _encodingInfo.isPrintable((char)ch) && ch != 0xF7 ) || - ch == '\n' || ch == '\r' || ch == '\t' ) { - _printer.printText((char)ch); - } else { - // The character is not printable -- split CDATA section - _printer.printText("]]>&#x"); - _printer.printText(Integer.toHexString(ch)); - _printer.printText(";<![CDATA["); - } + } + if ( ( ch >= ' ' && _encodingInfo.isPrintable(ch) && ch != 0xF7 ) || + ch == '\n' || ch == '\r' || ch == '\t' ) { + _printer.printText(ch); + } + else { + // The character is not printable -- split CDATA section + _printer.printText("]]>&#x"); + _printer.printText(Integer.toHexString(ch)); + _printer.printText(";<![CDATA["); } } _printer.setNextIndent( saveIndent ); @@ -1169,18 +1170,12 @@ public abstract class BaseMarkupSerializer } case Node.DOCUMENT_NODE : { DocumentType docType; - DOMImplementation domImpl; - NamedNodeMap map; - Entity entity; - Notation notation; - int i; // If there is a document type, use the SAX events to // serialize it. docType = ( (Document) node ).getDoctype(); if (docType != null) { // DOM Level 2 (or higher) - domImpl = ( (Document) node ).getImplementation(); try { String internal; @@ -1251,7 +1246,7 @@ public abstract class BaseMarkupSerializer * state with <tt>empty</tt> and <tt>afterElement</tt> set to false. * * @return The current element state - * @throws IOException An I/O exception occured while + * @throws IOException An I/O exception occurred while * serializing */ protected ElementState content() @@ -1294,7 +1289,6 @@ public abstract class BaseMarkupSerializer * whether the text is printed as CDATA or unescaped. * * @param text The text to print - * @param unescaped True is should print unescaped * @throws IOException An I/O exception occured while * serializing */ @@ -1309,9 +1303,6 @@ public abstract class BaseMarkupSerializer // state) or whether we are inside a CDATA section or entity. if ( state.inCData || state.doCData ) { - int index; - int saveIndent; - // Print a CDATA section. The text is not escaped, but ']]>' // appearing in the code must be identified and dealt with. // The contents of a text node is considered space preserving. @@ -1319,7 +1310,7 @@ public abstract class BaseMarkupSerializer _printer.printText("<![CDATA["); state.inCData = true; } - saveIndent = _printer.getNextIndent(); + int saveIndent = _printer.getNextIndent(); _printer.setNextIndent( 0 ); printCDATAText( text); _printer.setNextIndent( saveIndent ); @@ -1421,13 +1412,11 @@ public abstract class BaseMarkupSerializer modifyDOMError(msg, DOMError.SEVERITY_FATAL_ERROR, "wf-invalid-character", fCurrentNode); fDOMErrorHandler.handleError(fDOMError); throw new LSException(LSException.SERIALIZE_ERR, msg); - } - else { - // issue error - modifyDOMError(msg, DOMError.SEVERITY_ERROR, "cdata-section-not-splitted", fCurrentNode); - if (!fDOMErrorHandler.handleError(fDOMError)) { - throw new LSException(LSException.SERIALIZE_ERR, msg); - } + } + // issue error + modifyDOMError(msg, DOMError.SEVERITY_ERROR, "cdata-section-not-splitted", fCurrentNode); + if (!fDOMErrorHandler.handleError(fDOMError)) { + throw new LSException(LSException.SERIALIZE_ERR, msg); } } else { // issue warning @@ -1455,20 +1444,20 @@ public abstract class BaseMarkupSerializer surrogates(ch, text.charAt(index), true); } else { - fatalError("The character '"+(char)ch+"' is an invalid XML character"); + fatalError("The character '"+ch+"' is an invalid XML character"); } continue; - } else { - if ( ( ch >= ' ' && _encodingInfo.isPrintable((char)ch) && ch != 0xF7 ) || - ch == '\n' || ch == '\r' || ch == '\t' ) { - _printer.printText((char)ch); - } else { + } + if ( ( ch >= ' ' && _encodingInfo.isPrintable(ch) && ch != 0xF7 ) || + ch == '\n' || ch == '\r' || ch == '\t' ) { + _printer.printText(ch); + } + else { - // The character is not printable -- split CDATA section - _printer.printText("]]>&#x"); - _printer.printText(Integer.toHexString(ch)); - _printer.printText(";<![CDATA["); - } + // The character is not printable -- split CDATA section + _printer.printText("]]>&#x"); + _printer.printText(Integer.toHexString(ch)); + _printer.printText(";<![CDATA["); } } } @@ -1512,7 +1501,9 @@ public abstract class BaseMarkupSerializer * Multiple spaces are printed as such, but spaces at beginning * of line are removed. * - * @param text The text to print + * @param chars The text to print + * @param start The start offset + * @param length The number of characters * @param preserveSpace Space preserving flag * @param unescaped Print unescaped */ @@ -1520,8 +1511,6 @@ public abstract class BaseMarkupSerializer boolean preserveSpace, boolean unescaped ) throws IOException { - int index; - char ch; if ( preserveSpace ) { // Preserving spaces: the text must print exactly as it is, @@ -1529,12 +1518,14 @@ public abstract class BaseMarkupSerializer // consolidating spaces. If a line terminator is used, a line // break will occur. while ( length-- > 0 ) { - ch = chars[ start ]; + char ch = chars[ start ]; ++start; - if ( ch == '\n' || ch == '\r' || unescaped ) + if ( ch == '\n' || ch == '\r' || unescaped ) { _printer.printText( ch ); - else + } + else { printEscaped( ch ); + } } } else { // Not preserving spaces: print one part at a time, and @@ -1543,14 +1534,17 @@ public abstract class BaseMarkupSerializer // by printing mechanism. Line terminator is treated // no different than other text part. while ( length-- > 0 ) { - ch = chars[ start ]; + char ch = chars[ start ]; ++start; - if ( ch == ' ' || ch == '\f' || ch == '\t' || ch == '\n' || ch == '\r' ) + if ( ch == ' ' || ch == '\f' || ch == '\t' || ch == '\n' || ch == '\r' ) { _printer.printSpace(); - else if ( unescaped ) + } + else if ( unescaped ) { _printer.printText( ch ); - else + } + else { printEscaped( ch ); + } } } } @@ -1582,12 +1576,15 @@ public abstract class BaseMarkupSerializer // no different than other text part. for ( index = 0 ; index < text.length() ; ++index ) { ch = text.charAt( index ); - if ( ch == ' ' || ch == '\f' || ch == '\t' || ch == '\n' || ch == '\r' ) + if ( ch == ' ' || ch == '\f' || ch == '\t' || ch == '\n' || ch == '\r' ) { _printer.printSpace(); - else if ( unescaped ) + } + else if ( unescaped ) { _printer.printText( ch ); - else + } + else { printEscaped( ch ); + } } } } @@ -1751,14 +1748,13 @@ public abstract class BaseMarkupSerializer { if ( _elementStateCount > 0 ) { /*Corrected by David Blondeau (blondeau@intalio.com)*/ - _prefixes = null; - //_prefixes = _elementStates[ _elementStateCount ].prefixes; + _prefixes = null; + //_prefixes = _elementStates[ _elementStateCount ].prefixes; -- _elementStateCount; return _elementStates[ _elementStateCount ]; - } else { - String msg = DOMMessageFormatter.formatMessage(DOMMessageFormatter.SERIALIZER_DOMAIN, "Internal", null); - throw new IllegalStateException(msg); } + String msg = DOMMessageFormatter.formatMessage(DOMMessageFormatter.SERIALIZER_DOMAIN, "Internal", null); + throw new IllegalStateException(msg); } @@ -1769,8 +1765,7 @@ public abstract class BaseMarkupSerializer * * @return True if in the state of the document */ - protected boolean isDocumentState() - { + protected boolean isDocumentState() { return _elementStateCount == 0; } @@ -1796,15 +1791,14 @@ public abstract class BaseMarkupSerializer if ( prefix != null ) return prefix; } - if ( _elementStateCount == 0 ) + if ( _elementStateCount == 0 ) { return null; - else { - for ( int i = _elementStateCount ; i > 0 ; --i ) { - if ( _elementStates[ i ].prefixes != null ) { - prefix = (String) _elementStates[ i ].prefixes.get( namespaceURI ); - if ( prefix != null ) - return prefix; - } + } + for ( int i = _elementStateCount ; i > 0 ; --i ) { + if ( _elementStates[ i ].prefixes != null ) { + prefix = (String) _elementStates[ i ].prefixes.get( namespaceURI ); + if ( prefix != null ) + return prefix; } } return null; diff --git a/src/org/apache/xml/serialize/DOMSerializer.java b/src/org/apache/xml/serialize/DOMSerializer.java index 2ca26c3..c6741bf 100644 --- a/src/org/apache/xml/serialize/DOMSerializer.java +++ b/src/org/apache/xml/serialize/DOMSerializer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -28,8 +29,11 @@ import org.w3c.dom.DocumentFragment; /** * Interface for a DOM serializer implementation. * - * - * @version $Revision: 319808 $ $Date: 2004-02-24 18:34:05 -0500 (Tue, 24 Feb 2004) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML. See the Xerces documentation for more + * information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:Scott_Boag/CAM/Lotus@lotus.com">Scott Boag</a> * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> */ diff --git a/src/org/apache/xml/serialize/DOMSerializerImpl.java b/src/org/apache/xml/serialize/DOMSerializerImpl.java index 6063de4..9ac6969 100644 --- a/src/org/apache/xml/serialize/DOMSerializerImpl.java +++ b/src/org/apache/xml/serialize/DOMSerializerImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -16,17 +17,12 @@ package org.apache.xml.serialize; -import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.io.StringWriter; import java.io.UnsupportedEncodingException; import java.io.Writer; import java.lang.reflect.Method; -import java.net.HttpURLConnection; -import java.net.URL; -import java.net.URLConnection; -import java.util.StringTokenizer; import java.util.Vector; import org.apache.xerces.dom.CoreDocumentImpl; @@ -35,10 +31,6 @@ import org.apache.xerces.dom.DOMLocatorImpl; import org.apache.xerces.dom.DOMMessageFormatter; import org.apache.xerces.dom.DOMNormalizer; import org.apache.xerces.dom.DOMStringListImpl; -import org.w3c.dom.DOMConfiguration; -import org.w3c.dom.DOMError; -import org.w3c.dom.DOMErrorHandler; -import org.w3c.dom.DOMStringList; import org.apache.xerces.impl.Constants; import org.apache.xerces.impl.XMLEntityManager; import org.apache.xerces.util.DOMUtil; @@ -48,7 +40,11 @@ import org.apache.xerces.util.XML11Char; import org.apache.xerces.util.XMLChar; import org.w3c.dom.Attr; import org.w3c.dom.Comment; +import org.w3c.dom.DOMConfiguration; +import org.w3c.dom.DOMError; +import org.w3c.dom.DOMErrorHandler; import org.w3c.dom.DOMException; +import org.w3c.dom.DOMStringList; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; import org.w3c.dom.Element; @@ -60,7 +56,6 @@ import org.w3c.dom.ls.LSOutput; import org.w3c.dom.ls.LSSerializer; import org.w3c.dom.ls.LSSerializerFilter; - /** * EXPERIMENTAL: Implemenatation of DOM Level 3 org.w3c.ls.LSSerializer by delegating serialization * calls to <CODE>XMLSerializer</CODE>. @@ -72,7 +67,9 @@ import org.w3c.dom.ls.LSSerializerFilter; * @author Elena Litani, IBM * @author Gopal Sharma, Sun Microsystems * @author Arun Yadav, Sun Microsystems - * @version $Id: DOMSerializerImpl.java 410017 2006-05-29 03:53:02Z mrglavas $ + * @version $Id: DOMSerializerImpl.java 476047 2006-11-17 04:27:45Z mrglavas $ + * + * @deprecated Replaced by org.apache.xml.serializer.dom3.LSSerializerImpl in Xerces 2.9.0. */ public class DOMSerializerImpl implements LSSerializer, DOMConfiguration { @@ -713,33 +710,7 @@ public class DOMSerializerImpl implements LSSerializer, DOMConfiguration { throw new LSException(LSException.SERIALIZE_ERR, msg); } else { - // URI was specified. Handle relative URIs. - String expanded = XMLEntityManager.expandSystemId(uri, null, true); - URL url = new URL(expanded != null ? expanded : uri); - OutputStream out = null; - String protocol = url.getProtocol(); - String host = url.getHost(); - // Use FileOutputStream if this URI is for a local file. - if (protocol.equals("file") - && (host == null || host.length() == 0 || host.equals("localhost"))) { - out = new FileOutputStream(getPathWithoutEscapes(url.getFile())); - } - // Try to write to some other kind of URI. Some protocols - // won't support this, though HTTP should work. - else { - URLConnection urlCon = url.openConnection(); - urlCon.setDoInput(false); - urlCon.setDoOutput(true); - urlCon.setUseCaches(false); // Enable tunneling. - if (urlCon instanceof HttpURLConnection) { - // The DOM L3 LS CR says if we are writing to an HTTP URI - // it is to be done with an HTTP PUT. - HttpURLConnection httpCon = (HttpURLConnection) urlCon; - httpCon.setRequestMethod("PUT"); - } - out = urlCon.getOutputStream(); - } - ser.setOutputByteStream(out); + ser.setOutputByteStream(XMLEntityManager.createOutputStream(uri)); } } else { @@ -862,34 +833,7 @@ public class DOMSerializerImpl implements LSSerializer, DOMConfiguration { try { prepareForSerialization(ser, node); ser._format.setEncoding(encoding); - - // URI was specified. Handle relative URIs. - String expanded = XMLEntityManager.expandSystemId(URI, null, true); - URL url = new URL(expanded != null ? expanded : URI); - OutputStream out = null; - String protocol = url.getProtocol(); - String host = url.getHost(); - // Use FileOutputStream if this URI is for a local file. - if (protocol.equals("file") - && (host == null || host.length() == 0 || host.equals("localhost"))) { - out = new FileOutputStream(getPathWithoutEscapes(url.getFile())); - } - // Try to write to some other kind of URI. Some protocols - // won't support this, though HTTP should work. - else { - URLConnection urlCon = url.openConnection(); - urlCon.setDoInput(false); - urlCon.setDoOutput(true); - urlCon.setUseCaches(false); // Enable tunneling. - if (urlCon instanceof HttpURLConnection) { - // The DOM L3 LS CR says if we are writing to an HTTP URI - // it is to be done with an HTTP PUT. - HttpURLConnection httpCon = (HttpURLConnection) urlCon; - httpCon.setRequestMethod("PUT"); - } - out = urlCon.getOutputStream(); - } - ser.setOutputByteStream(out); + ser.setOutputByteStream(XMLEntityManager.createOutputStream(URI)); if (node.getNodeType() == Node.DOCUMENT_NODE) ser.serialize((Document) node); @@ -1106,24 +1050,6 @@ public class DOMSerializerImpl implements LSSerializer, DOMConfiguration { } - private String getPathWithoutEscapes(String origPath) { - if (origPath != null && origPath.length() != 0 && origPath.indexOf('%') != -1) { - // Locate the escape characters - StringTokenizer tokenizer = new StringTokenizer(origPath, "%"); - StringBuffer result = new StringBuffer(origPath.length()); - int size = tokenizer.countTokens(); - result.append(tokenizer.nextToken()); - for(int i = 1; i < size; ++i) { - String token = tokenizer.nextToken(); - // Decode the 2 digit hexadecimal number following % in '%nn' - result.append((char)Integer.valueOf(token.substring(0, 2), 16).intValue()); - result.append(token.substring(2)); - } - return result.toString(); - } - return origPath; - } - private String _getXmlVersion(Node node) { Document doc = (node.getNodeType() == Node.DOCUMENT_NODE) ? (Document) node : node.getOwnerDocument(); diff --git a/src/org/apache/xml/serialize/ElementState.java b/src/org/apache/xml/serialize/ElementState.java index 58a161d..70a059f 100644 --- a/src/org/apache/xml/serialize/ElementState.java +++ b/src/org/apache/xml/serialize/ElementState.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,8 +25,11 @@ import java.util.Hashtable; /** * Holds the state of the currently serialized element. * - * - * @version $Revision: 319808 $ $Date: 2004-02-24 18:34:05 -0500 (Tue, 24 Feb 2004) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML. See the Xerces documentation for more + * information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> * @see BaseMarkupSerializer */ diff --git a/src/org/apache/xml/serialize/EncodingInfo.java b/src/org/apache/xml/serialize/EncodingInfo.java index a237d49..592a633 100644 --- a/src/org/apache/xml/serialize/EncodingInfo.java +++ b/src/org/apache/xml/serialize/EncodingInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 2000-2002,2004,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -24,8 +25,12 @@ import org.apache.xerces.util.EncodingMap; /** * This class represents an encoding. - * - * @version $Id: EncodingInfo.java 320382 2005-05-22 19:11:07Z mrglavas $ + * + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML. See the Xerces documentation for more + * information. + * @version $Id: EncodingInfo.java 476047 2006-11-17 04:27:45Z mrglavas $ */ public class EncodingInfo { diff --git a/src/org/apache/xml/serialize/Encodings.java b/src/org/apache/xml/serialize/Encodings.java index 5d73da6..f38feae 100644 --- a/src/org/apache/xml/serialize/Encodings.java +++ b/src/org/apache/xml/serialize/Encodings.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -14,24 +15,25 @@ * limitations under the License. */ - package org.apache.xml.serialize; - import java.io.UnsupportedEncodingException; import java.util.Hashtable; import java.util.Locale; import org.apache.xerces.util.EncodingMap; - /** * Provides information about encodings. Depends on the Java runtime * to provides writers for the different encodings, but can be used * to override encoding names and provide the last printable character * for each encoding. * - * @version $Id: Encodings.java 320530 2005-06-24 01:32:04Z mrglavas $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML. See the Xerces documentation for more + * information. + * @version $Id: Encodings.java 476047 2006-11-17 04:27:45Z mrglavas $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> */ public class Encodings @@ -72,14 +74,14 @@ public class Encodings // need to convert it to upper case: encoding = encoding.toUpperCase(Locale.ENGLISH); String jName = EncodingMap.getIANA2JavaMapping(encoding); - if(jName == null) { + if (jName == null) { // see if the encoding passed in is a Java encoding name. - if(allowJavaNames ) { + if (allowJavaNames) { EncodingInfo.testJavaEncodingName(encoding); - if((eInfo = (EncodingInfo)_encodings.get(encoding)) != null) + if ((eInfo = (EncodingInfo)_encodings.get(encoding)) != null) return eInfo; // is it known to be unicode-compliant? - int i=0; + int i = 0; for(; i<UNICODE_ENCODINGS.length; i++) { if(UNICODE_ENCODINGS[i].equalsIgnoreCase(encoding)) { eInfo = new EncodingInfo(EncodingMap.getJava2IANAMapping(encoding), encoding, LAST_PRINTABLE_UNICODE); @@ -91,9 +93,8 @@ public class Encodings } _encodings.put(encoding, eInfo); return eInfo; - } else { - throw new UnsupportedEncodingException(encoding); } + throw new UnsupportedEncodingException(encoding); } if ((eInfo = (EncodingInfo)_encodings.get(jName)) != null) return eInfo; diff --git a/src/org/apache/xml/serialize/HTMLSerializer.java b/src/org/apache/xml/serialize/HTMLSerializer.java index 66fe730..e4b6456 100644 --- a/src/org/apache/xml/serialize/HTMLSerializer.java +++ b/src/org/apache/xml/serialize/HTMLSerializer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -86,7 +87,7 @@ import org.xml.sax.SAXException; * recommended that new applications use JAXP's Transformation API * for XML (TrAX) for serializing HTML. See the Xerces documentation * for more information. - * @version $Revision: 320042 $ $Date: 2004-09-06 18:57:13 -0400 (Mon, 06 Sep 2004) $ + * @version $Revision: 464300 $ $Date: 2006-10-15 17:56:26 -0400 (Sun, 15 Oct 2006) $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> * @see Serializer */ @@ -625,8 +626,6 @@ public class HTMLSerializer protected void startDocument( String rootTagName ) throws IOException { - StringBuffer buffer; - // Not supported in HTML/XHTML, but we still have to switch // out of DTD mode. _printer.leaveDTD(); @@ -847,10 +846,8 @@ public class HTMLSerializer protected void characters( String text ) throws IOException { - ElementState state; - // HTML: no CDATA section - state = content(); + content(); super.characters( text ); } @@ -868,15 +865,10 @@ public class HTMLSerializer // XXX Apparently Netscape doesn't like if we escape the URI // using %nn, so we leave it as is, just remove any quotes. index = uri.indexOf( "\"" ); - if ( index >= 0 ) + if ( index >= 0 ) { return uri.substring( 0, index ); - else - return uri; + } + return uri; } - } - - - - diff --git a/src/org/apache/xml/serialize/HTMLdtd.java b/src/org/apache/xml/serialize/HTMLdtd.java index 33d22e0..55614ed 100644 --- a/src/org/apache/xml/serialize/HTMLdtd.java +++ b/src/org/apache/xml/serialize/HTMLdtd.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -14,12 +15,10 @@ * limitations under the License. */ - // Aug 21, 2000: // Fixed bug in isElement and made HTMLdtd public. // Contributed by Eric SCHAEFFER" <eschaeffer@posterconseil.com> - package org.apache.xml.serialize; import org.apache.xerces.dom.DOMMessageFormatter; @@ -30,7 +29,6 @@ import java.io.BufferedReader; import java.util.Hashtable; import java.util.Locale; - /** * Utility class for accessing information specific to HTML documents. * The HTML DTD is expressed as three utility function groups. Two methods @@ -41,8 +39,10 @@ import java.util.Locale; * from value to name. A small entities resource is loaded into memory the * first time any of these methods is called for fast and efficient access. * - * - * @version $Revision: 319808 $ $Date: 2004-02-24 18:34:05 -0500 (Tue, 24 Feb 2004) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use JAXP's Transformation API for XML (TrAX) for + * serializing HTML. See the Xerces documentation for more information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> */ public final class HTMLdtd @@ -321,10 +321,10 @@ public final class HTMLdtd initialize(); value = _byName.get( name ); - if ( value != null && value instanceof Integer ) + if ( value != null && value instanceof Integer ) { return ( (Integer) value ).intValue(); - else - return -1; + } + return -1; } @@ -460,10 +460,10 @@ public final class HTMLdtd Integer flags; flags = (Integer) _elemDefs.get( name.toUpperCase(Locale.ENGLISH) ); - if ( flags == null ) + if ( flags == null ) { return false; - else - return ( ( flags.intValue() & flag ) == flag ); + } + return ( ( flags.intValue() & flag ) == flag ); } diff --git a/src/org/apache/xml/serialize/IndentPrinter.java b/src/org/apache/xml/serialize/IndentPrinter.java index 92aee15..9f8f871 100644 --- a/src/org/apache/xml/serialize/IndentPrinter.java +++ b/src/org/apache/xml/serialize/IndentPrinter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,7 +28,11 @@ import java.io.IOException; * Extends {@link Printer} and adds support for indentation and line * wrapping. * - * @version $Revision: 319808 $ $Date: 2004-02-24 18:34:05 -0500 (Tue, 24 Feb 2004) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML. See the Xerces documentation for more + * information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> */ public class IndentPrinter @@ -120,8 +125,8 @@ public class IndentPrinter flushLine( false ); _writer = _docWriter; return _dtdWriter.toString(); - } else - return null; + } + return null; } diff --git a/src/org/apache/xml/serialize/LineSeparator.java b/src/org/apache/xml/serialize/LineSeparator.java index e63eeeb..a75d2ea 100644 --- a/src/org/apache/xml/serialize/LineSeparator.java +++ b/src/org/apache/xml/serialize/LineSeparator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,11 @@ package org.apache.xml.serialize; /** - * @version $Revision: 319808 $ $Date: 2004-02-24 18:34:05 -0500 (Tue, 24 Feb 2004) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML. See the Xerces documentation for more + * information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:arkin@intalio..com">Assaf Arkin</a> * @see OutputFormat */ diff --git a/src/org/apache/xml/serialize/Method.java b/src/org/apache/xml/serialize/Method.java index 74ea53b..b675c06 100644 --- a/src/org/apache/xml/serialize/Method.java +++ b/src/org/apache/xml/serialize/Method.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,7 +20,11 @@ package org.apache.xml.serialize; /** - * @version $Revision: 319808 $ $Date: 2004-02-24 18:34:05 -0500 (Tue, 24 Feb 2004) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML. See the Xerces documentation for more + * information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> * @see OutputFormat */ diff --git a/src/org/apache/xml/serialize/ObjectFactory.java b/src/org/apache/xml/serialize/ObjectFactory.java index 2c63854..989fd11 100644 --- a/src/org/apache/xml/serialize/ObjectFactory.java +++ b/src/org/apache/xml/serialize/ObjectFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -37,7 +38,7 @@ import java.io.InputStreamReader; * when bundled as part of the JDK. * <p> * - * @version $Id: ObjectFactory.java 320285 2005-04-18 04:15:35Z mrglavas $ + * @version $Id: ObjectFactory.java 447253 2006-09-18 05:32:50Z mrglavas $ */ final class ObjectFactory { diff --git a/src/org/apache/xml/serialize/OutputFormat.java b/src/org/apache/xml/serialize/OutputFormat.java index 02c0eb6..8e4fbe6 100644 --- a/src/org/apache/xml/serialize/OutputFormat.java +++ b/src/org/apache/xml/serialize/OutputFormat.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -50,7 +51,11 @@ import org.w3c.dom.html.HTMLDocument; * </ul> * * - * @version $Revision: 429961 $ $Date: 2006-08-09 00:59:14 -0400 (Wed, 09 Aug 2006) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML and HTML. See the Xerces documentation for + * more information. + * @version $Revision: 476048 $ $Date: 2006-11-16 23:32:47 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> * <a href="mailto:visco@intalio.com">Keith Visco</a> * @see Serializer @@ -59,8 +64,12 @@ import org.w3c.dom.html.HTMLDocument; */ public class OutputFormat { - - + /** + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML and HTML. See the Xerces documentation for + * more information. + */ public static class DTD { @@ -89,7 +98,12 @@ public class OutputFormat } - + /** + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML and HTML. See the Xerces documentation for + * more information. + */ public static class Defaults { @@ -170,30 +184,24 @@ public class OutputFormat /** - * Ture if the XML declaration should be ommited; + * True if the XML declaration should be ommited; */ private boolean _omitXmlDeclaration = false; /** - * Ture if the DOCTYPE declaration should be ommited; + * True if the DOCTYPE declaration should be ommited; */ private boolean _omitDoctype = false; /** - * Ture if comments should be ommited; + * True if comments should be ommited; */ private boolean _omitComments = false; /** - * Ture if the comments should be ommited; - */ - private boolean _stripComments = false; - - - /** * True if the document type should be marked as standalone. */ private boolean _standalone = false; @@ -335,7 +343,7 @@ public class OutputFormat * Returns the version for this output method. * If no version was specified, will return null * and the default version number will be used. - * If the serializerr does not support that particular + * If the serializer does not support that particular * version, it should default to a supported version. * * @return The specified method version, or null @@ -824,10 +832,10 @@ public class OutputFormat public char getLastPrintable() { if ( getEncoding() != null && - ( getEncoding().equalsIgnoreCase( "ASCII" ) ) ) + ( getEncoding().equalsIgnoreCase( "ASCII" ) ) ) { return 0xFF; - else - return 0xFFFF; + } + return 0xFFFF; } diff --git a/src/org/apache/xml/serialize/Printer.java b/src/org/apache/xml/serialize/Printer.java index b5c7e91..54b175a 100644 --- a/src/org/apache/xml/serialize/Printer.java +++ b/src/org/apache/xml/serialize/Printer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -35,7 +36,11 @@ import java.io.IOException; * {@link IndentPrinter} supports indentation and line wrapping by * extending this class. * - * @version $Revision: 319808 $ $Date: 2004-02-24 18:34:05 -0500 (Tue, 24 Feb 2004) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML. See the Xerces documentation for more + * information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> */ public class Printer @@ -148,12 +153,12 @@ public class Printer { // Only works if we're going out of DTD mode. if ( _writer == _dtdWriter ) { - flushLine( false ); + flushLine( false ); _writer = _docWriter; return _dtdWriter.toString(); - } else - return null; + } + return null; } diff --git a/src/org/apache/xml/serialize/SecuritySupport.java b/src/org/apache/xml/serialize/SecuritySupport.java index 2440cb1..1ac2a7c 100644 --- a/src/org/apache/xml/serialize/SecuritySupport.java +++ b/src/org/apache/xml/serialize/SecuritySupport.java @@ -1,9 +1,10 @@ /* - * Copyright 2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/src/org/apache/xml/serialize/Serializer.java b/src/org/apache/xml/serialize/Serializer.java index 90b9707..6b953a9 100644 --- a/src/org/apache/xml/serialize/Serializer.java +++ b/src/org/apache/xml/serialize/Serializer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -49,8 +50,11 @@ import org.xml.sax.DocumentHandler; * format or method are missing, the default is an XML serializer with * UTF-8 encoding and now indentation. * - * - * @version $Revision: 319808 $ $Date: 2004-02-24 18:34:05 -0500 (Tue, 24 Feb 2004) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML and HTML. See the Xerces documentation for more + * information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> * @author <a href="mailto:Scott_Boag/CAM/Lotus@lotus.com">Scott Boag</a> * @see DocumentHandler diff --git a/src/org/apache/xml/serialize/SerializerFactory.java b/src/org/apache/xml/serialize/SerializerFactory.java index 6294cd8..b638f6f 100644 --- a/src/org/apache/xml/serialize/SerializerFactory.java +++ b/src/org/apache/xml/serialize/SerializerFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -23,7 +24,11 @@ import java.util.Hashtable; import java.util.StringTokenizer; /** - * @version $Revision: 423220 $ $Date: 2006-07-18 15:34:55 -0400 (Tue, 18 Jul 2006) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML and HTML. See the Xerces documentation for more + * information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:Scott_Boag/CAM/Lotus@lotus.com">Scott Boag</a> * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> */ diff --git a/src/org/apache/xml/serialize/SerializerFactoryImpl.java b/src/org/apache/xml/serialize/SerializerFactoryImpl.java index 9f7de4f..044a738 100644 --- a/src/org/apache/xml/serialize/SerializerFactoryImpl.java +++ b/src/org/apache/xml/serialize/SerializerFactoryImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -27,8 +28,11 @@ import org.apache.xerces.dom.DOMMessageFormatter; * Default serializer factory can construct serializers for the three * markup serializers (XML, HTML, XHTML ). * - * - * @version $Revision: 319808 $ $Date: 2004-02-24 18:34:05 -0500 (Tue, 24 Feb 2004) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML and HTML. See the Xerces documentation for more + * information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:Scott_Boag/CAM/Lotus@lotus.com">Scott Boag</a> * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> */ diff --git a/src/org/apache/xml/serialize/TextSerializer.java b/src/org/apache/xml/serialize/TextSerializer.java index 4c587d7..4c340c4 100644 --- a/src/org/apache/xml/serialize/TextSerializer.java +++ b/src/org/apache/xml/serialize/TextSerializer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -51,8 +52,11 @@ import org.xml.sax.SAXException; * at the end of serializing (either DOM or SAX's {@link * org.xml.sax.DocumentHandler#endDocument}. * - * - * @version $Revision: 319808 $ $Date: 2004-02-24 18:34:05 -0500 (Tue, 24 Feb 2004) $ + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML and HTML. See the Xerces documentation for more + * information. + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> * @see Serializer */ diff --git a/src/org/apache/xml/serialize/XHTMLSerializer.java b/src/org/apache/xml/serialize/XHTMLSerializer.java index 4176b74..668f0ff 100644 --- a/src/org/apache/xml/serialize/XHTMLSerializer.java +++ b/src/org/apache/xml/serialize/XHTMLSerializer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -31,7 +32,7 @@ import java.io.Writer; * recommended that new applications use JAXP's Transformation API * for XML (TrAX) for serializing XHTML. See the Xerces documentation * for more information. - * @version $Revision: 320042 $ $Date: 2004-09-06 18:57:13 -0400 (Mon, 06 Sep 2004) $ + * @version $Revision: 447253 $ $Date: 2006-09-18 01:32:50 -0400 (Mon, 18 Sep 2006) $ * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> * @see Serializer */ diff --git a/src/org/apache/xml/serialize/XML11Serializer.java b/src/org/apache/xml/serialize/XML11Serializer.java index 0fcf79a..879bd5d 100644 --- a/src/org/apache/xml/serialize/XML11Serializer.java +++ b/src/org/apache/xml/serialize/XML11Serializer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -34,13 +35,13 @@ import java.io.OutputStream; import java.io.Writer; import org.apache.xerces.dom.DOMMessageFormatter; -import org.apache.xerces.impl.Constants; import org.apache.xerces.util.NamespaceSupport; import org.apache.xerces.util.SymbolTable; import org.apache.xerces.util.XML11Char; import org.apache.xerces.util.XMLChar; -import org.xml.sax.SAXException; import org.w3c.dom.DOMError; +import org.w3c.dom.Document; +import org.xml.sax.SAXException; /** * Implements an XML serializer supporting both DOM and SAX pretty @@ -54,9 +55,9 @@ import org.w3c.dom.DOMError; * The serializer supports both DOM and SAX. SAX serializing is done by firing * SAX events and using the serializer as a document handler. DOM serializing is done * by calling {@link #serialize(Document)} or by using DOM Level 3 - * {@link org.w3c.dom.ls.DOMSerializer} and - * serializing with {@link org.w3c.dom.ls.DOMSerializer#write}, - * {@link org.w3c.dom.ls.DOMSerializer#writeToString}. + * {@link org.w3c.dom.ls.LSSerializer} and + * serializing with {@link org.w3c.dom.ls.LSSerializer#write}, + * {@link org.w3c.dom.ls.LSSerializer#writeToString}. * <p> * If an I/O exception occurs while serializing, the serializer * will not throw an exception directly, but only throw it @@ -68,13 +69,18 @@ import org.w3c.dom.DOMError; * boundaries, indent lines, and serialize elements on separate * lines. Line terminators will be regarded as spaces, and * spaces at beginning of line will be stripped. + * + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML. See the Xerces documentation for more + * information. * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a> * @author Elena Litani IBM - * @version $Revision: 405847 $ $Date: 2006-05-12 15:35:42 -0400 (Fri, 12 May 2006) $ + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @see Serializer */ -public class XML11Serializer +public class XML11Serializer extends XMLSerializer { // @@ -115,10 +121,6 @@ extends XMLSerializer { */ protected boolean fNamespaces = false; - - private boolean fPreserveSpace; - - /** * Constructs a new serializer. The serializer cannot be used without * calling {@link #setOutputCharStream} or {@link #setOutputByteStream} @@ -213,23 +215,24 @@ extends XMLSerializer { surrogates(ch, chars[index], true); } else { - fatalError("The character '"+(char)ch+"' is an invalid XML character"); + fatalError("The character '"+ch+"' is an invalid XML character"); } continue; - } else { - if ( _encodingInfo.isPrintable((char)ch) && XML11Char.isXML11ValidLiteral(ch)) { - _printer.printText((char)ch); - } else { - // The character is not printable -- split CDATA section - _printer.printText("]]>&#x"); - _printer.printText(Integer.toHexString(ch)); - _printer.printText(";<![CDATA["); - } + } + if ( _encodingInfo.isPrintable(ch) && XML11Char.isXML11ValidLiteral(ch)) { + _printer.printText(ch); + } + else { + // The character is not printable -- split CDATA section + _printer.printText("]]>&#x"); + _printer.printText(Integer.toHexString(ch)); + _printer.printText(";<![CDATA["); } } _printer.setNextIndent( saveIndent ); - } else { + } + else { int saveIndent; @@ -242,16 +245,17 @@ extends XMLSerializer { _printer.setNextIndent( 0 ); printText( chars, start, length, true, state.unescaped ); _printer.setNextIndent( saveIndent ); - } else { + } + else { printText( chars, start, length, false, state.unescaped ); } } - } catch ( IOException except ) { + } + catch ( IOException except ) { throw new SAXException( except ); } } - // // overwrite printing functions to make sure serializer prints out valid XML // @@ -262,24 +266,30 @@ extends XMLSerializer { if (!XML11Char.isXML11Valid(ch)) { if (++i <length) { surrogates(ch, source.charAt(i), false); - } else { + } + else { fatalError("The character '"+(char)ch+"' is an invalid XML character"); } continue; } - if (ch == '\n' || ch == '\r' || ch == '\t' || ch == 0x0085 || ch == 0x2028){ - printHex(ch); - } else if (ch == '<') { - _printer.printText("<"); - } else if (ch == '&') { - _printer.printText("&"); - } else if (ch == '"') { - _printer.printText("""); - } else if ((ch >= ' ' && _encodingInfo.isPrintable((char) ch))) { - _printer.printText((char) ch); - } else { - printHex(ch); - } + if (ch == '\n' || ch == '\r' || ch == '\t' || ch == 0x0085 || ch == 0x2028) { + printHex(ch); + } + else if (ch == '<') { + _printer.printText("<"); + } + else if (ch == '&') { + _printer.printText("&"); + } + else if (ch == '"') { + _printer.printText("""); + } + else if ((ch >= ' ' && _encodingInfo.isPrintable((char) ch))) { + _printer.printText((char) ch); + } + else { + printHex(ch); + } } } @@ -338,52 +348,50 @@ extends XMLSerializer { // check if it is surrogate if (++index < length) { surrogates(ch, text.charAt(index), true); - } else { - fatalError( - "The character '" - + (char) ch - + "' is an invalid XML character"); + } + else { + fatalError("The character '" + ch + "' is an invalid XML character"); } continue; - } else { - if (_encodingInfo.isPrintable((char) ch) - && XML11Char.isXML11ValidLiteral(ch)) { - _printer.printText((char) ch); - } else { - - // The character is not printable -- split CDATA section - _printer.printText("]]>&#x"); - _printer.printText(Integer.toHexString(ch)); - _printer.printText(";<![CDATA["); - } + } + if (_encodingInfo.isPrintable(ch) + && XML11Char.isXML11ValidLiteral(ch)) { + _printer.printText(ch); + } + else { + // The character is not printable -- split CDATA section + _printer.printText("]]>&#x"); + _printer.printText(Integer.toHexString(ch)); + _printer.printText(";<![CDATA["); } } } - // note that this "int" should, in all cases, be a char. // REVISIT: make it a char... protected final void printXMLChar( int ch ) throws IOException { - - if (ch == '\r' || ch == 0x0085 || ch == 0x2028) { - printHex(ch); - } else if ( ch == '<') { + if (ch == '\r' || ch == 0x0085 || ch == 0x2028) { + printHex(ch); + } + else if ( ch == '<') { _printer.printText("<"); - } else if (ch == '&') { + } + else if (ch == '&') { _printer.printText("&"); - } else if (ch == '>'){ - // character sequence "]]>" can't appear in content, therefore - // we should escape '>' - _printer.printText(">"); - } else if ( _encodingInfo.isPrintable((char)ch) && XML11Char.isXML11ValidLiteral(ch)) { + } + else if (ch == '>'){ + // character sequence "]]>" can't appear in content, therefore + // we should escape '>' + _printer.printText(">"); + } + else if ( _encodingInfo.isPrintable((char)ch) && XML11Char.isXML11ValidLiteral(ch)) { _printer.printText((char)ch); - } else { - printHex(ch); + } + else { + printHex(ch); } } - - protected final void surrogates(int high, int low, boolean inContent) throws IOException{ if (XMLChar.isHighSurrogate(high)) { if (!XMLChar.isLowSurrogate(low)) { @@ -407,13 +415,13 @@ extends XMLSerializer { } } } - } else { + } + else { fatalError("The character '"+(char)high+"' is an invalid XML character"); } } - protected void printText( String text, boolean preserveSpace, boolean unescaped ) throws IOException { int index; @@ -431,16 +439,19 @@ extends XMLSerializer { if (++index <length) { surrogates(ch, text.charAt(index), true); } else { - fatalError("The character '"+(char)ch+"' is an invalid XML character"); + fatalError("The character '"+ch+"' is an invalid XML character"); } continue; } if ( unescaped && XML11Char.isXML11ValidLiteral(ch)) { _printer.printText( ch ); - } else + } + else { printXMLChar( ch ); + } } - } else { + } + else { // Not preserving spaces: print one part at a time, and // use spaces between parts to break them into different // lines. Spaces at beginning of line will be stripped @@ -453,25 +464,22 @@ extends XMLSerializer { if (++index <length) { surrogates(ch, text.charAt(index), true); } else { - fatalError("The character '"+(char)ch+"' is an invalid XML character"); + fatalError("The character '"+ch+"' is an invalid XML character"); } continue; } - - if ( unescaped && XML11Char.isXML11ValidLiteral(ch) ) + if ( unescaped && XML11Char.isXML11ValidLiteral(ch) ) { _printer.printText( ch ); - else - printXMLChar( ch); + } + else { + printXMLChar( ch ); + } } } } - - protected void printText( char[] chars, int start, int length, boolean preserveSpace, boolean unescaped ) throws IOException { - int index; - char ch; if ( preserveSpace ) { // Preserving spaces: the text must print exactly as it is, @@ -479,56 +487,54 @@ extends XMLSerializer { // consolidating spaces. If a line terminator is used, a line // break will occur. while ( length-- > 0 ) { - ch = chars[start++]; + char ch = chars[start++]; if (!XML11Char.isXML11Valid(ch)) { // check if it is surrogate if ( length-- > 0) { surrogates(ch, chars[start++], true); } else { - fatalError("The character '"+(char)ch+"' is an invalid XML character"); + fatalError("The character '"+ch+"' is an invalid XML character"); } continue; } - if ( unescaped && XML11Char.isXML11ValidLiteral(ch)) + if ( unescaped && XML11Char.isXML11ValidLiteral(ch)) { _printer.printText( ch ); - else + } + else { printXMLChar( ch ); + } } - } else { + } + else { // Not preserving spaces: print one part at a time, and // use spaces between parts to break them into different // lines. Spaces at beginning of line will be stripped // by printing mechanism. Line terminator is treated // no different than other text part. while ( length-- > 0 ) { - ch = chars[start++]; + char ch = chars[start++]; if (!XML11Char.isXML11Valid(ch)) { // check if it is surrogate if ( length-- > 0) { surrogates(ch, chars[start++], true); } else { - fatalError("The character '"+(char)ch+"' is an invalid XML character"); + fatalError("The character '"+ch+"' is an invalid XML character"); } continue; } - - if ( unescaped && XML11Char.isXML11ValidLiteral(ch)) + if ( unescaped && XML11Char.isXML11ValidLiteral(ch)) { _printer.printText( ch ); - else + } + else { printXMLChar( ch ); + } } } } - public boolean reset() { super.reset(); return true; - } } - - - - diff --git a/src/org/apache/xml/serialize/XMLSerializer.java b/src/org/apache/xml/serialize/XMLSerializer.java index a3f04ab..3be11ed 100644 --- a/src/org/apache/xml/serialize/XMLSerializer.java +++ b/src/org/apache/xml/serialize/XMLSerializer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2002,2004-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -63,9 +64,9 @@ import org.xml.sax.helpers.AttributesImpl; * The serializer supports both DOM and SAX. SAX serializing is done by firing * SAX events and using the serializer as a document handler. DOM serializing is done * by calling {@link #serialize(Document)} or by using DOM Level 3 - * {@link org.w3c.dom.ls.DOMSerializer} and - * serializing with {@link org.w3c.dom.ls.DOMSerializer#write}, - * {@link org.w3c.dom.ls.DOMSerializer#writeToString}. + * {@link org.w3c.dom.ls.LSSerializer} and + * serializing with {@link org.w3c.dom.ls.LSSerializer#write}, + * {@link org.w3c.dom.ls.LSSerializer#writeToString}. * <p> * If an I/O exception occurs while serializing, the serializer * will not throw an exception directly, but only throw it @@ -77,10 +78,15 @@ import org.xml.sax.helpers.AttributesImpl; * boundaries, indent lines, and serialize elements on separate * lines. Line terminators will be regarded as spaces, and * spaces at beginning of line will be stripped. + * + * @deprecated This class was deprecated in Xerces 2.9.0. It is recommended + * that new applications use the DOM Level 3 LSSerializer or JAXP's Transformation + * API for XML (TrAX) for serializing XML. See the Xerces documentation for more + * information. * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a> * @author Elena Litani IBM - * @version $Revision: 405847 $ $Date: 2006-05-12 15:35:42 -0400 (Fri, 12 May 2006) $ + * @version $Revision: 476047 $ $Date: 2006-11-16 23:27:45 -0500 (Thu, 16 Nov 2006) $ * @see Serializer */ public class XMLSerializer @@ -188,7 +194,7 @@ extends BaseMarkupSerializer { /** * This methods turns on namespace fixup algorithm during * DOM serialization. - * @see org.w3c.dom.ls.DOMSerializer + * @see org.w3c.dom.ls.LSSerializer * * @param namespaces */ @@ -215,7 +221,6 @@ extends BaseMarkupSerializer { ElementState state; String name; String value; - boolean addNSAttr = false; if (DEBUG) { System.out.println("==>startElement("+namespaceURI+","+localName+ @@ -270,13 +275,16 @@ extends BaseMarkupSerializer { if (namespaceURI != null && ! namespaceURI.equals( "" )) { String prefix; prefix = getPrefix( namespaceURI ); - if (prefix != null && prefix.length() > 0) + if (prefix != null && prefix.length() > 0) { rawName = prefix + ":" + localName; - else + } + else { rawName = localName; - } else + } + } + else { rawName = localName; - addNSAttr = true; + } } _printer.printText( '<' ); @@ -763,13 +771,11 @@ extends BaseMarkupSerializer { // xmlns:foo = "" } continue; - } else { // xmlns - // empty prefix is always bound ("" or some string) - - value = fSymbolTable.addSymbol(value); - fNSBinder.declarePrefix(XMLSymbols.EMPTY_STRING, value); - continue; } + // xmlns --- empty prefix is always bound ("" or some string) + value = fSymbolTable.addSymbol(value); + fNSBinder.declarePrefix(XMLSymbols.EMPTY_STRING, value); + continue; } // end-else: valid declaration } // end-if: namespace declaration } // end-for @@ -951,22 +957,20 @@ extends BaseMarkupSerializer { // xmlns:foo = "" } continue; - } else { // xmlns - // empty prefix is always bound ("" or some string) - - uri = fNSBinder.getURI(XMLSymbols.EMPTY_STRING); - localUri=fLocalNSBinder.getURI(XMLSymbols.EMPTY_STRING); - value = fSymbolTable.addSymbol(value); - if (localUri == null ){ - // declaration was not printed while fixing element namespace binding - if (fNamespacePrefixes) { - printNamespaceAttr(XMLSymbols.EMPTY_STRING, value); - } - // case 4 does not apply here since attributes can't use - // default namespace + } + // xmlns --- empty prefix is always bound ("" or some string) + uri = fNSBinder.getURI(XMLSymbols.EMPTY_STRING); + localUri= fLocalNSBinder.getURI(XMLSymbols.EMPTY_STRING); + value = fSymbolTable.addSymbol(value); + if (localUri == null ) { + // declaration was not printed while fixing element namespace binding + if (fNamespacePrefixes) { + printNamespaceAttr(XMLSymbols.EMPTY_STRING, value); } - continue; + // case 4 does not apply here since attributes can't use + // default namespace } + continue; } uri = fSymbolTable.addSymbol(uri); @@ -1188,8 +1192,6 @@ extends BaseMarkupSerializer { AttributesImpl attrsOnly; String rawName; int i; - int indexColon; - String prefix; int length; if (attrs == null) { @@ -1286,7 +1288,7 @@ extends BaseMarkupSerializer { if (++index <length) { surrogates(ch, text.charAt(index), true); } else { - fatalError("The character '"+(char)ch+"' is an invalid XML character"); + fatalError("The character '"+ch+"' is an invalid XML character"); } continue; } @@ -1308,7 +1310,7 @@ extends BaseMarkupSerializer { if (++index <length) { surrogates(ch, text.charAt(index), true); } else { - fatalError("The character '"+(char)ch+"' is an invalid XML character"); + fatalError("The character '"+ch+"' is an invalid XML character"); } continue; } @@ -1325,8 +1327,6 @@ extends BaseMarkupSerializer { protected void printText( char[] chars, int start, int length, boolean preserveSpace, boolean unescaped ) throws IOException { - int index; - char ch; if ( preserveSpace ) { // Preserving spaces: the text must print exactly as it is, @@ -1334,20 +1334,23 @@ extends BaseMarkupSerializer { // consolidating spaces. If a line terminator is used, a line // break will occur. while ( length-- > 0 ) { - ch = chars[start++]; + char ch = chars[start++]; if (!XMLChar.isValid(ch)) { // check if it is surrogate if ( length-- > 0 ) { surrogates(ch, chars[start++], true); - } else { - fatalError("The character '"+(char)ch+"' is an invalid XML character"); + } + else { + fatalError("The character '"+ch+"' is an invalid XML character"); } continue; } - if ( unescaped ) + if ( unescaped ) { _printer.printText( ch ); - else + } + else { printXMLChar( ch ); + } } } else { // Not preserving spaces: print one part at a time, and @@ -1356,20 +1359,23 @@ extends BaseMarkupSerializer { // by printing mechanism. Line terminator is treated // no different than other text part. while ( length-- > 0 ) { - ch = chars[start++]; + char ch = chars[start++]; if (!XMLChar.isValid(ch)) { // check if it is surrogate if ( length-- > 0 ) { surrogates(ch, chars[start++], true); - } else { - fatalError("The character '"+(char)ch+"' is an invalid XML character"); + } + else { + fatalError("The character '"+ch+"' is an invalid XML character"); } continue; } - if ( unescaped ) + if ( unescaped ) { _printer.printText( ch ); - else + } + else { printXMLChar( ch ); + } } } } |