[seam-commits] Seam SVN: r11086 - in branches/community/Seam_2_2: src/ioc/org/jboss/seam/ioc/guice and 5 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Fri Jun 5 19:10:55 EDT 2009


Author: norman.richards at jboss.com
Date: 2009-06-05 19:10:55 -0400 (Fri, 05 Jun 2009)
New Revision: 11086

Added:
   branches/community/Seam_2_2/src/excel/org/jboss/seam/excel/excel-2.2.xsd
   branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/guice/guice-2.2.xsd
   branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-2.2.xsd
   branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/async-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/bpm-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/cache-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/components-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/core-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/document-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/drools-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/framework-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/international-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/jms-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/mail-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/navigation-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/pageflow-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/pages-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/persistence-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/remoting-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/security-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/theme-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/transaction-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/ui-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/web-2.2.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/wicket-2.2.xsd
   branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/pdf-2.2.xsd
   branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/resteasy-2.2.xsd
Removed:
   branches/community/Seam_2_2/src/excel/org/jboss/seam/excel/excel-2.1.xsd
   branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/guice/guice-2.1.xsd
   branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd
   branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/async-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/bpm-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/cache-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/components-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/core-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/document-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/drools-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/framework-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/international-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/jms-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/mail-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/navigation-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/pageflow-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/pages-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/persistence-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/remoting-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/security-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/theme-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/transaction-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/ui-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/web-2.1.xsd
   branches/community/Seam_2_2/src/main/org/jboss/seam/wicket-2.1.xsd
   branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd
   branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/resteasy-2.1.xsd
Modified:
   branches/community/Seam_2_2/ui/src/main/resources/META-INF/components.xml
Log:
bump schema versions

Deleted: branches/community/Seam_2_2/src/excel/org/jboss/seam/excel/excel-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/excel/org/jboss/seam/excel/excel-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/excel/org/jboss/seam/excel/excel-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,21 +0,0 @@
-<?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:excel="http://jboss.com/products/seam/excel"
-	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="excel-factory">
-		<xs:annotation>
-			<xs:documentation>Factory creating excel workbook instances</xs:documentation>
-		</xs:annotation>
-		<xs:complexType mixed="true">
-			<xs:sequence>
-                <xs:element name="implementations" type="components:mapProperty" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-
-
-</xs:schema>

Added: branches/community/Seam_2_2/src/excel/org/jboss/seam/excel/excel-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/excel/org/jboss/seam/excel/excel-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/excel/org/jboss/seam/excel/excel-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,21 @@
+<?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:excel="http://jboss.com/products/seam/excel"
+	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="excel-factory">
+		<xs:annotation>
+			<xs:documentation>Factory creating excel workbook instances</xs:documentation>
+		</xs:annotation>
+		<xs:complexType mixed="true">
+			<xs:sequence>
+                <xs:element name="implementations" type="components:mapProperty" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+
+
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/guice/guice-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/guice/guice-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/guice/guice-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,39 +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/guice" xmlns:guice="http://jboss.com/products/seam/guice"
-    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="init">
-        <xs:annotation>
-            <xs:documentation>Guice Support Configuration</xs:documentation>
-        </xs:annotation>
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="guice:attlist.guiceInit"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.guiceInit">
-        <xs:attribute name="injector" type="components:string"/>
-    </xs:attributeGroup>
-
-    <xs:element name="injector">
-        <xs:annotation>
-            <xs:documentation>Guice Injector</xs:documentation>
-        </xs:annotation>
-        <xs:complexType mixed="true">
-            <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element name="modules" type="components:multiValuedProperty">
-                    <xs:annotation>
-                        <xs:documentation>A list of modules</xs:documentation>
-                    </xs:annotation>
-                </xs:element>
-            </xs:choice>
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="guice:attlist.guiceInjector"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.guiceInjector"/>
-
-</xs:schema>

Added: branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/guice/guice-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/guice/guice-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/guice/guice-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,39 @@
+<?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/guice" xmlns:guice="http://jboss.com/products/seam/guice"
+    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="init">
+        <xs:annotation>
+            <xs:documentation>Guice Support Configuration</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="guice:attlist.guiceInit"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.guiceInit">
+        <xs:attribute name="injector" type="components:string"/>
+    </xs:attributeGroup>
+
+    <xs:element name="injector">
+        <xs:annotation>
+            <xs:documentation>Guice Injector</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="modules" type="components:multiValuedProperty">
+                    <xs:annotation>
+                        <xs:documentation>A list of modules</xs:documentation>
+                    </xs:annotation>
+                </xs:element>
+            </xs:choice>
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="guice:attlist.guiceInjector"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.guiceInjector"/>
+
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,88 +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/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: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>

Added: branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +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" />    
+
+    <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>

Deleted: branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<xsd:schema xmlns="http://jboss.com/products/seam/spring-seam" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://jboss.com/products/seam/spring-seam"
-            elementFormDefault="qualified" attributeFormDefault="unqualified">
-
-    <xsd:import namespace="http://www.springframework.org/schema/tool"
-                schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd" />
-
-    <xsd:element name="configure-scopes">
-        <xsd:annotation>
-            <xsd:documentation>Makes all the seam scopes available in spring.</xsd:documentation>
-            <xsd:appinfo>
-                <tool:annotation>
-                    <tool:exports />
-                </tool:annotation>
-            </xsd:appinfo>
-        </xsd:annotation>
-        <xsd:complexType>
-            <xsd:attribute name="prefix" type="xsd:string" use="optional">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-                                 The prefix to use for the seam scopes.  Default: "seam."
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="default-auto-create" type="xsd:boolean" use="optional" default="false">
-            	<xsd:annotation>
-            		<xsd:documentation>
-            			<![CDATA[
-							Should instances of this component be auto-created.  Defaults to false since custom Seam
-							scopes are typically used to create stateful components that go on to be created multiple times.
-                        ]]>
-            		</xsd:documentation>
-            	</xsd:annotation>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="instance">
-        <xsd:annotation>
-            <xsd:documentation>
-                Make an instance of a seam component available to spring beans for spring injection.
-            </xsd:documentation>
-            <xsd:appinfo>
-                <tool:annotation>
-                    <tool:exports />
-                </tool:annotation>
-            </xsd:appinfo>
-        </xsd:annotation>
-        <xsd:complexType>
-            <xsd:attribute name="id" type="xsd:ID">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-                                 The id to use when making this seam component instance available in spring.  The default will be the seam component name.
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="name" type="xsd:string" use="required">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-                                 The seam component name to get an instance of.
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="scope" use="optional">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-                                 The optional scope to look for this seam component instance in.
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string">
-                        <xsd:enumeration value="STATELESS" />
-                        <xsd:enumeration value="METHOD" />
-                        <xsd:enumeration value="EVENT" />
-                        <xsd:enumeration value="PAGE" />
-                        <xsd:enumeration value="CONVERSATION" />
-                        <xsd:enumeration value="SESSION" />
-                        <xsd:enumeration value="APPLICATION" />
-                        <xsd:enumeration value="BUSINESS_PROCESS" />
-                    </xsd:restriction>
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="type" type="xsd:string" use="optional">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-                                 The class type to use when creating a proxy of this instance.  Useful when using
-                                 EL for the name because the type of the EL expression may not be available when the
-                                 proxy is created.
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="create" type="xsd:boolean" use="optional">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-                                 Whether seam should create a new instance if one does not already exist.
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="proxy" type="xsd:boolean" use="optional" default="false">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-                                 Whether to wrap this definition in a proxy for safe injection into a spring singleton.
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="component">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
-                         Makes the surrounding spring bean a seam component with the scope managed by spring.  Also helps to resolve cases where
-                         the spring bean name must be different from the seam component name or where the seam beanClass cannot be correctly
-                         detected.
-                ]]>
-            </xsd:documentation>
-            <xsd:appinfo>
-                <tool:annotation>
-                    <tool:exports />
-                </tool:annotation>
-            </xsd:appinfo>
-        </xsd:annotation>
-        <xsd:complexType>
-            <xsd:attribute name="name" type="xsd:string" use="optional">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-                                 The seam component name to give this spring bean.  Optional unless the seam component name must be different from the
-                                 spring bean name.
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="spring-name" type="xsd:string" use="optional">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-                                 What spring bean name should seam use to obtain an instance of this bean.  Only necessary when seam-spring cannot
-                                 property detect the name of the spring bean which some spring NamespaceHandlers can do (eg. <aop:scoped-proxy/>, etc.).
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="class" type="xsd:string" use="optional">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-                                 The component class seam will use to get annotations from and to wrap it's interceptors around.  Optional unless the
-                                 correct class is not being detected by seam-spring.
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="intercept" type="xsd:boolean" use="optional">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-                                 Determines whether Seam interceptors should be wrapped around a bean, overriding
-                                 Seam's default which is currently "true". 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="auto-create" type="xsd:boolean" use="optional" default="true">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-							Should instances of this component be auto-created.  Defaults to true since the STATELESS
-							scope is going to be used most of the time when using this namespace handler.
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="scope" use="optional" default="STATELESS">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
-The optional scope this component should have.  STATELESS will allow spring to manage the scope.                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string">
-                        <xsd:enumeration value="STATELESS" />
-                        <xsd:enumeration value="EVENT" />
-                        <xsd:enumeration value="PAGE" />
-                        <xsd:enumeration value="CONVERSATION" />
-                        <xsd:enumeration value="SESSION" />
-                        <xsd:enumeration value="APPLICATION" />
-                        <xsd:enumeration value="BUSINESS_PROCESS" />
-                    </xsd:restriction>
-                </xsd:simpleType>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-</xsd:schema>

Added: branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://jboss.com/products/seam/spring-seam" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://jboss.com/products/seam/spring-seam"
+            elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+    <xsd:import namespace="http://www.springframework.org/schema/tool"
+                schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd" />
+
+    <xsd:element name="configure-scopes">
+        <xsd:annotation>
+            <xsd:documentation>Makes all the seam scopes available in spring.</xsd:documentation>
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:attribute name="prefix" type="xsd:string" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+                                 The prefix to use for the seam scopes.  Default: "seam."
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="default-auto-create" type="xsd:boolean" use="optional" default="false">
+            	<xsd:annotation>
+            		<xsd:documentation>
+            			<![CDATA[
+							Should instances of this component be auto-created.  Defaults to false since custom Seam
+							scopes are typically used to create stateful components that go on to be created multiple times.
+                        ]]>
+            		</xsd:documentation>
+            	</xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="instance">
+        <xsd:annotation>
+            <xsd:documentation>
+                Make an instance of a seam component available to spring beans for spring injection.
+            </xsd:documentation>
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:attribute name="id" type="xsd:ID">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+                                 The id to use when making this seam component instance available in spring.  The default will be the seam component name.
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="name" type="xsd:string" use="required">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+                                 The seam component name to get an instance of.
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="scope" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+                                 The optional scope to look for this seam component instance in.
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:enumeration value="STATELESS" />
+                        <xsd:enumeration value="METHOD" />
+                        <xsd:enumeration value="EVENT" />
+                        <xsd:enumeration value="PAGE" />
+                        <xsd:enumeration value="CONVERSATION" />
+                        <xsd:enumeration value="SESSION" />
+                        <xsd:enumeration value="APPLICATION" />
+                        <xsd:enumeration value="BUSINESS_PROCESS" />
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:attribute>
+            <xsd:attribute name="type" type="xsd:string" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+                                 The class type to use when creating a proxy of this instance.  Useful when using
+                                 EL for the name because the type of the EL expression may not be available when the
+                                 proxy is created.
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="create" type="xsd:boolean" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+                                 Whether seam should create a new instance if one does not already exist.
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="proxy" type="xsd:boolean" use="optional" default="false">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+                                 Whether to wrap this definition in a proxy for safe injection into a spring singleton.
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="component">
+        <xsd:annotation>
+            <xsd:documentation>
+                <![CDATA[
+                         Makes the surrounding spring bean a seam component with the scope managed by spring.  Also helps to resolve cases where
+                         the spring bean name must be different from the seam component name or where the seam beanClass cannot be correctly
+                         detected.
+                ]]>
+            </xsd:documentation>
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:attribute name="name" type="xsd:string" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+                                 The seam component name to give this spring bean.  Optional unless the seam component name must be different from the
+                                 spring bean name.
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="spring-name" type="xsd:string" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+                                 What spring bean name should seam use to obtain an instance of this bean.  Only necessary when seam-spring cannot
+                                 property detect the name of the spring bean which some spring NamespaceHandlers can do (eg. <aop:scoped-proxy/>, etc.).
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="class" type="xsd:string" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+                                 The component class seam will use to get annotations from and to wrap it's interceptors around.  Optional unless the
+                                 correct class is not being detected by seam-spring.
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="intercept" type="xsd:boolean" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+                                 Determines whether Seam interceptors should be wrapped around a bean, overriding
+                                 Seam's default which is currently "true". 
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="auto-create" type="xsd:boolean" use="optional" default="true">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+							Should instances of this component be auto-created.  Defaults to true since the STATELESS
+							scope is going to be used most of the time when using this namespace handler.
+                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="scope" use="optional" default="STATELESS">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        <![CDATA[
+The optional scope this component should have.  STATELESS will allow spring to manage the scope.                        ]]>
+                    </xsd:documentation>
+                </xsd:annotation>
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:enumeration value="STATELESS" />
+                        <xsd:enumeration value="EVENT" />
+                        <xsd:enumeration value="PAGE" />
+                        <xsd:enumeration value="CONVERSATION" />
+                        <xsd:enumeration value="SESSION" />
+                        <xsd:enumeration value="APPLICATION" />
+                        <xsd:enumeration value="BUSINESS_PROCESS" />
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+</xsd:schema>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/async-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/async-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/async-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,43 +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/async" xmlns:async="http://jboss.com/products/seam/async"
-    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="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: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"/>
-        </xs:complexType>
-    </xs:element>
-    <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="components:int"/>
-    </xs:attributeGroup>
-
-</xs:schema>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/async-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/async-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/async-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,43 @@
+<?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/async" xmlns:async="http://jboss.com/products/seam/async"
+    xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+    <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.2.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: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"/>
+        </xs:complexType>
+    </xs:element>
+    <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="components:int"/>
+    </xs:attributeGroup>
+
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/bpm-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/bpm-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/bpm-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,46 +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/bpm" xmlns:bpm="http://jboss.com/products/seam/bpm"
-    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="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"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="bpm:group-actor-ids"/>
-            </xs:choice>
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="bpm:attlist.actor"/>
-        </xs:complexType>
-    </xs:element>
-    <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" 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 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:complexType>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.jbpm" /> 
-
-</xs:schema>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/bpm-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/bpm-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/bpm-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,46 @@
+<?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/bpm" xmlns:bpm="http://jboss.com/products/seam/bpm"
+    xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+    <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.2.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"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="bpm:group-actor-ids"/>
+            </xs:choice>
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="bpm:attlist.actor"/>
+        </xs:complexType>
+    </xs:element>
+    <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" 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 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:complexType>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.jbpm" /> 
+
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/cache-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/cache-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/cache-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -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/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>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/cache-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/cache-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/cache-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -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.2.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>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/components-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/components-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/components-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,371 +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/components"
-           xmlns:components="http://jboss.com/products/seam/components">
-    <xs:annotation>
-        <xs:documentation> 
-            The top-level schema for a Seam components.xml. For more information on Seam, see
-            http://www.seamframework.org. 
-        </xs:documentation>
-    </xs:annotation>
-
-    <xs:element name="components">
-        <xs:annotation>
-            <xs:documentation> The components tag is a the root element for a components.xml containing multiples
-                component definitions. </xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element ref="components:component"/>
-                <xs:element ref="components:factory"/>
-                <xs:element ref="components:event"/>
-                <xs:element ref="components:import"/>
-                <xs:any namespace="##other" processContents="strict"/>
-            </xs:choice>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="component">
-        <xs:annotation>
-            <xs:documentation> The component tag defines a single Seam component. It may serve as to the root element of
-                a fine-grained *.component.xml file. </xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="components:property"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="components:attlist.ejbcomponent"/>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="import" type="xs:string">
-        <xs:annotation>
-            <xs:documentation>
-                The import tag declares additional global component namespaces that will be in effect for
-                all components. 
-            </xs:documentation>
-        </xs:annotation>
-    </xs:element>
-
-    <xs:attributeGroup name="attlist.ejbcomponent">
-        <xs:attribute name="jndi-name" type="components:string">
-            <xs:annotation>
-                <xs:documentation> 
-                    The JNDI name used to lookup the component. This value is only used with EJB
-                    components that don't follow the global JNDI pattern. 
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:attributeGroup>
-
-    <xs:attributeGroup name="attlist.component">
-        <xs:attribute name="name" type="components:componentName">
-            <xs:annotation>
-                <xs:documentation>The name of component</xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-        
-        <xs:attribute name="class" type="components:componentName">
-            <xs:annotation>
-                <xs:documentation>The Java class of the component implementation</xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-
-        <xs:attribute name="scope">
-            <xs:annotation>
-                <xs:documentation>The scope of the component</xs:documentation>
-            </xs:annotation>
-            
-            <xs:simpleType>
-                <xs:union memberTypes="components:scopeType components:expressionType"></xs:union>       
-            </xs:simpleType>
-        </xs:attribute>
-
-        <xs:attribute name="precedence" default="20">
-            <xs:annotation>
-                <xs:documentation>
-                    The precedence of the component, expressed as a positive integer.  Higher
-                    precedence components override lower precedence components.  The pre-definied precedence
-                    values are: 
-                    
-                    BUILT_IN = 0, 
-                    FRAMEWORK = 10,
-                    APPLICATION = 20,
-                    DEPLOYMENT = 30,
-                    MOCK = 40
-                </xs:documentation>
-            </xs:annotation>
-            <xs:simpleType>
-                <xs:union memberTypes="xs:nonNegativeInteger components:precedenceType components:expressionType"></xs:union>
-            </xs:simpleType>
-        </xs:attribute>
-        
-        <xs:attribute name="installed" default="true" type="components:boolean">
-            <xs:annotation>
-                <xs:documentation>
-                    The installed value indicates whether or not the component definition should be installed.
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-        
-        <xs:attribute name="auto-create" default="false" type="components:boolean">
-            <xs:annotation>
-                <xs:documentation>
-                    Indicates whether or not a components instance should be created when
-                    one doesn't exist and when the component is requested using a method that 
-                    would not normally instantiate a new instance.  (such as basic injection)
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-        
-        <xs:attribute name="startup" default="false" type="components:boolean">
-            <xs:annotation>
-                <xs:documentation>
-                    Indicates that an instance of the component should be created when the 
-                    the component's controlling scope starts.  This is only used for application and
-                    session scope.
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-        
-        <xs:attribute name="startupDepends" type="components:string">
-            <xs:annotation>
-                <xs:documentation>
-                    A list of component names that this component depends on and that should be created before
-                    this component is started.
-                </xs:documentation>
-            </xs:annotation></xs:attribute>
-    </xs:attributeGroup>
-    
-    <xs:element name="factory">
-        <xs:annotation>
-            <xs:documentation>
-                Factories are like a component instances except their values are 
-                determined by computing a value or calling a method on another 
-                component.
-            </xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:attributeGroup ref="components:attlist.factory"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.factory">
-        <xs:attribute name="name" use="required">
-            <xs:annotation>
-                <xs:documentation>The name of the factory component</xs:documentation>
-            </xs:annotation></xs:attribute>
-       
-        <xs:attribute name="method">
-            <xs:annotation>
-                <xs:documentation>
-                     The method binding used to evauluate the factory value.  A factory should have either
-                     a method binding or a value binding, but not both.
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-        
-        <xs:attribute name="value">
-            <xs:annotation>
-                <xs:documentation>
-                     The value binding used to evauluate the factory value.  A factory should have either
-                     a method binding or a value binding, but not both.
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-        
-        <xs:attribute name="scope">
-            <xs:annotation>
-                <xs:documentation>The scope of the factory value</xs:documentation>
-            </xs:annotation>
-            
-            <xs:simpleType>
-                <xs:union memberTypes="components:scopeType components:expressionType"></xs:union>       
-            </xs:simpleType>
-        </xs:attribute>
-        
-        <xs:attribute name="auto-create" default="false" type="components:boolean">
-            <xs:annotation>
-                <xs:documentation>
-                    Indicates whether or not the factory value should be created when
-                    one doesn't exist and when the component is requested using a method that 
-                    would not normally instantiate a new instance.  (such as basic injection)
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:attributeGroup>
-    
-    
-    <xs:element name="property">
-        <xs:annotation>
-            <xs:documentation>
-                A generic property.  The body contains the value or values.
-            </xs:documentation>
-        </xs:annotation>
-        <xs:complexType mixed="true">
-            <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element ref="components:key" />
-                <xs:element ref="components:value" />
-            </xs:choice>
-            <xs:attributeGroup ref="components:attlist.property"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.property">
-        <xs:attribute name="name" use="required" type="components:string">
-            <xs:annotation>
-                <xs:documentation>The property name</xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-	<xs:attribute name="type" type="components:string" >
-            <xs:annotation>
-                <xs:documentation>Concrete type to use if the property is multi-valued</xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:attributeGroup>
-    
-
-    <xs:element name="key" type="components:string">
-        <xs:annotation>
-            <xs:documentation>For map values, the key for the following value</xs:documentation>
-        </xs:annotation>
-    </xs:element>
-    
-    <xs:element name="value" type="components:string">
-        <xs:annotation>
-            <xs:documentation>
-                For list values, the value to be added.
-                For map values, the value for the preceding key
-            </xs:documentation>
-        </xs:annotation>
-    </xs:element>
-
-    <xs:complexType name="multiValuedProperty">
-        <xs:sequence minOccurs="0" maxOccurs="unbounded">
-            <xs:element ref="components:value"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="mapProperty">
-        <xs:sequence minOccurs="0" maxOccurs="unbounded">
-            <xs:element ref="components:key"/>
-            <xs:element ref="components:value"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:element name="event">
-        <xs:annotation>
-            <xs:documentation>An event handler definition</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element ref="components:action"/>
-            </xs:choice>
-            <xs:attributeGroup ref="components:attlist.event"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.event">
-        <xs:attribute name="type" use="required" type="components:componentNameType" >
-            <xs:annotation>
-                <xs:documentation>The event type to handle</xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:attributeGroup>
-
-    <xs:element name="action">
-        <xs:annotation>
-            <xs:documentation>The action to be taken when the event occurs</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:attributeGroup ref="components:attlist.action"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.action">
-        <xs:attribute name="execute" use="required" type="components:elType">
-            <xs:annotation>
-                <xs:documentation>An EL expression to be invoked when the event is invoked</xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:attributeGroup>
-
-    <xs:simpleType name="propertyType">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="@.+@"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="elType">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="\#\{.+\}"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <!-- place holder - need something more expressive -->
-    <xs:simpleType name="componentNameType">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1" />   
-        </xs:restriction>
-    </xs:simpleType>
-    
-    <xs:simpleType name="expressionType">
-        <xs:union memberTypes="components:elType components:propertyType"/>
-    </xs:simpleType>
-    
-    <xs:simpleType name="boolean">
-        <xs:union memberTypes="xs:boolean components:expressionType"/>
-    </xs:simpleType>
-
-    <xs:simpleType name="string">
-        <xs:union memberTypes="xs:string components:expressionType"/>
-    </xs:simpleType>
-    
-    <xs:simpleType name="int">
-        <xs:union memberTypes="xs:int components:expressionType"/>
-    </xs:simpleType>
-   
-    <xs:simpleType name="componentName">
-        <xs:union memberTypes="components:componentNameType components:expressionType" />
-    </xs:simpleType>
-    
-    <xs:simpleType name="scopeType">
-        <xs:restriction base="xs:token">
-            <xs:enumeration value="stateless"/>
-            <xs:enumeration value="event"/>
-            <xs:enumeration value="page"/>
-            <xs:enumeration value="conversation"/>
-            <xs:enumeration value="session"/>
-            <xs:enumeration value="business_process"/>
-            <xs:enumeration value="application"/>
-            <xs:enumeration value="STATELESS"/>
-            <xs:enumeration value="EVENT"/>
-            <xs:enumeration value="PAGE"/>
-            <xs:enumeration value="CONVERSATION"/>
-            <xs:enumeration value="SESSION"/>
-            <xs:enumeration value="BUSINESS_PROCESS"/>
-            <xs:enumeration value="APPLICATION"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="implementationType">
-        <xs:restriction base="xs:token">
-            <xs:enumeration value="hash"/>
-            <xs:enumeration value="linked"/>
-            <xs:enumeration value="tree"/>
-            <xs:enumeration value="HASH"/>
-            <xs:enumeration value="LINKED"/>
-            <xs:enumeration value="TREE"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="precedenceType">
-        <xs:restriction base="xs:int">
-            <xs:enumeration value="0"/>
-            <xs:enumeration value="10"/>
-            <xs:enumeration value="20"/>
-            <xs:enumeration value="30"/>
-            <xs:enumeration value="40"/>
-        </xs:restriction>
-    </xs:simpleType>
-</xs:schema>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/components-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/components-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/components-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,371 @@
+<?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/components"
+           xmlns:components="http://jboss.com/products/seam/components">
+    <xs:annotation>
+        <xs:documentation> 
+            The top-level schema for a Seam components.xml. For more information on Seam, see
+            http://www.seamframework.org. 
+        </xs:documentation>
+    </xs:annotation>
+
+    <xs:element name="components">
+        <xs:annotation>
+            <xs:documentation> The components tag is a the root element for a components.xml containing multiples
+                component definitions. </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="components:component"/>
+                <xs:element ref="components:factory"/>
+                <xs:element ref="components:event"/>
+                <xs:element ref="components:import"/>
+                <xs:any namespace="##other" processContents="strict"/>
+            </xs:choice>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="component">
+        <xs:annotation>
+            <xs:documentation> The component tag defines a single Seam component. It may serve as to the root element of
+                a fine-grained *.component.xml file. </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="components:property"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="components:attlist.ejbcomponent"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="import" type="xs:string">
+        <xs:annotation>
+            <xs:documentation>
+                The import tag declares additional global component namespaces that will be in effect for
+                all components. 
+            </xs:documentation>
+        </xs:annotation>
+    </xs:element>
+
+    <xs:attributeGroup name="attlist.ejbcomponent">
+        <xs:attribute name="jndi-name" type="components:string">
+            <xs:annotation>
+                <xs:documentation> 
+                    The JNDI name used to lookup the component. This value is only used with EJB
+                    components that don't follow the global JNDI pattern. 
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:attributeGroup>
+
+    <xs:attributeGroup name="attlist.component">
+        <xs:attribute name="name" type="components:componentName">
+            <xs:annotation>
+                <xs:documentation>The name of component</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        
+        <xs:attribute name="class" type="components:componentName">
+            <xs:annotation>
+                <xs:documentation>The Java class of the component implementation</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+
+        <xs:attribute name="scope">
+            <xs:annotation>
+                <xs:documentation>The scope of the component</xs:documentation>
+            </xs:annotation>
+            
+            <xs:simpleType>
+                <xs:union memberTypes="components:scopeType components:expressionType"></xs:union>       
+            </xs:simpleType>
+        </xs:attribute>
+
+        <xs:attribute name="precedence" default="20">
+            <xs:annotation>
+                <xs:documentation>
+                    The precedence of the component, expressed as a positive integer.  Higher
+                    precedence components override lower precedence components.  The pre-definied precedence
+                    values are: 
+                    
+                    BUILT_IN = 0, 
+                    FRAMEWORK = 10,
+                    APPLICATION = 20,
+                    DEPLOYMENT = 30,
+                    MOCK = 40
+                </xs:documentation>
+            </xs:annotation>
+            <xs:simpleType>
+                <xs:union memberTypes="xs:nonNegativeInteger components:precedenceType components:expressionType"></xs:union>
+            </xs:simpleType>
+        </xs:attribute>
+        
+        <xs:attribute name="installed" default="true" type="components:boolean">
+            <xs:annotation>
+                <xs:documentation>
+                    The installed value indicates whether or not the component definition should be installed.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        
+        <xs:attribute name="auto-create" default="false" type="components:boolean">
+            <xs:annotation>
+                <xs:documentation>
+                    Indicates whether or not a components instance should be created when
+                    one doesn't exist and when the component is requested using a method that 
+                    would not normally instantiate a new instance.  (such as basic injection)
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        
+        <xs:attribute name="startup" default="false" type="components:boolean">
+            <xs:annotation>
+                <xs:documentation>
+                    Indicates that an instance of the component should be created when the 
+                    the component's controlling scope starts.  This is only used for application and
+                    session scope.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        
+        <xs:attribute name="startupDepends" type="components:string">
+            <xs:annotation>
+                <xs:documentation>
+                    A list of component names that this component depends on and that should be created before
+                    this component is started.
+                </xs:documentation>
+            </xs:annotation></xs:attribute>
+    </xs:attributeGroup>
+    
+    <xs:element name="factory">
+        <xs:annotation>
+            <xs:documentation>
+                Factories are like a component instances except their values are 
+                determined by computing a value or calling a method on another 
+                component.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="components:attlist.factory"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.factory">
+        <xs:attribute name="name" use="required">
+            <xs:annotation>
+                <xs:documentation>The name of the factory component</xs:documentation>
+            </xs:annotation></xs:attribute>
+       
+        <xs:attribute name="method">
+            <xs:annotation>
+                <xs:documentation>
+                     The method binding used to evauluate the factory value.  A factory should have either
+                     a method binding or a value binding, but not both.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        
+        <xs:attribute name="value">
+            <xs:annotation>
+                <xs:documentation>
+                     The value binding used to evauluate the factory value.  A factory should have either
+                     a method binding or a value binding, but not both.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        
+        <xs:attribute name="scope">
+            <xs:annotation>
+                <xs:documentation>The scope of the factory value</xs:documentation>
+            </xs:annotation>
+            
+            <xs:simpleType>
+                <xs:union memberTypes="components:scopeType components:expressionType"></xs:union>       
+            </xs:simpleType>
+        </xs:attribute>
+        
+        <xs:attribute name="auto-create" default="false" type="components:boolean">
+            <xs:annotation>
+                <xs:documentation>
+                    Indicates whether or not the factory value should be created when
+                    one doesn't exist and when the component is requested using a method that 
+                    would not normally instantiate a new instance.  (such as basic injection)
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:attributeGroup>
+    
+    
+    <xs:element name="property">
+        <xs:annotation>
+            <xs:documentation>
+                A generic property.  The body contains the value or values.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="components:key" />
+                <xs:element ref="components:value" />
+            </xs:choice>
+            <xs:attributeGroup ref="components:attlist.property"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.property">
+        <xs:attribute name="name" use="required" type="components:string">
+            <xs:annotation>
+                <xs:documentation>The property name</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+	<xs:attribute name="type" type="components:string" >
+            <xs:annotation>
+                <xs:documentation>Concrete type to use if the property is multi-valued</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:attributeGroup>
+    
+
+    <xs:element name="key" type="components:string">
+        <xs:annotation>
+            <xs:documentation>For map values, the key for the following value</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    
+    <xs:element name="value" type="components:string">
+        <xs:annotation>
+            <xs:documentation>
+                For list values, the value to be added.
+                For map values, the value for the preceding key
+            </xs:documentation>
+        </xs:annotation>
+    </xs:element>
+
+    <xs:complexType name="multiValuedProperty">
+        <xs:sequence minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="components:value"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="mapProperty">
+        <xs:sequence minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="components:key"/>
+            <xs:element ref="components:value"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:element name="event">
+        <xs:annotation>
+            <xs:documentation>An event handler definition</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="components:action"/>
+            </xs:choice>
+            <xs:attributeGroup ref="components:attlist.event"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.event">
+        <xs:attribute name="type" use="required" type="components:componentNameType" >
+            <xs:annotation>
+                <xs:documentation>The event type to handle</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:attributeGroup>
+
+    <xs:element name="action">
+        <xs:annotation>
+            <xs:documentation>The action to be taken when the event occurs</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="components:attlist.action"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.action">
+        <xs:attribute name="execute" use="required" type="components:elType">
+            <xs:annotation>
+                <xs:documentation>An EL expression to be invoked when the event is invoked</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:attributeGroup>
+
+    <xs:simpleType name="propertyType">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="@.+@"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="elType">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="\#\{.+\}"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <!-- place holder - need something more expressive -->
+    <xs:simpleType name="componentNameType">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1" />   
+        </xs:restriction>
+    </xs:simpleType>
+    
+    <xs:simpleType name="expressionType">
+        <xs:union memberTypes="components:elType components:propertyType"/>
+    </xs:simpleType>
+    
+    <xs:simpleType name="boolean">
+        <xs:union memberTypes="xs:boolean components:expressionType"/>
+    </xs:simpleType>
+
+    <xs:simpleType name="string">
+        <xs:union memberTypes="xs:string components:expressionType"/>
+    </xs:simpleType>
+    
+    <xs:simpleType name="int">
+        <xs:union memberTypes="xs:int components:expressionType"/>
+    </xs:simpleType>
+   
+    <xs:simpleType name="componentName">
+        <xs:union memberTypes="components:componentNameType components:expressionType" />
+    </xs:simpleType>
+    
+    <xs:simpleType name="scopeType">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="stateless"/>
+            <xs:enumeration value="event"/>
+            <xs:enumeration value="page"/>
+            <xs:enumeration value="conversation"/>
+            <xs:enumeration value="session"/>
+            <xs:enumeration value="business_process"/>
+            <xs:enumeration value="application"/>
+            <xs:enumeration value="STATELESS"/>
+            <xs:enumeration value="EVENT"/>
+            <xs:enumeration value="PAGE"/>
+            <xs:enumeration value="CONVERSATION"/>
+            <xs:enumeration value="SESSION"/>
+            <xs:enumeration value="BUSINESS_PROCESS"/>
+            <xs:enumeration value="APPLICATION"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="implementationType">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="hash"/>
+            <xs:enumeration value="linked"/>
+            <xs:enumeration value="tree"/>
+            <xs:enumeration value="HASH"/>
+            <xs:enumeration value="LINKED"/>
+            <xs:enumeration value="TREE"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="precedenceType">
+        <xs:restriction base="xs:int">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="10"/>
+            <xs:enumeration value="20"/>
+            <xs:enumeration value="30"/>
+            <xs:enumeration value="40"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/core-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/core-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/core-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,115 +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/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:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element name="interceptors" type="components:multiValuedProperty">
-                    <xs:annotation>
-                        <xs:documentation>A list of interceptors that should be enabled for all components. You must specify all built-in interceptors as well as any additional interceptors. Execution order is determined by the around and within attributes on the @Interceptor annotation.
-                        
-These interceptors are enabled by default:
-   org.jboss.seam.core.SynchronizationInterceptor
-   org.jboss.seam.async.AsynchronousInterceptor
-   org.jboss.seam.ejb.RemoveInterceptor
-   org.jboss.seam.persistence.HibernateSessionProxyInterceptor
-   org.jboss.seam.persistence.EntityManagerProxyInterceptor
-   org.jboss.seam.core.MethodContextInterceptor
-   org.jboss.seam.core.EventInterceptor
-   org.jboss.seam.core.ConversationalInterceptor
-   org.jboss.seam.bpm.BusinessProcessInterceptor
-   org.jboss.seam.core.ConversationInterceptor
-   org.jboss.seam.core.BijectionInterceptor
-   org.jboss.seam.transaction.RollbackInterceptor
-   org.jboss.seam.transaction.TransactionInterceptor
-   org.jboss.seam.webservice.WSSecurityInterceptor
-   org.jboss.seam.security.SecurityInterceptor
-   
-The distributable flag appends the ManagedEntityInterceptor to this list (applies only to conversation-scoped components).</xs:documentation>
-                    </xs:annotation>
-                </xs:element>
-            </xs:choice>
-            <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" type="components:boolean" />
-        <xs:attribute name="distributable" type="components:boolean" />
-        <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: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="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:attribute name="default-flush-mode">
-            <xs:simpleType>
-                <xs:restriction base="xs:token">
-                    <xs:enumeration value="MANUAL"/>
-                    <xs:enumeration value="AUTO"/>
-                    <xs:enumeration value="COMMIT"/>
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
-    </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 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:attributeGroup name="attlist.resourceLoader">
-        <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" type="components:string" />
-    </xs:attributeGroup>
-</xs:schema>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/core-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/core-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/core-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,115 @@
+<?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/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.2.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:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="interceptors" type="components:multiValuedProperty">
+                    <xs:annotation>
+                        <xs:documentation>A list of interceptors that should be enabled for all components. You must specify all built-in interceptors as well as any additional interceptors. Execution order is determined by the around and within attributes on the @Interceptor annotation.
+                        
+These interceptors are enabled by default:
+   org.jboss.seam.core.SynchronizationInterceptor
+   org.jboss.seam.async.AsynchronousInterceptor
+   org.jboss.seam.ejb.RemoveInterceptor
+   org.jboss.seam.persistence.HibernateSessionProxyInterceptor
+   org.jboss.seam.persistence.EntityManagerProxyInterceptor
+   org.jboss.seam.core.MethodContextInterceptor
+   org.jboss.seam.core.EventInterceptor
+   org.jboss.seam.core.ConversationalInterceptor
+   org.jboss.seam.bpm.BusinessProcessInterceptor
+   org.jboss.seam.core.ConversationInterceptor
+   org.jboss.seam.core.BijectionInterceptor
+   org.jboss.seam.transaction.RollbackInterceptor
+   org.jboss.seam.transaction.TransactionInterceptor
+   org.jboss.seam.webservice.WSSecurityInterceptor
+   org.jboss.seam.security.SecurityInterceptor
+   
+The distributable flag appends the ManagedEntityInterceptor to this list (applies only to conversation-scoped components).</xs:documentation>
+                    </xs:annotation>
+                </xs:element>
+            </xs:choice>
+            <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" type="components:boolean" />
+        <xs:attribute name="distributable" type="components:boolean" />
+        <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: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="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:attribute name="default-flush-mode">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="MANUAL"/>
+                    <xs:enumeration value="AUTO"/>
+                    <xs:enumeration value="COMMIT"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </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 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:attributeGroup name="attlist.resourceLoader">
+        <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" type="components:string" />
+    </xs:attributeGroup>
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/document-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/document-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/document-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,41 +0,0 @@
-<?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>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/document-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/document-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/document-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -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.2.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>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/drools-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/drools-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/drools-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,58 +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/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"/>
-            </xs:choice>
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="drools:attlist.RuleBase"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="rule-files" type="components:multiValuedProperty"/>
-    <xs:attributeGroup name="attlist.RuleBase">
-        <xs:attribute name="dsl-file" type="components:string"/>
-        <xs:attribute name="rule-files" type="components:string"/>        
-    </xs:attributeGroup>
-
-    <xs:element name="rule-agent">
-        <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="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="components:expressionType"/>
-    </xs:attributeGroup>
-
-</xs:schema>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/drools-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/drools-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/drools-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,58 @@
+<?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/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.2.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"/>
+            </xs:choice>
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="drools:attlist.RuleBase"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="rule-files" type="components:multiValuedProperty"/>
+    <xs:attributeGroup name="attlist.RuleBase">
+        <xs:attribute name="dsl-file" type="components:string"/>
+        <xs:attribute name="rule-files" type="components:string"/>        
+    </xs:attributeGroup>
+
+    <xs:element name="rule-agent">
+        <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="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="components:expressionType"/>
+    </xs:attributeGroup>
+
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/framework-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/framework-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/framework-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,171 +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/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: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" name="hints" type="components:mapProperty" />
-            </xs:choice>
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="framework:attlist.Query"/>
-            <xs:attributeGroup ref="framework:attlist.entityQuery"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.entityQuery">
-        <xs:attribute name="entity-manager" type="xs:string"/>
-    </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:choice>
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="framework:attlist.Query"/>
-            <xs:attributeGroup ref="framework:attlist.HibernateEntityQuery"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.HibernateEntityQuery">
-        <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="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="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"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="framework:created-message"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="framework:updated-message"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="framework:deleted-message"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="framework:new-instance"/>
-            </xs:choice>
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="framework:attlist.Home"/>
-            <xs:attributeGroup ref="framework:attlist.EntityHome"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.EntityHome">
-        <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"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="framework:created-message"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="framework:updated-message"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="framework:deleted-message"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="framework:new-instance"/>
-            </xs:choice>
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="framework:attlist.Home"/>
-            <xs:attributeGroup ref="framework:attlist.HibernateEntityHome"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.HibernateEntityHome">
-        <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>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/framework-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/framework-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/framework-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,171 @@
+<?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/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.2.xsd"/>
+
+    <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" name="hints" type="components:mapProperty" />
+            </xs:choice>
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="framework:attlist.Query"/>
+            <xs:attributeGroup ref="framework:attlist.entityQuery"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.entityQuery">
+        <xs:attribute name="entity-manager" type="xs:string"/>
+    </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:choice>
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="framework:attlist.Query"/>
+            <xs:attributeGroup ref="framework:attlist.HibernateEntityQuery"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.HibernateEntityQuery">
+        <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="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="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"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="framework:created-message"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="framework:updated-message"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="framework:deleted-message"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="framework:new-instance"/>
+            </xs:choice>
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="framework:attlist.Home"/>
+            <xs:attributeGroup ref="framework:attlist.EntityHome"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.EntityHome">
+        <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"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="framework:created-message"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="framework:updated-message"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="framework:deleted-message"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="framework:new-instance"/>
+            </xs:choice>
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="framework:attlist.Home"/>
+            <xs:attributeGroup ref="framework:attlist.HibernateEntityHome"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.HibernateEntityHome">
+        <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>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/international-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/international-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/international-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,72 +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/international" xmlns:international="http://jboss.com/products/seam/international"
-    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="locale-config">
-        <xs:annotation>
-            <xs:documentation>
-                Locale configuration component. An alternative to configuring
-                the locale in the JSF configuration file.
-            </xs:documentation>
-        </xs:annotation>
-        <xs:complexType mixed="true">
-            <xs:choice minOccurs="0" maxOccurs="1">
-                <xs:element name="supported-locales" type="components:multiValuedProperty"/>
-            </xs:choice>
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="international:attlist.localeConfig"/>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:attributeGroup name="attlist.localeConfig">
-        <xs:attribute name="default-locale" type="components:string"/>
-        <xs:attribute name="supported-locales" type="components:string"/>
-    </xs:attributeGroup>
-
-    <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" 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" 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-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: branches/community/Seam_2_2/src/main/org/jboss/seam/international-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/international-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/international-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,72 @@
+<?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/international" xmlns:international="http://jboss.com/products/seam/international"
+    xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+    <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.2.xsd"/>
+
+    <xs:element name="locale-config">
+        <xs:annotation>
+            <xs:documentation>
+                Locale configuration component. An alternative to configuring
+                the locale in the JSF configuration file.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:choice minOccurs="0" maxOccurs="1">
+                <xs:element name="supported-locales" type="components:multiValuedProperty"/>
+            </xs:choice>
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="international:attlist.localeConfig"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:attributeGroup name="attlist.localeConfig">
+        <xs:attribute name="default-locale" type="components:string"/>
+        <xs:attribute name="supported-locales" type="components:string"/>
+    </xs:attributeGroup>
+
+    <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" 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" 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-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>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/jms-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/jms-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/jms-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,46 +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/jms" xmlns:jms="http://jboss.com/products/seam/jms"
-    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="topic-connection">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="jms:attlist.TopicConnection"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.TopicConnection">
-        <xs:attribute name="topic-connection-factory-jndi-name" type="components:string"/>
-    </xs:attributeGroup>
-
-    <xs:element name="queue-connection">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="jms:attlist.QueueConnection"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.QueueConnection">
-        <xs:attribute name="queue-connection-factory-jndi-name" type="components:string"/>
-    </xs:attributeGroup>
-
-    <xs:element name="managed-topic-publisher">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="jms:attlist.ManagedTopicPublisher"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.ManagedTopicPublisher">
-        <xs:attribute name="topic-jndi-name" type="components:string"/>
-    </xs:attributeGroup>
-
-    <xs:element name="managed-queue-sender">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="jms:attlist.ManagedQueueSender"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.ManagedQueueSender">
-        <xs:attribute name="queue-jndi-name" type="components:string"/>
-    </xs:attributeGroup>
-</xs:schema>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/jms-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/jms-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/jms-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,46 @@
+<?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/jms" xmlns:jms="http://jboss.com/products/seam/jms"
+    xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+    <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.2.xsd"/>
+
+    <xs:element name="topic-connection">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="jms:attlist.TopicConnection"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.TopicConnection">
+        <xs:attribute name="topic-connection-factory-jndi-name" type="components:string"/>
+    </xs:attributeGroup>
+
+    <xs:element name="queue-connection">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="jms:attlist.QueueConnection"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.QueueConnection">
+        <xs:attribute name="queue-connection-factory-jndi-name" type="components:string"/>
+    </xs:attributeGroup>
+
+    <xs:element name="managed-topic-publisher">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="jms:attlist.ManagedTopicPublisher"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.ManagedTopicPublisher">
+        <xs:attribute name="topic-jndi-name" type="components:string"/>
+    </xs:attributeGroup>
+
+    <xs:element name="managed-queue-sender">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="jms:attlist.ManagedQueueSender"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.ManagedQueueSender">
+        <xs:attribute name="queue-jndi-name" type="components:string"/>
+    </xs:attributeGroup>
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/mail-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/mail-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/mail-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,61 +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/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: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="meldware">
-        <xs:annotation>
-            <xs:documentation></xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <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="meldware-user">
-        <xs:annotation>
-            <xs:documentation></xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <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>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/mail-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/mail-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/mail-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,61 @@
+<?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/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.2.xsd"/>
+    
+    <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="meldware">
+        <xs:annotation>
+            <xs:documentation></xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <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="meldware-user">
+        <xs:annotation>
+            <xs:documentation></xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <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>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/navigation-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/navigation-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/navigation-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,35 +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/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 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:attributeGroup name="attlist.pages">
-        <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>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/navigation-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/navigation-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/navigation-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,35 @@
+<?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/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.2.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 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:attributeGroup name="attlist.pages">
+        <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>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/pageflow-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/pageflow-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/pageflow-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,326 +0,0 @@
-<?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>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/pageflow-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/pageflow-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/pageflow-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -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>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/pages-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/pages-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/pages-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,643 +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/pages" 
-           xmlns:pages="http://jboss.com/products/seam/pages">
-
-    <xs:annotation>
-        <xs:documentation>About this format ...</xs:documentation>
-    </xs:annotation>
-    
-    <xs:element name="pages">
-        <xs:annotation>
-            <xs:documentation>The root of a pages.xml file</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element ref="pages:conversation"/>
-                <xs:element ref="pages:page"/>
-                <xs:element ref="pages:exception"/>
-            </xs:choice>
-            <xs:attributeGroup ref="pages:attlist.pages"/>
-        </xs:complexType>
-        <xs:key name="conversation-key">
-            <xs:annotation>
-                <xs:documentation><p>You can read this as:</p>
-                  <p>The pages element has a bunch of conversation elements, and for each of those conversation elements, they must have a unique name within this document.</p>
-                </xs:documentation>
-            </xs:annotation>
-            <xs:selector xpath="conversation"/>
-            <xs:field xpath="name"/>
-        </xs:key>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.pages">
-        <xs:attribute name="no-conversation-view-id" type="pages:view-id" />
-        <xs:attribute name="login-view-id" type="pages:view-id"/>
-        <xs:attribute name="http-port" type="xs:unsignedLong"/>
-        <xs:attribute name="https-port" type="xs:unsignedLong"/>
-    </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"/>
-                <xs:choice>
-                    <xs:element ref="pages:http-error"/>
-                    <xs:element ref="pages:redirect"/>
-                </xs:choice>
-            </xs:sequence>
-            <xs:attributeGroup ref="pages:attlist.exception"/>
-        </xs:complexType>
-    </xs:element>
-    <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>
-    
-    <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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.conversation">
-        <xs:attribute name="name" use="required" type="xs:token" />
-        <xs:attribute name="parameter-name" use="required" type="xs:token" />
-        <xs:attribute name="parameter-value" type="xs:token" />
-    </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>
-            <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element ref="pages:restrict"/>
-                <xs:element ref="pages:description"/>
-                <xs:element ref="pages:param"/>
-                <xs:element ref="pages:header" />
-                <xs:element ref="pages:rewrite" />
-                <xs:element ref="pages:begin-conversation"/>
-                <xs:element ref="pages:end-conversation"/>
-                <xs:element ref="pages:start-task"/>
-                <xs:element ref="pages:begin-task"/>
-                <xs:element ref="pages:end-task"/>
-                <xs:element ref="pages:create-process"/>
-                <xs:element ref="pages:resume-process"/>
-                <xs:element ref="pages:in"/>
-                <xs:element ref="pages:raise-event"/>
-                <xs:element ref="pages:action"/>
-                <xs:element ref="pages:navigation"/>
-            </xs:choice>
-            <xs:attributeGroup ref="pages:attlist.page"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.page">
-        <xs:attribute name="action" type="xs:token" />
-        <xs:attribute name="view-id" type="pages:view-id"/>
-        <xs:attribute name="switch" default="enabled" type="pages:ableness"/>
-        <xs:attribute name="no-conversation-view-id" type="pages:view-id" />
-        <xs:attribute name="conversation-required" default="false" type="pages:tf-boolean"/>
-        <xs:attribute name="login-required" default="false" type="pages:tf-boolean"/>
-        <xs:attribute name="scheme" type="pages:schemes" />
-        <xs:attribute name="timeout" type="xs:unsignedLong" />
-        <xs:attribute name="concurrent-request-timeout" type="xs:unsignedLong" >
-            <xs:annotation>
-                <xs:documentation>
-                    Requests to conversations are serialized by default, and if
-                    a lock cannot be acquired in time, the request will be 
-                    dropped. You can set the timeout on a page-by-page basis 
-                    here.
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="bundle" type="xs:token" />
-        <xs:attribute name="conversation" type="xs:token" />
-        <xs:attribute name="expires" type="xs:unsignedLong" /> 
-        <xs:attribute name="validate-model" default="true" type="pages:tf-boolean"/>
-    </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>
-    </xs:element>
-
-    <xs:attributeGroup name="attlist.param">
-        <xs:attribute name="name" type="xs:token" />
-        <xs:attribute name="value" type="xs:token" />
-        <xs:attribute name="converter" type="xs:token" />
-        <xs:attribute name="converterId" type="xs:token" />
-        <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">
-        <xs:annotation>
-            <xs:documentation>HTTP headers to be added</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:attributeGroup ref="pages:attlist.header"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.header">
-        <xs:attribute name="name" use="required" type="xs:token" />
-        <xs:attribute name="value" type="xs:token" />
-    </xs:attributeGroup>
-    
-    <xs:element name="rewrite">
-        <xs:annotation>
-            <xs:documentation>URL rewriting pattern for this view</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:attributeGroup ref="pages:attlist.rewrite"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.rewrite">
-        <xs:attribute name="pattern" use="required" type="xs:token" />
-    </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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.action">
-        <xs:attribute name="if" type="pages:boolean-value-expression" />
-        <xs:attribute name="on-postback" default="true" type="pages:tf-boolean"/>
-        <xs:attribute name="execute" use="required" type="pages:method-expression" />
-    </xs:attributeGroup>
-    
-    <xs:element name="restrict" type="pages:boolean-value-expression" default="true">
-        <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>
-                    <xs:choice minOccurs="0">
-                        <xs:element ref="pages:begin-conversation"/>
-                        <xs:element ref="pages:end-conversation"/>
-                        <xs:element ref="pages:start-task"/>
-                        <xs:element ref="pages:begin-task"/>
-                        <xs:element ref="pages:end-task"/>
-                        <xs:element ref="pages:create-process"/>
-                        <xs:element ref="pages:resume-process"/>
-                    </xs:choice>
-                    <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/>
-                    <xs:element minOccurs="0" ref="pages:raise-event" maxOccurs="1"/>
-                    <xs:choice minOccurs="0">
-                        <xs:element ref="pages:render"/>
-                        <xs:element ref="pages:redirect"/>
-                    </xs:choice>
-                </xs:sequence>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:rule"/>
-            </xs:choice>
-            <xs:attributeGroup ref="pages:attlist.navigation"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.navigation">
-        <xs:attribute name="from-action" type="pages:from-action-expression" />
-        <xs:attribute name="evaluate" type="pages:method-expression" />
-    </xs:attributeGroup>
-    
-    <xs:element name="rule">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:choice minOccurs="0">
-                    <xs:element ref="pages:begin-conversation"/>
-                    <xs:element ref="pages:end-conversation"/>
-                    <xs:element ref="pages:start-task"/>
-                    <xs:element ref="pages:begin-task"/>
-                    <xs:element ref="pages:end-task"/>
-                    <xs:element ref="pages:create-process"/>
-                    <xs:element ref="pages:resume-process"/>
-                </xs:choice>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/>
-                <xs:element minOccurs="0" ref="pages:raise-event"/>
-                <xs:choice minOccurs="0">
-                    <xs:element ref="pages:render"/>
-                    <xs:element ref="pages:redirect"/>
-                </xs:choice>
-            </xs:sequence>
-            <xs:attributeGroup ref="pages:attlist.rule"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.rule">
-        <xs:attribute name="if-outcome" type="pages:outcome-expression" />
-        <xs:attribute name="if" type="pages:boolean-value-expression" />
-    </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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.raise-event">
-        <xs:attribute name="type" use="required" type="xs:token" />
-    </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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.begin-conversation">
-        <xs:attribute name="join" default="false" type="pages:tf-boolean"/>
-        <xs:attribute name="nested" default="false" type="pages:tf-boolean"/>
-        <xs:attribute name="pageflow" type="xs:token" />
-        <xs:attribute name="flush-mode" type="pages:flush-modes" />
-        <xs:attribute name="if" type="pages:boolean-value-expression" />
-        <xs:attribute name="conversation" type="xs:token" />
-    </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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.end-conversation">
-        <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean"/>
-        <xs:attribute name="root" default="false" type="pages:tf-boolean"/>
-        <xs:attribute name="if" type="pages:boolean-value-expression" />
-    </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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.begin-task">
-        <xs:attribute name="task-id" type="xs:token" />
-        <xs:attribute name="pageflow" type="xs:token" />
-        <xs:attribute name="flush-mode" type="pages:flush-modes" />
-    </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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.start-task">
-        <xs:attribute name="task-id" type="xs:token" />
-        <xs:attribute name="pageflow" type="xs:token" />
-        <xs:attribute name="flush-mode" type="pages:flush-modes" />
-    </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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.end-task">
-        <xs:attribute name="transition" type="xs:token" />
-        <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean" />
-    </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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.create-process">
-        <xs:attribute name="definition" type="xs:token" />
-    </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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.resume-process">
-        <xs:attribute name="process-id" type="xs:token" />
-    </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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.in">
-        <xs:attribute name="name" use="required" type="xs:token" />
-        <xs:attribute name="scope" type="pages:allowed-scopes" />
-        <xs:attribute name="value" use="required" type="xs:token" />
-    </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>
-    </xs:element>
-    <xs:attributeGroup name="attlist.out">
-        <xs:attribute name="name" use="required" type="xs:token" />
-        <xs:attribute name="scope" default="CONVERSATION" type="pages:allowed-scopes" />
-        <xs:attribute name="value" use="required" type="xs:token" />
-    </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"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="pages:attlist.render"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.render">
-        <xs:attribute name="view-id" type="pages:view-id-expression" />
-    </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"/>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:param"/>
-            </xs:sequence>
-            
-            <xs:attributeGroup ref="pages:attlist.redirect"/>  
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.redirect">
-        <xs:attribute name="view-id" type="pages:view-id-expression" />
-        <xs:attribute name="url" type="pages:url-expression" />
-        <xs:attribute name="include-page-params" type="pages:tf-boolean" />
-    </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"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="pages:attlist.http-error"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.http-error">
-        <xs:attribute name="error-code" use="required" type="xs:unsignedLong" />
-    </xs:attributeGroup>
-    
-    <xs:element name="message">
-        <xs:annotation>
-            <xs:documentation>Add a message to the faces messages</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:simpleContent>
-                <xs:extension base="xs:string">
-                    <xs:attributeGroup ref="pages:attlist.message"/>
-                </xs:extension>
-            </xs:simpleContent>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.message">
-        <xs:attribute name="for" type="xs:token"/>
-        <xs:attribute name="severity" default="INFO" type="pages:loglevel-values" />
-    </xs:attributeGroup>
-    
-    <xs:element name="description" type="xs:string">
-        <xs:annotation>
-            <xs:documentation>A page description for workflow switching</xs:documentation>
-        </xs:annotation>
-    </xs:element>
-
-    <xs:simpleType name="url">
-        <xs:restriction base="xs:anyURI">
-          <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>
-
-    <xs:simpleType name="schemes">
-        <xs:restriction base="xs:token">
-            <xs:enumeration value="https"/>
-            <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: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"/>
-            <xs:enumeration value="disabled"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="tf-boolean">
-        <xs:annotation>
-            <xs:documentation>
-              <p>Allows for the following values:</p>
-              <ul>
-                <li>true</li>
-                <li>false</li>
-              </ul>
-            </xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="xs:boolean">
-            <xs:pattern value="true"/>
-            <xs:pattern value="false"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="allowed-scopes">
-        <xs:restriction base="xs:token">
-           <xs:enumeration value="stateless"/>
-            <xs:enumeration value="event"/>
-            <xs:enumeration value="page"/>
-            <xs:enumeration value="conversation"/>
-            <xs:enumeration value="session"/>
-            <xs:enumeration value="business_process"/>
-            <xs:enumeration value="application"/>
-            <xs:enumeration value="STATELESS"/>
-            <xs:enumeration value="EVENT"/>
-            <xs:enumeration value="PAGE"/>
-            <xs:enumeration value="CONVERSATION"/>
-            <xs:enumeration value="SESSION"/>
-            <xs:enumeration value="BUSINESS_PROCESS"/>
-            <xs:enumeration value="APPLICATION"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="loglevel-values">
-        <xs:restriction base="xs:token">
-            <xs:enumeration value="info"/>
-            <xs:enumeration value="warn"/>
-            <xs:enumeration value="error"/>
-            <xs:enumeration value="fatal"/>
-            <xs:enumeration value="debug"/>
-            <xs:enumeration value="trace"/>
-            <xs:enumeration value="INFO"/>
-            <xs:enumeration value="WARN"/>
-            <xs:enumeration value="ERROR"/>
-            <xs:enumeration value="FATAL"/>
-            <xs:enumeration value="DEBUG"/>
-            <xs:enumeration value="TRACE"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="http-error-codes">
-        <xs:annotation>
-            <xs:documentation><p><b>Note:</b> These do not include the HTTP extensions.</p></xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="xs:token">
-            <xs:enumeration value="100"/>
-            <xs:enumeration value="101"/>
-            <xs:enumeration value="200"/>
-            <xs:enumeration value="201"/>
-            <xs:enumeration value="202"/>
-            <xs:enumeration value="203"/>
-            <xs:enumeration value="204"/>
-            <xs:enumeration value="205"/>
-            <xs:enumeration value="206"/>
-            <xs:enumeration value="300"/>
-            <xs:enumeration value="301"/>
-            <xs:enumeration value="302"/>
-            <xs:enumeration value="303"/>
-            <xs:enumeration value="304"/>
-            <xs:enumeration value="305"/>
-            <xs:enumeration value="306"/>
-            <xs:enumeration value="307"/>
-            <xs:enumeration value="400"/>
-            <xs:enumeration value="401"/>
-            <xs:enumeration value="402"/>
-            <xs:enumeration value="403"/>
-            <xs:enumeration value="404"/>
-            <xs:enumeration value="405"/>
-            <xs:enumeration value="406"/>
-            <xs:enumeration value="407"/>
-            <xs:enumeration value="408"/>
-            <xs:enumeration value="409"/>
-            <xs:enumeration value="410"/>
-            <xs:enumeration value="411"/>
-            <xs:enumeration value="412"/>
-            <xs:enumeration value="413"/>
-            <xs:enumeration value="414"/>
-            <xs:enumeration value="415"/>
-            <xs:enumeration value="416"/>
-            <xs:enumeration value="417"/>
-            <xs:enumeration value="500"/>
-            <xs:enumeration value="501"/>
-            <xs:enumeration value="502"/>
-            <xs:enumeration value="503"/>
-            <xs:enumeration value="504"/>
-            <xs:enumeration value="505"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="flush-modes">
-        <xs:restriction base="xs:token">
-            <xs:enumeration value="manual"/>
-            <xs:enumeration value="auto"/>
-            <xs:enumeration value="commit"/>
-            <xs:enumeration value="MANUAL"/>
-            <xs:enumeration value="AUTO"/>
-            <xs:enumeration value="COMMIT"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="method-expression">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="#\{.*\}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    
-    <xs:simpleType name="value-expression">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="#\{.*\}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    
-    <xs:simpleType name="boolean-value-expression">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="true|false|#\{.*\}"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-</xs:schema>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/pages-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/pages-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/pages-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,643 @@
+<?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/pages" 
+           xmlns:pages="http://jboss.com/products/seam/pages">
+
+    <xs:annotation>
+        <xs:documentation>About this format ...</xs:documentation>
+    </xs:annotation>
+    
+    <xs:element name="pages">
+        <xs:annotation>
+            <xs:documentation>The root of a pages.xml file</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="pages:conversation"/>
+                <xs:element ref="pages:page"/>
+                <xs:element ref="pages:exception"/>
+            </xs:choice>
+            <xs:attributeGroup ref="pages:attlist.pages"/>
+        </xs:complexType>
+        <xs:key name="conversation-key">
+            <xs:annotation>
+                <xs:documentation><p>You can read this as:</p>
+                  <p>The pages element has a bunch of conversation elements, and for each of those conversation elements, they must have a unique name within this document.</p>
+                </xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath="conversation"/>
+            <xs:field xpath="name"/>
+        </xs:key>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.pages">
+        <xs:attribute name="no-conversation-view-id" type="pages:view-id" />
+        <xs:attribute name="login-view-id" type="pages:view-id"/>
+        <xs:attribute name="http-port" type="xs:unsignedLong"/>
+        <xs:attribute name="https-port" type="xs:unsignedLong"/>
+    </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"/>
+                <xs:choice>
+                    <xs:element ref="pages:http-error"/>
+                    <xs:element ref="pages:redirect"/>
+                </xs:choice>
+            </xs:sequence>
+            <xs:attributeGroup ref="pages:attlist.exception"/>
+        </xs:complexType>
+    </xs:element>
+    <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>
+    
+    <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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.conversation">
+        <xs:attribute name="name" use="required" type="xs:token" />
+        <xs:attribute name="parameter-name" use="required" type="xs:token" />
+        <xs:attribute name="parameter-value" type="xs:token" />
+    </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>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="pages:restrict"/>
+                <xs:element ref="pages:description"/>
+                <xs:element ref="pages:param"/>
+                <xs:element ref="pages:header" />
+                <xs:element ref="pages:rewrite" />
+                <xs:element ref="pages:begin-conversation"/>
+                <xs:element ref="pages:end-conversation"/>
+                <xs:element ref="pages:start-task"/>
+                <xs:element ref="pages:begin-task"/>
+                <xs:element ref="pages:end-task"/>
+                <xs:element ref="pages:create-process"/>
+                <xs:element ref="pages:resume-process"/>
+                <xs:element ref="pages:in"/>
+                <xs:element ref="pages:raise-event"/>
+                <xs:element ref="pages:action"/>
+                <xs:element ref="pages:navigation"/>
+            </xs:choice>
+            <xs:attributeGroup ref="pages:attlist.page"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.page">
+        <xs:attribute name="action" type="xs:token" />
+        <xs:attribute name="view-id" type="pages:view-id"/>
+        <xs:attribute name="switch" default="enabled" type="pages:ableness"/>
+        <xs:attribute name="no-conversation-view-id" type="pages:view-id" />
+        <xs:attribute name="conversation-required" default="false" type="pages:tf-boolean"/>
+        <xs:attribute name="login-required" default="false" type="pages:tf-boolean"/>
+        <xs:attribute name="scheme" type="pages:schemes" />
+        <xs:attribute name="timeout" type="xs:unsignedLong" />
+        <xs:attribute name="concurrent-request-timeout" type="xs:unsignedLong" >
+            <xs:annotation>
+                <xs:documentation>
+                    Requests to conversations are serialized by default, and if
+                    a lock cannot be acquired in time, the request will be 
+                    dropped. You can set the timeout on a page-by-page basis 
+                    here.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="bundle" type="xs:token" />
+        <xs:attribute name="conversation" type="xs:token" />
+        <xs:attribute name="expires" type="xs:unsignedLong" /> 
+        <xs:attribute name="validate-model" default="true" type="pages:tf-boolean"/>
+    </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>
+    </xs:element>
+
+    <xs:attributeGroup name="attlist.param">
+        <xs:attribute name="name" type="xs:token" />
+        <xs:attribute name="value" type="xs:token" />
+        <xs:attribute name="converter" type="xs:token" />
+        <xs:attribute name="converterId" type="xs:token" />
+        <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">
+        <xs:annotation>
+            <xs:documentation>HTTP headers to be added</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="pages:attlist.header"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.header">
+        <xs:attribute name="name" use="required" type="xs:token" />
+        <xs:attribute name="value" type="xs:token" />
+    </xs:attributeGroup>
+    
+    <xs:element name="rewrite">
+        <xs:annotation>
+            <xs:documentation>URL rewriting pattern for this view</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="pages:attlist.rewrite"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.rewrite">
+        <xs:attribute name="pattern" use="required" type="xs:token" />
+    </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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.action">
+        <xs:attribute name="if" type="pages:boolean-value-expression" />
+        <xs:attribute name="on-postback" default="true" type="pages:tf-boolean"/>
+        <xs:attribute name="execute" use="required" type="pages:method-expression" />
+    </xs:attributeGroup>
+    
+    <xs:element name="restrict" type="pages:boolean-value-expression" default="true">
+        <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>
+                    <xs:choice minOccurs="0">
+                        <xs:element ref="pages:begin-conversation"/>
+                        <xs:element ref="pages:end-conversation"/>
+                        <xs:element ref="pages:start-task"/>
+                        <xs:element ref="pages:begin-task"/>
+                        <xs:element ref="pages:end-task"/>
+                        <xs:element ref="pages:create-process"/>
+                        <xs:element ref="pages:resume-process"/>
+                    </xs:choice>
+                    <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/>
+                    <xs:element minOccurs="0" ref="pages:raise-event" maxOccurs="1"/>
+                    <xs:choice minOccurs="0">
+                        <xs:element ref="pages:render"/>
+                        <xs:element ref="pages:redirect"/>
+                    </xs:choice>
+                </xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:rule"/>
+            </xs:choice>
+            <xs:attributeGroup ref="pages:attlist.navigation"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.navigation">
+        <xs:attribute name="from-action" type="pages:from-action-expression" />
+        <xs:attribute name="evaluate" type="pages:method-expression" />
+    </xs:attributeGroup>
+    
+    <xs:element name="rule">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:choice minOccurs="0">
+                    <xs:element ref="pages:begin-conversation"/>
+                    <xs:element ref="pages:end-conversation"/>
+                    <xs:element ref="pages:start-task"/>
+                    <xs:element ref="pages:begin-task"/>
+                    <xs:element ref="pages:end-task"/>
+                    <xs:element ref="pages:create-process"/>
+                    <xs:element ref="pages:resume-process"/>
+                </xs:choice>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/>
+                <xs:element minOccurs="0" ref="pages:raise-event"/>
+                <xs:choice minOccurs="0">
+                    <xs:element ref="pages:render"/>
+                    <xs:element ref="pages:redirect"/>
+                </xs:choice>
+            </xs:sequence>
+            <xs:attributeGroup ref="pages:attlist.rule"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.rule">
+        <xs:attribute name="if-outcome" type="pages:outcome-expression" />
+        <xs:attribute name="if" type="pages:boolean-value-expression" />
+    </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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.raise-event">
+        <xs:attribute name="type" use="required" type="xs:token" />
+    </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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.begin-conversation">
+        <xs:attribute name="join" default="false" type="pages:tf-boolean"/>
+        <xs:attribute name="nested" default="false" type="pages:tf-boolean"/>
+        <xs:attribute name="pageflow" type="xs:token" />
+        <xs:attribute name="flush-mode" type="pages:flush-modes" />
+        <xs:attribute name="if" type="pages:boolean-value-expression" />
+        <xs:attribute name="conversation" type="xs:token" />
+    </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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.end-conversation">
+        <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean"/>
+        <xs:attribute name="root" default="false" type="pages:tf-boolean"/>
+        <xs:attribute name="if" type="pages:boolean-value-expression" />
+    </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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.begin-task">
+        <xs:attribute name="task-id" type="xs:token" />
+        <xs:attribute name="pageflow" type="xs:token" />
+        <xs:attribute name="flush-mode" type="pages:flush-modes" />
+    </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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.start-task">
+        <xs:attribute name="task-id" type="xs:token" />
+        <xs:attribute name="pageflow" type="xs:token" />
+        <xs:attribute name="flush-mode" type="pages:flush-modes" />
+    </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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.end-task">
+        <xs:attribute name="transition" type="xs:token" />
+        <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean" />
+    </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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.create-process">
+        <xs:attribute name="definition" type="xs:token" />
+    </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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.resume-process">
+        <xs:attribute name="process-id" type="xs:token" />
+    </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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.in">
+        <xs:attribute name="name" use="required" type="xs:token" />
+        <xs:attribute name="scope" type="pages:allowed-scopes" />
+        <xs:attribute name="value" use="required" type="xs:token" />
+    </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>
+    </xs:element>
+    <xs:attributeGroup name="attlist.out">
+        <xs:attribute name="name" use="required" type="xs:token" />
+        <xs:attribute name="scope" default="CONVERSATION" type="pages:allowed-scopes" />
+        <xs:attribute name="value" use="required" type="xs:token" />
+    </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"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="pages:attlist.render"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.render">
+        <xs:attribute name="view-id" type="pages:view-id-expression" />
+    </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"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:param"/>
+            </xs:sequence>
+            
+            <xs:attributeGroup ref="pages:attlist.redirect"/>  
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.redirect">
+        <xs:attribute name="view-id" type="pages:view-id-expression" />
+        <xs:attribute name="url" type="pages:url-expression" />
+        <xs:attribute name="include-page-params" type="pages:tf-boolean" />
+    </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"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="pages:attlist.http-error"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.http-error">
+        <xs:attribute name="error-code" use="required" type="xs:unsignedLong" />
+    </xs:attributeGroup>
+    
+    <xs:element name="message">
+        <xs:annotation>
+            <xs:documentation>Add a message to the faces messages</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string">
+                    <xs:attributeGroup ref="pages:attlist.message"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.message">
+        <xs:attribute name="for" type="xs:token"/>
+        <xs:attribute name="severity" default="INFO" type="pages:loglevel-values" />
+    </xs:attributeGroup>
+    
+    <xs:element name="description" type="xs:string">
+        <xs:annotation>
+            <xs:documentation>A page description for workflow switching</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+
+    <xs:simpleType name="url">
+        <xs:restriction base="xs:anyURI">
+          <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>
+
+    <xs:simpleType name="schemes">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="https"/>
+            <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: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"/>
+            <xs:enumeration value="disabled"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="tf-boolean">
+        <xs:annotation>
+            <xs:documentation>
+              <p>Allows for the following values:</p>
+              <ul>
+                <li>true</li>
+                <li>false</li>
+              </ul>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:boolean">
+            <xs:pattern value="true"/>
+            <xs:pattern value="false"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="allowed-scopes">
+        <xs:restriction base="xs:token">
+           <xs:enumeration value="stateless"/>
+            <xs:enumeration value="event"/>
+            <xs:enumeration value="page"/>
+            <xs:enumeration value="conversation"/>
+            <xs:enumeration value="session"/>
+            <xs:enumeration value="business_process"/>
+            <xs:enumeration value="application"/>
+            <xs:enumeration value="STATELESS"/>
+            <xs:enumeration value="EVENT"/>
+            <xs:enumeration value="PAGE"/>
+            <xs:enumeration value="CONVERSATION"/>
+            <xs:enumeration value="SESSION"/>
+            <xs:enumeration value="BUSINESS_PROCESS"/>
+            <xs:enumeration value="APPLICATION"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="loglevel-values">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="info"/>
+            <xs:enumeration value="warn"/>
+            <xs:enumeration value="error"/>
+            <xs:enumeration value="fatal"/>
+            <xs:enumeration value="debug"/>
+            <xs:enumeration value="trace"/>
+            <xs:enumeration value="INFO"/>
+            <xs:enumeration value="WARN"/>
+            <xs:enumeration value="ERROR"/>
+            <xs:enumeration value="FATAL"/>
+            <xs:enumeration value="DEBUG"/>
+            <xs:enumeration value="TRACE"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="http-error-codes">
+        <xs:annotation>
+            <xs:documentation><p><b>Note:</b> These do not include the HTTP extensions.</p></xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="100"/>
+            <xs:enumeration value="101"/>
+            <xs:enumeration value="200"/>
+            <xs:enumeration value="201"/>
+            <xs:enumeration value="202"/>
+            <xs:enumeration value="203"/>
+            <xs:enumeration value="204"/>
+            <xs:enumeration value="205"/>
+            <xs:enumeration value="206"/>
+            <xs:enumeration value="300"/>
+            <xs:enumeration value="301"/>
+            <xs:enumeration value="302"/>
+            <xs:enumeration value="303"/>
+            <xs:enumeration value="304"/>
+            <xs:enumeration value="305"/>
+            <xs:enumeration value="306"/>
+            <xs:enumeration value="307"/>
+            <xs:enumeration value="400"/>
+            <xs:enumeration value="401"/>
+            <xs:enumeration value="402"/>
+            <xs:enumeration value="403"/>
+            <xs:enumeration value="404"/>
+            <xs:enumeration value="405"/>
+            <xs:enumeration value="406"/>
+            <xs:enumeration value="407"/>
+            <xs:enumeration value="408"/>
+            <xs:enumeration value="409"/>
+            <xs:enumeration value="410"/>
+            <xs:enumeration value="411"/>
+            <xs:enumeration value="412"/>
+            <xs:enumeration value="413"/>
+            <xs:enumeration value="414"/>
+            <xs:enumeration value="415"/>
+            <xs:enumeration value="416"/>
+            <xs:enumeration value="417"/>
+            <xs:enumeration value="500"/>
+            <xs:enumeration value="501"/>
+            <xs:enumeration value="502"/>
+            <xs:enumeration value="503"/>
+            <xs:enumeration value="504"/>
+            <xs:enumeration value="505"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="flush-modes">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="manual"/>
+            <xs:enumeration value="auto"/>
+            <xs:enumeration value="commit"/>
+            <xs:enumeration value="MANUAL"/>
+            <xs:enumeration value="AUTO"/>
+            <xs:enumeration value="COMMIT"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="method-expression">
+        <xs:restriction base="xs:token">
+            <xs:pattern value="#\{.*\}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    
+    <xs:simpleType name="value-expression">
+        <xs:restriction base="xs:token">
+            <xs:pattern value="#\{.*\}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    
+    <xs:simpleType name="boolean-value-expression">
+        <xs:restriction base="xs:token">
+            <xs:pattern value="true|false|#\{.*\}"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/persistence-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/persistence-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/persistence-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,88 +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/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">
-        <xs:complexType mixed="true">
-            <xs:sequence>
-            	<xs:choice minOccurs="0" maxOccurs="unbounded">
-    	            <xs:element ref="persistence:filters"/>
-	                <xs:element ref="persistence:persistence-unit-jndi-name" />
-                </xs:choice>
-            </xs:sequence>
-            <xs:attributeGroup ref="persistence:attlist.ManagedPersistenceContext"/>
-            <xs:attributeGroup ref="components:attlist.component"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.ManagedPersistenceContext">
-        <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">
-        <xs:complexType mixed="true">
-            <xs:sequence minOccurs="0" maxOccurs="1">
-                <xs:element ref="persistence:filters"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="persistence:attlist.ManagedHibernateSession"/>
-            <xs:attributeGroup ref="components:attlist.component"/>
-        </xs:complexType>
-    </xs:element>
-    <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">
-                <xs:element name="mapping-classes" type="components:multiValuedProperty"/>
-                <xs:element name="mapping-files" type="components:multiValuedProperty"/>
-                <xs:element name="mapping-jars" type="components:multiValuedProperty"/>
-                <xs:element name="mapping-packages" type="components:multiValuedProperty"/>
-                <xs:element name="mapping-resources" type="components:multiValuedProperty"/>
-                <xs:element name="naming-strategy" type="components:expressionType"/>
-                <xs:element name="cfg-properties" type="components:mapProperty"/>
-            </xs:choice>
-            <xs:attributeGroup ref="persistence:attlist.HibernateSessionFactory"/>
-            <xs:attributeGroup ref="components:attlist.component"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.HibernateSessionFactory">
-        <xs:attribute name="cfg-resource-name" type="components:string"/>
-    </xs:attributeGroup>
-
-    <xs:element name="entity-manager-factory">
-        <xs:complexType mixed="true">
-            <xs:sequence minOccurs="0" maxOccurs="1">
-                <xs:element name="persistence-unit-properties" type="components:mapProperty"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="persistence:attlist.EntityManagerFactory"/>
-            <xs:attributeGroup ref="components:attlist.component"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.EntityManagerFactory">
-        <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="components:string"/>
-                <xs:element minOccurs="0" name="parameters" type="components:mapProperty"/>
-            </xs:sequence>
-            <xs:attributeGroup ref="persistence:attlist.filter"/>
-            <xs:attributeGroup ref="components:attlist.component"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.filter">
-        <xs:attribute name="enabled" type="components:boolean" />
-    </xs:attributeGroup>
-
-</xs:schema>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/persistence-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/persistence-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/persistence-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +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/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.2.xsd"/>
+
+    <xs:element name="managed-persistence-context">
+        <xs:complexType mixed="true">
+            <xs:sequence>
+            	<xs:choice minOccurs="0" maxOccurs="unbounded">
+    	            <xs:element ref="persistence:filters"/>
+	                <xs:element ref="persistence:persistence-unit-jndi-name" />
+                </xs:choice>
+            </xs:sequence>
+            <xs:attributeGroup ref="persistence:attlist.ManagedPersistenceContext"/>
+            <xs:attributeGroup ref="components:attlist.component"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.ManagedPersistenceContext">
+        <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">
+        <xs:complexType mixed="true">
+            <xs:sequence minOccurs="0" maxOccurs="1">
+                <xs:element ref="persistence:filters"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="persistence:attlist.ManagedHibernateSession"/>
+            <xs:attributeGroup ref="components:attlist.component"/>
+        </xs:complexType>
+    </xs:element>
+    <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">
+                <xs:element name="mapping-classes" type="components:multiValuedProperty"/>
+                <xs:element name="mapping-files" type="components:multiValuedProperty"/>
+                <xs:element name="mapping-jars" type="components:multiValuedProperty"/>
+                <xs:element name="mapping-packages" type="components:multiValuedProperty"/>
+                <xs:element name="mapping-resources" type="components:multiValuedProperty"/>
+                <xs:element name="naming-strategy" type="components:expressionType"/>
+                <xs:element name="cfg-properties" type="components:mapProperty"/>
+            </xs:choice>
+            <xs:attributeGroup ref="persistence:attlist.HibernateSessionFactory"/>
+            <xs:attributeGroup ref="components:attlist.component"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.HibernateSessionFactory">
+        <xs:attribute name="cfg-resource-name" type="components:string"/>
+    </xs:attributeGroup>
+
+    <xs:element name="entity-manager-factory">
+        <xs:complexType mixed="true">
+            <xs:sequence minOccurs="0" maxOccurs="1">
+                <xs:element name="persistence-unit-properties" type="components:mapProperty"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="persistence:attlist.EntityManagerFactory"/>
+            <xs:attributeGroup ref="components:attlist.component"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.EntityManagerFactory">
+        <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="components:string"/>
+                <xs:element minOccurs="0" name="parameters" type="components:mapProperty"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="persistence:attlist.filter"/>
+            <xs:attributeGroup ref="components:attlist.component"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.filter">
+        <xs:attribute name="enabled" type="components:boolean" />
+    </xs:attributeGroup>
+
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/remoting-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/remoting-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/remoting-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,20 +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/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">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="remoting:attlist.remoting"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.remoting">
-        <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>
\ No newline at end of file

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/remoting-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/remoting-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/remoting-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,20 @@
+<?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/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.2.xsd"/>
+
+    <xs:element name="remoting">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="remoting:attlist.remoting"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.remoting">
+        <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>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/security-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/security-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/security-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,136 +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/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">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="security:attlist.identity"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.identity">
-        <xs:attribute name="authenticate-method" type="components:expressionType"/>
-        <xs:attribute name="remember-me" type="components:boolean"/>
-        <xs:attribute name="jaas-config-name" type="components:string"/>
-    </xs:attributeGroup>
-    
-    <xs:element name="remember-me">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="security:attlist.remember-me"/>
-        </xs:complexType>    
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.remember-me">
-        <xs:attribute name="cookie-max-age" type="components:int"/>
-        <xs:attribute name="enabled" type="components:boolean"/>
-    </xs:attributeGroup>
-    
-    <xs:element name="identity-manager">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="security:attlist.identity-manager"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:element name="jpa-identity-store">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="security:attlist.jpa-identity-store"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:element name="ldap-identity-store">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="security:attlist.ldap-identity-store"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:element name="permission-manager">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="security:attlist.permission-manager"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:element name="jpa-permission-store">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="security:attlist.jpa-permission-store"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:element name="rule-based-permission-resolver">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="security:attlist.rule-based-permission-resolver"/>        
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:element name="persistent-permission-resolver">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="security:attlist.persistent-permission-resolver"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.identity-manager">
-        <xs:attribute name="identity-store" type="components:expressionType"/>
-        <xs:attribute name="role-identity-store" type="components:expressionType"/>
-    </xs:attributeGroup>
-    
-    <xs:attributeGroup name="attlist.jpa-identity-store">
-        <xs:attribute name="entity-manager" type="components:string"/>
-        <xs:attribute name="user-class" type="components:string" use="required"/>
-        <xs:attribute name="role-class" type="components:string"/>
-        <xs:attribute name="features" type="components:string"/>
-    </xs:attributeGroup>     
-    
-    <xs:attributeGroup name="attlist.ldap-identity-store">
-        <xs:attribute name="server-address" type="components:string"/>
-        <xs:attribute name="server-port" type="components:string"/>
-        <xs:attribute name="bind-DN" type="components:string"/>
-        <xs:attribute name="bind-credentials" type="components:string"/>
-        <xs:attribute name="user-DN-prefix" type="components:string"/>
-        <xs:attribute name="user-DN-suffix" type="components:string"/>
-        <xs:attribute name="role-DN-prefix" type="components:string"/>
-        <xs:attribute name="role-DN-suffix" type="components:string"/>
-        <xs:attribute name="user-context-DN" type="components:string"/>
-        <xs:attribute name="role-context-DN" type="components:string"/>
-        <xs:attribute name="user-role-attribute" type="components:string"/>
-        <xs:attribute name="user-name-attribute" type="components:string"/>
-        <xs:attribute name="role-name-attribute" type="components:string"/>
-        <xs:attribute name="role-attribute-is-DN" type="components:boolean"/>
-        <xs:attribute name="user-object-classes" type="components:string"/>
-        <xs:attribute name="role-object-classes" type="components:string"/>
-        <xs:attribute name="enabled-attribute" type="components:string"/>
-        <xs:attribute name="search-scope" type="components:string"/>
-        <xs:attribute name="first-name-attribute" type="components:string"/>
-        <xs:attribute name="last-name-attribute" type="components:string"/>
-        <xs:attribute name="user-password-attribute" type="components:string"/>
-    </xs:attributeGroup>
-    
-    <xs:attributeGroup name="attlist.permission-manager">
-        <xs:attribute name="permission-store" type="components:expressionType"/>
-    </xs:attributeGroup>
-    
-    <xs:attributeGroup name="attlist.jpa-permission-store">
-        <xs:attribute name="entity-manager" type="components:string"/>
-        <xs:attribute name="user-permission-class" type="components:string"/>
-        <xs:attribute name="role-permission-class" type="components:string"/>
-    </xs:attributeGroup>
-    
-    <xs:attributeGroup name="attlist.rule-based-permission-resolver">
-        <xs:attribute name="security-rules" type="components:expressionType"/>
-    </xs:attributeGroup>
-
-    <xs:attributeGroup name="attlist.persistent-permission-resolver">
-        <xs:attribute name="permission-store" type="components:expressionType"/>
-    </xs:attributeGroup>
-            
-</xs:schema>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/security-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/security-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/security-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,136 @@
+<?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/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.2.xsd"/>
+
+    <xs:element name="identity">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="security:attlist.identity"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.identity">
+        <xs:attribute name="authenticate-method" type="components:expressionType"/>
+        <xs:attribute name="remember-me" type="components:boolean"/>
+        <xs:attribute name="jaas-config-name" type="components:string"/>
+    </xs:attributeGroup>
+    
+    <xs:element name="remember-me">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="security:attlist.remember-me"/>
+        </xs:complexType>    
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.remember-me">
+        <xs:attribute name="cookie-max-age" type="components:int"/>
+        <xs:attribute name="enabled" type="components:boolean"/>
+    </xs:attributeGroup>
+    
+    <xs:element name="identity-manager">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="security:attlist.identity-manager"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:element name="jpa-identity-store">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="security:attlist.jpa-identity-store"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:element name="ldap-identity-store">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="security:attlist.ldap-identity-store"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:element name="permission-manager">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="security:attlist.permission-manager"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:element name="jpa-permission-store">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="security:attlist.jpa-permission-store"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:element name="rule-based-permission-resolver">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="security:attlist.rule-based-permission-resolver"/>        
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:element name="persistent-permission-resolver">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="security:attlist.persistent-permission-resolver"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.identity-manager">
+        <xs:attribute name="identity-store" type="components:expressionType"/>
+        <xs:attribute name="role-identity-store" type="components:expressionType"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="attlist.jpa-identity-store">
+        <xs:attribute name="entity-manager" type="components:string"/>
+        <xs:attribute name="user-class" type="components:string" use="required"/>
+        <xs:attribute name="role-class" type="components:string"/>
+        <xs:attribute name="features" type="components:string"/>
+    </xs:attributeGroup>     
+    
+    <xs:attributeGroup name="attlist.ldap-identity-store">
+        <xs:attribute name="server-address" type="components:string"/>
+        <xs:attribute name="server-port" type="components:string"/>
+        <xs:attribute name="bind-DN" type="components:string"/>
+        <xs:attribute name="bind-credentials" type="components:string"/>
+        <xs:attribute name="user-DN-prefix" type="components:string"/>
+        <xs:attribute name="user-DN-suffix" type="components:string"/>
+        <xs:attribute name="role-DN-prefix" type="components:string"/>
+        <xs:attribute name="role-DN-suffix" type="components:string"/>
+        <xs:attribute name="user-context-DN" type="components:string"/>
+        <xs:attribute name="role-context-DN" type="components:string"/>
+        <xs:attribute name="user-role-attribute" type="components:string"/>
+        <xs:attribute name="user-name-attribute" type="components:string"/>
+        <xs:attribute name="role-name-attribute" type="components:string"/>
+        <xs:attribute name="role-attribute-is-DN" type="components:boolean"/>
+        <xs:attribute name="user-object-classes" type="components:string"/>
+        <xs:attribute name="role-object-classes" type="components:string"/>
+        <xs:attribute name="enabled-attribute" type="components:string"/>
+        <xs:attribute name="search-scope" type="components:string"/>
+        <xs:attribute name="first-name-attribute" type="components:string"/>
+        <xs:attribute name="last-name-attribute" type="components:string"/>
+        <xs:attribute name="user-password-attribute" type="components:string"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="attlist.permission-manager">
+        <xs:attribute name="permission-store" type="components:expressionType"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="attlist.jpa-permission-store">
+        <xs:attribute name="entity-manager" type="components:string"/>
+        <xs:attribute name="user-permission-class" type="components:string"/>
+        <xs:attribute name="role-permission-class" type="components:string"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="attlist.rule-based-permission-resolver">
+        <xs:attribute name="security-rules" type="components:expressionType"/>
+    </xs:attributeGroup>
+
+    <xs:attributeGroup name="attlist.persistent-permission-resolver">
+        <xs:attribute name="permission-store" type="components:expressionType"/>
+    </xs:attributeGroup>
+            
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/theme-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/theme-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/theme-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,26 +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/theme" xmlns:theme="http://jboss.com/products/seam/theme"
-    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="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 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:attributeGroup name="attlist.themeSelector">
-        <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>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/theme-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/theme-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/theme-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,26 @@
+<?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/theme" xmlns:theme="http://jboss.com/products/seam/theme"
+    xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+    <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.2.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 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:attributeGroup name="attlist.themeSelector">
+        <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>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/transaction-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/transaction-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/transaction-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,54 +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/transaction" xmlns:transaction="http://jboss.com/products/seam/transaction"
-    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="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"/>
-            <xs:attributeGroup ref="transaction:attlist.transaction"/>
-        </xs:complexType>
-    </xs:element>
-    <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="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="components:string" use="required"/>
-    </xs:attributeGroup>
-    
-    <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>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/transaction-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/transaction-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/transaction-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,54 @@
+<?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/transaction" xmlns:transaction="http://jboss.com/products/seam/transaction"
+    xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+    <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.2.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"/>
+            <xs:attributeGroup ref="transaction:attlist.transaction"/>
+        </xs:complexType>
+    </xs:element>
+    <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="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="components:string" use="required"/>
+    </xs:attributeGroup>
+    
+    <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>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/ui-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/ui-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/ui-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,36 +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/ui"
-    xmlns:ui="http://jboss.com/products/seam/ui"
-    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="jpa-entity-loader">
-      <xs:complexType>
-         <xs:attributeGroup ref="components:attlist.component" />
-         <xs:attribute name="entity-manager" type="xs:string" />
-      </xs:complexType>
-    </xs:element>
-    
-    <xs:element name="hibernate-entity-loader">
-      <xs:complexType>
-         <xs:attributeGroup ref="components:attlist.component" />
-         <xs:attribute name="session" type="xs:string" />
-      </xs:complexType>
-    </xs:element>
-    
-    <xs:element name="entity-converter">
-      <xs:complexType>
-         <xs:attributeGroup ref="components:attlist.component" />
-         <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>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/ui-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/ui-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/ui-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,36 @@
+<?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/ui"
+    xmlns:ui="http://jboss.com/products/seam/ui"
+    xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+    <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.2.xsd"/>
+    
+    <xs:element name="jpa-entity-loader">
+      <xs:complexType>
+         <xs:attributeGroup ref="components:attlist.component" />
+         <xs:attribute name="entity-manager" type="xs:string" />
+      </xs:complexType>
+    </xs:element>
+    
+    <xs:element name="hibernate-entity-loader">
+      <xs:complexType>
+         <xs:attributeGroup ref="components:attlist.component" />
+         <xs:attribute name="session" type="xs:string" />
+      </xs:complexType>
+    </xs:element>
+    
+    <xs:element name="entity-converter">
+      <xs:complexType>
+         <xs:attributeGroup ref="components:attlist.component" />
+         <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>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/web-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/web-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/web-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,188 +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/web" xmlns:web="http://jboss.com/products/seam/web"
-    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="hot-deploy-filter">
-        <xs:annotation>
-            <xs:documentation>This filter triggers a scan for hot deployable components and descriptor files on each request. The URL pattern should be set to the same pattern as used by the Faces Servlet. Note that this filter is automatically disabled when Seam debug mode is disabled.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="web:attlist.filter"/>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="identity-filter">
-        <xs:annotation>
-            <xs:documentation>This filter provides integration between Servlet Security and the identity component.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="web:attlist.filter"/>
-        </xs:complexType>
-    </xs:element>
-
-    <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"/>
-            <xs:attributeGroup ref="web:attlist.multipartFilter"/>
-        </xs:complexType>
-    </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"/>
-        </xs:complexType>    
-    </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"/>
-        </xs:complexType>
-    </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"/>
-        </xs:complexType>
-    </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"/>
-            <xs:attributeGroup ref="web:attlist.wicketFilter"/>
-        </xs:complexType>
-    </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="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="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"/>
-        </xs:complexType>
-    </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"/>
-            <xs:attributeGroup ref="web:attlist.ajax4jsfFilter"/>
-        </xs:complexType>
-    </xs:element>    
-    
-    <xs:element name="rewrite-filter">
-        <xs:annotation>
-            <xs:documentation>This filter performs URL rewriting.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="web:rewrite.filter"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.filter">
-        <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="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" type="components:boolean" />           
-        <xs:attribute name="max-request-size" type="components:int"/>
-    </xs:attributeGroup>
-    
-    <xs:attributeGroup name="attlist.ajax4jsfFilter">
-        <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="session">
-        <xs:complexType mixed="true">
-            <xs:attributeGroup ref="components:attlist.component"/>
-            <xs:attributeGroup ref="web:attlist.session"/>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:attributeGroup name="attlist.session">
-        <xs:attribute name="invalidate-on-scheme-change" type="components:boolean"/>
-    </xs:attributeGroup>   
-    
-    <xs:attributeGroup name="rewrite.filter">
-        <xs:attribute name="view-mapping" type="components:string">
-            <xs:annotation>
-                <xs:documentation>
-                    This is the servlet mapping.  It should be set to the same pattern as used by the
-                    Faces Servlet.  If no value is specified, a pattern of *.seam will be assumed.
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:attributeGroup>
-   
-</xs:schema>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/web-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/web-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/web-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,188 @@
+<?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/web" xmlns:web="http://jboss.com/products/seam/web"
+    xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+    <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.2.xsd"/>
+
+    <xs:element name="hot-deploy-filter">
+        <xs:annotation>
+            <xs:documentation>This filter triggers a scan for hot deployable components and descriptor files on each request. The URL pattern should be set to the same pattern as used by the Faces Servlet. Note that this filter is automatically disabled when Seam debug mode is disabled.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="web:attlist.filter"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="identity-filter">
+        <xs:annotation>
+            <xs:documentation>This filter provides integration between Servlet Security and the identity component.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="web:attlist.filter"/>
+        </xs:complexType>
+    </xs:element>
+
+    <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"/>
+            <xs:attributeGroup ref="web:attlist.multipartFilter"/>
+        </xs:complexType>
+    </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"/>
+        </xs:complexType>    
+    </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"/>
+        </xs:complexType>
+    </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"/>
+        </xs:complexType>
+    </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"/>
+            <xs:attributeGroup ref="web:attlist.wicketFilter"/>
+        </xs:complexType>
+    </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="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="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"/>
+        </xs:complexType>
+    </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"/>
+            <xs:attributeGroup ref="web:attlist.ajax4jsfFilter"/>
+        </xs:complexType>
+    </xs:element>    
+    
+    <xs:element name="rewrite-filter">
+        <xs:annotation>
+            <xs:documentation>This filter performs URL rewriting.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="web:rewrite.filter"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.filter">
+        <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="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" type="components:boolean" />           
+        <xs:attribute name="max-request-size" type="components:int"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="attlist.ajax4jsfFilter">
+        <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="session">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="components:attlist.component"/>
+            <xs:attributeGroup ref="web:attlist.session"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:attributeGroup name="attlist.session">
+        <xs:attribute name="invalidate-on-scheme-change" type="components:boolean"/>
+    </xs:attributeGroup>   
+    
+    <xs:attributeGroup name="rewrite.filter">
+        <xs:attribute name="view-mapping" type="components:string">
+            <xs:annotation>
+                <xs:documentation>
+                    This is the servlet mapping.  It should be set to the same pattern as used by the
+                    Faces Servlet.  If no value is specified, a pattern of *.seam will be assumed.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:attributeGroup>
+   
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/main/org/jboss/seam/wicket-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/wicket-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/wicket-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,23 +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/wicket"
-    xmlns:wicket="http://jboss.com/products/seam/wicket"
-    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="web-application">
-        <xs:annotation>
-            <xs:documentation></xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:attributeGroup ref="components:attlist.component" />
-            <xs:attributeGroup ref="wicket:attlist.webApplication" />
-        </xs:complexType>
-    </xs:element>
-   
-    <xs:attributeGroup name="attlist.webApplication">
-        <xs:attribute name="application-class" type="components:string" />
-    </xs:attributeGroup>
-
-</xs:schema>

Added: branches/community/Seam_2_2/src/main/org/jboss/seam/wicket-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/wicket-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/wicket-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,23 @@
+<?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/wicket"
+    xmlns:wicket="http://jboss.com/products/seam/wicket"
+    xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+    
+    <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.2.xsd"/>
+    
+    <xs:element name="web-application">
+        <xs:annotation>
+            <xs:documentation></xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="components:attlist.component" />
+            <xs:attributeGroup ref="wicket:attlist.webApplication" />
+        </xs:complexType>
+    </xs:element>
+   
+    <xs:attributeGroup name="attlist.webApplication">
+        <xs:attribute name="application-class" type="components:string" />
+    </xs:attributeGroup>
+
+</xs:schema>

Deleted: branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,29 +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="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>

Added: branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/pdf-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/pdf-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/pdf/org/jboss/seam/pdf/pdf-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,29 @@
+<?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="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>

Deleted: branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/resteasy-2.1.xsd
===================================================================
--- branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/resteasy-2.1.xsd	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/resteasy-2.1.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,200 +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/resteasy" xmlns:resteasy="http://jboss.com/products/seam/resteasy"
-    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="application">
-       <xs:annotation>
-           <xs:documentation>
-               An implementation of JAX-RS Application with additional properties for RESTEasy.
-           </xs:documentation>
-       </xs:annotation>
-       <xs:complexType mixed="true">
-          <xs:sequence>
-             <xs:element minOccurs="0" maxOccurs="1"
-                         name="provider-class-names" type="components:multiValuedProperty">
-                 <xs:annotation>
-                    <xs:documentation>
-                        List of provider classes.
-                    </xs:documentation>
-                 </xs:annotation>
-             </xs:element>
-             <xs:element minOccurs="0" maxOccurs="1"
-                         name="resource-class-names" type="components:multiValuedProperty">
-                 <xs:annotation>
-                    <xs:documentation>
-                        List of resource classes.
-                    </xs:documentation>
-                 </xs:annotation>
-             </xs:element>
-             <xs:element minOccurs="0" maxOccurs="1"
-                         name="media-type-mappings" type="components:mapProperty">
-                 <xs:annotation>
-                    <xs:documentation>
-                        Maps media type URI extensions to Accept header, see RESTEasy documentation and JAX-RS (JSR 311).
-                    </xs:documentation>
-                 </xs:annotation>
-             </xs:element>
-             <xs:element minOccurs="0" maxOccurs="1"
-                         name="language-mappings" type="components:mapProperty">
-                 <xs:annotation>
-                    <xs:documentation>
-                        Maps language URI extension to Accept header, see RESTEasy documentation and JAX-RS (JSR 311).
-                    </xs:documentation>
-                 </xs:annotation>
-             </xs:element>
-          </xs:sequence>
-          <xs:attributeGroup ref="components:attlist.component"/>
-          <xs:attributeGroup ref="resteasy:attlist.application"/>
-       </xs:complexType>
-   </xs:element>
-
-	<xs:element name="resource-home">
-		<xs:annotation>
-			<xs:documentation>
-				Allows you to expose an entity home component as a
-				REST resource.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element minOccurs="0" maxOccurs="1" name="media-types" type="components:multiValuedProperty"/>
-			</xs:sequence>
-			<xs:attributeGroup ref="components:attlist.component" />
-			<xs:attributeGroup ref="resteasy:attlist.resourceHome" />
-			<xs:attributeGroup ref="resteasy:attlist.abstractResource" />
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="resource-query">
-		<xs:annotation>
-			<xs:documentation>
-				Allows you to expose an entity query component as a
-				REST resource.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element minOccurs="0" maxOccurs="1" name="media-types" type="components:multiValuedProperty"/>
-			</xs:sequence>
-			<xs:attributeGroup ref="components:attlist.component" />
-			<xs:attributeGroup ref="resteasy:attlist.resourceQuery" />
-			<xs:attributeGroup ref="resteasy:attlist.abstractResource" />
-		</xs:complexType>
-	</xs:element>
-
-   <xs:attributeGroup name="attlist.application">
-       <xs:attribute name="scan-providers" type="components:boolean">
-           <xs:annotation>
-               <xs:documentation>
-                   Enable automatic discovery of classes annoated with JAX-RS @Provider, defaults to 'true'.
-               </xs:documentation>
-           </xs:annotation>
-       </xs:attribute>
-      <xs:attribute name="scan-resources" type="components:boolean">
-          <xs:annotation>
-              <xs:documentation>
-                  Enable automatic discovery of classes annoated with JAX-RS @Path, defaults to 'true'.
-              </xs:documentation>
-          </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="use-builtin-providers" type="components:boolean">
-          <xs:annotation>
-              <xs:documentation>
-                  Enable RESTEasy built-in providers, defaults to 'true'.
-              </xs:documentation>
-          </xs:annotation>
-      </xs:attribute>
-       <xs:attribute name="destroy-session-after-request" type="components:boolean">
-           <xs:annotation>
-               <xs:documentation>
-                   Destroy the HttpSession after a REST request if it was created for that request (it is a
-                   new session), defaults to 'true'.
-               </xs:documentation>
-           </xs:annotation>
-       </xs:attribute>
-      <xs:attribute name="resource-path-prefix" type="components:string">
-          <xs:annotation>
-              <xs:documentation>
-                 Append this prefix to any request path, after the SeamResourceServlet
-                 url-pattern prefix (configured in web.xml). Defaults to "/rest".
-              </xs:documentation>
-          </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="strip-seam-resource-path" type="components:boolean">
-          <xs:annotation>
-              <xs:documentation>
-                 Remove the "/&lt;url-pattern-of-seam-resource-servlet&gt;/&lt;resource-path-prefix&gt;" part
-                 of the  request path before the request is mapped to a @Path resource. If disabled,
-                 all @Path definitions must use the full prefix of the SeamResourceServlet as 
-                 mapped with the url-pattern in  web.xml, plus the resourcePathPrefix.
-              </xs:documentation>
-          </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   
-   	<xs:attributeGroup name="attlist.abstractResource">
-		<xs:attribute name="path" type="xs:string" use="required" >
-			<xs:annotation>
-				<xs:documentation>
-					Location of the resource. For example /user
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="media-types" type="xs:string">
-			<xs:annotation>
-				<xs:documentation>
-					Media type this resource will operate on. Defaults to application/xml.
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:attributeGroup>
-
-	<xs:attributeGroup name="attlist.resourceHome">
-		<xs:attribute name="entity-id-class" type="xs:string"
-			use="required">
-			<xs:annotation>
-				<xs:documentation>
-					Entity identifier class.
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="entity-home" type="components:elType"
-			use="required">
-			<xs:annotation>
-				<xs:documentation>
-					EntityHome component that will be used for operating database.
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="readonly" type="xs:boolean" default="false">
-			<xs:annotation>
-				<xs:documentation>
-					Disable "write" operations on this resource. Resource will only allow GET
-					method.
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:attributeGroup>
-
-	<xs:attributeGroup name="attlist.resourceQuery">
-		<xs:attribute name="entity-class" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:documentation>
-					Entity class.
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="entity-query" type="components:elType">
-			<xs:annotation>
-				<xs:documentation>
-					EntityQuery component that will be used for
-					listing operation (GET on path). If not set, it will be created
-					automatically.
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:attributeGroup>
-</xs:schema>

Added: branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/resteasy-2.2.xsd
===================================================================
--- branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/resteasy-2.2.xsd	                        (rev 0)
+++ branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/resteasy-2.2.xsd	2009-06-05 23:10:55 UTC (rev 11086)
@@ -0,0 +1,200 @@
+<?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/resteasy" xmlns:resteasy="http://jboss.com/products/seam/resteasy"
+    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="application">
+       <xs:annotation>
+           <xs:documentation>
+               An implementation of JAX-RS Application with additional properties for RESTEasy.
+           </xs:documentation>
+       </xs:annotation>
+       <xs:complexType mixed="true">
+          <xs:sequence>
+             <xs:element minOccurs="0" maxOccurs="1"
+                         name="provider-class-names" type="components:multiValuedProperty">
+                 <xs:annotation>
+                    <xs:documentation>
+                        List of provider classes.
+                    </xs:documentation>
+                 </xs:annotation>
+             </xs:element>
+             <xs:element minOccurs="0" maxOccurs="1"
+                         name="resource-class-names" type="components:multiValuedProperty">
+                 <xs:annotation>
+                    <xs:documentation>
+                        List of resource classes.
+                    </xs:documentation>
+                 </xs:annotation>
+             </xs:element>
+             <xs:element minOccurs="0" maxOccurs="1"
+                         name="media-type-mappings" type="components:mapProperty">
+                 <xs:annotation>
+                    <xs:documentation>
+                        Maps media type URI extensions to Accept header, see RESTEasy documentation and JAX-RS (JSR 311).
+                    </xs:documentation>
+                 </xs:annotation>
+             </xs:element>
+             <xs:element minOccurs="0" maxOccurs="1"
+                         name="language-mappings" type="components:mapProperty">
+                 <xs:annotation>
+                    <xs:documentation>
+                        Maps language URI extension to Accept header, see RESTEasy documentation and JAX-RS (JSR 311).
+                    </xs:documentation>
+                 </xs:annotation>
+             </xs:element>
+          </xs:sequence>
+          <xs:attributeGroup ref="components:attlist.component"/>
+          <xs:attributeGroup ref="resteasy:attlist.application"/>
+       </xs:complexType>
+   </xs:element>
+
+	<xs:element name="resource-home">
+		<xs:annotation>
+			<xs:documentation>
+				Allows you to expose an entity home component as a
+				REST resource.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" maxOccurs="1" name="media-types" type="components:multiValuedProperty"/>
+			</xs:sequence>
+			<xs:attributeGroup ref="components:attlist.component" />
+			<xs:attributeGroup ref="resteasy:attlist.resourceHome" />
+			<xs:attributeGroup ref="resteasy:attlist.abstractResource" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="resource-query">
+		<xs:annotation>
+			<xs:documentation>
+				Allows you to expose an entity query component as a
+				REST resource.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" maxOccurs="1" name="media-types" type="components:multiValuedProperty"/>
+			</xs:sequence>
+			<xs:attributeGroup ref="components:attlist.component" />
+			<xs:attributeGroup ref="resteasy:attlist.resourceQuery" />
+			<xs:attributeGroup ref="resteasy:attlist.abstractResource" />
+		</xs:complexType>
+	</xs:element>
+
+   <xs:attributeGroup name="attlist.application">
+       <xs:attribute name="scan-providers" type="components:boolean">
+           <xs:annotation>
+               <xs:documentation>
+                   Enable automatic discovery of classes annoated with JAX-RS @Provider, defaults to 'true'.
+               </xs:documentation>
+           </xs:annotation>
+       </xs:attribute>
+      <xs:attribute name="scan-resources" type="components:boolean">
+          <xs:annotation>
+              <xs:documentation>
+                  Enable automatic discovery of classes annoated with JAX-RS @Path, defaults to 'true'.
+              </xs:documentation>
+          </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="use-builtin-providers" type="components:boolean">
+          <xs:annotation>
+              <xs:documentation>
+                  Enable RESTEasy built-in providers, defaults to 'true'.
+              </xs:documentation>
+          </xs:annotation>
+      </xs:attribute>
+       <xs:attribute name="destroy-session-after-request" type="components:boolean">
+           <xs:annotation>
+               <xs:documentation>
+                   Destroy the HttpSession after a REST request if it was created for that request (it is a
+                   new session), defaults to 'true'.
+               </xs:documentation>
+           </xs:annotation>
+       </xs:attribute>
+      <xs:attribute name="resource-path-prefix" type="components:string">
+          <xs:annotation>
+              <xs:documentation>
+                 Append this prefix to any request path, after the SeamResourceServlet
+                 url-pattern prefix (configured in web.xml). Defaults to "/rest".
+              </xs:documentation>
+          </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="strip-seam-resource-path" type="components:boolean">
+          <xs:annotation>
+              <xs:documentation>
+                 Remove the "/&lt;url-pattern-of-seam-resource-servlet&gt;/&lt;resource-path-prefix&gt;" part
+                 of the  request path before the request is mapped to a @Path resource. If disabled,
+                 all @Path definitions must use the full prefix of the SeamResourceServlet as 
+                 mapped with the url-pattern in  web.xml, plus the resourcePathPrefix.
+              </xs:documentation>
+          </xs:annotation>
+      </xs:attribute>
+   </xs:attributeGroup>
+   
+   	<xs:attributeGroup name="attlist.abstractResource">
+		<xs:attribute name="path" type="xs:string" use="required" >
+			<xs:annotation>
+				<xs:documentation>
+					Location of the resource. For example /user
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="media-types" type="xs:string">
+			<xs:annotation>
+				<xs:documentation>
+					Media type this resource will operate on. Defaults to application/xml.
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:attributeGroup>
+
+	<xs:attributeGroup name="attlist.resourceHome">
+		<xs:attribute name="entity-id-class" type="xs:string"
+			use="required">
+			<xs:annotation>
+				<xs:documentation>
+					Entity identifier class.
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="entity-home" type="components:elType"
+			use="required">
+			<xs:annotation>
+				<xs:documentation>
+					EntityHome component that will be used for operating database.
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="readonly" type="xs:boolean" default="false">
+			<xs:annotation>
+				<xs:documentation>
+					Disable "write" operations on this resource. Resource will only allow GET
+					method.
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:attributeGroup>
+
+	<xs:attributeGroup name="attlist.resourceQuery">
+		<xs:attribute name="entity-class" type="xs:string" use="required">
+			<xs:annotation>
+				<xs:documentation>
+					Entity class.
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="entity-query" type="components:elType">
+			<xs:annotation>
+				<xs:documentation>
+					EntityQuery component that will be used for
+					listing operation (GET on path). If not set, it will be created
+					automatically.
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:attributeGroup>
+</xs:schema>

Modified: branches/community/Seam_2_2/ui/src/main/resources/META-INF/components.xml
===================================================================
--- branches/community/Seam_2_2/ui/src/main/resources/META-INF/components.xml	2009-06-05 23:03:29 UTC (rev 11085)
+++ branches/community/Seam_2_2/ui/src/main/resources/META-INF/components.xml	2009-06-05 23:10:55 UTC (rev 11086)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <components xmlns="http://jboss.com/products/seam/components"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
+            xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.2.xsd">
 
 </components>




More information about the seam-commits mailing list