[seam-commits] Seam SVN: r8000 - trunk/src/main/org/jboss/seam.

Author: norman.richards(a)jboss.com Date: 2008-04-21 18:30:08 -0400 (Mon, 21 Apr 2008) New Revision: 8000 Modified: trunk/src/main/org/jboss/seam/async-2.1.xsd trunk/src/main/org/jboss/seam/core-2.1.xsd trunk/src/main/org/jboss/seam/pdf-2.1.xsd trunk/src/main/org/jboss/seam/theme-2.1.xsd trunk/src/main/org/jboss/seam/transaction-2.1.xsd trunk/src/main/org/jboss/seam/web-2.1.xsd Log: JBSEAM-1531 Modified: trunk/src/main/org/jboss/seam/async-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/async-2.1.xsd 2008-04-21 20:06:44 UTC (rev 7999) +++ trunk/src/main/org/jboss/seam/async-2.1.xsd 2008-04-21 22:30:08 UTC (rev 8000) @@ -5,15 +5,21 @@ <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> <xs:element name="timer-service-dispatcher"> + <xs:annotation> + <xs:documentation></xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="components:attlist.ejbcomponent"/> <xs:attributeGroup ref="async:attlist.timerServiceDispatcher"/> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.timerServiceDispatcher"> </xs:attributeGroup> + <xs:attributeGroup name="attlist.timerServiceDispatcher" /> <xs:element name="quartz-dispatcher"> + <xs:annotation> + <xs:documentation></xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="async:attlist.quartzDispatcher"/> @@ -22,13 +28,16 @@ <xs:attributeGroup name="attlist.quartzDispatcher"> </xs:attributeGroup> <xs:element name="thread-pool-dispatcher"> + <xs:annotation> + <xs:documentation></xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="async:attlist.threadPoolDispatcher"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.threadPoolDispatcher"> - <xs:attribute name="thread-pool-size" type="xs:integer"/> + <xs:attribute name="thread-pool-size" type="components:int"/> </xs:attributeGroup> </xs:schema> Modified: trunk/src/main/org/jboss/seam/core-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/core-2.1.xsd 2008-04-21 20:06:44 UTC (rev 7999) +++ trunk/src/main/org/jboss/seam/core-2.1.xsd 2008-04-21 22:30:08 UTC (rev 8000) @@ -2,71 +2,78 @@ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://jboss.com/products/seam/core" xmlns:core="http://jboss.com/products/seam/core" xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + <xs:annotation> + <xs:documentation>The core Seam components</xs:documentation> + </xs:annotation> + <xs:element name="init"> + <xs:annotation> + <xs:documentation>A Seam component that holds Seam configuration settings</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="core:attlist.init"/> </xs:complexType> </xs:element> + <xs:attributeGroup name="attlist.init"> - <xs:attribute name="debug"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="jndi-pattern"/> - <xs:attribute name="transaction-management-enabled"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="user-transaction-name"/> + <xs:attribute name="debug" type="components:boolean" /> + <xs:attribute name="jndi-pattern" type="components:string" /> + <xs:attribute name="transaction-management-enabled" type="components:boolean"/> + <xs:attribute name="user-transaction-name" type="components:string"/> </xs:attributeGroup> <xs:element name="manager"> + <xs:annotation> + <xs:documentation>The Seam conversation manager</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="core:attlist.manager"/> </xs:complexType> </xs:element> + <xs:attributeGroup name="attlist.manager"> - <xs:attribute name="concurrent-request-timeout" type="xs:integer"/> - <xs:attribute name="conversation-timeout" type="xs:integer"/> - <xs:attribute name="conversation-id-parameter"/> - <xs:attribute name="parent-conversation-id-parameter"/> - <xs:attribute name="uri-encoding"/> + <xs:attribute name="concurrent-request-timeout" type="components:int"/> + <xs:attribute name="conversation-timeout" type="components:int"/> + <xs:attribute name="conversation-id-parameter" type="components:string"/> + <xs:attribute name="parent-conversation-id-parameter" type="components:string"/> + <xs:attribute name="uri-encoding" type="components:string" /> </xs:attributeGroup> <xs:element name="resource-loader"> + <xs:annotation> + <xs:documentation>Access to application resources and resource bundles</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="core:bundle-names"/> + <xs:element name="bundle-names" type="components:multiValuedProperty"> + <xs:annotation> + <xs:documentation>A list of resource bundle names</xs:documentation> + </xs:annotation> + </xs:element> </xs:choice> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="core:attlist.resourceLoader"/> </xs:complexType> </xs:element> - <xs:element name="bundle-names" type="components:multiValuedProperty"/> <xs:attributeGroup name="attlist.resourceLoader"> - <xs:attribute name="bundle-names"> </xs:attribute> + <xs:attribute name="bundle-names" type="components:string" /> </xs:attributeGroup> <xs:element name="pojo-cache"> + <xs:annotation> + <xs:documentation>Integration with JBoss Cache</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="core:attlist.pojoCache"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.pojoCache"> - <xs:attribute name="cfg-resource-name"/> + <xs:attribute name="cfg-resource-name" type="components:string" /> </xs:attributeGroup> - </xs:schema> Modified: trunk/src/main/org/jboss/seam/pdf-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/pdf-2.1.xsd 2008-04-21 20:06:44 UTC (rev 7999) +++ trunk/src/main/org/jboss/seam/pdf-2.1.xsd 2008-04-21 22:30:08 UTC (rev 8000) @@ -8,26 +8,49 @@ <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> <xs:element name="document-store"> + <xs:annotation> + <xs:documentation> + The PDF document store is used to store rendered documents for download on a later request. + </xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="pdf:attlist.docstore"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.docstore"> - <xs:attribute name="error-page" type="xs:string"/> - <xs:attribute name="use-extensions" type="xs:string"/> + <xs:attribute name="error-page" type="components:string"> + <xs:annotation> + <xs:documentation> + When a document had expired or otherwise cannot be loaded, this page is displayed. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="use-extensions" type="components:boolean"> + <xs:annotation> + <xs:documentation> + Controls whether or not the URLs for documents should contain their correct file name extensions. + Using file name extensions requires additional configuration in web.xml. + </xs:documentation> + </xs:annotation> + </xs:attribute> </xs:attributeGroup> <xs:element name="key-store-config"> + <xs:annotation> + <xs:documentation> + The key stores holds the encryption keys for creating signed PDF documents + </xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="pdf:attlist.UseExtensions"/> + <xs:attributeGroup ref="pdf:attlist.keystore"/> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.UseExtensions"> - <xs:attribute name="key-store" type="xs:string"/> - <xs:attribute name="key-store-password" type="xs:string"/> - <xs:attribute name="key-password" type="xs:string"/> - <xs:attribute name="key-alias" type="xs:string"/> + <xs:attributeGroup name="attlist.keystore"> + <xs:attribute name="key-store" type="components:string"/> + <xs:attribute name="key-store-password" type="components:string"/> + <xs:attribute name="key-password" type="components:string"/> + <xs:attribute name="key-alias" type="components:string"/> </xs:attributeGroup> </xs:schema> Modified: trunk/src/main/org/jboss/seam/theme-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/theme-2.1.xsd 2008-04-21 20:06:44 UTC (rev 7999) +++ trunk/src/main/org/jboss/seam/theme-2.1.xsd 2008-04-21 22:30:08 UTC (rev 8000) @@ -5,27 +5,22 @@ <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> <xs:element name="theme-selector"> + <xs:annotation> + <xs:documentation>Theme selector component</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element ref="theme:available-themes"/> + <xs:element name="available-themes" type="components:multiValuedProperty"/> </xs:choice> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="theme:attlist.themeSelector"/> </xs:complexType> </xs:element> - <xs:element name="available-themes" type="components:multiValuedProperty"/> + <xs:attributeGroup name="attlist.themeSelector"> - <xs:attribute name="theme" type="xs:string"/> - <xs:attribute name="available-themes" type="xs:string"/> - <xs:attribute name="cookie-max-age"/> - <xs:attribute name="cookie-enabled"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> + <xs:attribute name="theme" type="components:string"/> + <xs:attribute name="available-themes" type="components:string"/> + <xs:attribute name="cookie-max-age" type="components:int"/> + <xs:attribute name="cookie-enabled" type="components:boolean" /> </xs:attributeGroup> - </xs:schema> Modified: trunk/src/main/org/jboss/seam/transaction-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/transaction-2.1.xsd 2008-04-21 20:06:44 UTC (rev 7999) +++ trunk/src/main/org/jboss/seam/transaction-2.1.xsd 2008-04-21 22:30:08 UTC (rev 8000) @@ -5,6 +5,9 @@ <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> <xs:element name="ejb-transaction"> + <xs:annotation> + <xs:documentation></xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="components:attlist.ejbcomponent"/> @@ -14,29 +17,38 @@ <xs:attributeGroup name="attlist.transaction"> </xs:attributeGroup> <xs:element name="hibernate-transaction"> + <xs:annotation> + <xs:documentation></xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="transaction:attlist.HibernateTransaction"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.HibernateTransaction"> - <xs:attribute name="session" type="xs:string" use="required"/> + <xs:attribute name="session" type="components:string" use="required"/> </xs:attributeGroup> <xs:element name="entity-transaction"> + <xs:annotation> + <xs:documentation></xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="transaction:attlist.EntityTransaction"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.EntityTransaction"> - <xs:attribute name="entity-manager" type="xs:string" use="required"/> + <xs:attribute name="entity-manager" type="components:string" use="required"/> </xs:attributeGroup> - <xs:element name="no-transaction"> + <xs:element name="no-transaction"> + <xs:annotation> + <xs:documentation></xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> </xs:complexType> </xs:element> - + </xs:schema> Modified: trunk/src/main/org/jboss/seam/web-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/web-2.1.xsd 2008-04-21 20:06:44 UTC (rev 7999) +++ trunk/src/main/org/jboss/seam/web-2.1.xsd 2008-04-21 22:30:08 UTC (rev 8000) @@ -5,6 +5,12 @@ <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> <xs:element name="multipart-filter"> + <xs:annotation> + <xs:documentation> + Detects multipart form requests and processes them according to the + multipart/form-data specification (RFC-2388). + </xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="web:attlist.filter"/> @@ -13,6 +19,10 @@ </xs:element> <xs:element name="redirect-filter"> + <xs:annotation> + <xs:documentation>This filter allows Seam to propagate the conversation context across browser redirects. It intercepts any +browser redirects and adds a request parameter that specifies the Seam conversation identifier.</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="web:attlist.filter"/> @@ -20,6 +30,9 @@ </xs:element> <xs:element name="exception-filter"> + <xs:annotation> + <xs:documentation>This filter provides the exception mapping functionality in pages.xml.</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="web:attlist.filter"/> @@ -27,6 +40,10 @@ </xs:element> <xs:element name="context-filter"> + <xs:annotation> + <xs:documentation>This filter allows custom servlets to interact with the Seam contexts. It sets up the Seam contexts at the begin- +ning of each request, and tears them down at the end of the request.</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="web:attlist.filter"/> @@ -34,6 +51,9 @@ </xs:element> <xs:element name="wicket-filter"> + <xs:annotation> + <xs:documentation></xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="web:attlist.filter"/> @@ -42,26 +62,37 @@ </xs:element> <xs:element name="character-encoding-filter"> + <xs:annotation> + <xs:documentation>Sets the character encoding of submitted form data.</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attribute name="encoding" type="xs:string"/> - <xs:attribute name="override-client" type="xs:boolean"/> + <xs:attribute name="encoding" type="components:string"/> + <xs:attribute name="override-client" type="components:boolean"/> </xs:complexType> </xs:element> <xs:element name="authentication-filter"> + <xs:annotation> + <xs:documentation>Although not recommended for use unless absolutely necessary, Seam provides means for authenticating using +either HTTP Basic or HTTP Digest (RFC 2617) methods.</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attribute name="realm" type="xs:string"/> - <xs:attribute name="key" type="xs:string"/> - <xs:attribute name="nonce-validity-seconds" type="xs:int"/> - <xs:attribute name="auth-type" type="xs:string"/> + <xs:attribute name="realm" type="components:string"/> + <xs:attribute name="key" type="components:string"/> + <xs:attribute name="nonce-validity-seconds" type="components:int"/> + <xs:attribute name="auth-type" type="components:string"/> </xs:complexType> </xs:element> <xs:element name="logging-filter"> + <xs:annotation> + <xs:documentation>This filter adds the authenticated user name to the log4j mapped diagnostic context so that it can be included in +formatted log output if desired, by adding %X{username} to the pattern.</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="web:attlist.filter"/> @@ -69,6 +100,9 @@ </xs:element> <xs:element name="ajax4jsf-filter"> + <xs:annotation> + <xs:documentation>The ajax4jsf filter for RichFaces</xs:documentation> + </xs:annotation> <xs:complexType mixed="true"> <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="web:attlist.filter"/> @@ -77,47 +111,26 @@ </xs:element> <xs:attributeGroup name="attlist.filter"> - <xs:attribute name="url-pattern" type="xs:string"/> - <xs:attribute name="regex-url-pattern" type="xs:string"/> - <xs:attribute name="disabled" type="xs:boolean" default="false" /> + <xs:attribute name="url-pattern" type="components:string"/> + <xs:attribute name="regex-url-pattern" type="components:string"/> + <xs:attribute name="disabled" type="components:boolean" default="false" /> </xs:attributeGroup> <xs:attributeGroup name="attlist.wicketFilter"> - <xs:attribute name="application-class" type="xs:string"/> - <xs:attribute name="application-factory-class" type="xs:string"/> - <xs:attribute name="detect-portlet-context" type="xs:boolean" default="false" /> + <xs:attribute name="application-class" type="components:string"/> + <xs:attribute name="application-factory-class" type="components:string"/> + <xs:attribute name="detect-portlet-context" type="components:boolean" default="false" /> </xs:attributeGroup> <xs:attributeGroup name="attlist.multipartFilter"> - <xs:attribute name="create-temp-files"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="max-request-size" type="xs:integer"/> + <xs:attribute name="create-temp-files" type="components:boolean" /> + <xs:attribute name="max-request-size" type="components:int"/> </xs:attributeGroup> <xs:attributeGroup name="attlist.ajax4jsfFilter"> - <xs:attribute name="enable-cache"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="force-parser"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="log4j-init-file" type="xs:string"/> + <xs:attribute name="enable-cache" type="components:boolean" /> + <xs:attribute name="force-parser" type="components:boolean" /> + <xs:attribute name="log4j-init-file" type="components:string"/> </xs:attributeGroup> <xs:element name="servlet-session"> @@ -126,8 +139,9 @@ <xs:attributeGroup ref="web:attlist.servlet-session"/> </xs:complexType> </xs:element> + <xs:attributeGroup name="attlist.servlet-session"> - <xs:attribute name="invalidate-on-scheme-change" type="xs:boolean"/> + <xs:attribute name="invalidate-on-scheme-change" type="components:boolean"/> </xs:attributeGroup> </xs:schema>