You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/11 17:45:53 UTC

[07/24] incubator-netbeans git commit: [NETBEANS-54] Modules review xml.catalog

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd
----------------------------------------------------------------------
diff --git a/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd
new file mode 100644
index 0000000..130bc89
--- /dev/null
+++ b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd
@@ -0,0 +1,250 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have 
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without 
+modification, for any purpose and without fee or royalty is hereby granted, 
+provided that you include the following on ALL copies of the work or portions 
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the 
+  redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and 
+  conditions. If none exist, the W3C Software and Document Short Notice should 
+  be included.
+- Notice of any changes or modifications, through a copyright statement on the
+  new code or document such as "This software or document includes material 
+  copied from or derived from [title and URI of the W3C document]. 
+  Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)." 
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF 
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE 
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, 
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or 
+publicity pertaining to the work without specific, written prior permission. 
+Title to copyright in this work will at all times remain with copyright 
+holders.
+
+Changes:
+
+- Added license header
+
+-->
+<!--
+        DTD for XML Schemas: Part 2: Datatypes
+        $Id$
+        Note this DTD is NOT normative, or even definitive. - - the
+        prose copy in the datatypes REC is the definitive version
+        (which shouldn't differ from this one except for this comment
+        and entity expansions, but just in case)
+  -->
+
+<!--
+        This DTD cannot be used on its own, it is intended
+        only for incorporation in XMLSchema.dtd, q.v.
+  -->
+
+<!-- Define all the element names, with optional prefix -->
+<!ENTITY % simpleType "%p;simpleType">
+<!ENTITY % restriction "%p;restriction">
+<!ENTITY % list "%p;list">
+<!ENTITY % union "%p;union">
+<!ENTITY % maxExclusive "%p;maxExclusive">
+<!ENTITY % minExclusive "%p;minExclusive">
+<!ENTITY % maxInclusive "%p;maxInclusive">
+<!ENTITY % minInclusive "%p;minInclusive">
+<!ENTITY % totalDigits "%p;totalDigits">
+<!ENTITY % fractionDigits "%p;fractionDigits">
+<!ENTITY % length "%p;length">
+<!ENTITY % minLength "%p;minLength">
+<!ENTITY % maxLength "%p;maxLength">
+<!ENTITY % enumeration "%p;enumeration">
+<!ENTITY % whiteSpace "%p;whiteSpace">
+<!ENTITY % pattern "%p;pattern">
+
+<!--
+        Customisation entities for the ATTLIST of each element
+        type. Define one of these if your schema takes advantage
+        of the anyAttribute='##other' in the schema for schemas
+  -->
+
+<!ENTITY % simpleTypeAttrs "">
+<!ENTITY % restrictionAttrs "">
+<!ENTITY % listAttrs "">
+<!ENTITY % unionAttrs "">
+<!ENTITY % maxExclusiveAttrs "">
+<!ENTITY % minExclusiveAttrs "">
+<!ENTITY % maxInclusiveAttrs "">
+<!ENTITY % minInclusiveAttrs "">
+<!ENTITY % totalDigitsAttrs "">
+<!ENTITY % fractionDigitsAttrs "">
+<!ENTITY % lengthAttrs "">
+<!ENTITY % minLengthAttrs "">
+<!ENTITY % maxLengthAttrs "">
+<!ENTITY % enumerationAttrs "">
+<!ENTITY % whiteSpaceAttrs "">
+<!ENTITY % patternAttrs "">
+
+<!-- Define some entities for informative use as attribute
+        types -->
+<!ENTITY % URIref "CDATA">
+<!ENTITY % XPathExpr "CDATA">
+<!ENTITY % QName "NMTOKEN">
+<!ENTITY % QNames "NMTOKENS">
+<!ENTITY % NCName "NMTOKEN">
+<!ENTITY % nonNegativeInteger "NMTOKEN">
+<!ENTITY % boolean "(true|false)">
+<!ENTITY % simpleDerivationSet "CDATA">
+<!--
+        #all or space-separated list drawn from derivationChoice
+  -->
+
+<!--
+        Note that the use of 'facet' below is less restrictive
+        than is really intended:  There should in fact be no
+        more than one of each of minInclusive, minExclusive,
+        maxInclusive, maxExclusive, totalDigits, fractionDigits,
+        length, maxLength, minLength within datatype,
+        and the min- and max- variants of Inclusive and Exclusive
+        are mutually exclusive. On the other hand,  pattern and
+        enumeration may repeat.
+  -->
+<!ENTITY % minBound "(%minInclusive; | %minExclusive;)">
+<!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)">
+<!ENTITY % bounds "%minBound; | %maxBound;">
+<!ENTITY % numeric "%totalDigits; | %fractionDigits;">
+<!ENTITY % ordered "%bounds; | %numeric;">
+<!ENTITY % unordered
+   "%pattern; | %enumeration; | %whiteSpace; | %length; |
+   %maxLength; | %minLength;">
+<!ENTITY % facet "%ordered; | %unordered;">
+<!ENTITY % facetAttr 
+        "value CDATA #REQUIRED
+        id ID #IMPLIED">
+<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">
+<!ENTITY % facetModel "(%annotation;)?">
+<!ELEMENT %simpleType;
+        ((%annotation;)?, (%restriction; | %list; | %union;))>
+<!ATTLIST %simpleType;
+    name      %NCName; #IMPLIED
+    final     %simpleDerivationSet; #IMPLIED
+    id        ID       #IMPLIED
+    %simpleTypeAttrs;>
+<!-- name is required at top level -->
+<!ELEMENT %restriction; ((%annotation;)?,
+                         (%restriction1; |
+                          ((%simpleType;)?,(%facet;)*)),
+                         (%attrDecls;))>
+<!ATTLIST %restriction;
+    base      %QName;                  #IMPLIED
+    id        ID       #IMPLIED
+    %restrictionAttrs;>
+<!--
+        base and simpleType child are mutually exclusive,
+        one is required.
+
+        restriction is shared between simpleType and
+        simpleContent and complexContent (in XMLSchema.xsd).
+        restriction1 is for the latter cases, when this
+        is restricting a complex type, as is attrDecls.
+  -->
+<!ELEMENT %list; ((%annotation;)?,(%simpleType;)?)>
+<!ATTLIST %list;
+    itemType      %QName;             #IMPLIED
+    id        ID       #IMPLIED
+    %listAttrs;>
+<!--
+        itemType and simpleType child are mutually exclusive,
+        one is required
+  -->
+<!ELEMENT %union; ((%annotation;)?,(%simpleType;)*)>
+<!ATTLIST %union;
+    id            ID       #IMPLIED
+    memberTypes   %QNames;            #IMPLIED
+    %unionAttrs;>
+<!--
+        At least one item in memberTypes or one simpleType
+        child is required
+  -->
+
+<!ELEMENT %maxExclusive; %facetModel;>
+<!ATTLIST %maxExclusive;
+        %facetAttr;
+        %fixedAttr;
+        %maxExclusiveAttrs;>
+<!ELEMENT %minExclusive; %facetModel;>
+<!ATTLIST %minExclusive;
+        %facetAttr;
+        %fixedAttr;
+        %minExclusiveAttrs;>
+
+<!ELEMENT %maxInclusive; %facetModel;>
+<!ATTLIST %maxInclusive;
+        %facetAttr;
+        %fixedAttr;
+        %maxInclusiveAttrs;>
+<!ELEMENT %minInclusive; %facetModel;>
+<!ATTLIST %minInclusive;
+        %facetAttr;
+        %fixedAttr;
+        %minInclusiveAttrs;>
+
+<!ELEMENT %totalDigits; %facetModel;>
+<!ATTLIST %totalDigits;
+        %facetAttr;
+        %fixedAttr;
+        %totalDigitsAttrs;>
+<!ELEMENT %fractionDigits; %facetModel;>
+<!ATTLIST %fractionDigits;
+        %facetAttr;
+        %fixedAttr;
+        %fractionDigitsAttrs;>
+
+<!ELEMENT %length; %facetModel;>
+<!ATTLIST %length;
+        %facetAttr;
+        %fixedAttr;
+        %lengthAttrs;>
+<!ELEMENT %minLength; %facetModel;>
+<!ATTLIST %minLength;
+        %facetAttr;
+        %fixedAttr;
+        %minLengthAttrs;>
+<!ELEMENT %maxLength; %facetModel;>
+<!ATTLIST %maxLength;
+        %facetAttr;
+        %fixedAttr;
+        %maxLengthAttrs;>
+
+<!-- This one can be repeated -->
+<!ELEMENT %enumeration; %facetModel;>
+<!ATTLIST %enumeration;
+        %facetAttr;
+        %enumerationAttrs;>
+
+<!ELEMENT %whiteSpace; %facetModel;>
+<!ATTLIST %whiteSpace;
+        %facetAttr;
+        %fixedAttr;
+        %whiteSpaceAttrs;>
+
+<!-- This one can be repeated -->
+<!ELEMENT %pattern; %facetModel;>
+<!ATTLIST %pattern;
+        %facetAttr;
+        %patternAttrs;>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml
----------------------------------------------------------------------
diff --git a/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml b/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml
index a75b935..bb38151 100644
--- a/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml
+++ b/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this 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.
+
+-->
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 <public publicId="public ID"
 	uri="xmlcatdtd.dtd"/>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd
----------------------------------------------------------------------
diff --git a/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd b/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd
index ac5c6a7..a0326d3 100644
--- a/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd
+++ b/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd
@@ -1,4 +1,34 @@
-<!--  -->
+<!--
+
+Copyright � 2000, 2001 The Organization for the Advancement of Structured 
+Information Standards [OASIS]. All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and
+derivative works that comment on or otherwise explain it or assist in its 
+implementation may be prepared, copied, published and distributed, in whole or 
+in part, without restriction of any kind, provided that the above copyright 
+notice and this paragraph are included on all such copies and derivative works.
+However, this document itself may not be modified in any way, such as by 
+removing the copyright notice or references to OASIS, except as needed for the 
+purpose of developing OASIS specifications, in which case the procedures for
+copyrights defined in the OASIS Intellectual Property Rights document must be 
+followed, or as required to translate it into languages other than English.
+
+The limited permissions granted above are perpetual and will not be revoked by
+OASIS or its successors or assigns.
+
+This document and the information contained herein is provided on an "AS IS" 
+basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
+LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE
+ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A 
+PARTICULAR PURPOSE.
+
+Original XSD can be found here:
+https://www.oasis-open.org/committees/entity/spec-2001-08-06.html
+
+-->
+
+<!-- $Id: catalog.dtd,v 1.9 2001/06/12 14:26:00 ndw Exp $ -->
 
 <!ENTITY % pubIdChars "CDATA">
 <!ENTITY % publicIdentifier "%pubIdChars;">
@@ -23,127 +53,95 @@
 <!ENTITY % nextCatalog "%p;nextCatalog">
 <!ENTITY % group "%p;group">
 
-<!ENTITY % local.catalog.mix "">
 <!ENTITY % local.catalog.attribs "">
 
 <!ELEMENT %catalog; (%public;|%system;|%uri;
                      |%rewriteSystem;|%rewriteURI;
                      |%delegatePublic;|%delegateSystem;|%delegateURI;
-                     |%nextCatalog;|%group; %local.catalog.mix;)+>
+                     |%nextCatalog;|%group;)+>
 <!ATTLIST %catalog;
-	%nsdecl;	%uriReference;		#FIXED
-		'urn:oasis:names:tc:entity:xmlns:xml:catalog'
-	prefer		%systemOrPublic;	#IMPLIED
-	xml:base	%uriReference;		#IMPLIED
-	%local.catalog.attribs;
+    %nsdecl;    %uriReference;      #FIXED
+        'urn:oasis:names:tc:entity:xmlns:xml:catalog'
+    prefer      %systemOrPublic;    #IMPLIED
+    xml:base    %uriReference;      #IMPLIED
+    %local.catalog.attribs;
 >
 
-<!ENTITY % local.public.attribs "">
-
 <!ELEMENT %public; EMPTY>
 <!ATTLIST %public;
-	id		ID			#IMPLIED
-	publicId	%publicIdentifier;	#REQUIRED
-	uri		%uriReference;		#REQUIRED
-	xml:base	%uriReference;		#IMPLIED
-        %local.public.attribs;
+    id      ID          #IMPLIED
+    publicId    %publicIdentifier;  #REQUIRED
+    uri     %uriReference;      #REQUIRED
+    xml:base    %uriReference;      #IMPLIED
 >
 
-<!ENTITY % local.system.attribs "">
-
 <!ELEMENT %system; EMPTY>
 <!ATTLIST %system;
-	id		ID			#IMPLIED
-	systemId	%string;		#REQUIRED
-	uri		%uriReference;		#REQUIRED
-	xml:base	%uriReference;		#IMPLIED
-        %local.system.attribs;
+    id      ID          #IMPLIED
+    systemId    %string;        #REQUIRED
+    uri     %uriReference;      #REQUIRED
+    xml:base    %uriReference;      #IMPLIED
 >
 
-<!ENTITY % local.uri.attribs "">
-
 <!ELEMENT %uri; EMPTY>
 <!ATTLIST %uri;
-	id		ID			#IMPLIED
-	name		%string;		#REQUIRED
-	uri		%uriReference;		#REQUIRED
-	xml:base	%uriReference;		#IMPLIED
-        %local.uri.attribs;
+    id      ID          #IMPLIED
+    name        %string;        #REQUIRED
+    uri     %uriReference;      #REQUIRED
+    xml:base    %uriReference;      #IMPLIED
 >
 
-<!ENTITY % local.rewriteSystem.attribs "">
-
 <!ELEMENT %rewriteSystem; EMPTY>
 <!ATTLIST %rewriteSystem;
-	id		ID			#IMPLIED
-	systemIdStartString	%string;	#REQUIRED
-	rewritePrefix		%string;		#REQUIRED
-        %local.rewriteSystem.attribs;
+    id      ID          #IMPLIED
+    systemIdStartString %string;    #REQUIRED
+    rewritePrefix       %string;        #REQUIRED
 >
 
-<!ENTITY % local.rewriteURI.attribs "">
-
 <!ELEMENT %rewriteURI; EMPTY>
 <!ATTLIST %rewriteURI;
-	id		ID			#IMPLIED
-	uriStartString	%string;		#REQUIRED
-	rewritePrefix	%string;		#REQUIRED
-        %local.rewriteURI.attribs;
+    id      ID          #IMPLIED
+    uriStartString  %string;        #REQUIRED
+    rewritePrefix   %string;        #REQUIRED
 >
 
-<!ENTITY % local.delegatePublic.attribs "">
-
 <!ELEMENT %delegatePublic; EMPTY>
 <!ATTLIST %delegatePublic;
-	id		ID			#IMPLIED
-	publicIdStartString	%partialPublicIdentifier;	#REQUIRED
-	catalog		%uriReference;		#REQUIRED
-	xml:base	%uriReference;		#IMPLIED
-        %local.delegatePublic.attribs;
+    id      ID          #IMPLIED
+    publicIdStartString %partialPublicIdentifier;   #REQUIRED
+    catalog     %uriReference;      #REQUIRED
+    xml:base    %uriReference;      #IMPLIED
 >
 
-<!ENTITY % local.delegateSystem.attribs "">
-
 <!ELEMENT %delegateSystem; EMPTY>
 <!ATTLIST %delegateSystem;
-	id		ID			#IMPLIED
-	systemIdStartString	%string;	#REQUIRED
-	catalog		%uriReference;		#REQUIRED
-	xml:base	%uriReference;		#IMPLIED
-        %local.delegateSystem.attribs;
+    id      ID          #IMPLIED
+    systemIdStartString %string;    #REQUIRED
+    catalog     %uriReference;      #REQUIRED
+    xml:base    %uriReference;      #IMPLIED
 >
 
-<!ENTITY % local.delegateURI.attribs "">
-
 <!ELEMENT %delegateURI; EMPTY>
 <!ATTLIST %delegateURI;
-	id		ID			#IMPLIED
-	uriStartString	%string;		#REQUIRED
-	catalog		%uriReference;		#REQUIRED
-	xml:base	%uriReference;		#IMPLIED
-        %local.delegateURI.attribs;
+    id      ID          #IMPLIED
+    uriStartString  %string;        #REQUIRED
+    catalog     %uriReference;      #REQUIRED
+    xml:base    %uriReference;      #IMPLIED
 >
 
-<!ENTITY % local.nextCatalog.attribs "">
-
 <!ELEMENT %nextCatalog; EMPTY>
 <!ATTLIST %nextCatalog;
-	id		ID			#IMPLIED
-	catalog		%uriReference;		#REQUIRED
-	xml:base	%uriReference;		#IMPLIED
-        %local.nextCatalog.attribs;
+    id      ID          #IMPLIED
+    catalog     %uriReference;      #REQUIRED
+    xml:base    %uriReference;      #IMPLIED
 >
 
-<!ENTITY % local.group.mix "">
-<!ENTITY % local.group.attribs "">
-
 <!ELEMENT %group; (%public;|%system;|%uri;
                    |%rewriteSystem;|%rewriteURI;
                    |%delegatePublic;|%delegateSystem;|%delegateURI;
-                   |%nextCatalog; %local.group.mix;)+>
+                   |%nextCatalog;)+>
 <!ATTLIST %group;
-	id		ID			#IMPLIED
-	prefer		%systemOrPublic;	#IMPLIED
-	xml:base	%uriReference;		#IMPLIED
-        %local.group.attribs;
->
+    id      ID          #IMPLIED
+    prefer      %systemOrPublic;    #IMPLIED
+    xml:base    %uriReference;      #IMPLIED
+>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd
----------------------------------------------------------------------
diff --git a/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd b/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd
index a987e3c..3c6974d 100644
--- a/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd
+++ b/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd
@@ -1,22 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Copyright � 2000, 2001 The Organization for the Advancement of Structured 
+Information Standards [OASIS]. All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and
+derivative works that comment on or otherwise explain it or assist in its 
+implementation may be prepared, copied, published and distributed, in whole or 
+in part, without restriction of any kind, provided that the above copyright 
+notice and this paragraph are included on all such copies and derivative works.
+However, this document itself may not be modified in any way, such as by 
+removing the copyright notice or references to OASIS, except as needed for the 
+purpose of developing OASIS specifications, in which case the procedures for
+copyrights defined in the OASIS Intellectual Property Rights document must be 
+followed, or as required to translate it into languages other than English.
+
+The limited permissions granted above are perpetual and will not be revoked by
+OASIS or its successors or assigns.
+
+This document and the information contained herein is provided on an "AS IS" 
+basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
+LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE
+ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A 
+PARTICULAR PURPOSE.
+
+Original XSD can be found here:
+https://www.oasis-open.org/committees/entity/spec-2001-08-06.html
+
+-->
+<!DOCTYPE xs:schema SYSTEM "http://www.w3.org/2001/XMLSchema.dtd" [
+<!ENTITY % schemaAttrs "
+    xmlns:er    CDATA   #IMPLIED
+">
+]>
 <xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
            xmlns:er='urn:oasis:names:tc:entity:xmlns:xml:catalog'
            targetNamespace='urn:oasis:names:tc:entity:xmlns:xml:catalog'
            elementFormDefault='qualified'>
 
-  <!--  -->
+  <!-- $Id: catalog.xsd,v 1.9 2001/07/30 19:40:04 ndw Exp $ -->
 
   <xs:simpleType name='pubIdChars'>
     <!-- A string of the characters defined as pubIdChar in production 13
-         of the Second Edition of the XML 1.0 Recommendation. Does not include
-         the whitespace characters because they're normalized by XML parsing. -->
-    <xs:restriction base='xs:string'>
-      <xs:pattern value="[a-zA-Z0-9-'()+,./:=?;!*#@$_%]*"/>
-    </xs:restriction>
+         of the Second Edition of the XML 1.0 Recommendation -->
+    <xs:restriction base='xs:string'/>
   </xs:simpleType>
 
   <xs:simpleType name='publicIdentifier'>
-    <xs:restriction base='er:pubIdChars'/>
+    <xs:restriction base='xs:string'/>
   </xs:simpleType>
 
   <xs:simpleType name='partialPublicIdentifier'>
@@ -193,4 +224,4 @@
   <xs:element name="nextCatalog" type="er:nextCatalog"/>
   <xs:element name="group" type="er:group"/>
 
-</xs:schema>
+</xs:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd
----------------------------------------------------------------------
diff --git a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd
index e126f84..7a6f992 100644
--- a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd	
+++ b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd	
@@ -1 +1,21 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this 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.
+
+-->
 <!-- EMPTY -->

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml
----------------------------------------------------------------------
diff --git a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml
index f2b88e2..4e72c01 100644
--- a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml
+++ b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this 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.
+
+-->
 <!--
    Tests treating of spaces in catalog paths.
    Three URL space syntaxes are supported:

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd
----------------------------------------------------------------------
diff --git a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd
index e126f84..7a6f992 100644
--- a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd
+++ b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd
@@ -1 +1,21 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this 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.
+
+-->
 <!-- EMPTY -->