Finishing work for IPZilla #4
diff --git a/bundles/org.eclipse.wst.standard.schemas/build.properties b/bundles/org.eclipse.wst.standard.schemas/build.properties
index a8d1418..3b4f20c 100644
--- a/bundles/org.eclipse.wst.standard.schemas/build.properties
+++ b/bundles/org.eclipse.wst.standard.schemas/build.properties
@@ -14,7 +14,8 @@
META-INF/,\
about.html,\
about_files/,\
- xsd/
+ xsd/,\
+ dtdsAndSchemas/
bin.excludes = bin/**,\
@dot/**,\
temp.folder/**
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtdsAndSchemas/XMLSchema.dtd b/bundles/org.eclipse.wst.standard.schemas/dtdsAndSchemas/XMLSchema.dtd
new file mode 100644
index 0000000..d98710f
--- /dev/null
+++ b/bundles/org.eclipse.wst.standard.schemas/dtdsAndSchemas/XMLSchema.dtd
@@ -0,0 +1,402 @@
+<!-- DTD for XML Schemas: Part 1: Structures
+ Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
+ Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
+<!-- $Id: XMLSchema.dtd,v 1.1 2007/05/21 02:04:33 david_williams Exp $ -->
+<!-- Note this DTD is NOT normative, or even definitive. --> <!--d-->
+<!-- prose copy in the structures REC is the definitive version --> <!--d-->
+<!-- (which shouldn't differ from this one except for this --> <!--d-->
+<!-- comment and entity expansions, but just in case) --> <!--d-->
+<!-- With the exception of cases with multiple namespace
+ prefixes for the XML Schema namespace, any XML document which is
+ not valid per this DTD given redefinitions in its internal subset of the
+ 'p' and 's' parameter entities below appropriate to its namespace
+ declaration of the XML Schema namespace is almost certainly not
+ a valid schema. -->
+
+<!-- The simpleType element and its constituent parts
+ are defined in XML Schema: Part 2: Datatypes -->
+<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
+
+<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
+ schema document to establish a different
+ namespace prefix -->
+<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
+ also define %s as the suffix for the appropriate
+ namespace declaration (e.g. :foo) -->
+<!ENTITY % nds 'xmlns%s;'>
+
+<!-- Define all the element names, with optional prefix -->
+<!ENTITY % schema "%p;schema">
+<!ENTITY % complexType "%p;complexType">
+<!ENTITY % complexContent "%p;complexContent">
+<!ENTITY % simpleContent "%p;simpleContent">
+<!ENTITY % extension "%p;extension">
+<!ENTITY % element "%p;element">
+<!ENTITY % unique "%p;unique">
+<!ENTITY % key "%p;key">
+<!ENTITY % keyref "%p;keyref">
+<!ENTITY % selector "%p;selector">
+<!ENTITY % field "%p;field">
+<!ENTITY % group "%p;group">
+<!ENTITY % all "%p;all">
+<!ENTITY % choice "%p;choice">
+<!ENTITY % sequence "%p;sequence">
+<!ENTITY % any "%p;any">
+<!ENTITY % anyAttribute "%p;anyAttribute">
+<!ENTITY % attribute "%p;attribute">
+<!ENTITY % attributeGroup "%p;attributeGroup">
+<!ENTITY % include "%p;include">
+<!ENTITY % import "%p;import">
+<!ENTITY % redefine "%p;redefine">
+<!ENTITY % notation "%p;notation">
+
+<!-- annotation elements -->
+<!ENTITY % annotation "%p;annotation">
+<!ENTITY % appinfo "%p;appinfo">
+<!ENTITY % documentation "%p;documentation">
+
+<!-- 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 % schemaAttrs ''>
+<!ENTITY % complexTypeAttrs ''>
+<!ENTITY % complexContentAttrs ''>
+<!ENTITY % simpleContentAttrs ''>
+<!ENTITY % extensionAttrs ''>
+<!ENTITY % elementAttrs ''>
+<!ENTITY % groupAttrs ''>
+<!ENTITY % allAttrs ''>
+<!ENTITY % choiceAttrs ''>
+<!ENTITY % sequenceAttrs ''>
+<!ENTITY % anyAttrs ''>
+<!ENTITY % anyAttributeAttrs ''>
+<!ENTITY % attributeAttrs ''>
+<!ENTITY % attributeGroupAttrs ''>
+<!ENTITY % uniqueAttrs ''>
+<!ENTITY % keyAttrs ''>
+<!ENTITY % keyrefAttrs ''>
+<!ENTITY % selectorAttrs ''>
+<!ENTITY % fieldAttrs ''>
+<!ENTITY % includeAttrs ''>
+<!ENTITY % importAttrs ''>
+<!ENTITY % redefineAttrs ''>
+<!ENTITY % notationAttrs ''>
+<!ENTITY % annotationAttrs ''>
+<!ENTITY % appinfoAttrs ''>
+<!ENTITY % documentationAttrs ''>
+
+<!ENTITY % complexDerivationSet "CDATA">
+ <!-- #all or space-separated list drawn from derivationChoice -->
+<!ENTITY % blockSet "CDATA">
+ <!-- #all or space-separated list drawn from
+ derivationChoice + 'substitution' -->
+
+<!ENTITY % mgs '%all; | %choice; | %sequence;'>
+<!ENTITY % cs '%choice; | %sequence;'>
+<!ENTITY % formValues '(qualified|unqualified)'>
+
+
+<!ENTITY % attrDecls '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'>
+
+<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'>
+
+<!-- This is used in part2 -->
+<!ENTITY % restriction1 '((%mgs; | %group;)?)'>
+
+%xs-datatypes;
+
+<!-- the duplication below is to produce an unambiguous content model
+ which allows annotation everywhere -->
+<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*,
+ ((%simpleType; | %complexType;
+ | %element; | %attribute;
+ | %attributeGroup; | %group;
+ | %notation; ),
+ (%annotation;)*)* )>
+<!ATTLIST %schema;
+ targetNamespace %URIref; #IMPLIED
+ version CDATA #IMPLIED
+ %nds; %URIref; #FIXED 'http://www.w3.org/2001/XMLSchema'
+ xmlns CDATA #IMPLIED
+ finalDefault %complexDerivationSet; ''
+ blockDefault %blockSet; ''
+ id ID #IMPLIED
+ elementFormDefault %formValues; 'unqualified'
+ attributeFormDefault %formValues; 'unqualified'
+ xml:lang CDATA #IMPLIED
+ %schemaAttrs;>
+<!-- Note the xmlns declaration is NOT in the Schema for Schemas,
+ because at the Infoset level where schemas operate,
+ xmlns(:prefix) is NOT an attribute! -->
+<!-- The declaration of xmlns is a convenience for schema authors -->
+
+<!-- The id attribute here and below is for use in external references
+ from non-schemas using simple fragment identifiers.
+ It is NOT used for schema-to-schema reference, internal or
+ external. -->
+
+<!-- a type is a named content type specification which allows attribute
+ declarations-->
+<!-- -->
+
+<!ELEMENT %complexType; ((%annotation;)?,
+ (%simpleContent;|%complexContent;|
+ %particleAndAttrs;))>
+
+<!ATTLIST %complexType;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ abstract %boolean; #IMPLIED
+ final %complexDerivationSet; #IMPLIED
+ block %complexDerivationSet; #IMPLIED
+ mixed (true|false) 'false'
+ %complexTypeAttrs;>
+
+<!-- particleAndAttrs is shorthand for a root type -->
+<!-- mixed is disallowed if simpleContent, overriden if complexContent
+ has one too. -->
+
+<!-- If anyAttribute appears in one or more referenced attributeGroups
+ and/or explicitly, the intersection of the permissions is used -->
+
+<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))>
+<!ATTLIST %complexContent;
+ mixed (true|false) #IMPLIED
+ id ID #IMPLIED
+ %complexContentAttrs;>
+
+<!-- restriction should use the branch defined above, not the simple
+ one from part2; extension should use the full model -->
+
+<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))>
+<!ATTLIST %simpleContent;
+ id ID #IMPLIED
+ %simpleContentAttrs;>
+
+<!-- restriction should use the simple branch from part2, not the
+ one defined above; extension should have no particle -->
+
+<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
+<!ATTLIST %extension;
+ base %QName; #REQUIRED
+ id ID #IMPLIED
+ %extensionAttrs;>
+
+<!-- an element is declared by either:
+ a name and a type (either nested or referenced via the type attribute)
+ or a ref to an existing element declaration -->
+
+<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?,
+ (%unique; | %key; | %keyref;)*)>
+<!-- simpleType or complexType only if no type|ref attribute -->
+<!-- ref not allowed at top level -->
+<!ATTLIST %element;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ type %QName; #IMPLIED
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ nillable %boolean; #IMPLIED
+ substitutionGroup %QName; #IMPLIED
+ abstract %boolean; #IMPLIED
+ final %complexDerivationSet; #IMPLIED
+ block %blockSet; #IMPLIED
+ default CDATA #IMPLIED
+ fixed CDATA #IMPLIED
+ form %formValues; #IMPLIED
+ %elementAttrs;>
+<!-- type and ref are mutually exclusive.
+ name and ref are mutually exclusive, one is required -->
+<!-- In the absence of type AND ref, type defaults to type of
+ substitutionGroup, if any, else the ur-type, i.e. unconstrained -->
+<!-- default and fixed are mutually exclusive -->
+
+<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
+<!ATTLIST %group;
+ name %NCName; #IMPLIED
+ ref %QName; #IMPLIED
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %groupAttrs;>
+
+<!ELEMENT %all; ((%annotation;)?, (%element;)*)>
+<!ATTLIST %all;
+ minOccurs (1) #IMPLIED
+ maxOccurs (1) #IMPLIED
+ id ID #IMPLIED
+ %allAttrs;>
+
+<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
+<!ATTLIST %choice;
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %choiceAttrs;>
+
+<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
+<!ATTLIST %sequence;
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %sequenceAttrs;>
+
+<!-- an anonymous grouping in a model, or
+ a top-level named group definition, or a reference to same -->
+
+<!-- Note that if order is 'all', group is not allowed inside.
+ If order is 'all' THIS group must be alone (or referenced alone) at
+ the top level of a content model -->
+<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside -->
+<!-- Should allow minOccurs=0 inside order='all' . . . -->
+
+<!ELEMENT %any; (%annotation;)?>
+<!ATTLIST %any;
+ namespace CDATA '##any'
+ processContents (skip|lax|strict) 'strict'
+ minOccurs %nonNegativeInteger; '1'
+ maxOccurs CDATA '1'
+ id ID #IMPLIED
+ %anyAttrs;>
+
+<!-- namespace is interpreted as follows:
+ ##any - - any non-conflicting WFXML at all
+
+ ##other - - any non-conflicting WFXML from namespace other
+ than targetNamespace
+
+ ##local - - any unqualified non-conflicting WFXML/attribute
+ one or - - any non-conflicting WFXML from
+ more URI the listed namespaces
+ references
+
+ ##targetNamespace ##local may appear in the above list,
+ with the obvious meaning -->
+
+<!ELEMENT %anyAttribute; (%annotation;)?>
+<!ATTLIST %anyAttribute;
+ namespace CDATA '##any'
+ processContents (skip|lax|strict) 'strict'
+ id ID #IMPLIED
+ %anyAttributeAttrs;>
+<!-- namespace is interpreted as for 'any' above -->
+
+<!-- simpleType only if no type|ref attribute -->
+<!-- ref not allowed at top level, name iff at top level -->
+<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)>
+<!ATTLIST %attribute;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ type %QName; #IMPLIED
+ use (prohibited|optional|required) #IMPLIED
+ default CDATA #IMPLIED
+ fixed CDATA #IMPLIED
+ form %formValues; #IMPLIED
+ %attributeAttrs;>
+<!-- type and ref are mutually exclusive.
+ name and ref are mutually exclusive, one is required -->
+<!-- default for use is optional when nested, none otherwise -->
+<!-- default and fixed are mutually exclusive -->
+<!-- type attr and simpleType content are mutually exclusive -->
+
+<!-- an attributeGroup is a named collection of attribute decls, or a
+ reference thereto -->
+<!ELEMENT %attributeGroup; ((%annotation;)?,
+ (%attribute; | %attributeGroup;)*,
+ (%anyAttribute;)?) >
+<!ATTLIST %attributeGroup;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ %attributeGroupAttrs;>
+
+<!-- ref iff no content, no name. ref iff not top level -->
+
+<!-- better reference mechanisms -->
+<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %unique;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ %uniqueAttrs;>
+
+<!ELEMENT %key; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %key;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ %keyAttrs;>
+
+<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %keyref;
+ name %NCName; #REQUIRED
+ refer %QName; #REQUIRED
+ id ID #IMPLIED
+ %keyrefAttrs;>
+
+<!ELEMENT %selector; ((%annotation;)?)>
+<!ATTLIST %selector;
+ xpath %XPathExpr; #REQUIRED
+ id ID #IMPLIED
+ %selectorAttrs;>
+<!ELEMENT %field; ((%annotation;)?)>
+<!ATTLIST %field;
+ xpath %XPathExpr; #REQUIRED
+ id ID #IMPLIED
+ %fieldAttrs;>
+
+<!-- Schema combination mechanisms -->
+<!ELEMENT %include; (%annotation;)?>
+<!ATTLIST %include;
+ schemaLocation %URIref; #REQUIRED
+ id ID #IMPLIED
+ %includeAttrs;>
+
+<!ELEMENT %import; (%annotation;)?>
+<!ATTLIST %import;
+ namespace %URIref; #IMPLIED
+ schemaLocation %URIref; #IMPLIED
+ id ID #IMPLIED
+ %importAttrs;>
+
+<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; |
+ %attributeGroup; | %group;)*>
+<!ATTLIST %redefine;
+ schemaLocation %URIref; #REQUIRED
+ id ID #IMPLIED
+ %redefineAttrs;>
+
+<!ELEMENT %notation; (%annotation;)?>
+<!ATTLIST %notation;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ public CDATA #REQUIRED
+ system %URIref; #IMPLIED
+ %notationAttrs;>
+
+<!-- Annotation is either application information or documentation -->
+<!-- By having these here they are available for datatypes as well
+ as all the structures elements -->
+
+<!ELEMENT %annotation; (%appinfo; | %documentation;)*>
+<!ATTLIST %annotation; %annotationAttrs;>
+
+<!-- User must define annotation elements in internal subset for this
+ to work -->
+<!ELEMENT %appinfo; ANY> <!-- too restrictive -->
+<!ATTLIST %appinfo;
+ source %URIref; #IMPLIED
+ id ID #IMPLIED
+ %appinfoAttrs;>
+<!ELEMENT %documentation; ANY> <!-- too restrictive -->
+<!ATTLIST %documentation;
+ source %URIref; #IMPLIED
+ id ID #IMPLIED
+ xml:lang CDATA #IMPLIED
+ %documentationAttrs;>
+
+<!NOTATION XMLSchemaStructures PUBLIC
+ 'structures' 'http://www.w3.org/2001/XMLSchema.xsd' >
+<!NOTATION XML PUBLIC
+ 'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' >
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtdsAndSchemas/xml.xsd b/bundles/org.eclipse.wst.standard.schemas/dtdsAndSchemas/xml.xsd
new file mode 100644
index 0000000..72e0a32
--- /dev/null
+++ b/bundles/org.eclipse.wst.standard.schemas/dtdsAndSchemas/xml.xsd
@@ -0,0 +1,82 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+ <xs:annotation>
+ <xs:documentation>
+ See http://www.w3.org/XML/1998/namespace.html and
+ http://www.w3.org/TR/REC-xml for information about this namespace.
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+ <xs:documentation>This schema defines attributes and an attribute group
+ suitable for use by
+ schemas wishing to allow xml:base, xml:lang or xml:space attributes
+ on elements they define.
+
+ To enable this, such a schema must import this schema
+ for the XML namespace, e.g. as follows:
+ <schema . . .>
+ . . .
+ <import namespace="http://www.w3.org/XML/1998/namespace"
+ schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
+
+ Subsequently, qualified reference to any of the attributes
+ or the group defined below will have the desired effect, e.g.
+
+ <type . . .>
+ . . .
+ <attributeGroup ref="xml:specialAttrs"/>
+
+ will define a type which will schema-validate an instance
+ element with any of those attributes</xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+ <xs:documentation>In keeping with the XML Schema WG's standard versioning
+ policy, this schema document will persist at
+ http://www.w3.org/2001/03/xml.xsd.
+ At the date of issue it can also be found at
+ http://www.w3.org/2001/xml.xsd.
+ The schema document at that URI may however change in the future,
+ in order to remain compatible with the latest version of XML Schema
+ itself. In other words, if the XML Schema namespace changes, the version
+ of this document at
+ http://www.w3.org/2001/xml.xsd will change
+ accordingly; the version at
+ http://www.w3.org/2001/03/xml.xsd will not change.
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang" type="xs:language">
+ <xs:annotation>
+ <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
+ codes as the enumerated possible values . . .</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="space" default="preserve">
+ <xs:simpleType>
+ <xs:restriction base="xs:NCName">
+ <xs:enumeration value="default"/>
+ <xs:enumeration value="preserve"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI">
+ <xs:annotation>
+ <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
+ information about this attribute.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+ <xs:attribute ref="xml:base"/>
+ <xs:attribute ref="xml:lang"/>
+ <xs:attribute ref="xml:space"/>
+ </xs:attributeGroup>
+
+</xs:schema>
diff --git a/bundles/org.eclipse.wst.standard.schemas/plugin.xml b/bundles/org.eclipse.wst.standard.schemas/plugin.xml
index 2c84213..74c1709 100644
--- a/bundles/org.eclipse.wst.standard.schemas/plugin.xml
+++ b/bundles/org.eclipse.wst.standard.schemas/plugin.xml
@@ -3,167 +3,171 @@
<plugin>
- <!--==========================================-->
- <!-- Catalog Contributions -->
- <!-- Register well known Web DTDs and XSDs -->
- <!--==========================================-->
-
- <!-- new form -->
-
- <!--
- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=100481
- you may have to comment out following extension if used
- in development environment.
-
- -->
-
- <extension point="org.eclipse.wst.xml.core.catalogContributions">
- <catalogContribution id="default">
+ <!--==========================================-->
+ <!-- Catalog Contributions -->
+ <!-- Register well known Web DTDs and XSDs -->
+ <!--==========================================-->
+
+ <!-- new form -->
+
+ <!--
+ See https://bugs.eclipse.org/bugs/show_bug.cgi?id=100481
+ you may have to comment out following extension if used
+ in development environment.
+
+ -->
+
+ <extension point="org.eclipse.wst.xml.core.catalogContributions">
+ <catalogContribution id="default">
- <public publicId="-//WAPFORUM//DTD WML 1.1//EN"
- uri="dtds/wml11.dtd">
- </public>
+ <public
+ publicId="-//WAPFORUM//DTD WML 1.1//EN"
+ uri="dtds/wml11.dtd">
+ </public>
- <public publicId="-//W3C//DTD XHTML 1.0 Strict//EN"
- uri="dtds/xhtml1-strict.dtd"
- webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
- </public>
+ <public
+ publicId="-//W3C//DTD XHTML 1.0 Strict//EN"
+ uri="dtds/xhtml1-strict.dtd"
+ webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ </public>
- <public publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
- uri="dtds/xhtml1-transitional.dtd"
- webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
- </public>
- <public publicId="-//W3C//DTD XHTML 1.0 Frameset//EN"
- uri="dtds/xhtml1-frameset.dtd"
- webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
- </public>
-
- <public publicId="-//W3C//DTD XHTML Basic 1.0//EN"
- uri="dtds/xhtml-basic10-f.dtd"
- webURL="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
- </public>
+ <public
+ publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
+ uri="dtds/xhtml1-transitional.dtd"
+ webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ </public>
+ <public
+ publicId="-//W3C//DTD XHTML 1.0 Frameset//EN"
+ uri="dtds/xhtml1-frameset.dtd"
+ webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+ </public>
- <public publicId="-//W3C//DTD XHTML 1.1//EN"
- uri="dtds/xhtml11-flat.dtd"
- webURL="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
- </public>
+ <public
+ publicId="-//W3C//DTD XHTML Basic 1.0//EN"
+ uri="dtds/xhtml-basic10-f.dtd"
+ webURL="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
+ </public>
- <public publicId="-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
- uri="dtds/xhtml-mobile10-flat.dtd"
- webURL="http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
- </public>
+ <public
+ publicId="-//W3C//DTD XHTML 1.1//EN"
+ uri="dtds/xhtml11-flat.dtd"
+ webURL="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+ </public>
- <public publicId="-//WAPFORUM//DTD WML 1.3//EN"
- uri="dtds/wml13.dtd"
- webURL="http://www.wapforum.org/DTD/wml13.dtd">
- </public>
+ <public
+ publicId="-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
+ uri="dtds/xhtml-mobile10-flat.dtd"
+ webURL="http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
+ </public>
+
+ <public
+ publicId="-//WAPFORUM//DTD WML 1.3//EN"
+ uri="dtds/wml13.dtd"
+ webURL="http://www.wapforum.org/DTD/wml13.dtd">
+ </public>
+
+
+
+ <uri
+ name="http://schemas.xmlsoap.org/wsdl/"
+ uri="xsd/wsdl.xsd" />
+ <uri
+ name="http://schemas.xmlsoap.org/wsdl/soap/"
+ uri="xsd/soap.xsd" />
+ <uri
+ name="http://schemas.xmlsoap.org/wsdl/http/"
+ uri="xsd/http.xsd" />
+ <uri
+ name="http://schemas.xmlsoap.org/wsdl/mime/"
+ uri="xsd/wsdl-mime.xsd" />
+ <uri
+ name="http://schemas.xmlsoap.org/soap/encoding/"
+ uri="xsd/soapenc.xsd" />
- <uri name="http://schemas.xmlsoap.org/wsdl/" uri="xsd/wsdl.xsd"/>
- <uri name="http://schemas.xmlsoap.org/wsdl/soap/" uri="xsd/soap.xsd"/>
- <uri name="http://schemas.xmlsoap.org/wsdl/http/" uri="xsd/http.xsd"/>
- <uri name="http://schemas.xmlsoap.org/wsdl/mime/" uri="xsd/wsdl-mime.xsd"/>
- <uri name="http://schemas.xmlsoap.org/soap/encoding/" uri="xsd/soapenc.xsd"/>
+ <uri
+ name="http://www.w3.org/2001/XMLSchema"
+ uri="dtdsAndSchemas/XMLSchema.xsd" />
+
+ <system
+ systemId="http://www.w3.org/2001/xml.xsd"
+ uri="dtdsAndSchemas/xml.xsd" />
+
+ </catalogContribution>
+
+ </extension>
- </catalogContribution>
- </extension>
- <!-- -->
-
- <!-- old form
- <extension
- point="org.eclipse.wst.xml.uriresolver.catalogContributor">
- <catalogContributor catalogId="default">
-
- <mappingInfo key="-//WAPFORUM//DTD WML 1.1//EN"
- uri="dtds/wml11.dtd">
- </mappingInfo>
-
- <mappingInfo key="-//W3C//DTD XHTML 1.0 Strict//EN"
- id="PUBLIC" uri="dtds/xhtml1-strict.dtd"
- webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
- </mappingInfo>
-
- <mappingInfo key="-//W3C//DTD XHTML 1.0 Transitional//EN"
- id="PUBLIC" uri="dtds/xhtml1-transitional.dtd"
- webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
- </mappingInfo>
-
- <mappingInfo key="-//W3C//DTD XHTML 1.0 Frameset//EN"
- id="PUBLIC" uri="dtds/xhtml1-frameset.dtd"
- webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
- </mappingInfo>
-
- <mappingInfo key="-//W3C//DTD XHTML Basic 1.0//EN"
- id="PUBLIC" uri="dtds/xhtml-basic10-f.dtd"
- webURL="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
- </mappingInfo>
-
- <mappingInfo key="-//W3C//DTD XHTML 1.1//EN" id="PUBLIC"
- uri="dtds/xhtml11-flat.dtd"
- webURL="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
- </mappingInfo>
-
- <mappingInfo key="-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
- id="PUBLIC" uri="dtds/xhtml-mobile10-flat.dtd"
- webURL="http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
- </mappingInfo>
-
- <mappingInfo key="-//WAPFORUM//DTD WML 1.3//EN" id="PUBLIC"
- uri="dtds/wml13.dtd"
- webURL="http://www.wapforum.org/DTD/wml13.dtd">
- </mappingInfo>
-
- </catalogContributor>
- </extension>
-
- -->
-
-
-
- <extension point="org.eclipse.wst.sse.core.documentTypes">
- <documentType elementName="html" displayName="%documentType.displayName.0"
- namespaceURI="http://www.w3.org/1999/xhtml" isXHTML="true"
- hasFrameset="false" publicID="-//W3C//DTD XHTML 1.0 Strict//EN"
- systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
- </documentType>
- <documentType elementName="html"
- displayName="%documentType.displayName.1"
- namespaceURI="http://www.w3.org/1999/xhtml" isXHTML="true"
- hasFrameset="false" publicID="-//W3C//DTD XHTML 1.0 Transitional//EN"
- defaultXHTML="true"
- systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
- </documentType>
- <documentType elementName="html"
- displayName="%documentType.displayName.2"
- namespaceURI="http://www.w3.org/1999/xhtml" isXHTML="true"
- hasFrameset="true" publicID="-//W3C//DTD XHTML 1.0 Frameset//EN"
- systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
- </documentType>
- <documentType elementName="html" displayName="%documentType.displayName.3"
- namespaceURI="http://www.w3.org/1999/xhtml" isXHTML="true"
- hasFrameset="false" publicID="-//W3C//DTD XHTML Basic 1.0//EN"
- systemID="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
- </documentType>
- <documentType elementName="html" displayName="%documentType.displayName.4"
- namespaceURI="http://www.w3.org/1999/xhtml" isXHTML="true"
- hasFrameset="false" publicID="-//W3C//DTD XHTML 1.1//EN"
- systemID="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
- </documentType>
- <documentType elementName="html" displayName="%documentType.displayName.5"
- namespaceURI="http://www.w3.org/1999/xhtml" isXHTML="true"
- hasFrameset="false" publicID="-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
- systemID="http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
- </documentType>
- <documentType elementName="wml" displayName="%documentType.displayName.6"
- namespaceURI="" isWML="true" hasFrameset="false"
- publicID="-//WAPFORUM//DTD WML 1.3//EN" defaultWML="true"
- systemID="http://www.wapforum.org/DTD/wml13.dtd">
- </documentType>
- </extension>
+ <extension point="org.eclipse.wst.sse.core.documentTypes">
+ <documentType
+ elementName="html"
+ displayName="%documentType.displayName.0"
+ namespaceURI="http://www.w3.org/1999/xhtml"
+ isXHTML="true"
+ hasFrameset="false"
+ publicID="-//W3C//DTD XHTML 1.0 Strict//EN"
+ systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ </documentType>
+ <documentType
+ elementName="html"
+ displayName="%documentType.displayName.1"
+ namespaceURI="http://www.w3.org/1999/xhtml"
+ isXHTML="true"
+ hasFrameset="false"
+ publicID="-//W3C//DTD XHTML 1.0 Transitional//EN"
+ defaultXHTML="true"
+ systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ </documentType>
+ <documentType
+ elementName="html"
+ displayName="%documentType.displayName.2"
+ namespaceURI="http://www.w3.org/1999/xhtml"
+ isXHTML="true"
+ hasFrameset="true"
+ publicID="-//W3C//DTD XHTML 1.0 Frameset//EN"
+ systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+ </documentType>
+ <documentType
+ elementName="html"
+ displayName="%documentType.displayName.3"
+ namespaceURI="http://www.w3.org/1999/xhtml"
+ isXHTML="true"
+ hasFrameset="false"
+ publicID="-//W3C//DTD XHTML Basic 1.0//EN"
+ systemID="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
+ </documentType>
+ <documentType
+ elementName="html"
+ displayName="%documentType.displayName.4"
+ namespaceURI="http://www.w3.org/1999/xhtml"
+ isXHTML="true"
+ hasFrameset="false"
+ publicID="-//W3C//DTD XHTML 1.1//EN"
+ systemID="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+ </documentType>
+ <documentType
+ elementName="html"
+ displayName="%documentType.displayName.5"
+ namespaceURI="http://www.w3.org/1999/xhtml"
+ isXHTML="true"
+ hasFrameset="false"
+ publicID="-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
+ systemID="http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
+ </documentType>
+ <documentType
+ elementName="wml"
+ displayName="%documentType.displayName.6"
+ namespaceURI=""
+ isWML="true"
+ hasFrameset="false"
+ publicID="-//WAPFORUM//DTD WML 1.3//EN"
+ defaultWML="true"
+ systemID="http://www.wapforum.org/DTD/wml13.dtd">
+ </documentType>
+ </extension>
</plugin>
diff --git a/features/org.eclipse.wst.web_core.feature/feature.xml b/features/org.eclipse.wst.web_core.feature/feature.xml
index df791bd..23f52e9 100644
--- a/features/org.eclipse.wst.web_core.feature/feature.xml
+++ b/features/org.eclipse.wst.web_core.feature/feature.xml
@@ -54,11 +54,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.wst.standard.schemas"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.xml b/features/org.eclipse.wst.xml_core.feature/feature.xml
index 51fefe3..be601af 100644
--- a/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -49,6 +49,13 @@
unpack="false"/>
<plugin
+ id="org.eclipse.wst.standard.schemas"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.wst.xml.core"
download-size="0"
install-size="0"
