[seam-commits] Seam SVN: r8011 - in trunk/src: main/org/jboss/seam and 1 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Wed Apr 23 14:55:14 EDT 2008
Author: norman.richards at jboss.com
Date: 2008-04-23 14:55:14 -0400 (Wed, 23 Apr 2008)
New Revision: 8011
Removed:
trunk/src/main/org/jboss/seam/pdf-2.1.xsd
Modified:
trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd
trunk/src/main/org/jboss/seam/bpm-2.1.xsd
trunk/src/main/org/jboss/seam/drools-2.1.xsd
trunk/src/main/org/jboss/seam/framework-2.1.xsd
trunk/src/main/org/jboss/seam/international-2.1.xsd
trunk/src/main/org/jboss/seam/jms-2.1.xsd
trunk/src/main/org/jboss/seam/mail-2.1.xsd
trunk/src/main/org/jboss/seam/navigation-2.1.xsd
trunk/src/main/org/jboss/seam/pages-2.1.xsd
trunk/src/main/org/jboss/seam/persistence-2.1.xsd
trunk/src/main/org/jboss/seam/remoting-2.1.xsd
trunk/src/main/org/jboss/seam/security-2.1.xsd
trunk/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd
Log:
JBSEAM-1531
Modified: trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd
===================================================================
--- trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -1,87 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
- targetNamespace="http://jboss.com/products/seam/spring" xmlns:spring="http://jboss.com/products/seam/spring"
- xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
- <xs:import namespace="http://jboss.com/products/seam/components"
- schemaLocation="http://jboss.com/products/seam/components-2.1.xsd" />
+ targetNamespace="http://jboss.com/products/seam/spring" xmlns:spring="http://jboss.com/products/seam/spring"
+ xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+
+ <xs:import namespace="http://jboss.com/products/seam/components"
+ schemaLocation="http://jboss.com/products/seam/components-2.1.xsd" />
- <xs:element name="context-loader">
- <xs:complexType mixed="true">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element minOccurs="0" maxOccurs="1" ref="spring:config-locations" />
- </xs:choice>
- <xs:attributeGroup ref="components:attlist.component" />
- <xs:attribute name="config-locations" type="xs:string" use="optional"
- default="/WEB-INF/applicationContext.xml">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[
- A single application context config location.
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="config-locations" type="components:multiValuedProperty">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[
- Allows you to specify many config-locations in nested value elements.
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
-
- <xs:element name="task-executor-dispatcher">
- <xs:complexType mixed="true">
- <xs:attributeGroup ref="components:attlist.component" />
- <xs:attributeGroup ref="spring:attlist.taskExecutorDispatcher" />
- </xs:complexType>
- </xs:element>
- <xs:attributeGroup name="attlist.taskExecutorDispatcher">
- <xs:attribute name="task-executor" use="required" />
- <xs:attribute name="schedule-dispatcher" />
- </xs:attributeGroup>
-
- <xs:element name="spring-transaction">
- <xs:complexType mixed="true">
- <xs:attributeGroup ref="components:attlist.component" />
- <xs:attribute name="platform-transaction-manager">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[
- An expression evalutating to the spring platform transaction manager
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="platform-transaction-manager-name">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[
- A spring bean name of a PlatformTransactionManager obtained from a BeanFactory instead of EL.
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="conversation-context-required" type="xs:boolean" use="optional" default="true">
- <xs:annotation>
- <xs:documentation>
- Specify if this transaction manager requires a conversation context to be available or not.
- Set to true if you're using a JpaTransactionManager with a conversation scoped persistence
- context.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="join-transaction" type="xs:boolean" use="optional">
- <xs:annotation>
- <xs:documentation>
- Should this transaction manager participate in request to join a transaction. For JTA
- transactions set to true.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
+ <xs:element name="context-loader">
+ <xs:annotation>
+ <xs:documentation>Loads a spring context file</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="config-locations"
+ type="components:multiValuedProperty"
+ minOccurs="0" maxOccurs="1" >
+ <xs:annotation>
+ <xs:documentation>Allows you to specify many config-locations in nested value elements.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+
+ <xs:attributeGroup ref="components:attlist.component" />
+ <xs:attribute name="config-locations" type="components:string" use="optional"
+ default="/WEB-INF/applicationContext.xml">
+ <xs:annotation>
+ <xs:documentation>A single application context config location.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="task-executor-dispatcher">
+ <xs:annotation>
+ <xs:documentation>Configures the Spring TaskExecuritor for asynchronous calls</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component" />
+ <xs:attributeGroup ref="spring:attlist.taskExecutorDispatcher" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:attributeGroup name="attlist.taskExecutorDispatcher">
+ <xs:attribute name="task-executor" use="required" type="components:string"/>
+ <xs:attribute name="schedule-dispatcher" type="components:string" />
+ </xs:attributeGroup>
+
+ <xs:element name="spring-transaction">
+ <xs:annotation>
+ <xs:documentation>Configure the use of Spring transactions</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component" />
+ <xs:attribute name="platform-transaction-manager" type="components:string">
+ <xs:annotation>
+ <xs:documentation>
+ An expression evalutating to the spring platform transaction manager
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="platform-transaction-manager-name" type="components:string">
+ <xs:annotation>
+ <xs:documentation>
+ A spring bean name of a PlatformTransactionManager obtained from a BeanFactory instead of EL.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="conversation-context-required" type="components:boolean" use="optional" default="true">
+ <xs:annotation>
+ <xs:documentation>
+ Specify if this transaction manager requires a conversation context to be available or not.
+ Set to true if you're using a JpaTransactionManager with a conversation scoped persistence
+ context.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="join-transaction" type="components:boolean" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Should this transaction manager participate in request to join a transaction. For JTA
+ transactions set to true.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
Modified: trunk/src/main/org/jboss/seam/bpm-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/bpm-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/bpm-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -5,6 +5,9 @@
<xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/>
<xs:element name="actor">
+ <xs:annotation>
+ <xs:documentation>The jbpm actor id</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element minOccurs="0" maxOccurs="1" ref="bpm:id"/>
@@ -17,21 +20,27 @@
<xs:element name="id" type="xs:string"/>
<xs:element name="group-actor-ids" type="components:multiValuedProperty"/>
<xs:attributeGroup name="attlist.actor">
- <xs:attribute name="group-actor-ids"> </xs:attribute>
+ <xs:attribute name="group-actor-ids" type="components:string" />
</xs:attributeGroup>
<xs:element name="jbpm">
+ <xs:annotation>
+ <xs:documentation>Configuration for jbpm</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="bpm:process-definitions"/>
- <xs:element ref="bpm:pageflow-definitions"/>
+ <xs:element name="process-definitions" type="components:multiValuedProperty">
+ <xs:annotation>
+ <xs:documentation>A list of jbpm process files</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="pageflow-definitions" type="components:multiValuedProperty"/>
</xs:choice>
- <xs:attributeGroup ref="components:attlist.component"/>
- <xs:attributeGroup ref="bpm:attlist.jbpm"/>
+ <xs:attributeGroup ref="components:attlist.component" />
+ <xs:attributeGroup ref="bpm:attlist.jbpm" />
</xs:complexType>
</xs:element>
- <xs:element name="process-definitions" type="components:multiValuedProperty"/>
- <xs:element name="pageflow-definitions" type="components:multiValuedProperty"/>
- <xs:attributeGroup name="attlist.jbpm"> </xs:attributeGroup>
+
+ <xs:attributeGroup name="attlist.jbpm" />
</xs:schema>
Modified: trunk/src/main/org/jboss/seam/drools-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/drools-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/drools-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -2,9 +2,13 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
targetNamespace="http://jboss.com/products/seam/drools" xmlns:drools="http://jboss.com/products/seam/drools"
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:element name="rule-base">
+ <xs:annotation>
+ <xs:documentation>A drools rule base</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element minOccurs="0" maxOccurs="1" ref="drools:rule-files"/>
@@ -15,34 +19,40 @@
</xs:element>
<xs:element name="rule-files" type="components:multiValuedProperty"/>
<xs:attributeGroup name="attlist.RuleBase">
- <xs:attribute name="dsl-file" type="xs:string"/>
- <xs:attribute name="rule-files" type="xs:string"/>
+ <xs:attribute name="dsl-file" type="components:string"/>
+ <xs:attribute name="rule-files" type="components:string"/>
</xs:attributeGroup>
<xs:element name="rule-agent">
- <xs:complexType mixed="true">
+ <xs:annotation>
+ <xs:documentation>A drools BRMS configuration</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
<xs:attributeGroup ref="components:attlist.component" />
<xs:attributeGroup ref="drools:attlist.RuleAgent" />
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.RuleAgent">
- <xs:attribute name="configuration-file" type="xs:string" />
- <xs:attribute name="config-name" type="xs:string" />
- <xs:attribute name="new-instance" type="xs:string" />
- <xs:attribute name="files" type="xs:string" />
- <xs:attribute name="url" type="xs:string" />
- <xs:attribute name="local-cache-dir" type="xs:string" />
- <xs:attribute name="poll" type="xs:string" />
+ <xs:attribute name="configuration-file" type="components:string" />
+ <xs:attribute name="config-name" type="components:string" />
+ <xs:attribute name="new-instance" type="components:string" />
+ <xs:attribute name="files" type="components:string" />
+ <xs:attribute name="url" type="components:string" />
+ <xs:attribute name="local-cache-dir" type="components:string" />
+ <xs:attribute name="poll" type="components:string" />
</xs:attributeGroup>
<xs:element name="managed-working-memory">
+ <xs:annotation>
+ <xs:documentation>A working memory for rules calculations</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:attributeGroup ref="components:attlist.component"/>
<xs:attributeGroup ref="drools:attlist.ManagedWorkingMemory"/>
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.ManagedWorkingMemory">
- <xs:attribute name="rule-base" type="xs:string"/>
+ <xs:attribute name="rule-base" type="components:expressionType"/>
</xs:attributeGroup>
</xs:schema>
Modified: trunk/src/main/org/jboss/seam/framework-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/framework-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/framework-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -3,38 +3,20 @@
targetNamespace="http://jboss.com/products/seam/framework"
xmlns:framework="http://jboss.com/products/seam/framework"
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:attributeGroup name="attlist.Home">
- <xs:attribute name="entity-class" type="xs:string"/>
- <xs:attribute name="new-instance" type="xs:string"/>
- <xs:attribute name="created-message" type="xs:string"/>
- <xs:attribute name="updated-message" type="xs:string"/>
- <xs:attribute name="deleted-message" type="xs:string"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="attlist.Query">
- <xs:attribute name="ejbql" type="xs:string"/>
- <xs:attribute name="max-results" type="xs:integer"/>
- <xs:attribute name="order" type="xs:string"/>
- <xs:attribute name="group-by" type="xs:string"/>
- </xs:attributeGroup>
- <xs:element name="restrictions" type="components:multiValuedProperty"/>
- <xs:element name="hints" type="components:mapProperty"/>
-
- <xs:element name="ejbql" type="xs:string"/>
- <xs:element name="order" type="xs:string"/>
- <xs:element name="group-by" type="xs:string"/>
-
<xs:element name="entity-query">
+ <xs:annotation>
+ <xs:documentation>A query controller for JPA queries</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element minOccurs="0" maxOccurs="1" ref="framework:ejbql"/>
<xs:element minOccurs="0" maxOccurs="1" ref="framework:order"/>
<xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/>
<xs:element minOccurs="0" maxOccurs="1" ref="framework:group-by"/>
- <xs:element minOccurs="0" maxOccurs="1" ref="framework:hints"/>
+ <xs:element minOccurs="0" maxOccurs="1" name="hints" type="components:mapProperty" />
</xs:choice>
<xs:attributeGroup ref="components:attlist.component"/>
<xs:attributeGroup ref="framework:attlist.Query"/>
@@ -46,12 +28,15 @@
</xs:attributeGroup>
<xs:element name="hibernate-entity-query">
+ <xs:annotation>
+ <xs:documentation>A query controller for Hibernate queries</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element minOccurs="0" maxOccurs="1" ref="framework:ejbql"/>
<xs:element minOccurs="0" maxOccurs="1" ref="framework:order"/>
+ <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/>
<xs:element minOccurs="0" maxOccurs="1" ref="framework:group-by"/>
- <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/>
</xs:choice>
<xs:attributeGroup ref="components:attlist.component"/>
<xs:attributeGroup ref="framework:attlist.Query"/>
@@ -59,25 +44,63 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.HibernateEntityQuery">
- <xs:attribute name="cacheable">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
+ <xs:attribute name="cacheable" type="components:boolean" />
+ <xs:attribute name="cache-region" type="components:string"/>
+ <xs:attribute name="fetch-size" type="components:int"/>
+ <xs:attribute name="session" type="components:string"/>
+ </xs:attributeGroup>
+
+ <xs:attributeGroup name="attlist.Query">
+ <xs:attribute name="ejbql" type="components:string">
+ <xs:annotation>
+ <xs:documentation>The base query</xs:documentation>
+ </xs:annotation>
</xs:attribute>
- <xs:attribute name="cache-region" type="xs:string"/>
- <xs:attribute name="fetch-size" type="xs:integer"/>
- <xs:attribute name="session" type="xs:string"/>
+ <xs:attribute name="max-results" type="components:int">
+ <xs:annotation>
+ <xs:documentation>The query page size</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="order" type="components:string">
+ <xs:annotation>
+ <xs:documentation>The property to order results by</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="group-by" type="components:string">
+ <xs:annotation>
+ <xs:documentation>The group-by clause</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:attributeGroup>
- <xs:element name="created-message" type="xs:string"/>
- <xs:element name="updated-message" type="xs:string"/>
- <xs:element name="deleted-message" type="xs:string"/>
- <xs:element name="new-instance" type="xs:string"/>
+ <xs:element name="ejbql" type="components:string">
+ <xs:annotation>
+ <xs:documentation>The base query</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="order" type="components:string">
+ <xs:annotation>
+ <xs:documentation>The property to order results by</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="group-by" type="components:string">
+ <xs:annotation>
+ <xs:documentation>The group-by clause</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:element name="restrictions" type="components:multiValuedProperty">
+ <xs:annotation>
+ <xs:documentation>Query restrictions (the WHERE clause)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+
<xs:element name="entity-home">
+ <xs:annotation>
+ <xs:documentation>A home controller for JPA entities</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="id" type="xs:string"/>
@@ -92,10 +115,13 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.EntityHome">
- <xs:attribute name="entity-manager" type="xs:string"/>
+ <xs:attribute name="entity-manager" type="components:string"/>
</xs:attributeGroup>
<xs:element name="hibernate-entity-home">
+ <xs:annotation>
+ <xs:documentation>A home controller for Hibernate entities</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="id" type="xs:string"/>
@@ -110,7 +136,36 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.HibernateEntityHome">
- <xs:attribute name="session" type="xs:string"/>
+ <xs:attribute name="session" type="components:string"/>
</xs:attributeGroup>
+
+ <xs:attributeGroup name="attlist.Home">
+ <xs:attribute name="entity-class" type="components:string"/>
+ <xs:attribute name="new-instance" type="components:expressionType"/>
+ <xs:attribute name="created-message" type="components:string"/>
+ <xs:attribute name="updated-message" type="components:string"/>
+ <xs:attribute name="deleted-message" type="components:string"/>
+ </xs:attributeGroup>
+ <xs:element name="created-message" type="components:string">
+ <xs:annotation>
+ <xs:documentation>A faces message added when the home controller creates a new instance</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="updated-message" type="components:string">
+ <xs:annotation>
+ <xs:documentation>A faces message added when the home controller updates an instance</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="deleted-message" type="components:string">
+ <xs:annotation>
+ <xs:documentation>A faces message added when the home controller deletes an instance</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="new-instance" type="components:expressionType">
+ <xs:annotation>
+ <xs:documentation>The new instance managed by a home controller</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
</xs:schema>
Modified: trunk/src/main/org/jboss/seam/international-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/international-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/international-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -5,41 +5,34 @@
<xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/>
<xs:element name="locale-selector">
+ <xs:annotation>
+ <xs:documentation>The locale selector component</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:attributeGroup ref="components:attlist.component"/>
<xs:attributeGroup ref="international:attlist.localeSelector"/>
</xs:complexType>
</xs:element>
+
<xs:attributeGroup name="attlist.localeSelector">
- <xs:attribute name="locale-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="locale-string" type="components:string" />
+ <xs:attribute name="cookie-max-age" type="components:int" />
+ <xs:attribute name="cookie-enabled" type="components:boolean" />
</xs:attributeGroup>
<xs:element name="time-zone-selector">
+ <xs:annotation>
+ <xs:documentation>The time zone selector component</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:attributeGroup ref="components:attlist.component"/>
<xs:attributeGroup ref="international:attlist.timeZoneSelector"/>
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.timeZoneSelector">
- <xs:attribute name="time-zone-id"/>
- <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="time-zone-id" 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/jms-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/jms-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/jms-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -11,7 +11,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.TopicConnection">
- <xs:attribute name="topic-connection-factory-jndi-name" type="xs:string"/>
+ <xs:attribute name="topic-connection-factory-jndi-name" type="components:string"/>
</xs:attributeGroup>
<xs:element name="queue-connection">
@@ -21,7 +21,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.QueueConnection">
- <xs:attribute name="queue-connection-factory-jndi-name" type="xs:string"/>
+ <xs:attribute name="queue-connection-factory-jndi-name" type="components:string"/>
</xs:attributeGroup>
<xs:element name="managed-topic-publisher">
@@ -31,7 +31,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.ManagedTopicPublisher">
- <xs:attribute name="topic-jndi-name" type="xs:string"/>
+ <xs:attribute name="topic-jndi-name" type="components:string"/>
</xs:attributeGroup>
<xs:element name="managed-queue-sender">
@@ -41,6 +41,6 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.ManagedQueueSender">
- <xs:attribute name="queue-jndi-name" type="xs:string"/>
+ <xs:attribute name="queue-jndi-name" type="components:string"/>
</xs:attributeGroup>
</xs:schema>
Modified: trunk/src/main/org/jboss/seam/mail-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/mail-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/mail-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -3,48 +3,59 @@
targetNamespace="http://jboss.com/products/seam/mail"
xmlns:mail="http://jboss.com/products/seam/mail"
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:attributeGroup name="attlist.mailSession">
- <xs:attribute name="username" type="xs:string"/>
- <xs:attribute name="password" type="xs:string"/>
- <xs:attribute name="host" type="xs:string" default="localhost"/>
- <xs:attribute name="port" type="xs:string" />
- <xs:attribute name="debug" type="xs:string" default="false" />
- <xs:attribute name="ssl" type="xs:boolean" default="false" />
- <xs:attribute name="tls" type="xs:boolean" default="true" />
- <xs:attribute name="session-jndi-name" type="xs:string" />
- </xs:attributeGroup>
<xs:element name="mail-session">
+ <xs:annotation>
+ <xs:documentation></xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="components:attlist.component" />
<xs:attributeGroup ref="mail:attlist.mailSession" />
</xs:complexType>
</xs:element>
+
+ <xs:attributeGroup name="attlist.mailSession">
+ <xs:attribute name="username" type="components:string"/>
+ <xs:attribute name="password" type="components:string"/>
+ <xs:attribute name="host" type="components:string" default="localhost"/>
+ <xs:attribute name="port" type="components:string" />
+ <xs:attribute name="debug" type="components:string" default="false" />
+ <xs:attribute name="ssl" type="components:boolean" default="false" />
+ <xs:attribute name="tls" type="components:boolean" default="true" />
+ <xs:attribute name="session-jndi-name" type="components:string" />
+ </xs:attributeGroup>
+
- <xs:element name="users" type="components:multiValuedProperty"/>
<xs:element name="meldware">
+ <xs:annotation>
+ <xs:documentation></xs:documentation>
+ </xs:annotation>
<xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="mail:users" />
- </xs:choice>
- <xs:attributeGroup ref="components:attlist.component" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="users" type="components:multiValuedProperty" />
+ </xs:choice>
+ <xs:attributeGroup ref="components:attlist.component" />
</xs:complexType>
</xs:element>
- <xs:element name="aliases" type="components:multiValuedProperty"/>
- <xs:attributeGroup name="attlist.meldwareUser">
- <xs:attribute name="username" type="xs:string" />
- <xs:attribute name="password" type="xs:string" />
- <xs:attribute name="administrator" type="xs:boolean" default="false"/>
- </xs:attributeGroup>
<xs:element name="meldware-user">
+ <xs:annotation>
+ <xs:documentation></xs:documentation>
+ </xs:annotation>
<xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="mail:aliases" />
- </xs:choice>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="aliases" type="components:multiValuedProperty" />
+ </xs:choice>
<xs:attributeGroup ref="components:attlist.component" />
<xs:attributeGroup ref="mail:attlist.meldwareUser" />
</xs:complexType>
</xs:element>
+
+ <xs:attributeGroup name="attlist.meldwareUser">
+ <xs:attribute name="username" type="components:string" />
+ <xs:attribute name="password" type="components:string" />
+ <xs:attribute name="administrator" type="components:boolean" default="false"/>
+ </xs:attributeGroup>
</xs:schema>
Modified: trunk/src/main/org/jboss/seam/navigation-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/navigation-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/navigation-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -2,25 +2,34 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
targetNamespace="http://jboss.com/products/seam/navigation" xmlns:navigation="http://jboss.com/products/seam/navigation"
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:element name="pages">
+ <xs:annotation>
+ <xs:documentation>The pages component</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="1">
- <xs:element ref="navigation:resources"/>
+ <xs:element name="resources" type="components:multiValuedProperty">
+ <xs:annotation>
+ <xs:documentation>
+ A list of pages configuration files. Setting this value overrides the
+ default /WEB-INF/pages.xml.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:choice>
<xs:attributeGroup ref="components:attlist.component"/>
<xs:attributeGroup ref="navigation:attlist.pages"/>
</xs:complexType>
</xs:element>
-
- <xs:element name="resources" type="components:multiValuedProperty"/>
-
+
<xs:attributeGroup name="attlist.pages">
- <xs:attribute name="no-conversation-view-id"/>
- <xs:attribute name="login-view-id"/>
- <xs:attribute name="http-port" type="xs:integer"/>
- <xs:attribute name="https-port" type="xs:integer"/>
+ <xs:attribute name="no-conversation-view-id" type="components:string" />
+ <xs:attribute name="login-view-id" type="components:string" />
+ <xs:attribute name="http-port" type="components:int" />
+ <xs:attribute name="https-port" type="components:int" />
</xs:attributeGroup>
</xs:schema>
Modified: trunk/src/main/org/jboss/seam/pages-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -3,7 +3,11 @@
elementFormDefault="qualified"
targetNamespace="http://jboss.com/products/seam/pages"
xmlns:pages="http://jboss.com/products/seam/pages">
+
<xs:element name="pages">
+ <xs:annotation>
+ <xs:documentation>The root of a pages.xml file</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -15,11 +19,16 @@
<xs:attributeGroup ref="pages:attlist.pages"/>
</xs:complexType>
</xs:element>
+
<xs:attributeGroup name="attlist.pages">
- <xs:attribute name="no-conversation-view-id"/>
- <xs:attribute name="login-view-id"/>
+ <xs:attribute name="no-conversation-view-id" />
+ <xs:attribute name="login-view-id" />
</xs:attributeGroup>
+
<xs:element name="exception">
+ <xs:annotation>
+ <xs:documentation>A Seam exception handler</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" ref="pages:end-conversation"/>
@@ -36,7 +45,11 @@
<xs:attribute name="log"/>
<xs:attribute name="logLevel"/>
</xs:attributeGroup>
+
<xs:element name="conversation">
+ <xs:annotation>
+ <xs:documentation>Natural conversation configuration</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.conversation"/>
</xs:complexType>
@@ -46,7 +59,11 @@
<xs:attribute name="parameter-name" use="required"/>
<xs:attribute name="parameter-value"/>
</xs:attributeGroup>
+
<xs:element name="page">
+ <xs:annotation>
+ <xs:documentation>Configuration for a specific page or set up pages</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="pages:restrict"/>
@@ -102,7 +119,11 @@
<xs:attribute name="conversation"/>
<xs:attribute name="expires" />
</xs:attributeGroup>
+
<xs:element name="param">
+ <xs:annotation>
+ <xs:documentation>A page parameter</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.param"/>
</xs:complexType>
@@ -119,6 +140,9 @@
</xs:attributeGroup>
<xs:element name="header">
+ <xs:annotation>
+ <xs:documentation>HTTP headers to be added</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:attributeGroup ref="pages:attlist.header"/>
</xs:complexType>
@@ -130,6 +154,9 @@
</xs:attributeGroup>
<xs:element name="action">
+ <xs:annotation>
+ <xs:documentation>Page action</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.action"/>
</xs:complexType>
@@ -138,8 +165,17 @@
<xs:attribute name="if"/>
<xs:attribute name="execute" use="required"/>
</xs:attributeGroup>
- <xs:element name="restrict" type="xs:string"/>
+
+ <xs:element name="restrict" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Security restrictions</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
<xs:element name="navigation">
+ <xs:annotation>
+ <xs:documentation>Page navigation</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:choice maxOccurs="2">
<xs:sequence>
@@ -168,6 +204,7 @@
<xs:attribute name="from-action"/>
<xs:attribute name="evaluate"/>
</xs:attributeGroup>
+
<xs:element name="rule">
<xs:complexType>
<xs:sequence>
@@ -194,7 +231,11 @@
<xs:attribute name="if-outcome"/>
<xs:attribute name="if"/>
</xs:attributeGroup>
+
<xs:element name="raise-event">
+ <xs:annotation>
+ <xs:documentation>Event to be raised</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.raise-event"/>
</xs:complexType>
@@ -202,7 +243,11 @@
<xs:attributeGroup name="attlist.raise-event">
<xs:attribute name="type" use="required"/>
</xs:attributeGroup>
+
<xs:element name="begin-conversation">
+ <xs:annotation>
+ <xs:documentation>This page begins a new conversation</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.begin-conversation"/>
</xs:complexType>
@@ -239,7 +284,11 @@
</xs:attribute>
<xs:attribute name="if"/>
</xs:attributeGroup>
+
<xs:element name="end-conversation">
+ <xs:annotation>
+ <xs:documentation>This page ends a conversation</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.end-conversation"/>
</xs:complexType>
@@ -255,7 +304,11 @@
</xs:attribute>
<xs:attribute name="if"/>
</xs:attributeGroup>
+
<xs:element name="begin-task">
+ <xs:annotation>
+ <xs:documentation>Begin a BPM task</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.begin-task"/>
</xs:complexType>
@@ -276,7 +329,11 @@
</xs:simpleType>
</xs:attribute>
</xs:attributeGroup>
+
<xs:element name="start-task">
+ <xs:annotation>
+ <xs:documentation>Start a BPM task</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.start-task"/>
</xs:complexType>
@@ -297,7 +354,11 @@
</xs:simpleType>
</xs:attribute>
</xs:attributeGroup>
+
<xs:element name="end-task">
+ <xs:annotation>
+ <xs:documentation>Add a BPM task</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.end-task"/>
</xs:complexType>
@@ -313,7 +374,11 @@
</xs:simpleType>
</xs:attribute>
</xs:attributeGroup>
+
<xs:element name="create-process">
+ <xs:annotation>
+ <xs:documentation>Create a BPM process</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.create-process"/>
</xs:complexType>
@@ -321,7 +386,11 @@
<xs:attributeGroup name="attlist.create-process">
<xs:attribute name="definition"/>
</xs:attributeGroup>
+
<xs:element name="resume-process">
+ <xs:annotation>
+ <xs:documentation>Resume a BPM process instance</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.resume-process"/>
</xs:complexType>
@@ -329,7 +398,11 @@
<xs:attributeGroup name="attlist.resume-process">
<xs:attribute name="process-id"/>
</xs:attributeGroup>
+
<xs:element name="in">
+ <xs:annotation>
+ <xs:documentation>A page input</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.in"/>
</xs:complexType>
@@ -358,7 +431,11 @@
</xs:attribute>
<xs:attribute name="value" use="required"/>
</xs:attributeGroup>
+
<xs:element name="out">
+ <xs:annotation>
+ <xs:documentation>A contextual output for a navigation rule</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.out"/>
</xs:complexType>
@@ -387,7 +464,11 @@
</xs:attribute>
<xs:attribute name="value" use="required"/>
</xs:attributeGroup>
+
<xs:element name="render">
+ <xs:annotation>
+ <xs:documentation>Render a view</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" ref="pages:message"/>
@@ -398,7 +479,11 @@
<xs:attributeGroup name="attlist.render">
<xs:attribute name="view-id"/>
</xs:attributeGroup>
+
<xs:element name="redirect">
+ <xs:annotation>
+ <xs:documentation>Redirect to another view or URL</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" ref="pages:message"/>
@@ -412,7 +497,11 @@
<xs:attribute name="view-id"/>
<xs:attribute name="url"/>
</xs:attributeGroup>
+
<xs:element name="http-error">
+ <xs:annotation>
+ <xs:documentation>Send an HTTP error code</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" ref="pages:message"/>
@@ -423,7 +512,11 @@
<xs:attributeGroup name="attlist.http-error">
<xs:attribute name="error-code"/>
</xs:attributeGroup>
+
<xs:element name="message">
+ <xs:annotation>
+ <xs:documentation>Add a message to the faces messages</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:attributeGroup ref="pages:attlist.message"/>
</xs:complexType>
@@ -445,5 +538,10 @@
</xs:simpleType>
</xs:attribute>
</xs:attributeGroup>
- <xs:element name="description" type="xs:string"/>
+
+ <xs:element name="description" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A page description for workflow switching</xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:schema>
Deleted: trunk/src/main/org/jboss/seam/pdf-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pdf-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/pdf-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- targetNamespace="http://jboss.com/products/seam/pdf"
- xmlns:pdf="http://jboss.com/products/seam/pdf"
- 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: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="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.keystore"/>
- </xs:complexType>
- </xs:element>
- <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/persistence-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/persistence-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/persistence-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -2,6 +2,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
targetNamespace="http://jboss.com/products/seam/persistence" xmlns:persistence="http://jboss.com/products/seam/persistence"
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:element name="managed-persistence-context">
@@ -17,8 +18,8 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.ManagedPersistenceContext">
- <xs:attribute name="entity-manager-factory"/>
- <xs:attribute name="persistence-unit-jndi-name"/>
+ <xs:attribute name="entity-manager-factory" type="components:expressionType"/>
+ <xs:attribute name="persistence-unit-jndi-name" type="components:string"/>
</xs:attributeGroup>
<xs:element name="managed-hibernate-session">
@@ -30,16 +31,14 @@
<xs:attributeGroup ref="components:attlist.component"/>
</xs:complexType>
</xs:element>
-
- <xs:element name="filters" type="components:multiValuedProperty"/>
-
- <xs:element name="persistence-unit-jndi-name" type="xs:string" />
-
<xs:attributeGroup name="attlist.ManagedHibernateSession">
<xs:attribute name="session-factory"/>
<xs:attribute name="session-factory-jndi-name"/>
</xs:attributeGroup>
-
+
+ <xs:element name="filters" type="components:multiValuedProperty"/>
+ <xs:element name="persistence-unit-jndi-name" type="components:string" />
+
<xs:element name="hibernate-session-factory">
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -55,7 +54,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.HibernateSessionFactory">
- <xs:attribute name="cfg-resource-name"/>
+ <xs:attribute name="cfg-resource-name" type="components:string"/>
</xs:attributeGroup>
<xs:element name="entity-manager-factory">
@@ -68,13 +67,13 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.EntityManagerFactory">
- <xs:attribute name="persistence-unit-name"/>
+ <xs:attribute name="persistence-unit-name" type="components:string" />
</xs:attributeGroup>
<xs:element name="filter">
<xs:complexType mixed="true">
<xs:sequence>
- <xs:element minOccurs="0" name="name" type="xs:string"/>
+ <xs:element minOccurs="0" name="name" type="components:string"/>
<xs:element minOccurs="0" name="parameters" type="components:mapProperty"/>
</xs:sequence>
<xs:attributeGroup ref="persistence:attlist.filter"/>
@@ -82,7 +81,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.filter">
- <xs:attribute name="enabled"/>
+ <xs:attribute name="enabled" type="components:boolean" />
</xs:attributeGroup>
</xs:schema>
Modified: trunk/src/main/org/jboss/seam/remoting-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/remoting-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/remoting-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -2,6 +2,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
targetNamespace="http://jboss.com/products/seam/remoting" xmlns:remoting="http://jboss.com/products/seam/remoting"
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:element name="remoting">
@@ -11,16 +12,9 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.remoting">
- <xs:attribute name="poll-interval" />
- <xs:attribute name="poll-timeout" />
- <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="poll-interval" type="components:int"/>
+ <xs:attribute name="poll-timeout" type="components:int" />
+ <xs:attribute name="debug" type="components:boolean" />
</xs:attributeGroup>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
Modified: trunk/src/main/org/jboss/seam/security-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/security-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/main/org/jboss/seam/security-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -2,6 +2,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
targetNamespace="http://jboss.com/products/seam/security" xmlns:security="http://jboss.com/products/seam/security"
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:element name="identity">
@@ -19,15 +20,15 @@
</xs:element>
<xs:attributeGroup name="attlist.identity">
- <xs:attribute name="authenticate-method" />
- <xs:attribute name="remember-me" type="xs:boolean"/>
- <xs:attribute name="authenticate-every-request" type="xs:boolean"/>
- <xs:attribute name="jaas-config-name" type="xs:string"/>
- <xs:attribute name="security-rules" type="xs:string"/>
+ <xs:attribute name="authenticate-method" type="components:expressionType"/>
+ <xs:attribute name="remember-me" type="components:boolean"/>
+ <xs:attribute name="authenticate-every-request" type="components:boolean"/>
+ <xs:attribute name="jaas-config-name" type="components:string"/>
+ <xs:attribute name="security-rules" type="components:string"/>
</xs:attributeGroup>
<xs:attributeGroup name="attlist.faces-security-events">
- <xs:attribute name="cookie-max-age"/>
+ <xs:attribute name="cookie-max-age" type="components:int"/>
</xs:attributeGroup>
<xs:element name="jpa-identity-store">
@@ -38,7 +39,7 @@
</xs:element>
<xs:attributeGroup name="attlist.jpa-identity-store">
- <xs:attribute name="account-class" />
+ <xs:attribute name="account-class" type="components:string"/>
</xs:attributeGroup>
</xs:schema>
Modified: trunk/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd
===================================================================
--- trunk/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd 2008-04-23 14:43:29 UTC (rev 8010)
+++ trunk/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd 2008-04-23 18:55:14 UTC (rev 8011)
@@ -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>
More information about the seam-commits
mailing list