OPENJPA-1167 Update persistence and orm schemas and schemas within doc to current versions

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@792610 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeremy Bauer 2009-07-09 17:13:43 +00:00
parent f6413764d5
commit c8b99a764c
4 changed files with 661 additions and 451 deletions

View File

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Java Persistence API object/relational mapping file schema -->
<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified" attributeFormDefault="unqualified"
version="2.0">
<xsd:annotation>
<xsd:documentation>
@(#)orm_2_0.xsd 2.0 August 27 2008
@(#)orm_2_0.xsd 2.0 May 27 2009
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
@ -523,7 +524,8 @@ version="2.0">
<xsd:element name="map-key-enumerated"
type="orm:enumerated" minOccurs="0" />
<xsd:element name="map-key-attribute-override"
type="orm:attribute-override" minOccurs="0" />
type="orm:attribute-override" minOccurs="0"
maxOccurs="unbounded" />
</xsd:choice>
<xsd:choice>
<xsd:element name="map-key-column"
@ -962,7 +964,8 @@ version="2.0">
<xsd:element name="map-key-enumerated"
type="orm:enumerated" minOccurs="0" />
<xsd:element name="map-key-attribute-override"
type="orm:attribute-override" minOccurs="0" />
type="orm:attribute-override" minOccurs="0"
maxOccurs="unbounded" />
</xsd:choice>
<xsd:choice>
<xsd:element name="map-key-column"
@ -1222,7 +1225,8 @@ version="2.0">
<xsd:element name="map-key-enumerated"
type="orm:enumerated" minOccurs="0" />
<xsd:element name="map-key-attribute-override"
type="orm:attribute-override" minOccurs="0" />
type="orm:attribute-override" minOccurs="0"
maxOccurs="unbounded" />
</xsd:choice>
<xsd:choice>
<xsd:element name="map-key-column"
@ -1295,7 +1299,7 @@ version="2.0">
public @interface OrderBy {
String value() default "";
}
</xsd:documentation>
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string" />
</xsd:simpleType>
@ -1310,7 +1314,6 @@ version="2.0">
boolean insertable() default true;
boolean updatable() default true;
String columnDefinition() default "";
String table() default "";
}
</xsd:documentation>
</xsd:annotation>
@ -1319,7 +1322,6 @@ version="2.0">
<xsd:attribute name="insertable" type="xsd:boolean" />
<xsd:attribute name="updatable" type="xsd:boolean" />
<xsd:attribute name="column-definition" type="xsd:string" />
<xsd:attribute name="table" type="xsd:string" />
</xsd:complexType>
<!-- **************************************************** -->
<xsd:complexType name="post-load">
@ -1663,4 +1665,4 @@ version="2.0">
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="access" type="orm:access-type" />
</xsd:complexType>
</xsd:schema>
</xsd:schema>

View File

@ -7,8 +7,8 @@
version="2.0">
<xsd:annotation>
<xsd:documentation>
@(#)persistence_2_0.xsd 1.0 August 27 2008
</xsd:documentation>
@(#)persistence_2_0.xsd 1.0 May 8 2009
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
<xsd:documentation><![CDATA[
@ -131,7 +131,7 @@ version="2.0">
</xsd:annotation>
</xsd:element>
<!-- **************************************************** -->
<xsd:element name="caching"
<xsd:element name="shared-cache-mode"
type="persistence:persistence-unit-caching-type"
minOccurs="0">
<xsd:annotation>
@ -143,7 +143,8 @@ version="2.0">
be cached. When set to ENABLE_SELECTIVE, only entities
specified as cacheable will be cached. When set to
DISABLE_SELECTIVE, entities specified as not cacheable
will not be cached.
will not be cached. When not specified or when set to
UNSPECIFIED, provider defaults may apply.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@ -231,7 +232,7 @@ version="2.0">
<xsd:annotation>
<xsd:documentation>
public enum CachingType { ALL, NONE, ENABLE_SELECTIVE,
DISABLE_SELECTIVE};
DISABLE_SELECTIVE, UNSPECIFIED};
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@ -239,6 +240,7 @@ version="2.0">
<xsd:enumeration value="NONE" />
<xsd:enumeration value="ENABLE_SELECTIVE" />
<xsd:enumeration value="DISABLE_SELECTIVE" />
<xsd:enumeration value="UNSPECIFIED" />
</xsd:restriction>
</xsd:simpleType>
<!-- **************************************************** -->
@ -254,4 +256,4 @@ version="2.0">
<xsd:enumeration value="NONE" />
</xsd:restriction>
</xsd:simpleType>
</xsd:schema>
</xsd:schema>

File diff suppressed because it is too large Load Diff

View File

@ -106,15 +106,15 @@ schema can be found at
</para>
<programlisting>
&lt;?xml version="1.0" encoding="UTF-8"?&gt;
&lt;!-- persistence.xml schema --&gt;
&lt;!-- persistence.xml schema --&gt;
&lt;xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:persistence="http://java.sun.com/xml/ns/persistence"
elementFormDefault="qualified" attributeFormDefault="unqualified"
version="2.0"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
@(#)persistence_2_0.xsd 1.0 August 27 2008
@(#)persistence_2_0.xsd 1.0 May 8 2009
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;xsd:annotation&gt;
@ -148,8 +148,8 @@ schema can be found at
&lt;xsd:complexType&gt;
&lt;xsd:sequence&gt;
&lt;!-- **************************************************** --&gt;
&lt;xsd:element name="persistence-unit" minOccurs="1"
maxOccurs="unbounded"&gt;
&lt;xsd:element name="persistence-unit"
minOccurs="1" maxOccurs="unbounded"&gt;
&lt;xsd:complexType&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
@ -162,8 +162,7 @@ schema can be found at
type="xsd:string" minOccurs="0"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
Description of this persistence
unit.
Description of this persistence unit.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;/xsd:element&gt;
@ -172,8 +171,7 @@ schema can be found at
type="xsd:string" minOccurs="0"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
Provider class that supplies
EntityManagers for this
Provider class that supplies EntityManagers for this
persistence unit.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
@ -183,8 +181,7 @@ schema can be found at
type="xsd:string" minOccurs="0"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
The container-specific name of
the JTA datasource to use.
The container-specific name of the JTA datasource to use.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;/xsd:element&gt;
@ -193,8 +190,7 @@ schema can be found at
type="xsd:string" minOccurs="0"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
The container-specific name of a
non-JTA datasource to use.
The container-specific name of a non-JTA datasource to use.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;/xsd:element&gt;
@ -204,10 +200,8 @@ schema can be found at
maxOccurs="unbounded"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
File containing mapping
information. Loaded as a
resource by the persistence
provider.
File containing mapping information. Loaded as a resource
by the persistence provider.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;/xsd:element&gt;
@ -217,9 +211,8 @@ schema can be found at
maxOccurs="unbounded"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
Jar file that should be scanned
for entities. Not applicable to
Java SE persistence units.
Jar file that should be scanned for entities.
Not applicable to Java SE persistence units.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;/xsd:element&gt;
@ -228,10 +221,8 @@ schema can be found at
minOccurs="0" maxOccurs="unbounded"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
Class to scan for annotations.
It should be annotated with
either @Entity, @Embeddable or
@MappedSuperclass.
Class to scan for annotations. It should be annotated
with either @Entity, @Embeddable or @MappedSuperclass.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;/xsd:element&gt;
@ -241,13 +232,39 @@ schema can be found at
minOccurs="0"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
When set to true then only
listed classes and jars will be
scanned for persistent classes,
otherwise the enclosing jar or
directory will also be scanned.
Not applicable to Java SE
persistence units.
When set to true then only listed classes and jars will
be scanned for persistent classes, otherwise the enclosing
jar or directory will also be scanned. Not applicable to
Java SE persistence units.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;/xsd:element&gt;
&lt;!-- **************************************************** --&gt;
&lt;xsd:element name="shared-cache-mode"
type="persistence:persistence-unit-caching-type"
minOccurs="0"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
Defines whether caching is enabled for the
persistence unit if caching is supported by the
persistence provider. When set to ALL, all entities
will be cached. When set to NONE, no entities will
be cached. When set to ENABLE_SELECTIVE, only entities
specified as cacheable will be cached. When set to
DISABLE_SELECTIVE, entities specified as not cacheable
will not be cached. When not specified or when set to
UNSPECIFIED, provider defaults may apply.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;/xsd:element&gt;
&lt;!-- **************************************************** --&gt;
&lt;xsd:element name="validation-mode"
type="persistence:persistence-unit-validation-mode-type"
minOccurs="0"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
Specifies the validation mode to be used for the
persistence unit.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;/xsd:element&gt;
@ -256,15 +273,13 @@ schema can be found at
minOccurs="0"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
A list of vendor-specific
properties.
A list of vendor-specific properties.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;xsd:complexType&gt;
&lt;xsd:sequence&gt;
&lt;xsd:element name="property"
minOccurs="0"
maxOccurs="unbounded"&gt;
minOccurs="0" maxOccurs="unbounded"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
A name-value pair.
@ -272,12 +287,10 @@ schema can be found at
&lt;/xsd:annotation&gt;
&lt;xsd:complexType&gt;
&lt;xsd:attribute
name="name"
type="xsd:string"
name="name" type="xsd:string"
use="required" /&gt;
&lt;xsd:attribute
name="value"
type="xsd:string"
name="value" type="xsd:string"
use="required" /&gt;
&lt;/xsd:complexType&gt;
&lt;/xsd:element&gt;
@ -290,8 +303,7 @@ schema can be found at
use="required"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
Name used in code to reference this
persistence unit.
Name used in code to reference this persistence unit.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;/xsd:attribute&gt;
@ -300,9 +312,8 @@ schema can be found at
type="persistence:persistence-unit-transaction-type"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
Type of transactions used by
EntityManagers from this persistence
unit.
Type of transactions used by EntityManagers from this
persistence unit.
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;/xsd:attribute&gt;
@ -325,6 +336,35 @@ schema can be found at
&lt;xsd:enumeration value="RESOURCE_LOCAL" /&gt;
&lt;/xsd:restriction&gt;
&lt;/xsd:simpleType&gt;
&lt;!-- **************************************************** --&gt;
&lt;xsd:simpleType name="persistence-unit-caching-type"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
public enum CachingType { ALL, NONE, ENABLE_SELECTIVE,
DISABLE_SELECTIVE, UNSPECIFIED};
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;xsd:restriction base="xsd:token"&gt;
&lt;xsd:enumeration value="ALL" /&gt;
&lt;xsd:enumeration value="NONE" /&gt;
&lt;xsd:enumeration value="ENABLE_SELECTIVE" /&gt;
&lt;xsd:enumeration value="DISABLE_SELECTIVE" /&gt;
&lt;xsd:enumeration value="UNSPECIFIED" /&gt;
&lt;/xsd:restriction&gt;
&lt;/xsd:simpleType&gt;
&lt;!-- **************************************************** --&gt;
&lt;xsd:simpleType name="persistence-unit-validation-mode-type"&gt;
&lt;xsd:annotation&gt;
&lt;xsd:documentation&gt;
public enum ValidationMode { AUTO, CALLBACK, NONE};
&lt;/xsd:documentation&gt;
&lt;/xsd:annotation&gt;
&lt;xsd:restriction base="xsd:token"&gt;
&lt;xsd:enumeration value="AUTO" /&gt;
&lt;xsd:enumeration value="CALLBACK" /&gt;
&lt;xsd:enumeration value="NONE" /&gt;
&lt;/xsd:restriction&gt;
&lt;/xsd:simpleType&gt;
&lt;/xsd:schema&gt;
</programlisting>
<para>