[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...
Norman Richards
norman.richards at jboss.com
Mon Nov 20 21:51:03 EST 2006
User: nrichards
Date: 06/11/20 21:51:03
Modified: src/main/org/jboss/seam components-1.1.xsd core-1.1.xsd
framework-1.1.xsd
Log:
update framework schema
Revision Changes Path
1.4 +7 -0 jboss-seam/src/main/org/jboss/seam/components-1.1.xsd
(In the diff below, changes in quantity of whitespace are not shown.)
Index: components-1.1.xsd
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/components-1.1.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- components-1.1.xsd 21 Nov 2006 01:26:28 -0000 1.3
+++ components-1.1.xsd 21 Nov 2006 02:51:03 -0000 1.4
@@ -112,4 +112,11 @@
</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:schema>
1.13 +6 -6 jboss-seam/src/main/org/jboss/seam/core-1.1.xsd
(In the diff below, changes in quantity of whitespace are not shown.)
Index: core-1.1.xsd
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core-1.1.xsd,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- core-1.1.xsd 21 Nov 2006 02:03:18 -0000 1.12
+++ core-1.1.xsd 21 Nov 2006 02:51:03 -0000 1.13
@@ -8,10 +8,10 @@
<!-- done -->
<xs:element name="actor">
<xs:complexType mixed="true">
- <xs:sequence minOccurs="0" maxOccurs="1">
- <xs:element minOccurs="0" ref="core:id"/>
- <xs:element minOccurs="0" ref="core:group-actor-ids" />
- </xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element minOccurs="0" maxOccurs="1" ref="core:id"/>
+ <xs:element minOccurs="0" maxOccurs="1" ref="core:group-actor-ids"/>
+ </xs:choice>
<xs:attributeGroup ref="components:attlist.component"/>
<xs:attributeGroup ref="core:attlist.actor"/>
</xs:complexType>
1.2 +82 -1 jboss-seam/src/main/org/jboss/seam/framework-1.1.xsd
(In the diff below, changes in quantity of whitespace are not shown.)
Index: framework-1.1.xsd
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework-1.1.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- framework-1.1.xsd 21 Nov 2006 02:03:18 -0000 1.1
+++ framework-1.1.xsd 21 Nov 2006 02:51:03 -0000 1.2
@@ -1,7 +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/framework" xmlns:jms="http://jboss.com/products/seam/framework"
+ 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-1.1.xsd"/>
+
+ <xs:attributeGroup name="attlist.Home">
+ <xs:attribute name="entity-class" type="xs:string"/>
+ <xs:attribute name="new-instance" type="xs:string"/>
+ <xs:attribute name="created-message" type="xs:string"/>
+ <xs:attribute name="updated-message" type="xs:string"/>
+ <xs:attribute name="deleted-message" type="xs:string"/>
+ </xs:attributeGroup>
+
+ <xs:attributeGroup name="attlist.Query">
+ <xs:attribute name="eqbql" type="xs:string"/>
+ <xs:attribute name="max-results" type="xs:integer"/>
+ <xs:attribute name="order" type="xs:string"/>
+ </xs:attributeGroup>
+ <xs:element name="restrictions" type="components:multiValuedProperty"/>
+ <xs:element name="hints" type="components:mapProperty"/>
+
+
+
+ <xs:element name="entity-query">
+ <xs:complexType mixed="true">
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/>
+ <xs:element minOccurs="0" maxOccurs="1" ref="framework:hints"/>
+ </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:complexType mixed="true">
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/>
+ </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">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="cache-region" type="xs:string"/>
+ <xs:attribute name="fetch-size" type="xs:integer"/>
+ <xs:attribute name="session" type="xs:string"/>
+ </xs:attributeGroup>
+
+ <xs:element name="entity-home">
+ <xs:complexType mixed="true">
+ <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="xs:string"/>
+ </xs:attributeGroup>
+
+ <xs:element name="hibernate-entity-home">
+ <xs:complexType mixed="true">
+ <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="xs:string"/>
+ </xs:attributeGroup>
+
</xs:schema>
More information about the jboss-cvs-commits
mailing list