Author: akazakov
Date: 2009-06-09 08:12:35 -0400 (Tue, 09 Jun 2009)
New Revision: 15814
Added:
trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/cache-2.1.xsd
trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/document-2.1.xsd
trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/pageflow-2.1.xsd
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/core-2.1.xsd
trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/international-2.1.xsd
trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/pages-2.1.xsd
trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/ui-2.1.xsd
Log:
https://jira.jboss.org/jira/browse/JBIDE-4444
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-06-09 10:57:08 UTC (rev
15813)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-06-09 12:12:35 UTC (rev
15814)
@@ -115,8 +115,6 @@
publicId="-//JBoss/Seam Component Configuration DTD 1.1//EN"
uri="dtds/components-1.1.dtd"/>
-
-
<uri
name="http://jboss.com/products/seam/async-2.0.xsd"
uri="schemas/async-2.0.xsd"/>
@@ -142,6 +140,10 @@
uri="schemas/components-2.1.xsd"/>
<uri
+
name="http://jboss.com/products/seam/cache-2.1.xsd"
+ uri="schemas/cache-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/core-2.0.xsd"
uri="schemas/core-2.0.xsd"/>
@@ -158,6 +160,10 @@
uri="schemas/drools-2.1.xsd"/>
<uri
+
name="http://jboss.com/products/seam/document-2.1.xsd"
+ uri="schemas/document-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/framework-2.0.xsd"
uri="schemas/framework-2.0.xsd"/>
@@ -202,6 +208,10 @@
uri="schemas/pageflow-2.0.xsd"/>
<uri
+
name="http://jboss.com/products/seam/pageflow-2.1.xsd"
+ uri="schemas/pageflow-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/pages-2.0.xsd"
uri="schemas/pages-2.0.xsd"/>
Added: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/cache-2.1.xsd
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/cache-2.1.xsd
(rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/cache-2.1.xsd 2009-06-09 12:12:35
UTC (rev 15814)
@@ -0,0 +1,56 @@
+<?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/cache"
+
xmlns:cache="http://jboss.com/products/seam/cache"
+
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="eh-cache-provider">
+ <xs:annotation>
+ <xs:documentation>The EHCache provider</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component" />
+ <xs:attributeGroup ref="cache:attlist.cacheProvider" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="jboss-cache-provider">
+ <xs:annotation>
+ <xs:documentation>The JBoss 1.x Cache provider</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component" />
+ <xs:attributeGroup ref="cache:attlist.cacheProvider" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="jboss-cache2-provider">
+ <xs:annotation>
+ <xs:documentation>The JBoss 2.x cache provider</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component" />
+ <xs:attributeGroup ref="cache:attlist.cacheProvider" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="jboss-pojo-cache-provider">
+ <xs:annotation>
+ <xs:documentation>The JBoss 1.x POJOCache
provider</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component" />
+ <xs:attributeGroup ref="cache:attlist.cacheProvider" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:attributeGroup name="attlist.cacheProvider">
+ <xs:attribute name="default-region" type="components:string"
/>
+ <xs:attribute name="configuration" type="components:string"
/>
+ </xs:attributeGroup>
+
+</xs:schema>
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/cache-2.1.xsd
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/core-2.1.xsd
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/core-2.1.xsd 2009-06-09 10:57:08
UTC (rev 15813)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/core-2.1.xsd 2009-06-09 12:12:35
UTC (rev 15814)
@@ -51,7 +51,6 @@
<xs:attribute name="jndi-pattern" type="components:string"
/>
<xs:attribute name="security-enabled"
type="components:boolean" />
<xs:attribute name="transaction-management-enabled"
type="components:boolean"/>
- <xs:attribute name="user-transaction-name"
type="components:string"/>
</xs:attributeGroup>
<xs:element name="manager">
Added: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/document-2.1.xsd
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/document-2.1.xsd
(rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/document-2.1.xsd 2009-06-09
12:12:35 UTC (rev 15814)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
+
xmlns:doc="http://jboss.com/products/seam/document"
+
xmlns:components="http://jboss.com/products/seam/components"
+
targetNamespace="http://jboss.com/products/seam/document"
+ elementFormDefault="qualified"
+ 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 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="doc: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:schema>
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/document-2.1.xsd
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/international-2.1.xsd
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/international-2.1.xsd 2009-06-09
10:57:08 UTC (rev 15813)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/international-2.1.xsd 2009-06-09
12:12:35 UTC (rev 15814)
@@ -56,4 +56,17 @@
<xs:attribute name="cookie-enabled"
type="components:boolean" />
</xs:attributeGroup>
+ <xs:element name="time-zones">
+ <xs:annotation>
+ <xs:documentation>The time zones provider
component</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component"/>
+ <xs:attributeGroup ref="international:attlist.timeZones"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.timeZones">
+ <xs:attribute name="wrap" type="components:boolean" />
+ </xs:attributeGroup>
+
</xs:schema>
Added: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/pageflow-2.1.xsd
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/pageflow-2.1.xsd
(rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/pageflow-2.1.xsd 2009-06-09
12:12:35 UTC (rev 15814)
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xs:schema
xmlns="http://jboss.com/products/seam/pageflow"
+
targetNamespace="http://jboss.com/products/seam/pageflow"
+
xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+
+ <!-- PAGEFLOW-DEFINITION -->
+ <!-- ################### -->
+ <xs:element name="pageflow-definition">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:group ref="start-node-elements" />
+ <xs:group ref="node-elements" />
+ <xs:group ref="end-node-elements" />
+ <xs:group ref="action-elements" />
+ <xs:element ref="event" />
+ <xs:element ref="exception-handler" />
+ </xs:choice>
+ <xs:attribute name="name" type="xs:string"
use="required" />
+ <xs:attribute name="start-page" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+
+ <!-- NODES -->
+ <!-- ##### -->
+ <xs:element name="start-state">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="transition" />
+ <xs:element ref="event" />
+ <xs:element ref="exception-handler" />
+ </xs:choice>
+ <xs:attribute name="name" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="end-state">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="event" />
+ <xs:element ref="exception-handler" />
+ </xs:choice>
+ <xs:attribute name="name" type="xs:string"
use="required" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="process-state">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="sub-process" />
+ <xs:element ref="transition" />
+ <xs:element ref="event" />
+ <xs:element ref="exception-handler" />
+ </xs:choice>
+ <xs:attribute name="name" type="xs:string" />
+ <xs:attribute name="binding" type="bindingType" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="sub-process">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string"
use="required" />
+ <xs:attribute name="version" type="xs:integer" />
+ <xs:attribute name="binding" type="bindingType" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="start-page">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:group ref="page-elements" />
+ </xs:choice>
+ <xs:attributeGroup ref="page-attributes" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="decision">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="handler" type="delegation" />
+ <xs:element ref="event" />
+ <xs:element ref="exception-handler" />
+ <xs:element name="transition">
+ <xs:complexType>
+ <xs:choice minOccurs="0"
+ maxOccurs="unbounded">
+ <xs:element name="condition">
+ <xs:complexType mixed="true">
+ <xs:sequence minOccurs="0"
+ maxOccurs="unbounded">
+ <xs:any processContents="lax"
+ minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ <xs:attribute name="expression"
+ type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+ <xs:group ref="action-elements" />
+ <xs:element ref="exception-handler" />
+ </xs:choice>
+ <xs:attribute name="to" type="xs:string"
+ use="required" />
+ <xs:attribute name="name" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ <xs:attribute name="name" type="xs:string"
use="required" />
+ <xs:attribute name="expression" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="page">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element ref="end-conversation" />
+ </xs:choice>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element ref="end-task" />
+ </xs:choice>
+ <xs:group ref="page-elements" />
+ </xs:sequence>
+ <xs:attributeGroup ref="page-attributes" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="redirect" />
+ <xs:element name="description" type="xs:string" />
+
+ <xs:element name="end-conversation">
+ <xs:complexType>
+ <xs:attribute name="before-redirect" type="booleanType" />
+ <xs:attribute name="create-process" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="end-task">
+ <xs:complexType>
+ <xs:attribute name="transition" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+
+ <!-- TRANSITION -->
+ <!-- ########## -->
+ <xs:element name="transition">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:group ref="action-elements" />
+ <xs:element ref="exception-handler" />
+ </xs:choice>
+ <xs:attribute name="to" type="xs:string"
use="required" />
+ <xs:attribute name="name" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+
+ <!-- ACTIONS -->
+ <!-- ####### -->
+ <xs:element name="action">
+ <xs:complexType mixed="true">
+ <xs:sequence>
+ <xs:any processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ <xs:attribute name="class" type="xs:string" />
+ <xs:attribute name="config-type" default="field"
type="xs:string" />
+ <xs:attribute name="name" type="xs:string" />
+ <xs:attribute name="ref-name" type="xs:string" />
+ <xs:attribute name="accept-propagated-events"
+ type="booleanType" default="true" />
+ <xs:attribute name="expression" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="script">
+ <xs:complexType mixed="true">
+ <xs:sequence>
+ <xs:any processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" />
+ <xs:attribute name="accept-propagated-events"
+ type="booleanType" default="true" />
+ </xs:complexType>
+ </xs:element>
+
+ <!-- EVENT -->
+ <!-- ##### -->
+ <xs:element name="event">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:group ref="action-elements" />
+ </xs:choice>
+ <xs:attribute name="type" use="required">
+ <xs:simpleType>
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="node-enter" />
+ <xs:enumeration value="node-leave" />
+ <xs:enumeration value="process-start" />
+ <xs:enumeration value="process-end" />
+ <xs:enumeration value="task-create" />
+ <xs:enumeration value="task-assign" />
+ <xs:enumeration value="task-start" />
+ <xs:enumeration value="task-end" />
+ <xs:enumeration value="before-signal" />
+ <xs:enumeration value="after-signal" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+
+ <!-- EXCEPTION-HANDLER -->
+ <!-- ################# -->
+ <xs:element name="exception-handler">
+ <xs:complexType>
+ <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="action" />
+ <xs:element ref="script" />
+ </xs:choice>
+ <xs:attribute name="exception-class" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+
+ <!-- TYPES AND GROUPS -->
+ <!-- ################ -->
+ <xs:complexType name="delegation" mixed="true">
+ <xs:sequence>
+ <xs:any processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ <xs:attribute name="class" type="xs:string" />
+ <xs:attribute name="config-type" default="field"
type="xs:string" />
+ </xs:complexType>
+
+ <xs:simpleType name="configType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="field" />
+ <xs:enumeration value="bean" />
+ <xs:enumeration value="constructor" />
+ <xs:enumeration value="configuration-property" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="booleanType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="yes" />
+ <xs:enumeration value="no" />
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
+ <xs:enumeration value="on" />
+ <xs:enumeration value="off" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="enabledType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="enabled" />
+ <xs:enumeration value="disabled" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:group name="start-node-elements">
+ <xs:choice>
+ <xs:element ref="start-state" />
+ <xs:element ref="start-page" />
+ </xs:choice>
+ </xs:group>
+
+ <xs:group name="node-elements">
+ <xs:choice>
+ <xs:element ref="page" />
+ <xs:element ref="decision" />
+ <xs:element ref="process-state" />
+ </xs:choice>
+ </xs:group>
+
+ <xs:group name="end-node-elements">
+ <xs:choice>
+ <xs:element ref="end-state" />
+ </xs:choice>
+ </xs:group>
+
+ <xs:group name="action-elements">
+ <xs:choice>
+ <xs:element ref="action" />
+ <xs:element ref="script"/>
+ </xs:choice>
+ </xs:group>
+
+ <xs:group name="page-elements">
+ <xs:sequence>
+ <xs:element ref="description" maxOccurs="1"
minOccurs="0"/>
+ <xs:element ref="redirect" maxOccurs="1"
minOccurs="0"/>
+ <xs:element ref="event" minOccurs="0"
maxOccurs="unbounded"/>
+ <xs:element ref="exception-handler" minOccurs="0"
maxOccurs="unbounded"/>
+ <xs:element ref="transition" maxOccurs="unbounded"
minOccurs="0"/>
+ <xs:group ref="action-elements" minOccurs="0"
maxOccurs="1" />
+ </xs:sequence>
+ </xs:group>
+
+ <xs:attributeGroup name="page-attributes">
+ <xs:attribute name="redirect" type="xs:boolean" />
+ <xs:attribute name="switch" type="enabledType" />
+ <xs:attribute name="no-conversation-view-id" type="xs:string"
/>
+ <xs:attribute name="timeout" type="xs:int" />
+ <xs:attribute name="back" type="enabledType" />
+ <xs:attribute name="view-id" type="xs:string"
use="required" />
+ <xs:attribute name="name" type="xs:string"
use="required" />
+ </xs:attributeGroup>
+
+ <xs:simpleType name="bindingType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="late" />
+ <xs:enumeration value="early" />
+ </xs:restriction>
+ </xs:simpleType>
+
+</xs:schema>
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/pageflow-2.1.xsd
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/pages-2.1.xsd
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/pages-2.1.xsd 2009-06-09 10:57:08
UTC (rev 15813)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/pages-2.1.xsd 2009-06-09 12:12:35
UTC (rev 15814)
@@ -56,6 +56,9 @@
<xs:attributeGroup name="attlist.exception">
<xs:attribute name="class" type="xs:token"/>
<xs:attribute name="log" type="pages:tf-boolean"/>
+ <xs:attribute name="log-level"
type="pages:loglevel-values"/>
+
+ <!-- The logLevel attribute is deprecated and will be removed in the next
major version! Please use log-level instead -->
<xs:attribute name="logLevel"
type="pages:loglevel-values"/>
</xs:attributeGroup>
@@ -140,6 +143,7 @@
<xs:attribute name="validator" type="xs:token" />
<xs:attribute name="validatorId" type="xs:token" />
<xs:attribute name="required"
type="pages:tf-boolean"/>
+ <xs:attribute name="validateModel" default="true"
type="pages:tf-boolean"/>
</xs:attributeGroup>
<xs:element name="header">
@@ -183,7 +187,7 @@
<xs:attribute name="execute" use="required"
type="pages:method-expression" />
</xs:attributeGroup>
- <xs:element name="restrict" type="pages:value-expression">
+ <xs:element name="restrict"
type="pages:boolean-value-expression" default="true">
<xs:annotation>
<xs:documentation>Security restrictions</xs:documentation>
</xs:annotation>
@@ -218,7 +222,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.navigation">
- <xs:attribute name="from-action"
type="pages:method-expression" />
+ <xs:attribute name="from-action"
type="pages:from-action-expression" />
<xs:attribute name="evaluate"
type="pages:method-expression" />
</xs:attributeGroup>
@@ -245,7 +249,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.rule">
- <xs:attribute name="if-outcome"
type="pages:value-expression" />
+ <xs:attribute name="if-outcome"
type="pages:outcome-expression" />
<xs:attribute name="if"
type="pages:boolean-value-expression" />
</xs:attributeGroup>
@@ -462,7 +466,7 @@
<xs:pattern value="http://.*|https://.*"/>
</xs:restriction>
</xs:simpleType>
-
+
<xs:simpleType name="url-expression">
<xs:union memberTypes="pages:url
pages:method-expression"></xs:union>
</xs:simpleType>
@@ -473,17 +477,31 @@
<xs:enumeration value="http"/>
</xs:restriction>
</xs:simpleType>
+
+ <xs:simpleType name="outcome">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="[^#\{\}]+"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="view-id">
<xs:restriction base="xs:string">
<xs:pattern value="(/.*)|\*"/>
</xs:restriction>
</xs:simpleType>
-
+
<xs:simpleType name="view-id-expression">
- <xs:union memberTypes="pages:view-id
pages:method-expression"></xs:union>
+ <xs:union memberTypes="pages:view-id
pages:value-expression"></xs:union>
</xs:simpleType>
+ <xs:simpleType name="outcome-expression">
+ <xs:union memberTypes="pages:outcome
pages:value-expression"></xs:union>
+ </xs:simpleType>
+
+ <xs:simpleType name="from-action-expression">
+ <xs:union memberTypes="pages:outcome
pages:method-expression"></xs:union>
+ </xs:simpleType>
+
<xs:simpleType name="ableness">
<xs:restriction base="xs:token">
<xs:enumeration value="enabled"/>
@@ -610,7 +628,9 @@
</xs:simpleType>
<xs:simpleType name="value-expression">
- <xs:restriction base="xs:token"/>
+ <xs:restriction base="xs:token">
+ <xs:pattern value="#\{.*\}"/>
+ </xs:restriction>
</xs:simpleType>
<xs:simpleType name="boolean-value-expression">
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/ui-2.1.xsd
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/ui-2.1.xsd 2009-06-09 10:57:08 UTC
(rev 15813)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/ui-2.1.xsd 2009-06-09 12:12:35 UTC
(rev 15814)
@@ -25,5 +25,12 @@
<xs:attribute name="entity-loader" type="xs:string"
/>
</xs:complexType>
</xs:element>
+
+ <xs:element name="render-stamp-store">
+ <xs:complexType>
+ <xs:attributeGroup ref="components:attlist.component" />
+ <xs:attribute name="max-size" type="xs:int" />
+ </xs:complexType>
+ </xs:element>
</xs:schema>