portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r607448 [16/36] - in /portals/pluto/branches/pluto-1.1.x: ./ assembly/src/main/assembly/ assembly/src/main/resources/ maven-pluto-plugin/ maven-pluto-plugin/src/main/java/org/apache/pluto/maven/ pluto-ant-tasks/ pluto-ant-tasks/src/assemble...
Date Sat, 29 Dec 2007 17:20:42 GMT
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/XMLSchema.dtd
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/XMLSchema.dtd?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/XMLSchema.dtd (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/XMLSchema.dtd Sat Dec 29 09:20:23 2007
@@ -1,420 +1,420 @@
-<!-- 
+<!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this 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.
--->
-<!-- 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.1.1 2003/09/30 14:03:01 rubys 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' >
+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.
+-->
+<!-- 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.1.1 2003/09/30 14:03:01 rubys 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' >

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/XMLSchema.dtd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-portlet-xml-mapping.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-portlet-xml-mapping.xml?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-portlet-xml-mapping.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-portlet-xml-mapping.xml Sat Dec 29 09:20:23 2007
@@ -1,278 +1,278 @@
-<?xml version="1.0"?>
-<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Object Mapping DTD Version 1.0//EN"
-    "http://castor.exolab.org/mapping.dtd">
-<!-- 
+<?xml version="1.0"?>
+<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Object Mapping DTD Version 1.0//EN"
+    "http://castor.exolab.org/mapping.dtd">
+<!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this 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.
--->
-<mapping>
-    <description>Portlet Deployment Descriptor Mapping</description>
-
-    <!--
-    Bare Bones for now!
-    -->
-
-    <class name="org.apache.pluto.descriptors.portlet.PortletAppDD">
-        <map-to xml="portlet-app"/>
-
-        <field name="Version">
-            <bind-xml name="version" node="attribute"/>
-        </field>
-
-        <field name="Portlets"
-               type="org.apache.pluto.descriptors.portlet.PortletDD"
-               collection="arraylist">
-            <bind-xml name="portlet" node="element"/>
-        </field>
-
-        <field name="CustomPortletModes"
-               type="org.apache.pluto.descriptors.portlet.CustomPortletModeDD"
-               collection="arraylist">
-            <bind-xml name="custom-portlet-mode" node="element"/>
-        </field>
-        <field name="CustomWindowStates"
-               type="org.apache.pluto.descriptors.portlet.CustomWindowStateDD"
-               collection="arraylist">
-            <bind-xml name="custom-window-state" node="element"/>
-        </field>
-        <field name="UserAttributes"
-               type="org.apache.pluto.descriptors.portlet.UserAttributeDD"
-               collection="arraylist">
-            <bind-xml name="user-attribute" node="element"/>
-        </field>
-
-        <field name="SecurityConstraints"
-               type="org.apache.pluto.descriptors.portlet.SecurityConstraintDD"
-               collection="arraylist">
-            <bind-xml name="security-constraint" node="element"/>
-         </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.portlet.PortletDD">
-        <field name="PortletName">
-            <bind-xml name="portlet-name" node="element"/>
-        </field>
-
-        <field name="DisplayNames" type="org.apache.pluto.descriptors.common.DisplayNameDD"
-               collection="arraylist">
-            <bind-xml name="display-name" node="element"/>
-        </field>
-
-        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
-               collection="arraylist">
-            <bind-xml name="description" node="element"/>
-        </field>
-
-        <field name="ExpirationCache">
-            <bind-xml name="expiration-cache" node="element"/>
-        </field>
-
-        <field name="PortletClass">
-            <bind-xml name="portlet-class" node="element"/>
-        </field>
-
-        <field name="PortletInfo" type="org.apache.pluto.descriptors.portlet.PortletInfoDD">
-            <bind-xml name="portlet-info" node="element"/>
-        </field>
-
-        <field name="InitParams" type="org.apache.pluto.descriptors.common.InitParamDD" collection="arraylist">
-            <bind-xml name="init-param" node="element"/>
-        </field>
-
-        <field name="ResourceBundle">
-            <bind-xml name="resource-bundle" node="element"/>
-        </field>
-
-        <field name="SecurityRoleRefs"
-               type="org.apache.pluto.descriptors.common.SecurityRoleRefDD"
-               collection="arraylist">
-            <bind-xml name="security-role-ref" node="element"/>
-        </field>
-
-        <field name="Supports" type="org.apache.pluto.descriptors.portlet.SupportsDD"
-               collection="arraylist">
-            <bind-xml name="supports" node="element"/>
-        </field>
-
-        <field name="SupportedLocales" type="java.lang.String"
-               collection="arraylist">
-            <bind-xml name="supported-locale" node="element"/>
-        </field>
-
-        <field name="PortletPreferences" type="org.apache.pluto.descriptors.portlet.PortletPreferencesDD">
-            <bind-xml name="portlet-preferences" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.portlet.PortletInfoDD">
-        <map-to xml="portlet-info"/>
-        <field name="Title">
-            <bind-xml name="title" node="element"/>
-        </field>
-        <field name="Keywords">
-            <bind-xml name="keywords" node="element"/>
-        </field>
-        <field name="ShortTitle">
-            <bind-xml name="short-title" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.portlet.SupportsDD">
-        <map-to xml="supports"/>
-
-        <field name="MimeType">
-            <bind-xml name="mime-type" node="element"/>
-        </field>
-
-        <field name="PortletModes" type="java.lang.String"
-               collection="arraylist">
-            <bind-xml name="portlet-mode" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.common.InitParamDD">
-        <field name="ParamName">
-            <bind-xml name="name" node="element"/>
-        </field>
-        <field name="ParamValue">
-            <bind-xml name="value" node="element"/>
-        </field>
-        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
-               collection="arraylist">
-            <bind-xml name="description" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.portlet.PortletPreferencesDD">
-        <map-to xml="portlet-preferences"/>
-
-        <field name="PortletPreferences" type="org.apache.pluto.descriptors.portlet.PortletPreferenceDD"
-               collection="arraylist">
-            <bind-xml name="preference" node="element"/>
-        </field>
-
-        <field name="PreferencesValidator">
-            <bind-xml name="preferences-validator" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.portlet.PortletPreferenceDD">
-        <field name="Name">
-            <bind-xml name="name" node="element"/>
-        </field>
-        <field name="Values" type="java.lang.String" collection="arraylist">
-            <bind-xml name="value" node="element"/>
-        </field>
-        <field name="ReadOnly" type="boolean">
-            <bind-xml name="read-only" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.portlet.CustomPortletModeDD">
-        <field name="PortletMode">
-            <bind-xml name="portlet-mode" node="element"/>
-        </field>
-        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
-               collection="arraylist">
-            <bind-xml name="description" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.portlet.CustomWindowStateDD">
-        <field name="WindowState">
-            <bind-xml name="window-state" node="element"/>
-        </field>
-        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
-               collection="arraylist">
-            <bind-xml name="description" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.portlet.UserAttributeDD">
-        <field name="Name">
-            <bind-xml name="name" node="element"/>
-        </field>
-        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
-               collection="arraylist">
-            <bind-xml name="description" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.portlet.SecurityConstraintDD">
-        <field name="DisplayNames" type="org.apache.pluto.descriptors.common.DisplayNameDD"
-            collection="arraylist">
-            <bind-xml name="display-name" node="element"/>
-        </field>
-
-        <field name="PortletCollection" type="org.apache.pluto.descriptors.portlet.PortletCollectionDD">
-            <bind-xml name="portlet-collection"/>
-        </field>
-
-        <field name="UserDataConstraint" type="org.apache.pluto.descriptors.common.UserDataConstraintDD">
-            <bind-xml name="user-data-constraint"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.portlet.PortletCollectionDD">
-        <field name="PortletNames" type="java.lang.String" collection="arraylist">
-            <bind-xml name="portlet-name" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.common.UserDataConstraintDD">
-        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
-               collection="arraylist">
-            <bind-xml name="description" node="element"/>
-        </field>
-
-        <field name="TransportGuarantee">
-            <bind-xml name="transport-guarantee" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.common.DisplayNameDD">
-        <field name="Lang">
-            <bind-xml name="lang" node="attribute"/>
-        </field>
-
-        <field name="DisplayName">
-            <bind-xml name="display-name" node="text"/>
-        </field>
-    </class>
-
-
-    <class name="org.apache.pluto.descriptors.common.DescriptionDD">
-        <field name="Lang">
-            <bind-xml name="lang" node="attribute"/>
-        </field>
-
-        <field name="Description">
-            <bind-xml name="description" node="text"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.common.SecurityRoleRefDD">
-        <field name="RoleName">
-            <bind-xml name="role-name" node="element"/>
-        </field>
-        <field name="RoleLink">
-            <bind-xml name="role-link" node="element"/>
-        </field>
-        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
-               collection="arraylist">
-            <bind-xml name="description"/>
-        </field>
-    </class>
-</mapping>
+  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.
+-->
+<mapping>
+    <description>Portlet Deployment Descriptor Mapping</description>
+
+    <!--
+    Bare Bones for now!
+    -->
+
+    <class name="org.apache.pluto.descriptors.portlet.PortletAppDD">
+        <map-to xml="portlet-app"/>
+
+        <field name="Version">
+            <bind-xml name="version" node="attribute"/>
+        </field>
+
+        <field name="Portlets"
+               type="org.apache.pluto.descriptors.portlet.PortletDD"
+               collection="arraylist">
+            <bind-xml name="portlet" node="element"/>
+        </field>
+
+        <field name="CustomPortletModes"
+               type="org.apache.pluto.descriptors.portlet.CustomPortletModeDD"
+               collection="arraylist">
+            <bind-xml name="custom-portlet-mode" node="element"/>
+        </field>
+        <field name="CustomWindowStates"
+               type="org.apache.pluto.descriptors.portlet.CustomWindowStateDD"
+               collection="arraylist">
+            <bind-xml name="custom-window-state" node="element"/>
+        </field>
+        <field name="UserAttributes"
+               type="org.apache.pluto.descriptors.portlet.UserAttributeDD"
+               collection="arraylist">
+            <bind-xml name="user-attribute" node="element"/>
+        </field>
+
+        <field name="SecurityConstraints"
+               type="org.apache.pluto.descriptors.portlet.SecurityConstraintDD"
+               collection="arraylist">
+            <bind-xml name="security-constraint" node="element"/>
+         </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.portlet.PortletDD">
+        <field name="PortletName">
+            <bind-xml name="portlet-name" node="element"/>
+        </field>
+
+        <field name="DisplayNames" type="org.apache.pluto.descriptors.common.DisplayNameDD"
+               collection="arraylist">
+            <bind-xml name="display-name" node="element"/>
+        </field>
+
+        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
+               collection="arraylist">
+            <bind-xml name="description" node="element"/>
+        </field>
+
+        <field name="ExpirationCache">
+            <bind-xml name="expiration-cache" node="element"/>
+        </field>
+
+        <field name="PortletClass">
+            <bind-xml name="portlet-class" node="element"/>
+        </field>
+
+        <field name="PortletInfo" type="org.apache.pluto.descriptors.portlet.PortletInfoDD">
+            <bind-xml name="portlet-info" node="element"/>
+        </field>
+
+        <field name="InitParams" type="org.apache.pluto.descriptors.common.InitParamDD" collection="arraylist">
+            <bind-xml name="init-param" node="element"/>
+        </field>
+
+        <field name="ResourceBundle">
+            <bind-xml name="resource-bundle" node="element"/>
+        </field>
+
+        <field name="SecurityRoleRefs"
+               type="org.apache.pluto.descriptors.common.SecurityRoleRefDD"
+               collection="arraylist">
+            <bind-xml name="security-role-ref" node="element"/>
+        </field>
+
+        <field name="Supports" type="org.apache.pluto.descriptors.portlet.SupportsDD"
+               collection="arraylist">
+            <bind-xml name="supports" node="element"/>
+        </field>
+
+        <field name="SupportedLocales" type="java.lang.String"
+               collection="arraylist">
+            <bind-xml name="supported-locale" node="element"/>
+        </field>
+
+        <field name="PortletPreferences" type="org.apache.pluto.descriptors.portlet.PortletPreferencesDD">
+            <bind-xml name="portlet-preferences" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.portlet.PortletInfoDD">
+        <map-to xml="portlet-info"/>
+        <field name="Title">
+            <bind-xml name="title" node="element"/>
+        </field>
+        <field name="Keywords">
+            <bind-xml name="keywords" node="element"/>
+        </field>
+        <field name="ShortTitle">
+            <bind-xml name="short-title" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.portlet.SupportsDD">
+        <map-to xml="supports"/>
+
+        <field name="MimeType">
+            <bind-xml name="mime-type" node="element"/>
+        </field>
+
+        <field name="PortletModes" type="java.lang.String"
+               collection="arraylist">
+            <bind-xml name="portlet-mode" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.common.InitParamDD">
+        <field name="ParamName">
+            <bind-xml name="name" node="element"/>
+        </field>
+        <field name="ParamValue">
+            <bind-xml name="value" node="element"/>
+        </field>
+        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
+               collection="arraylist">
+            <bind-xml name="description" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.portlet.PortletPreferencesDD">
+        <map-to xml="portlet-preferences"/>
+
+        <field name="PortletPreferences" type="org.apache.pluto.descriptors.portlet.PortletPreferenceDD"
+               collection="arraylist">
+            <bind-xml name="preference" node="element"/>
+        </field>
+
+        <field name="PreferencesValidator">
+            <bind-xml name="preferences-validator" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.portlet.PortletPreferenceDD">
+        <field name="Name">
+            <bind-xml name="name" node="element"/>
+        </field>
+        <field name="Values" type="java.lang.String" collection="arraylist">
+            <bind-xml name="value" node="element"/>
+        </field>
+        <field name="ReadOnly" type="boolean">
+            <bind-xml name="read-only" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.portlet.CustomPortletModeDD">
+        <field name="PortletMode">
+            <bind-xml name="portlet-mode" node="element"/>
+        </field>
+        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
+               collection="arraylist">
+            <bind-xml name="description" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.portlet.CustomWindowStateDD">
+        <field name="WindowState">
+            <bind-xml name="window-state" node="element"/>
+        </field>
+        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
+               collection="arraylist">
+            <bind-xml name="description" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.portlet.UserAttributeDD">
+        <field name="Name">
+            <bind-xml name="name" node="element"/>
+        </field>
+        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
+               collection="arraylist">
+            <bind-xml name="description" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.portlet.SecurityConstraintDD">
+        <field name="DisplayNames" type="org.apache.pluto.descriptors.common.DisplayNameDD"
+            collection="arraylist">
+            <bind-xml name="display-name" node="element"/>
+        </field>
+
+        <field name="PortletCollection" type="org.apache.pluto.descriptors.portlet.PortletCollectionDD">
+            <bind-xml name="portlet-collection"/>
+        </field>
+
+        <field name="UserDataConstraint" type="org.apache.pluto.descriptors.common.UserDataConstraintDD">
+            <bind-xml name="user-data-constraint"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.portlet.PortletCollectionDD">
+        <field name="PortletNames" type="java.lang.String" collection="arraylist">
+            <bind-xml name="portlet-name" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.common.UserDataConstraintDD">
+        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
+               collection="arraylist">
+            <bind-xml name="description" node="element"/>
+        </field>
+
+        <field name="TransportGuarantee">
+            <bind-xml name="transport-guarantee" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.common.DisplayNameDD">
+        <field name="Lang">
+            <bind-xml name="lang" node="attribute"/>
+        </field>
+
+        <field name="DisplayName">
+            <bind-xml name="display-name" node="text"/>
+        </field>
+    </class>
+
+
+    <class name="org.apache.pluto.descriptors.common.DescriptionDD">
+        <field name="Lang">
+            <bind-xml name="lang" node="attribute"/>
+        </field>
+
+        <field name="Description">
+            <bind-xml name="description" node="text"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.common.SecurityRoleRefDD">
+        <field name="RoleName">
+            <bind-xml name="role-name" node="element"/>
+        </field>
+        <field name="RoleLink">
+            <bind-xml name="role-link" node="element"/>
+        </field>
+        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
+               collection="arraylist">
+            <bind-xml name="description"/>
+        </field>
+    </class>
+</mapping>

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-portlet-xml-mapping.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-web-xml-mapping.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-web-xml-mapping.xml?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-web-xml-mapping.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-web-xml-mapping.xml Sat Dec 29 09:20:23 2007
@@ -1,387 +1,387 @@
-<?xml version="1.0"?>
-<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Object Mapping DTD Version 1.0//EN"
-                         "http://castor.org/mapping.dtd">
-<!-- 
+<?xml version="1.0"?>
+<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Object Mapping DTD Version 1.0//EN"
+                         "http://castor.org/mapping.dtd">
+<!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this 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.
--->
-<mapping>
-  <description>Servlet Deployment Descriptor Mapping</description>
-
-  <!--
-    The Root WebApplication Element
-    This element should map each and every one of the possible 2.4
-    elements in order.
-      + icon,
-      + display-name
-      + description
-      + distributable
-      + context-param
-      + filter
-      + filter-mapping
-      + listener
-      + servlet
-      + servlet-mapping
-      + session-config
-      + mime-mapping
-      + welcome-file-list?,
-      + error-page
-      + taglib
-      + resource-env-ref
-      + resource-ref
-      + security-constraint
-      + login-config
-      + security-role
-      + env-entry
-      + ejb-ref
-      + ejb-local-ref
-    -->
-  <class name="org.apache.pluto.descriptors.servlet.WebAppDD">
-    <map-to xml="web-app"/>
-    
-    <field name="ServletVersion"
-           handler="org.apache.pluto.descriptors.services.castor.ServletVersionCastorFieldHandler"
+  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.
+-->
+<mapping>
+  <description>Servlet Deployment Descriptor Mapping</description>
+
+  <!--
+    The Root WebApplication Element
+    This element should map each and every one of the possible 2.4
+    elements in order.
+      + icon,
+      + display-name
+      + description
+      + distributable
+      + context-param
+      + filter
+      + filter-mapping
+      + listener
+      + servlet
+      + servlet-mapping
+      + session-config
+      + mime-mapping
+      + welcome-file-list?,
+      + error-page
+      + taglib
+      + resource-env-ref
+      + resource-ref
+      + security-constraint
+      + login-config
+      + security-role
+      + env-entry
+      + ejb-ref
+      + ejb-local-ref
+    -->
+  <class name="org.apache.pluto.descriptors.servlet.WebAppDD">
+    <map-to xml="web-app"/>
+    
+    <field name="ServletVersion"
+           handler="org.apache.pluto.descriptors.services.castor.ServletVersionCastorFieldHandler"
            type="java.lang.String">
         <bind-xml name="version" node="attribute"/>
-    </field>
-        
-    <field name="Icon"
-           type="org.apache.pluto.descriptors.common.IconDD"/>
-
-    <field name="DisplayName">
-      <bind-xml name="display-name" node="element"/>
-    </field>
-
-    <field name="Description">
-      <bind-xml name="description" node="element"/>
-    </field>
-
-    <field name="Distributable"
-           type="org.apache.pluto.descriptors.servlet.DistributableDD"
-           handler="org.apache.pluto.descriptors.services.castor.DistributableDDCastorFieldHandler">
-      <bind-xml name="distributable" node="element"/>
-    </field>
-
-    <field name="ContextParams"
-           type="org.apache.pluto.descriptors.common.InitParamDD"
-           collection="arraylist">
-      <bind-xml name="context-param" node="element"/>
-    </field>
-
-    <field name="Filters"
-           type="org.apache.pluto.descriptors.servlet.FilterDD"
-           collection="arraylist">
-      <bind-xml name="filter" node="element"/>
-    </field>
-
-    <field name="Listeners"
-        type="org.apache.pluto.descriptors.servlet.ListenerDD"
-        collection="arraylist">
-        <bind-xml name="listener" node="element"/>
-    </field>
-
-    <field name="Servlets"
-           type="org.apache.pluto.descriptors.servlet.ServletDD"
-           collection="arraylist">
-      <bind-xml name="servlet" node="element"/>
-    </field>
-
-    <field name="FilterMappings"
-           type="org.apache.pluto.descriptors.servlet.FilterMappingDD"
-           collection="arraylist">
-      <bind-xml name="filter-mapping" node="element"/>
-    </field>
-
-    <field name="ServletMappings"
-        type="org.apache.pluto.descriptors.servlet.ServletMappingDD"
-        collection="arraylist">
-        <bind-xml name="servlet-mapping" node="element"/>
-    </field>
-
-    <field name="SessionConfig"
-           type="org.apache.pluto.descriptors.servlet.SessionConfigDD">
-      <bind-xml name="session-config" node="element"/>
-    </field>
-
-    <field name="MimeMappings"
-           type="org.apache.pluto.descriptors.servlet.MimeMappingDD"
-           collection="arraylist">
-      <bind-xml name="mime-mapping" node="element"/>
-    </field>
-
-    <field name="WelcomeFileList"
-           type="org.apache.pluto.descriptors.servlet.WelcomeFileListDD">
-       <bind-xml name="welcome-file-list" node="element"/>
-    </field>
-
-    <field name="ErrorPages"
-           type="org.apache.pluto.descriptors.servlet.ErrorPageDD"
-           collection="arraylist">
-        <bind-xml name="error-page" node="element"/>
-    </field>
-
-    <field name="Taglibs"
-           type="org.apache.pluto.descriptors.servlet.TaglibDD"
-           collection="arraylist">
-      <bind-xml name="taglib" node="element"/>
-    </field>
-
-    <field name="ResourceRefs"
-           type="org.apache.pluto.descriptors.servlet.ResourceRefDD"
-           collection="arraylist">
-      <bind-xml name="resource-ref" node="element"/>
-    </field>
-
-    <field name="SecurityConstraints"
-           type="org.apache.pluto.descriptors.servlet.SecurityConstraintDD"
-           collection="arraylist">
-      <bind-xml name="security-constraint" node="element"/>
-    </field>
-
-    <field name="LoginConfig"
-           type="org.apache.pluto.descriptors.servlet.LoginConfigDD">
-        <bind-xml name="login-config" node="element"/>
-    </field>
-
-    <field name="SecurityRoles"
-           type="org.apache.pluto.descriptors.servlet.SecurityRoleDD"
-           collection="arraylist">
-        <bind-xml name="security-role" node="element"/>
-    </field>
-
-    <field name="envEntrys"
-           type="org.apache.pluto.descriptors.servlet.EnvEntryDD"
-           collection="arraylist">
-      <bind-xml name="env-entry" node="element"/>    
-    </field>
-      
-    <field name="ejbRefs"
-           type="org.apache.pluto.descriptors.servlet.EjbRefDD"
-           collection="arraylist">
-      <bind-xml name="ejb-ref" node="element"/>
-    </field>
-  </class>
-
-  <!--
-    Filter DDuration
-     + filter
-     + filter-mapping
-    -->
-  <class name="org.apache.pluto.descriptors.servlet.FilterDD">
-      <field name="Icon" type="org.apache.pluto.descriptors.common.IconDD"/>
-
-      <field name="FilterName">
-          <bind-xml name="filter-name" node="element"/>
-      </field>
-
-      <field name="DisplayName">
-          <bind-xml name="display-name" node="element"/>
-      </field>
-
-      <field name="Description">
-          <bind-xml name="description" node="element"/>
-      </field>
-
-      <field name="FilterClass">
-          <bind-xml name="filter-class" node="element"/>
-      </field>
-
-      <field name="InitParams"
-          type="org.apache.pluto.descriptors.common.InitParamDD"
-          collection="arraylist">
-          <bind-xml name="init-param" node="element"/>
-      </field>
-  </class>
-  <class name="org.apache.pluto.descriptors.servlet.FilterMappingDD">
-
-    <field name="FilterName">
-        <bind-xml name="filter-name" node="element"/>
-    </field>
-
-    <field name="ServletName">
-        <bind-xml name="servlet-name" node="element"/>
-    </field>
-
-    <field name="UrlPatterns" type="java.lang.String"
-           collection="arraylist">
-        <bind-xml name="url-pattern" node="element"/>
-    </field>
-    <field name="Dispatchers" type="java.lang.String"
-           collection="arraylist">
-        <bind-xml name="dispatcher" node="element"/>
-    </field>
-  </class>
-
-
-    <!--
-      Servlet DDuration
-      -->
-
-    <class name="org.apache.pluto.descriptors.servlet.ServletDD">
-      <field name="Icon" type="org.apache.pluto.descriptors.common.IconDD"/>
-
-      <field name="ServletName">
-          <bind-xml name="servlet-name" node="element"/>
-      </field>
-
-      <field name="DisplayName">
-          <bind-xml name="display-name" node="element"/>
-      </field>
-
-      <field name="Description">
-          <bind-xml name="description" node="element"/>
-      </field>
-
-      <field name="ServletClass">
-          <bind-xml name="servlet-class" node="element"/>
-      </field>
-
-      <field name="JspFile">
-          <bind-xml name="jsp-file" node="element"/>
-      </field>
-
-      <field name="InitParams"
-             type="org.apache.pluto.descriptors.common.InitParamDD"
-             collection="arraylist">
-          <bind-xml name="init-param"/>
-      </field>
-
-      <field name="LoadOnStartup"
-             type="org.apache.pluto.descriptors.servlet.LoadOnStartupDD">
-          <bind-xml name="load-on-startup" node="element"/>
-      </field>
-
-      <field name="SecurityRoleRefs"
-             type="org.apache.pluto.descriptors.common.SecurityRoleRefDD"
-             collection="arraylist">
-        <bind-xml name="security-role-ref" node="element"/>
-      </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.servlet.SessionConfigDD">
-      <field name="SessionTimeout" type="int">
-        <bind-xml name="session-timeout" node="element"/>
-      </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.servlet.WelcomeFileListDD">
-      <field name="WelcomeFiles"
-          type="java.lang.String"
-          collection="arraylist">
-          <bind-xml name="welcome-file" node="element"/>
-      </field>
-    </class>
-
-    <!--
-      Security Constraint
-      + SecurityConstraint
-      + WebResourceCollection
-      -->
-    <class name="org.apache.pluto.descriptors.servlet.SecurityConstraintDD">
-        <field name="DisplayName" type="java.lang.String"/>
-        <field name="WebResourceCollections"
-               type="org.apache.pluto.descriptors.servlet.WebResourceCollectionDD"
-               collection="arraylist">
-          <bind-xml name="web-resource-collection" node="element"/>
-        </field>
-        <field name="AuthConstraint"
-               type="org.apache.pluto.descriptors.servlet.AuthConstraintDD"/>
-        <field name="UserDataConstraint"
-               type="org.apache.pluto.descriptors.common.UserDataConstraintDD"/>
-    </class>
-    <class name="org.apache.pluto.descriptors.servlet.WebResourceCollectionDD">
-        <field name="description" type="java.lang.String"/>
-        <field name="webResourceName" type="java.lang.String"/>
-        <field name="httpMethods" type="java.lang.String" collection="arraylist">
-          <bind-xml name="http-method" node="element"/>
-        </field>
-        <field name="urlPatterns" type="java.lang.String" collection="arraylist">
-            <bind-xml name="url-pattern" node="element"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.servlet.LoginConfigDD">
-        <field name="AuthMethod" type="java.lang.String"/>
-        <field name="FormLoginConfig"
-               type="org.apache.pluto.descriptors.servlet.FormLoginConfigDD">
-          <bind-xml name="form-login-config" node="element"/>
-        </field>
-        <field name="RealmName" type="java.lang.String"/>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.servlet.LoadOnStartupDD">
-        <field name="Priority" type="int">
-            <bind-xml name="load-on-startup" node="text"/>
-        </field>
-    </class>
-    
-    <class name="org.apache.pluto.descriptors.common.DescriptionDD">
-        <field name="Lang">
-            <bind-xml name="lang" node="attribute"/>
-        </field>
-
-        <field name="Description">
-            <bind-xml name="description" node="text"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.common.InitParamDD">
-        <field name="ParamName">
-            <bind-xml name="param-name" node="element"/>
-        </field>
-        <field name="ParamValue">
-            <bind-xml name="param-value" node="element"/>
-        </field>
-        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
-               collection="arraylist">
-            <bind-xml name="description" node="element"/>
-        </field>
-    </class>
-
-
-    <class name="org.apache.pluto.descriptors.common.SecurityRoleRefDD">
-        <field name="RoleName">
-            <bind-xml name="role-name" node="element"/>
-        </field>
-        <field name="RoleLink">
-            <bind-xml name="role-link" node="element"/>
-        </field>
-        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
-               collection="arraylist">
-            <bind-xml name="description"/>
-        </field>
-    </class>
-
-    <class name="org.apache.pluto.descriptors.common.UserDataConstraintDD">
-        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
-               collection="arraylist">
-            <bind-xml name="description" node="element"/>
-        </field>
-
-        <field name="TransportGuarantee">
-            <bind-xml name="transport-guarantee" node="element"/>
-        </field>
-    </class>
-    
-    <class name="org.apache.pluto.descriptors.servlet.DistributableDD">
-         <field name="Distributable" 
-                type="java.lang.Boolean"
-                handler="org.apache.pluto.descriptors.services.castor.DistributableCastorFieldHandler">
-             <bind-xml name="distributable" node="element"/>
-         </field>
-    </class>        
-
-</mapping>
-
+    </field>
+        
+    <field name="Icon"
+           type="org.apache.pluto.descriptors.common.IconDD"/>
+
+    <field name="DisplayName">
+      <bind-xml name="display-name" node="element"/>
+    </field>
+
+    <field name="Description">
+      <bind-xml name="description" node="element"/>
+    </field>
+
+    <field name="Distributable"
+           type="org.apache.pluto.descriptors.servlet.DistributableDD"
+           handler="org.apache.pluto.descriptors.services.castor.DistributableDDCastorFieldHandler">
+      <bind-xml name="distributable" node="element"/>
+    </field>
+
+    <field name="ContextParams"
+           type="org.apache.pluto.descriptors.common.InitParamDD"
+           collection="arraylist">
+      <bind-xml name="context-param" node="element"/>
+    </field>
+
+    <field name="Filters"
+           type="org.apache.pluto.descriptors.servlet.FilterDD"
+           collection="arraylist">
+      <bind-xml name="filter" node="element"/>
+    </field>
+
+    <field name="Listeners"
+        type="org.apache.pluto.descriptors.servlet.ListenerDD"
+        collection="arraylist">
+        <bind-xml name="listener" node="element"/>
+    </field>
+
+    <field name="Servlets"
+           type="org.apache.pluto.descriptors.servlet.ServletDD"
+           collection="arraylist">
+      <bind-xml name="servlet" node="element"/>
+    </field>
+
+    <field name="FilterMappings"
+           type="org.apache.pluto.descriptors.servlet.FilterMappingDD"
+           collection="arraylist">
+      <bind-xml name="filter-mapping" node="element"/>
+    </field>
+
+    <field name="ServletMappings"
+        type="org.apache.pluto.descriptors.servlet.ServletMappingDD"
+        collection="arraylist">
+        <bind-xml name="servlet-mapping" node="element"/>
+    </field>
+
+    <field name="SessionConfig"
+           type="org.apache.pluto.descriptors.servlet.SessionConfigDD">
+      <bind-xml name="session-config" node="element"/>
+    </field>
+
+    <field name="MimeMappings"
+           type="org.apache.pluto.descriptors.servlet.MimeMappingDD"
+           collection="arraylist">
+      <bind-xml name="mime-mapping" node="element"/>
+    </field>
+
+    <field name="WelcomeFileList"
+           type="org.apache.pluto.descriptors.servlet.WelcomeFileListDD">
+       <bind-xml name="welcome-file-list" node="element"/>
+    </field>
+
+    <field name="ErrorPages"
+           type="org.apache.pluto.descriptors.servlet.ErrorPageDD"
+           collection="arraylist">
+        <bind-xml name="error-page" node="element"/>
+    </field>
+
+    <field name="Taglibs"
+           type="org.apache.pluto.descriptors.servlet.TaglibDD"
+           collection="arraylist">
+      <bind-xml name="taglib" node="element"/>
+    </field>
+
+    <field name="ResourceRefs"
+           type="org.apache.pluto.descriptors.servlet.ResourceRefDD"
+           collection="arraylist">
+      <bind-xml name="resource-ref" node="element"/>
+    </field>
+
+    <field name="SecurityConstraints"
+           type="org.apache.pluto.descriptors.servlet.SecurityConstraintDD"
+           collection="arraylist">
+      <bind-xml name="security-constraint" node="element"/>
+    </field>
+
+    <field name="LoginConfig"
+           type="org.apache.pluto.descriptors.servlet.LoginConfigDD">
+        <bind-xml name="login-config" node="element"/>
+    </field>
+
+    <field name="SecurityRoles"
+           type="org.apache.pluto.descriptors.servlet.SecurityRoleDD"
+           collection="arraylist">
+        <bind-xml name="security-role" node="element"/>
+    </field>
+
+    <field name="envEntrys"
+           type="org.apache.pluto.descriptors.servlet.EnvEntryDD"
+           collection="arraylist">
+      <bind-xml name="env-entry" node="element"/>    
+    </field>
+      
+    <field name="ejbRefs"
+           type="org.apache.pluto.descriptors.servlet.EjbRefDD"
+           collection="arraylist">
+      <bind-xml name="ejb-ref" node="element"/>
+    </field>
+  </class>
+
+  <!--
+    Filter DDuration
+     + filter
+     + filter-mapping
+    -->
+  <class name="org.apache.pluto.descriptors.servlet.FilterDD">
+      <field name="Icon" type="org.apache.pluto.descriptors.common.IconDD"/>
+
+      <field name="FilterName">
+          <bind-xml name="filter-name" node="element"/>
+      </field>
+
+      <field name="DisplayName">
+          <bind-xml name="display-name" node="element"/>
+      </field>
+
+      <field name="Description">
+          <bind-xml name="description" node="element"/>
+      </field>
+
+      <field name="FilterClass">
+          <bind-xml name="filter-class" node="element"/>
+      </field>
+
+      <field name="InitParams"
+          type="org.apache.pluto.descriptors.common.InitParamDD"
+          collection="arraylist">
+          <bind-xml name="init-param" node="element"/>
+      </field>
+  </class>
+  <class name="org.apache.pluto.descriptors.servlet.FilterMappingDD">
+
+    <field name="FilterName">
+        <bind-xml name="filter-name" node="element"/>
+    </field>
+
+    <field name="ServletName">
+        <bind-xml name="servlet-name" node="element"/>
+    </field>
+
+    <field name="UrlPatterns" type="java.lang.String"
+           collection="arraylist">
+        <bind-xml name="url-pattern" node="element"/>
+    </field>
+    <field name="Dispatchers" type="java.lang.String"
+           collection="arraylist">
+        <bind-xml name="dispatcher" node="element"/>
+    </field>
+  </class>
+
+
+    <!--
+      Servlet DDuration
+      -->
+
+    <class name="org.apache.pluto.descriptors.servlet.ServletDD">
+      <field name="Icon" type="org.apache.pluto.descriptors.common.IconDD"/>
+
+      <field name="ServletName">
+          <bind-xml name="servlet-name" node="element"/>
+      </field>
+
+      <field name="DisplayName">
+          <bind-xml name="display-name" node="element"/>
+      </field>
+
+      <field name="Description">
+          <bind-xml name="description" node="element"/>
+      </field>
+
+      <field name="ServletClass">
+          <bind-xml name="servlet-class" node="element"/>
+      </field>
+
+      <field name="JspFile">
+          <bind-xml name="jsp-file" node="element"/>
+      </field>
+
+      <field name="InitParams"
+             type="org.apache.pluto.descriptors.common.InitParamDD"
+             collection="arraylist">
+          <bind-xml name="init-param"/>
+      </field>
+
+      <field name="LoadOnStartup"
+             type="org.apache.pluto.descriptors.servlet.LoadOnStartupDD">
+          <bind-xml name="load-on-startup" node="element"/>
+      </field>
+
+      <field name="SecurityRoleRefs"
+             type="org.apache.pluto.descriptors.common.SecurityRoleRefDD"
+             collection="arraylist">
+        <bind-xml name="security-role-ref" node="element"/>
+      </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.servlet.SessionConfigDD">
+      <field name="SessionTimeout" type="int">
+        <bind-xml name="session-timeout" node="element"/>
+      </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.servlet.WelcomeFileListDD">
+      <field name="WelcomeFiles"
+          type="java.lang.String"
+          collection="arraylist">
+          <bind-xml name="welcome-file" node="element"/>
+      </field>
+    </class>
+
+    <!--
+      Security Constraint
+      + SecurityConstraint
+      + WebResourceCollection
+      -->
+    <class name="org.apache.pluto.descriptors.servlet.SecurityConstraintDD">
+        <field name="DisplayName" type="java.lang.String"/>
+        <field name="WebResourceCollections"
+               type="org.apache.pluto.descriptors.servlet.WebResourceCollectionDD"
+               collection="arraylist">
+          <bind-xml name="web-resource-collection" node="element"/>
+        </field>
+        <field name="AuthConstraint"
+               type="org.apache.pluto.descriptors.servlet.AuthConstraintDD"/>
+        <field name="UserDataConstraint"
+               type="org.apache.pluto.descriptors.common.UserDataConstraintDD"/>
+    </class>
+    <class name="org.apache.pluto.descriptors.servlet.WebResourceCollectionDD">
+        <field name="description" type="java.lang.String"/>
+        <field name="webResourceName" type="java.lang.String"/>
+        <field name="httpMethods" type="java.lang.String" collection="arraylist">
+          <bind-xml name="http-method" node="element"/>
+        </field>
+        <field name="urlPatterns" type="java.lang.String" collection="arraylist">
+            <bind-xml name="url-pattern" node="element"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.servlet.LoginConfigDD">
+        <field name="AuthMethod" type="java.lang.String"/>
+        <field name="FormLoginConfig"
+               type="org.apache.pluto.descriptors.servlet.FormLoginConfigDD">
+          <bind-xml name="form-login-config" node="element"/>
+        </field>
+        <field name="RealmName" type="java.lang.String"/>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.servlet.LoadOnStartupDD">
+        <field name="Priority" type="int">
+            <bind-xml name="load-on-startup" node="text"/>
+        </field>
+    </class>
+    
+    <class name="org.apache.pluto.descriptors.common.DescriptionDD">
+        <field name="Lang">
+            <bind-xml name="lang" node="attribute"/>
+        </field>
+
+        <field name="Description">
+            <bind-xml name="description" node="text"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.common.InitParamDD">
+        <field name="ParamName">
+            <bind-xml name="param-name" node="element"/>
+        </field>
+        <field name="ParamValue">
+            <bind-xml name="param-value" node="element"/>
+        </field>
+        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
+               collection="arraylist">
+            <bind-xml name="description" node="element"/>
+        </field>
+    </class>
+
+
+    <class name="org.apache.pluto.descriptors.common.SecurityRoleRefDD">
+        <field name="RoleName">
+            <bind-xml name="role-name" node="element"/>
+        </field>
+        <field name="RoleLink">
+            <bind-xml name="role-link" node="element"/>
+        </field>
+        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
+               collection="arraylist">
+            <bind-xml name="description"/>
+        </field>
+    </class>
+
+    <class name="org.apache.pluto.descriptors.common.UserDataConstraintDD">
+        <field name="Descriptions" type="org.apache.pluto.descriptors.common.DescriptionDD"
+               collection="arraylist">
+            <bind-xml name="description" node="element"/>
+        </field>
+
+        <field name="TransportGuarantee">
+            <bind-xml name="transport-guarantee" node="element"/>
+        </field>
+    </class>
+    
+    <class name="org.apache.pluto.descriptors.servlet.DistributableDD">
+         <field name="Distributable" 
+                type="java.lang.Boolean"
+                handler="org.apache.pluto.descriptors.services.castor.DistributableCastorFieldHandler">
+             <bind-xml name="distributable" node="element"/>
+         </field>
+    </class>        
+
+</mapping>
+

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-web-xml-mapping.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message