You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by jr...@apache.org on 2009/07/21 21:40:27 UTC
svn commit: r796511 - in /openjpa/trunk:
openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/
openjpa-project/src/doc/manual/
Author: jrbauer
Date: Tue Jul 21 19:40:27 2009
New Revision: 796511
URL: http://svn.apache.org/viewvc?rev=796511&view=rev
Log:
OPENJPA-1190 Update schemas and schemas in documentation for EA5
Modified:
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_2_0-xsd.rsrc
openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_meta.xml
openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_persistence.xml
Modified: openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc?rev=796511&r1=796510&r2=796511&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc (original)
+++ openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc Tue Jul 21 19:40:27 2009
@@ -7,7 +7,7 @@
version="2.0">
<xsd:annotation>
<xsd:documentation>
- @(#)orm_2_0.xsd 2.0 May 27 2009
+ @(#)orm_2_0.xsd 2.0 July 17 2009
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
@@ -270,12 +270,13 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description" type="xsd:string"
- minOccurs="0" />
- <xsd:element name="join-column" type="orm:join-column"
- minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="join-table" type="orm:join-table"
- minOccurs="0" />
+ <xsd:element name="description" type="xsd:string" minOccurs="0" />
+ <xsd:choice>
+ <xsd:element name="join-column" type="orm:join-column"
+ minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element name="join-table" type="orm:join-table"
+ minOccurs="0" />
+ </xsd:choice>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
@@ -369,7 +370,8 @@
<xsd:complexType name="cascade-type">
<xsd:annotation>
<xsd:documentation>
- public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH};
+ public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH,
+ DETACH};
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -383,6 +385,8 @@
minOccurs="0" />
<xsd:element name="cascade-refresh" type="orm:emptyType"
minOccurs="0" />
+ <xsd:element name="cascade-detach" type="orm:emptyType"
+ minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<!-- **************************************************** -->
Modified: openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_2_0-xsd.rsrc
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_2_0-xsd.rsrc?rev=796511&r1=796510&r2=796511&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_2_0-xsd.rsrc (original)
+++ openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_2_0-xsd.rsrc Tue Jul 21 19:40:27 2009
@@ -7,7 +7,7 @@
version="2.0">
<xsd:annotation>
<xsd:documentation>
- @(#)persistence_2_0.xsd 1.0 May 8 2009
+ @(#)persistence_2_0.xsd 1.0 July 17 2009
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
@@ -102,8 +102,7 @@
maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
- Jar file that should be scanned for entities.
- Not applicable to Java SE persistence units.
+ Jar file that is to be scanned for managed classes.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -112,14 +111,15 @@
minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
- Class to scan for annotations. It should be annotated
+ Managed class to be included in the persistence unit and
+ to scan for annotations. It should be annotated
with either @Entity, @Embeddable or @MappedSuperclass.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<!-- **************************************************** -->
<xsd:element name="exclude-unlisted-classes"
- type="xsd:boolean" default="false"
+ type="xsd:boolean" default="true"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -154,8 +154,7 @@
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
- Specifies the validation mode to be used for the
- persistence unit.
+ The validation mode to be used for the persistence unit.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -164,7 +163,8 @@
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
- A list of vendor-specific properties.
+ A list of standard and vendor-specific properties
+ and hints.
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
@@ -219,7 +219,7 @@
<xsd:simpleType name="persistence-unit-transaction-type">
<xsd:annotation>
<xsd:documentation>
- public enum TransactionType { JTA, RESOURCE_LOCAL };
+ public enum PersistenceUnitTransactionType {JTA, RESOURCE_LOCAL};
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -231,7 +231,7 @@
<xsd:simpleType name="persistence-unit-caching-type">
<xsd:annotation>
<xsd:documentation>
- public enum CachingType { ALL, NONE, ENABLE_SELECTIVE,
+ public enum SharedCacheMode { ALL, NONE, ENABLE_SELECTIVE,
DISABLE_SELECTIVE, UNSPECIFIED};
</xsd:documentation>
</xsd:annotation>
Modified: openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_meta.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_meta.xml?rev=796511&r1=796510&r2=796511&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_meta.xml (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_meta.xml Tue Jul 21 19:40:27 2009
@@ -2042,7 +2042,7 @@
version="2.0">
<xsd:annotation>
<xsd:documentation>
- @(#)orm_2_0.xsd 2.0 May 27 2009
+ @(#)orm_2_0.xsd 2.0 July 17 2009
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
@@ -2307,12 +2307,13 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description" type="xsd:string"
- minOccurs="0" />
- <xsd:element name="join-column" type="orm:join-column"
- minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="join-table" type="orm:join-table"
- minOccurs="0" />
+ <xsd:element name="description" type="xsd:string" minOccurs="0" />
+ <xsd:choice>
+ <xsd:element name="join-column" type="orm:join-column"
+ minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element name="join-table" type="orm:join-table"
+ minOccurs="0" />
+ </xsd:choice>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
@@ -2406,7 +2407,8 @@
<xsd:complexType name="cascade-type">
<xsd:annotation>
<xsd:documentation>
- public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH};
+ public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH,
+ DETACH};
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -2420,6 +2422,8 @@
minOccurs="0" />
<xsd:element name="cascade-refresh" type="orm:emptyType"
minOccurs="0" />
+ <xsd:element name="cascade-detach" type="orm:emptyType"
+ minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<!-- **************************************************** -->
Modified: openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_persistence.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_persistence.xml?rev=796511&r1=796510&r2=796511&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_persistence.xml (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_persistence.xml Tue Jul 21 19:40:27 2009
@@ -114,7 +114,7 @@
version="2.0">
<xsd:annotation>
<xsd:documentation>
- @(#)persistence_2_0.xsd 1.0 May 8 2009
+ @(#)persistence_2_0.xsd 1.0 July 17 2009
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
@@ -211,8 +211,7 @@
maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
- Jar file that should be scanned for entities.
- Not applicable to Java SE persistence units.
+ Jar file that is to be scanned for managed classes.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -221,14 +220,15 @@
minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
- Class to scan for annotations. It should be annotated
+ Managed class to be included in the persistence unit and
+ to scan for annotations. It should be annotated
with either @Entity, @Embeddable or @MappedSuperclass.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<!-- **************************************************** -->
<xsd:element name="exclude-unlisted-classes"
- type="xsd:boolean" default="false"
+ type="xsd:boolean" default="true"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -263,8 +263,7 @@
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
- Specifies the validation mode to be used for the
- persistence unit.
+ The validation mode to be used for the persistence unit.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -273,7 +272,8 @@
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
- A list of vendor-specific properties.
+ A list of standard and vendor-specific properties
+ and hints.
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
@@ -328,7 +328,7 @@
<xsd:simpleType name="persistence-unit-transaction-type">
<xsd:annotation>
<xsd:documentation>
- public enum TransactionType { JTA, RESOURCE_LOCAL };
+ public enum PersistenceUnitTransactionType {JTA, RESOURCE_LOCAL};
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -340,7 +340,7 @@
<xsd:simpleType name="persistence-unit-caching-type">
<xsd:annotation>
<xsd:documentation>
- public enum CachingType { ALL, NONE, ENABLE_SELECTIVE,
+ public enum SharedCacheMode { ALL, NONE, ENABLE_SELECTIVE,
DISABLE_SELECTIVE, UNSPECIFIED};
</xsd:documentation>
</xsd:annotation>