[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...
Peter Muir
peter at bleepbleep.org.uk
Mon Jun 25 09:16:23 EDT 2007
User: pmuir
Date: 07/06/25 09:16:23
Modified: src/main/org/jboss/seam persistence-1.3.xsd theme-1.3.xsd
pageflow-1.3.xsd
Log:
better xsds, example xml which validates, better validation in ant
Revision Changes Path
1.2 +9 -2 jboss-seam/src/main/org/jboss/seam/persistence-1.3.xsd
(In the diff below, changes in quantity of whitespace are not shown.)
Index: persistence-1.3.xsd
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence-1.3.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- persistence-1.3.xsd 19 Jun 2007 19:02:30 -0000 1.1
+++ persistence-1.3.xsd 25 Jun 2007 13:16:23 -0000 1.2
@@ -6,8 +6,11 @@
<xs:element name="managed-persistence-context">
<xs:complexType mixed="true">
- <xs:sequence minOccurs="0" maxOccurs="1">
+ <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"/>
@@ -27,7 +30,11 @@
<xs:attributeGroup ref="components:attlist.component"/>
</xs:complexType>
</xs:element>
+
<xs:element name="filters" type="components:multiValuedProperty"/>
+
+ <xs:element name="persistence-unit-jndi-name" type="xs:string" />
+
<xs:attributeGroup name="attlist.ManagedHibernateSession">
<xs:attribute name="session-factory"/>
<xs:attribute name="session-factory-jndi-name"/>
1.3 +1 -1 jboss-seam/src/main/org/jboss/seam/theme-1.3.xsd
(In the diff below, changes in quantity of whitespace are not shown.)
Index: theme-1.3.xsd
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/theme-1.3.xsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- theme-1.3.xsd 22 Jun 2007 20:16:38 -0000 1.2
+++ theme-1.3.xsd 25 Jun 2007 13:16:23 -0000 1.3
@@ -17,7 +17,7 @@
<xs:attributeGroup name="attlist.themeSelector">
<xs:attribute name="theme" type="xs:string"/>
<xs:attribute name="available-themes" type="xs:string"/>
- <xs:attribute name="cookie-max-age">
+ <xs:attribute name="cookie-max-age"/>
<xs:attribute name="cookie-enabled">
<xs:simpleType>
<xs:restriction base="xs:token">
1.3 +35 -18 jboss-seam/src/main/org/jboss/seam/pageflow-1.3.xsd
(In the diff below, changes in quantity of whitespace are not shown.)
Index: pageflow-1.3.xsd
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pageflow-1.3.xsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- pageflow-1.3.xsd 19 Jun 2007 04:33:46 -0000 1.2
+++ pageflow-1.3.xsd 25 Jun 2007 13:16:23 -0000 1.3
@@ -12,6 +12,7 @@
<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" />
@@ -33,6 +34,16 @@
</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">
@@ -46,7 +57,8 @@
</xs:element>
<xs:element name="sub-process">
- <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required" />
</xs:complexType>
</xs:element>
@@ -94,13 +106,14 @@
<xs:element name="page">
<xs:complexType>
- <xs:sequence>
<xs:group ref="page-elements" />
+ <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>
@@ -280,26 +293,30 @@
</xs:choice>
</xs:group>
- <xs:group name="action-elements">
+ <xs:group name="end-node-elements">
<xs:choice>
- <xs:element ref="action" />
</xs:choice>
+ <xs:element ref="end-state" />
+ </xs:choice>
</xs:group>
- <xs:group name="node-content-elements">
+ <xs:group name="action-elements">
<xs:choice>
- <xs:element ref="event" />
- <xs:element ref="exception-handler" />
- <xs:element ref="transition" />
- </xs:choice>
+ <xs:element ref="action" />
</xs:choice>
</xs:group>
<xs:group name="page-elements">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="redirect" />
+ <xs:sequence>
+ <xs:choice minOccurs="0">
<xs:element ref="description" />
+ <xs:element ref="redirect" />
+ </xs:choice>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="event" />
+ <xs:element ref="exception-handler" />
+ <xs:element ref="transition" />
<xs:group ref="action-elements" />
- <xs:group ref="node-content-elements" />
</xs:choice>
+ </xs:sequence>
</xs:group>
<xs:attributeGroup name="page-attributes">
More information about the jboss-cvs-commits
mailing list