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/03/27 21:58:11 UTC

svn commit: r759348 [4/4] - in /openjpa/trunk: ./ openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/ openjpa-persistence-jdbc/src/test/java/org/apach...

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=759348&r1=759347&r2=759348&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 Fri Mar 27 20:58:10 2009
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- persistence.xml schema -->
+    <!-- persistence.xml schema -->
 <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">
     <xsd:annotation>
         <xsd:documentation>
             @(#)persistence_2_0.xsd 1.0 August 27 2008
-        </xsd:documentation>
+</xsd:documentation>
     </xsd:annotation>
     <xsd:annotation>
-        <xsd:documentation>
-            <![CDATA[
+        <xsd:documentation><![CDATA[
 This is the XML Schema for the persistence configuration file.
 The file must be named "META-INF/persistence.xml" in the
 persistence archive.
@@ -28,8 +27,7 @@
 version="2.0">
 ...
 </persistence>
-]]>
-        </xsd:documentation>
+]]></xsd:documentation>
     </xsd:annotation>
     <xsd:simpleType name="versionType">
         <xsd:restriction base="xsd:token">
@@ -41,8 +39,8 @@
         <xsd:complexType>
             <xsd:sequence>
                 <!-- **************************************************** -->
-                <xsd:element name="persistence-unit" minOccurs="1"
-                    maxOccurs="unbounded">
+                <xsd:element name="persistence-unit"
+                    minOccurs="1" maxOccurs="unbounded">
                     <xsd:complexType>
                         <xsd:annotation>
                             <xsd:documentation>
@@ -55,8 +53,7 @@
                                 type="xsd:string" minOccurs="0">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        Description of this persistence
-                                        unit.
+                                        Description of this persistence unit.
                                     </xsd:documentation>
                                 </xsd:annotation>
                             </xsd:element>
@@ -65,8 +62,7 @@
                                 type="xsd:string" minOccurs="0">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        Provider class that supplies
-                                        EntityManagers for this
+                                        Provider class that supplies EntityManagers for this
                                         persistence unit.
                                     </xsd:documentation>
                                 </xsd:annotation>
@@ -76,8 +72,7 @@
                                 type="xsd:string" minOccurs="0">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        The container-specific name of
-                                        the JTA datasource to use.
+                                        The container-specific name of the JTA datasource to use.
                                     </xsd:documentation>
                                 </xsd:annotation>
                             </xsd:element>
@@ -86,8 +81,7 @@
                                 type="xsd:string" minOccurs="0">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        The container-specific name of a
-                                        non-JTA datasource to use.
+                                        The container-specific name of a non-JTA datasource to use.
                                     </xsd:documentation>
                                 </xsd:annotation>
                             </xsd:element>
@@ -97,10 +91,8 @@
                                 maxOccurs="unbounded">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        File containing mapping
-                                        information. Loaded as a
-                                        resource by the persistence
-                                        provider.
+                                        File containing mapping information. Loaded as a resource
+                                        by the persistence provider.
                                     </xsd:documentation>
                                 </xsd:annotation>
                             </xsd:element>
@@ -110,9 +102,8 @@
                                 maxOccurs="unbounded">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        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.
                                     </xsd:documentation>
                                 </xsd:annotation>
                             </xsd:element>
@@ -121,10 +112,8 @@
                                 minOccurs="0" maxOccurs="unbounded">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        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.
                                     </xsd:documentation>
                                 </xsd:annotation>
                             </xsd:element>
@@ -134,13 +123,38 @@
                                 minOccurs="0">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        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.
+                                    </xsd:documentation>
+                                </xsd:annotation>
+                            </xsd:element>
+                            <!-- **************************************************** -->
+                            <xsd:element name="caching"
+                                type="persistence:persistence-unit-caching-type"
+                                minOccurs="0">
+                                <xsd:annotation>
+                                    <xsd:documentation>
+                                        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.
+                                    </xsd:documentation>
+                                </xsd:annotation>
+                            </xsd:element>
+                            <!-- **************************************************** -->
+                            <xsd:element name="validation-mode"
+                                type="persistence:persistence-unit-validation-mode-type"
+                                minOccurs="0">
+                                <xsd:annotation>
+                                    <xsd:documentation>
+                                        Specifies the validation mode to be used for the
+                                        persistence unit.
                                     </xsd:documentation>
                                 </xsd:annotation>
                             </xsd:element>
@@ -149,15 +163,13 @@
                                 minOccurs="0">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        A list of vendor-specific
-                                        properties.
+                                        A list of vendor-specific properties.
                                     </xsd:documentation>
                                 </xsd:annotation>
                                 <xsd:complexType>
                                     <xsd:sequence>
                                         <xsd:element name="property"
-                                            minOccurs="0"
-                                            maxOccurs="unbounded">
+                                            minOccurs="0" maxOccurs="unbounded">
                                             <xsd:annotation>
                                                 <xsd:documentation>
                                                     A name-value pair.
@@ -165,12 +177,10 @@
                                             </xsd:annotation>
                                             <xsd:complexType>
                                                 <xsd:attribute
-                                                    name="name"
-                                                    type="xsd:string"
+                                                    name="name" type="xsd:string"
                                                     use="required" />
                                                 <xsd:attribute
-                                                    name="value"
-                                                    type="xsd:string"
+                                                    name="value" type="xsd:string"
                                                     use="required" />
                                             </xsd:complexType>
                                         </xsd:element>
@@ -183,8 +193,7 @@
                             use="required">
                             <xsd:annotation>
                                 <xsd:documentation>
-                                    Name used in code to reference this
-                                    persistence unit.
+                                    Name used in code to reference this persistence unit.
                                 </xsd:documentation>
                             </xsd:annotation>
                         </xsd:attribute>
@@ -193,9 +202,8 @@
                             type="persistence:persistence-unit-transaction-type">
                             <xsd:annotation>
                                 <xsd:documentation>
-                                    Type of transactions used by
-                                    EntityManagers from this persistence
-                                    unit.
+                                    Type of transactions used by EntityManagers from this
+                                    persistence unit.
                                 </xsd:documentation>
                             </xsd:annotation>
                         </xsd:attribute>
@@ -218,4 +226,32 @@
             <xsd:enumeration value="RESOURCE_LOCAL" />
         </xsd:restriction>
     </xsd:simpleType>
+    <!-- **************************************************** -->
+    <xsd:simpleType name="persistence-unit-caching-type">
+        <xsd:annotation>
+            <xsd:documentation>
+                public enum CachingType { ALL, NONE, ENABLE_SELECTIVE,
+                DISABLE_SELECTIVE};
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:enumeration value="ALL" />
+            <xsd:enumeration value="NONE" />
+            <xsd:enumeration value="ENABLE_SELECTIVE" />
+            <xsd:enumeration value="DISABLE_SELECTIVE" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <!-- **************************************************** -->
+    <xsd:simpleType name="persistence-unit-validation-mode-type">
+        <xsd:annotation>
+            <xsd:documentation>
+                public enum ValidationMode { AUTO, CALLBACK, NONE};
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:enumeration value="AUTO" />
+            <xsd:enumeration value="CALLBACK" />
+            <xsd:enumeration value="NONE" />
+        </xsd:restriction>
+    </xsd:simpleType>
 </xsd:schema>
\ No newline at end of file

Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Fri Mar 27 20:58:10 2009
@@ -435,7 +435,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_2.0_spec</artifactId>
-                <version>1.0-EA-SNAPSHOT</version>
+                <version>1.0-EA2-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>