db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1664473 [2/3] - in /db/jdo/trunk: api/test/java/javax/jdo/ api/test/java/javax/jdo/stub/ api/test/schema/jdoconfig/Negative00/META-INF/ api/test/schema/jdoconfig/Negative01/META-INF/ api/test/schema/jdoconfig/Negative02/META-INF/ api/test/...
Date Thu, 05 Mar 2015 20:23:52 GMT
Modified: db/jdo/trunk/api/test/schema/jdoconfig/Positive03/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/schema/jdoconfig/Positive03/META-INF/jdoconfig.xml?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/api/test/schema/jdoconfig/Positive03/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api/test/schema/jdoconfig/Positive03/META-INF/jdoconfig.xml Thu Mar  5 20:23:52 2015
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Do not change any values in this file without also making changes to
-    JDOHelperConfigTest.java, as that file depends on the values in this one!
--->
-<jdoconfig
-    xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
-
-    <!-- Anonymous PMF & with META-INF/services lookup for PMF class name -->
-    <persistence-manager-factory/>
-</jdoconfig>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Do not change any values in this file without also making changes to
+    JDOHelperConfigTest.java, as that file depends on the values in this one!
+-->
+<jdoconfig
+    xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
+
+    <!-- Anonymous PMF & with META-INF/services lookup for PMF class name -->
+    <persistence-manager-factory/>
+</jdoconfig>

Modified: db/jdo/trunk/api/test/schema/jdoconfig/Positive04/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/schema/jdoconfig/Positive04/META-INF/jdoconfig.xml?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/api/test/schema/jdoconfig/Positive04/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api/test/schema/jdoconfig/Positive04/META-INF/jdoconfig.xml Thu Mar  5 20:23:52 2015
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Do not change any values in this file without also making changes to
-    JDOHelperConfigTest.java, as that file depends on the values in this one!
--->
-<jdoconfig
-    xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
-
-    <!-- Anonymous PMF & with META-INF/services lookup for PMF class name -->
-    <persistence-manager-factory/>
-</jdoconfig>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Do not change any values in this file without also making changes to
+    JDOHelperConfigTest.java, as that file depends on the values in this one!
+-->
+<jdoconfig
+    xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
+
+    <!-- Anonymous PMF & with META-INF/services lookup for PMF class name -->
+    <persistence-manager-factory/>
+</jdoconfig>

Modified: db/jdo/trunk/api/test/schema/jdoconfig/Positive04/META-INF/services/javax.jdo.PersistenceManagerFactory
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/schema/jdoconfig/Positive04/META-INF/services/javax.jdo.PersistenceManagerFactory?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/api/test/schema/jdoconfig/Positive04/META-INF/services/javax.jdo.PersistenceManagerFactory (original)
+++ db/jdo/trunk/api/test/schema/jdoconfig/Positive04/META-INF/services/javax.jdo.PersistenceManagerFactory Thu Mar  5 20:23:52 2015
@@ -1,3 +1,3 @@
-
-#this is a comment
-class.positive04.pmf0 # this is another comment
\ No newline at end of file
+
+#this is a comment
+class.positive04.pmf0 # this is another comment

Modified: db/jdo/trunk/api/test/schema/jdoconfig/Positive05/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/schema/jdoconfig/Positive05/META-INF/jdoconfig.xml?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/api/test/schema/jdoconfig/Positive05/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api/test/schema/jdoconfig/Positive05/META-INF/jdoconfig.xml Thu Mar  5 20:23:52 2015
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Do not change any values in this file without also making changes to
-    JDOHelperConfigTest.java, as that file depends on the values in this one!
--->
-<jdoconfig
-    xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
-
-    <!-- Anonymous PMF & with META-INF/services lookup for PMF class name -->
-    <persistence-manager-factory/>
-</jdoconfig>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Do not change any values in this file without also making changes to
+    JDOHelperConfigTest.java, as that file depends on the values in this one!
+-->
+<jdoconfig
+    xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
+
+    <!-- Anonymous PMF & with META-INF/services lookup for PMF class name -->
+    <persistence-manager-factory/>
+</jdoconfig>

Modified: db/jdo/trunk/api/test/schema/jdoconfig/Positive06/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/schema/jdoconfig/Positive06/META-INF/jdoconfig.xml?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/api/test/schema/jdoconfig/Positive06/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api/test/schema/jdoconfig/Positive06/META-INF/jdoconfig.xml Thu Mar  5 20:23:52 2015
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Do not change any values in this file without also making changes to
-    JDOHelperConfigTest.java, as that file depends on the values in this one!
--->
-<jdoconfig
-    xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
-
-    <!--
-        Basic anonymous PMF config using attributes & listeners with no nonstandard
-        properties.
-    -->
-    <persistence-manager-factory
-        class="class.positive06.pmf0"
-        connection-driver-name="connection-driver-name.positive06.pmf0"
-        connection-factory-name="connection-factory-name.positive06.pmf0"
-        connection-factory2-name="connection-factory2-name.positive06.pmf0"
-        connection-password="connection-password.positive06.pmf0"
-        connection-url="connection-url.positive06.pmf0"
-        connection-user-name="connection-user-name.positive06.pmf0"
-        ignore-cache="ignore-cache.positive06.pmf0"
-        mapping="mapping.positive06.pmf0"
-        multithreaded="multithreaded.positive06.pmf0"
-        nontransactional-read="nontransactional-read.positive06.pmf0"
-        nontransactional-write="nontransactional-write.positive06.pmf0"
-        optimistic="optimistic.positive06.pmf0"
-        restore-values="restore-values.positive06.pmf0"
-        retain-values="retain-values.positive06.pmf0"
-        detach-all-on-commit="detach-all-on-commit.positive06.pmf0"
-        server-time-zone-id="server-time-zone-id.positive06.pmf0">
-
-        <instance-lifecycle-listener
-            listener="listener.positive06.pmf0.listener0"
-            classes="classes.positive06.pmf0.classes0"
-            />
-        <instance-lifecycle-listener
-            listener="listener.positive06.pmf0.listener1"
-            classes="classes.positive06.pmf0.classes1"
-            />
-    </persistence-manager-factory>
-</jdoconfig>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Do not change any values in this file without also making changes to
+    JDOHelperConfigTest.java, as that file depends on the values in this one!
+-->
+<jdoconfig
+    xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
+
+    <!--
+        Basic anonymous PMF config using attributes & listeners with no nonstandard
+        properties.
+    -->
+    <persistence-manager-factory
+        class="class.positive06.pmf0"
+        connection-driver-name="connection-driver-name.positive06.pmf0"
+        connection-factory-name="connection-factory-name.positive06.pmf0"
+        connection-factory2-name="connection-factory2-name.positive06.pmf0"
+        connection-password="connection-password.positive06.pmf0"
+        connection-url="connection-url.positive06.pmf0"
+        connection-user-name="connection-user-name.positive06.pmf0"
+        ignore-cache="ignore-cache.positive06.pmf0"
+        mapping="mapping.positive06.pmf0"
+        multithreaded="multithreaded.positive06.pmf0"
+        nontransactional-read="nontransactional-read.positive06.pmf0"
+        nontransactional-write="nontransactional-write.positive06.pmf0"
+        optimistic="optimistic.positive06.pmf0"
+        restore-values="restore-values.positive06.pmf0"
+        retain-values="retain-values.positive06.pmf0"
+        detach-all-on-commit="detach-all-on-commit.positive06.pmf0"
+        server-time-zone-id="server-time-zone-id.positive06.pmf0">
+
+        <instance-lifecycle-listener
+            listener="listener.positive06.pmf0.listener0"
+            classes="classes.positive06.pmf0.classes0"
+            />
+        <instance-lifecycle-listener
+            listener="listener.positive06.pmf0.listener1"
+            classes="classes.positive06.pmf0.classes1"
+            />
+    </persistence-manager-factory>
+</jdoconfig>

Modified: db/jdo/trunk/api/test/schema/jdoconfig/Positive07/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/schema/jdoconfig/Positive07/META-INF/jdoconfig.xml?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/api/test/schema/jdoconfig/Positive07/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api/test/schema/jdoconfig/Positive07/META-INF/jdoconfig.xml Thu Mar  5 20:23:52 2015
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Do not change any values in this file without also making changes to
-    JDOHelperConfigTest.java, as that file depends on the values in this one!
--->
-<jdoconfig
-    xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
-
-    <!--
-        Basic anonymous PMF config using attributes & listeners with no nonstandard
-        properties but with a PU name.
-    -->
-    <persistence-manager-factory
-        class="class.positive07.pmf0"
-        connection-driver-name="connection-driver-name.positive07.pmf0"
-        connection-factory-name="connection-factory-name.positive07.pmf0"
-        connection-factory2-name="connection-factory2-name.positive07.pmf0"
-        connection-password="connection-password.positive07.pmf0"
-        connection-url="connection-url.positive07.pmf0"
-        connection-user-name="connection-user-name.positive07.pmf0"
-        ignore-cache="ignore-cache.positive07.pmf0"
-        mapping="mapping.positive07.pmf0"
-        multithreaded="multithreaded.positive07.pmf0"
-        nontransactional-read="nontransactional-read.positive07.pmf0"
-        nontransactional-write="nontransactional-write.positive07.pmf0"
-        optimistic="optimistic.positive07.pmf0"
-        persistence-unit-name="persistence-unit-name.positive07.pmf0"
-        restore-values="restore-values.positive07.pmf0"
-        retain-values="retain-values.positive07.pmf0"
-        detach-all-on-commit="detach-all-on-commit.positive07.pmf0"
-        server-time-zone-id="server-time-zone-id.positive07.pmf0">
-
-        <instance-lifecycle-listener
-            listener="listener.positive07.pmf0.listener0"
-            classes="classes.positive07.pmf0.classes0"
-            />
-        <instance-lifecycle-listener
-            listener="listener.positive07.pmf0.listener1"
-            classes="classes.positive07.pmf0.classes1"
-            />
-    </persistence-manager-factory>
-</jdoconfig>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Do not change any values in this file without also making changes to
+    JDOHelperConfigTest.java, as that file depends on the values in this one!
+-->
+<jdoconfig
+    xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
+
+    <!--
+        Basic anonymous PMF config using attributes & listeners with no nonstandard
+        properties but with a PU name.
+    -->
+    <persistence-manager-factory
+        class="class.positive07.pmf0"
+        connection-driver-name="connection-driver-name.positive07.pmf0"
+        connection-factory-name="connection-factory-name.positive07.pmf0"
+        connection-factory2-name="connection-factory2-name.positive07.pmf0"
+        connection-password="connection-password.positive07.pmf0"
+        connection-url="connection-url.positive07.pmf0"
+        connection-user-name="connection-user-name.positive07.pmf0"
+        ignore-cache="ignore-cache.positive07.pmf0"
+        mapping="mapping.positive07.pmf0"
+        multithreaded="multithreaded.positive07.pmf0"
+        nontransactional-read="nontransactional-read.positive07.pmf0"
+        nontransactional-write="nontransactional-write.positive07.pmf0"
+        optimistic="optimistic.positive07.pmf0"
+        persistence-unit-name="persistence-unit-name.positive07.pmf0"
+        restore-values="restore-values.positive07.pmf0"
+        retain-values="retain-values.positive07.pmf0"
+        detach-all-on-commit="detach-all-on-commit.positive07.pmf0"
+        server-time-zone-id="server-time-zone-id.positive07.pmf0">
+
+        <instance-lifecycle-listener
+            listener="listener.positive07.pmf0.listener0"
+            classes="classes.positive07.pmf0.classes0"
+            />
+        <instance-lifecycle-listener
+            listener="listener.positive07.pmf0.listener1"
+            classes="classes.positive07.pmf0.classes1"
+            />
+    </persistence-manager-factory>
+</jdoconfig>
+

Modified: db/jdo/trunk/specification/imports/jdo_2_0.dtd
URL: http://svn.apache.org/viewvc/db/jdo/trunk/specification/imports/jdo_2_0.dtd?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/specification/imports/jdo_2_0.dtd (original)
+++ db/jdo/trunk/specification/imports/jdo_2_0.dtd Thu Mar  5 20:23:52 2015
@@ -1,241 +1,241 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- The DOCTYPE should be as follows for metadata documents.
-<!DOCTYPE jdo
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
-    "http://java.sun.com/dtd/jdo_2_0.dtd">
--->
-<!ELEMENT jdo (extension*, (package|query)+, extension*)>
-<!ATTLIST jdo catalog CDATA #IMPLIED>
-<!ATTLIST jdo schema CDATA #IMPLIED>
-
-<!ELEMENT package (extension*, (interface|class|sequence)+, extension*)>
-<!ATTLIST package name CDATA ''>
-<!ATTLIST package catalog CDATA #IMPLIED>
-<!ATTLIST package schema CDATA #IMPLIED>
-
-<!ELEMENT interface (extension*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, property*, query*, fetch-group*, extension*)>
-<!ATTLIST interface name CDATA #REQUIRED>
-<!ATTLIST interface table CDATA #IMPLIED>
-<!ATTLIST interface identity-type (datastore|application|nondurable) #IMPLIED>
-<!ATTLIST interface objectid-class CDATA #IMPLIED>
-<!ATTLIST interface requires-extent (true|false) 'true'>
-<!ATTLIST interface detachable (true|false) 'false'>
-<!ATTLIST interface embedded-only (true|false) #IMPLIED>
-<!ATTLIST interface catalog CDATA #IMPLIED>
-<!ATTLIST interface schema CDATA #IMPLIED>
-
-<!ELEMENT property (extension*, (array|collection|map)?, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST property name CDATA #REQUIRED>
-<!ATTLIST property persistence-modifier (persistent|transactional|none) #IMPLIED>
-<!ATTLIST property default-fetch-group (true|false) #IMPLIED>
-<!ATTLIST property load-fetch-group CDATA #IMPLIED>
-<!ATTLIST property null-value (default|exception|none) 'none'>
-<!ATTLIST property dependent (true|false) #IMPLIED>
-<!ATTLIST property embedded (true|false) #IMPLIED>
-<!ATTLIST property primary-key (true|false) 'false'>
-<!ATTLIST property value-strategy CDATA #IMPLIED>
-<!ATTLIST property sequence CDATA #IMPLIED>
-<!ATTLIST property serialized (true|false) #IMPLIED>
-<!ATTLIST property field-type CDATA #IMPLIED>
-<!ATTLIST property table CDATA #IMPLIED>
-<!ATTLIST property column CDATA #IMPLIED>
-<!ATTLIST property delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST property indexed (true|false|unique) #IMPLIED>
-<!ATTLIST property unique (true|false) #IMPLIED>
-<!ATTLIST property mapped-by CDATA #IMPLIED>
-<!ATTLIST property recursion-depth CDATA #IMPLIED>
-<!ATTLIST property field-name CDATA #IMPLIED>
-
-<!ELEMENT class (extension*, implements*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, column*, field*, property*, query*, fetch-group*, extension*)>
-<!ATTLIST class name CDATA #REQUIRED>
-<!ATTLIST class identity-type (application|datastore|nondurable) #IMPLIED>
-<!ATTLIST class objectid-class CDATA #IMPLIED>
-<!ATTLIST class table CDATA #IMPLIED>
-<!ATTLIST class requires-extent (true|false) 'true'>
-<!ATTLIST class persistence-capable-superclass CDATA #IMPLIED>
-<!ATTLIST class detachable (true|false) 'false'>
-<!ATTLIST class embedded-only (true|false) #IMPLIED>
-<!ATTLIST class persistence-modifier (persistence-capable|persistence-aware|non-persistent) #IMPLIED>
-<!ATTLIST class catalog CDATA #IMPLIED>
-<!ATTLIST class schema CDATA #IMPLIED>
-
-<!ELEMENT primary-key (extension*, column*, extension*)>
-<!ATTLIST primary-key name CDATA #IMPLIED>
-<!ATTLIST primary-key column CDATA #IMPLIED>
-
-<!ELEMENT join (extension*, primary-key?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST join table CDATA #IMPLIED>
-<!ATTLIST join column CDATA #IMPLIED>
-<!ATTLIST join outer (true|false) 'false'>
-<!ATTLIST join delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST join indexed (true|false|unique) #IMPLIED>
-<!ATTLIST join unique (true|false) #IMPLIED>
-
-<!ELEMENT version (extension*, column*, index?, extension*)>
-<!ATTLIST version strategy CDATA #IMPLIED>
-<!ATTLIST version column CDATA #IMPLIED>
-<!ATTLIST version indexed (true|false|unique) #IMPLIED>
-
-<!ELEMENT datastore-identity (extension*, column*, extension*)>
-<!ATTLIST datastore-identity column CDATA #IMPLIED>
-<!ATTLIST datastore-identity strategy CDATA 'native'>
-<!ATTLIST datastore-identity sequence CDATA #IMPLIED>
-
-<!ELEMENT implements (extension*, property*, extension*)>
-<!ATTLIST implements name CDATA #REQUIRED>
-
-<!ELEMENT inheritance (extension*, join?, discriminator?, extension*)>
-<!ATTLIST inheritance strategy CDATA #IMPLIED>
-
-<!ELEMENT discriminator (extension*, column*, index?, extension*)>
-<!ATTLIST discriminator column CDATA #IMPLIED>
-<!ATTLIST discriminator value CDATA #IMPLIED>
-<!ATTLIST discriminator strategy CDATA #IMPLIED>
-<!ATTLIST discriminator indexed (true|false|unique) #IMPLIED>
-
-<!ELEMENT column (extension*)>
-<!ATTLIST column name CDATA #IMPLIED>
-<!ATTLIST column target CDATA #IMPLIED>
-<!ATTLIST column target-field CDATA #IMPLIED>
-<!ATTLIST column jdbc-type CDATA #IMPLIED>
-<!ATTLIST column sql-type CDATA #IMPLIED>
-<!ATTLIST column length CDATA #IMPLIED>
-<!ATTLIST column scale CDATA #IMPLIED>
-<!ATTLIST column allows-null (true|false) #IMPLIED>
-<!ATTLIST column default-value CDATA #IMPLIED>
-<!ATTLIST column insert-value CDATA #IMPLIED>
-
-<!ELEMENT field (extension*, (array|collection|map)?, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST field name CDATA #REQUIRED>
-<!ATTLIST field persistence-modifier (persistent|transactional|none) #IMPLIED>
-<!ATTLIST field field-type CDATA #IMPLIED>
-<!ATTLIST field table CDATA #IMPLIED>
-<!ATTLIST field column CDATA #IMPLIED>
-<!ATTLIST field primary-key (true|false) 'false'>
-<!ATTLIST field null-value (exception|default|none) 'none'>
-<!ATTLIST field default-fetch-group (true|false) #IMPLIED>
-<!ATTLIST field embedded (true|false) #IMPLIED>
-<!ATTLIST field serialized (true|false) #IMPLIED>
-<!ATTLIST field dependent (true|false) #IMPLIED>
-<!ATTLIST field value-strategy CDATA #IMPLIED>
-<!ATTLIST field delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST field indexed (true|false|unique) #IMPLIED>
-<!ATTLIST field unique (true|false) #IMPLIED>
-<!ATTLIST field sequence CDATA #IMPLIED>
-<!ATTLIST field load-fetch-group CDATA #IMPLIED>
-<!ATTLIST field recursion-depth CDATA #IMPLIED>
-<!ATTLIST field mapped-by CDATA #IMPLIED>
-
-<!ELEMENT foreign-key (extension*, (column* | field* | property*), extension*)>
-<!ATTLIST foreign-key table CDATA #IMPLIED>
-<!ATTLIST foreign-key deferred (true|false) #IMPLIED>
-<!ATTLIST foreign-key delete-action (restrict|cascade|null|default|none) 'restrict'>
-<!ATTLIST foreign-key update-action (restrict|cascade|null|default|none) 'restrict'>
-<!ATTLIST foreign-key unique (true|false) #IMPLIED>
-<!ATTLIST foreign-key name CDATA #IMPLIED>
-
-<!ELEMENT collection (extension*)>
-<!ATTLIST collection element-type CDATA #IMPLIED>
-<!ATTLIST collection embedded-element (true|false) #IMPLIED>
-<!ATTLIST collection dependent-element (true|false) #IMPLIED>
-<!ATTLIST collection serialized-element (true|false) #IMPLIED>
-
-<!ELEMENT map (extension)*>
-<!ATTLIST map key-type CDATA #IMPLIED>
-<!ATTLIST map embedded-key (true|false) #IMPLIED>
-<!ATTLIST map dependent-key (true|false) #IMPLIED>
-<!ATTLIST map serialized-key (true|false) #IMPLIED>
-<!ATTLIST map value-type CDATA #IMPLIED>
-<!ATTLIST map embedded-value (true|false) #IMPLIED>
-<!ATTLIST map dependent-value (true|false) #IMPLIED>
-<!ATTLIST map serialized-value (true|false) #IMPLIED>
-
-<!ELEMENT key (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST key column CDATA #IMPLIED>
-<!ATTLIST key table CDATA #IMPLIED>
-<!ATTLIST key delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST key update-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST key indexed (true|false|unique) #IMPLIED>
-<!ATTLIST key unique (true|false) #IMPLIED>
-<!ATTLIST key mapped-by CDATA #IMPLIED>
-
-<!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST value column CDATA #IMPLIED>
-<!ATTLIST value table CDATA #IMPLIED>
-<!ATTLIST value delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST value update-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST value indexed (true|false|unique) #IMPLIED>
-<!ATTLIST value unique (true|false) #IMPLIED>
-<!ATTLIST value mapped-by CDATA #IMPLIED>
-
-<!ELEMENT array (extension*)>
-<!ATTLIST array element-type CDATA #IMPLIED>
-<!ATTLIST array embedded-element (true|false) #IMPLIED>
-<!ATTLIST array dependent-element (true|false) #IMPLIED>
-<!ATTLIST array serialized-element (true|false) #IMPLIED>
-
-<!ELEMENT element (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST element column CDATA #IMPLIED>
-<!ATTLIST element table CDATA #IMPLIED>
-<!ATTLIST element delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST element update-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST element indexed (true|false|unique) #IMPLIED>
-<!ATTLIST element unique (true|false) #IMPLIED>
-<!ATTLIST element mapped-by CDATA #IMPLIED>
-
-<!ELEMENT order (extension*, column*, index?, extension*)>
-<!ATTLIST order column CDATA #IMPLIED>
-<!ATTLIST order mapped-by CDATA #IMPLIED>
-
-<!ELEMENT fetch-group (extension*, (fetch-group|field|property)*, extension*)>
-<!ATTLIST fetch-group name CDATA #REQUIRED>
-<!ATTLIST fetch-group post-load (true|false) #IMPLIED>
-
-<!ELEMENT embedded (extension*, (field|property)*, extension*)>
-<!ATTLIST embedded owner-field CDATA #IMPLIED>
-<!ATTLIST embedded null-indicator-column CDATA #IMPLIED>
-<!ATTLIST embedded null-indicator-value CDATA #IMPLIED>
-
-<!ELEMENT sequence (extension*)>
-<!ATTLIST sequence name CDATA #REQUIRED>
-<!ATTLIST sequence datastore-sequence CDATA #IMPLIED>
-<!ATTLIST sequence factory-class CDATA #IMPLIED>
-<!ATTLIST sequence strategy (nontransactional|contiguous|noncontiguous) #REQUIRED>
-
-<!ELEMENT index (extension*, (column* | field* | property*), extension*)>
-<!ATTLIST index name CDATA #IMPLIED>
-<!ATTLIST index table CDATA #IMPLIED>
-<!ATTLIST index unique (true|false) 'false'>
-
-<!ELEMENT query (#PCDATA|extension)*>
-<!ATTLIST query name CDATA #REQUIRED>
-<!ATTLIST query language CDATA #IMPLIED>
-<!ATTLIST query unmodifiable (true|false) 'false'>
-<!ATTLIST query unique (true|false) #IMPLIED>
-<!ATTLIST query result-class CDATA #IMPLIED>
-
-<!ELEMENT unique (extension*, (column* | field* | property*), extension*)>
-<!ATTLIST unique name CDATA #IMPLIED>
-<!ATTLIST unique table CDATA #IMPLIED>
-<!ATTLIST unique deferred (true|false) 'false'>
-
-<!ELEMENT extension ANY>
-<!ATTLIST extension vendor-name CDATA #REQUIRED>
-<!ATTLIST extension key CDATA #IMPLIED>
-<!ATTLIST extension value CDATA #IMPLIED>
-
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- The DOCTYPE should be as follows for metadata documents.
+<!DOCTYPE jdo
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
+    "http://java.sun.com/dtd/jdo_2_0.dtd">
+-->
+<!ELEMENT jdo (extension*, (package|query)+, extension*)>
+<!ATTLIST jdo catalog CDATA #IMPLIED>
+<!ATTLIST jdo schema CDATA #IMPLIED>
+
+<!ELEMENT package (extension*, (interface|class|sequence)+, extension*)>
+<!ATTLIST package name CDATA ''>
+<!ATTLIST package catalog CDATA #IMPLIED>
+<!ATTLIST package schema CDATA #IMPLIED>
+
+<!ELEMENT interface (extension*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, property*, query*, fetch-group*, extension*)>
+<!ATTLIST interface name CDATA #REQUIRED>
+<!ATTLIST interface table CDATA #IMPLIED>
+<!ATTLIST interface identity-type (datastore|application|nondurable) #IMPLIED>
+<!ATTLIST interface objectid-class CDATA #IMPLIED>
+<!ATTLIST interface requires-extent (true|false) 'true'>
+<!ATTLIST interface detachable (true|false) 'false'>
+<!ATTLIST interface embedded-only (true|false) #IMPLIED>
+<!ATTLIST interface catalog CDATA #IMPLIED>
+<!ATTLIST interface schema CDATA #IMPLIED>
+
+<!ELEMENT property (extension*, (array|collection|map)?, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST property name CDATA #REQUIRED>
+<!ATTLIST property persistence-modifier (persistent|transactional|none) #IMPLIED>
+<!ATTLIST property default-fetch-group (true|false) #IMPLIED>
+<!ATTLIST property load-fetch-group CDATA #IMPLIED>
+<!ATTLIST property null-value (default|exception|none) 'none'>
+<!ATTLIST property dependent (true|false) #IMPLIED>
+<!ATTLIST property embedded (true|false) #IMPLIED>
+<!ATTLIST property primary-key (true|false) 'false'>
+<!ATTLIST property value-strategy CDATA #IMPLIED>
+<!ATTLIST property sequence CDATA #IMPLIED>
+<!ATTLIST property serialized (true|false) #IMPLIED>
+<!ATTLIST property field-type CDATA #IMPLIED>
+<!ATTLIST property table CDATA #IMPLIED>
+<!ATTLIST property column CDATA #IMPLIED>
+<!ATTLIST property delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST property indexed (true|false|unique) #IMPLIED>
+<!ATTLIST property unique (true|false) #IMPLIED>
+<!ATTLIST property mapped-by CDATA #IMPLIED>
+<!ATTLIST property recursion-depth CDATA #IMPLIED>
+<!ATTLIST property field-name CDATA #IMPLIED>
+
+<!ELEMENT class (extension*, implements*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, column*, field*, property*, query*, fetch-group*, extension*)>
+<!ATTLIST class name CDATA #REQUIRED>
+<!ATTLIST class identity-type (application|datastore|nondurable) #IMPLIED>
+<!ATTLIST class objectid-class CDATA #IMPLIED>
+<!ATTLIST class table CDATA #IMPLIED>
+<!ATTLIST class requires-extent (true|false) 'true'>
+<!ATTLIST class persistence-capable-superclass CDATA #IMPLIED>
+<!ATTLIST class detachable (true|false) 'false'>
+<!ATTLIST class embedded-only (true|false) #IMPLIED>
+<!ATTLIST class persistence-modifier (persistence-capable|persistence-aware|non-persistent) #IMPLIED>
+<!ATTLIST class catalog CDATA #IMPLIED>
+<!ATTLIST class schema CDATA #IMPLIED>
+
+<!ELEMENT primary-key (extension*, column*, extension*)>
+<!ATTLIST primary-key name CDATA #IMPLIED>
+<!ATTLIST primary-key column CDATA #IMPLIED>
+
+<!ELEMENT join (extension*, primary-key?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST join table CDATA #IMPLIED>
+<!ATTLIST join column CDATA #IMPLIED>
+<!ATTLIST join outer (true|false) 'false'>
+<!ATTLIST join delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST join indexed (true|false|unique) #IMPLIED>
+<!ATTLIST join unique (true|false) #IMPLIED>
+
+<!ELEMENT version (extension*, column*, index?, extension*)>
+<!ATTLIST version strategy CDATA #IMPLIED>
+<!ATTLIST version column CDATA #IMPLIED>
+<!ATTLIST version indexed (true|false|unique) #IMPLIED>
+
+<!ELEMENT datastore-identity (extension*, column*, extension*)>
+<!ATTLIST datastore-identity column CDATA #IMPLIED>
+<!ATTLIST datastore-identity strategy CDATA 'native'>
+<!ATTLIST datastore-identity sequence CDATA #IMPLIED>
+
+<!ELEMENT implements (extension*, property*, extension*)>
+<!ATTLIST implements name CDATA #REQUIRED>
+
+<!ELEMENT inheritance (extension*, join?, discriminator?, extension*)>
+<!ATTLIST inheritance strategy CDATA #IMPLIED>
+
+<!ELEMENT discriminator (extension*, column*, index?, extension*)>
+<!ATTLIST discriminator column CDATA #IMPLIED>
+<!ATTLIST discriminator value CDATA #IMPLIED>
+<!ATTLIST discriminator strategy CDATA #IMPLIED>
+<!ATTLIST discriminator indexed (true|false|unique) #IMPLIED>
+
+<!ELEMENT column (extension*)>
+<!ATTLIST column name CDATA #IMPLIED>
+<!ATTLIST column target CDATA #IMPLIED>
+<!ATTLIST column target-field CDATA #IMPLIED>
+<!ATTLIST column jdbc-type CDATA #IMPLIED>
+<!ATTLIST column sql-type CDATA #IMPLIED>
+<!ATTLIST column length CDATA #IMPLIED>
+<!ATTLIST column scale CDATA #IMPLIED>
+<!ATTLIST column allows-null (true|false) #IMPLIED>
+<!ATTLIST column default-value CDATA #IMPLIED>
+<!ATTLIST column insert-value CDATA #IMPLIED>
+
+<!ELEMENT field (extension*, (array|collection|map)?, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST field name CDATA #REQUIRED>
+<!ATTLIST field persistence-modifier (persistent|transactional|none) #IMPLIED>
+<!ATTLIST field field-type CDATA #IMPLIED>
+<!ATTLIST field table CDATA #IMPLIED>
+<!ATTLIST field column CDATA #IMPLIED>
+<!ATTLIST field primary-key (true|false) 'false'>
+<!ATTLIST field null-value (exception|default|none) 'none'>
+<!ATTLIST field default-fetch-group (true|false) #IMPLIED>
+<!ATTLIST field embedded (true|false) #IMPLIED>
+<!ATTLIST field serialized (true|false) #IMPLIED>
+<!ATTLIST field dependent (true|false) #IMPLIED>
+<!ATTLIST field value-strategy CDATA #IMPLIED>
+<!ATTLIST field delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST field indexed (true|false|unique) #IMPLIED>
+<!ATTLIST field unique (true|false) #IMPLIED>
+<!ATTLIST field sequence CDATA #IMPLIED>
+<!ATTLIST field load-fetch-group CDATA #IMPLIED>
+<!ATTLIST field recursion-depth CDATA #IMPLIED>
+<!ATTLIST field mapped-by CDATA #IMPLIED>
+
+<!ELEMENT foreign-key (extension*, (column* | field* | property*), extension*)>
+<!ATTLIST foreign-key table CDATA #IMPLIED>
+<!ATTLIST foreign-key deferred (true|false) #IMPLIED>
+<!ATTLIST foreign-key delete-action (restrict|cascade|null|default|none) 'restrict'>
+<!ATTLIST foreign-key update-action (restrict|cascade|null|default|none) 'restrict'>
+<!ATTLIST foreign-key unique (true|false) #IMPLIED>
+<!ATTLIST foreign-key name CDATA #IMPLIED>
+
+<!ELEMENT collection (extension*)>
+<!ATTLIST collection element-type CDATA #IMPLIED>
+<!ATTLIST collection embedded-element (true|false) #IMPLIED>
+<!ATTLIST collection dependent-element (true|false) #IMPLIED>
+<!ATTLIST collection serialized-element (true|false) #IMPLIED>
+
+<!ELEMENT map (extension)*>
+<!ATTLIST map key-type CDATA #IMPLIED>
+<!ATTLIST map embedded-key (true|false) #IMPLIED>
+<!ATTLIST map dependent-key (true|false) #IMPLIED>
+<!ATTLIST map serialized-key (true|false) #IMPLIED>
+<!ATTLIST map value-type CDATA #IMPLIED>
+<!ATTLIST map embedded-value (true|false) #IMPLIED>
+<!ATTLIST map dependent-value (true|false) #IMPLIED>
+<!ATTLIST map serialized-value (true|false) #IMPLIED>
+
+<!ELEMENT key (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST key column CDATA #IMPLIED>
+<!ATTLIST key table CDATA #IMPLIED>
+<!ATTLIST key delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST key update-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST key indexed (true|false|unique) #IMPLIED>
+<!ATTLIST key unique (true|false) #IMPLIED>
+<!ATTLIST key mapped-by CDATA #IMPLIED>
+
+<!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST value column CDATA #IMPLIED>
+<!ATTLIST value table CDATA #IMPLIED>
+<!ATTLIST value delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST value update-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST value indexed (true|false|unique) #IMPLIED>
+<!ATTLIST value unique (true|false) #IMPLIED>
+<!ATTLIST value mapped-by CDATA #IMPLIED>
+
+<!ELEMENT array (extension*)>
+<!ATTLIST array element-type CDATA #IMPLIED>
+<!ATTLIST array embedded-element (true|false) #IMPLIED>
+<!ATTLIST array dependent-element (true|false) #IMPLIED>
+<!ATTLIST array serialized-element (true|false) #IMPLIED>
+
+<!ELEMENT element (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST element column CDATA #IMPLIED>
+<!ATTLIST element table CDATA #IMPLIED>
+<!ATTLIST element delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST element update-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST element indexed (true|false|unique) #IMPLIED>
+<!ATTLIST element unique (true|false) #IMPLIED>
+<!ATTLIST element mapped-by CDATA #IMPLIED>
+
+<!ELEMENT order (extension*, column*, index?, extension*)>
+<!ATTLIST order column CDATA #IMPLIED>
+<!ATTLIST order mapped-by CDATA #IMPLIED>
+
+<!ELEMENT fetch-group (extension*, (fetch-group|field|property)*, extension*)>
+<!ATTLIST fetch-group name CDATA #REQUIRED>
+<!ATTLIST fetch-group post-load (true|false) #IMPLIED>
+
+<!ELEMENT embedded (extension*, (field|property)*, extension*)>
+<!ATTLIST embedded owner-field CDATA #IMPLIED>
+<!ATTLIST embedded null-indicator-column CDATA #IMPLIED>
+<!ATTLIST embedded null-indicator-value CDATA #IMPLIED>
+
+<!ELEMENT sequence (extension*)>
+<!ATTLIST sequence name CDATA #REQUIRED>
+<!ATTLIST sequence datastore-sequence CDATA #IMPLIED>
+<!ATTLIST sequence factory-class CDATA #IMPLIED>
+<!ATTLIST sequence strategy (nontransactional|contiguous|noncontiguous) #REQUIRED>
+
+<!ELEMENT index (extension*, (column* | field* | property*), extension*)>
+<!ATTLIST index name CDATA #IMPLIED>
+<!ATTLIST index table CDATA #IMPLIED>
+<!ATTLIST index unique (true|false) 'false'>
+
+<!ELEMENT query (#PCDATA|extension)*>
+<!ATTLIST query name CDATA #REQUIRED>
+<!ATTLIST query language CDATA #IMPLIED>
+<!ATTLIST query unmodifiable (true|false) 'false'>
+<!ATTLIST query unique (true|false) #IMPLIED>
+<!ATTLIST query result-class CDATA #IMPLIED>
+
+<!ELEMENT unique (extension*, (column* | field* | property*), extension*)>
+<!ATTLIST unique name CDATA #IMPLIED>
+<!ATTLIST unique table CDATA #IMPLIED>
+<!ATTLIST unique deferred (true|false) 'false'>
+
+<!ELEMENT extension ANY>
+<!ATTLIST extension vendor-name CDATA #REQUIRED>
+<!ATTLIST extension key CDATA #IMPLIED>
+<!ATTLIST extension value CDATA #IMPLIED>
+

Modified: db/jdo/trunk/specification/imports/jdoconfig_2_1.dtd
URL: http://svn.apache.org/viewvc/db/jdo/trunk/specification/imports/jdoconfig_2_1.dtd?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/specification/imports/jdoconfig_2_1.dtd (original)
+++ db/jdo/trunk/specification/imports/jdoconfig_2_1.dtd Thu Mar  5 20:23:52 2015
@@ -1,51 +1,51 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!--
-<!DOCTYPE jdoconfig
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Configuration 2.1//EN"
-    "http://java.sun.com/dtd/jdoconfig_2_1.dtd">
--->
-<!ELEMENT jdoconfig (persistence-manager-factory+)>
-
-<!ELEMENT persistence-manager-factory (property*, instance-lifecycle-listener*)>
-<!ATTLIST persistence-manager-factory class CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory persistence-unit-name CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory optimistic (true|false) CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory retain-values (true|false) CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory restore-values (true|false) CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory ignore-cache (true|false) CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory nontransactional-read (true|false) CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory nontransactional-write (true|false) CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory multithreaded (true|false) CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory connection-driver-name CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory connection-user-name CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory connection-password CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory connection-url CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory connection-factory-name CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory connection-factory2-name CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory mapping CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory detach-all-on-commit (true|false) CDATA #IMPLIED>
-<!ATTLIST persistence-manager-factory server-time-zone-id CDATA #IMPLIED>
-
-<!ELEMENT property EMPTY>
-<!ATTLIST property name CDATA #REQUIRED>
-<!ATTLIST property value CDATA #IMPLIED>
-
-<!ELEMENT instance-lifecycle-listener EMPTY>
-<!ATTLIST instance-lifecycle-listener listener CDATA #REQUIRED>
-<!ATTLIST instance-lifecycle-listener classes CDATA #IMPLIED>
-
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+<!DOCTYPE jdoconfig
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Configuration 2.1//EN"
+    "http://java.sun.com/dtd/jdoconfig_2_1.dtd">
+-->
+<!ELEMENT jdoconfig (persistence-manager-factory+)>
+
+<!ELEMENT persistence-manager-factory (property*, instance-lifecycle-listener*)>
+<!ATTLIST persistence-manager-factory class CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory persistence-unit-name CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory optimistic (true|false) CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory retain-values (true|false) CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory restore-values (true|false) CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory ignore-cache (true|false) CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory nontransactional-read (true|false) CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory nontransactional-write (true|false) CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory multithreaded (true|false) CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory connection-driver-name CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory connection-user-name CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory connection-password CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory connection-url CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory connection-factory-name CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory connection-factory2-name CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory mapping CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory detach-all-on-commit (true|false) CDATA #IMPLIED>
+<!ATTLIST persistence-manager-factory server-time-zone-id CDATA #IMPLIED>
+
+<!ELEMENT property EMPTY>
+<!ATTLIST property name CDATA #REQUIRED>
+<!ATTLIST property value CDATA #IMPLIED>
+
+<!ELEMENT instance-lifecycle-listener EMPTY>
+<!ATTLIST instance-lifecycle-listener listener CDATA #REQUIRED>
+<!ATTLIST instance-lifecycle-listener classes CDATA #IMPLIED>
+

Modified: db/jdo/trunk/specification/imports/jdoquery_2_0.dtd
URL: http://svn.apache.org/viewvc/db/jdo/trunk/specification/imports/jdoquery_2_0.dtd?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/specification/imports/jdoquery_2_0.dtd (original)
+++ db/jdo/trunk/specification/imports/jdoquery_2_0.dtd Thu Mar  5 20:23:52 2015
@@ -1,43 +1,43 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- The DOCTYPE should be as follows for jdoquery documents.
-<!DOCTYPE jdoquery
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.0//EN"
-    "http://java.sun.com/dtd/jdoquery_2_0.dtd">
--->
-<!ELEMENT jdoquery (extension*, (package|query)+, (extension)*)>
-
-<!ELEMENT package (extension*, (interface|class)+, (extension)*)>
-<!ATTLIST package name CDATA ''>
-
-<!ELEMENT interface (extension*, query+, extension*)>
-<!ATTLIST interface name CDATA #REQUIRED>
-
-<!ELEMENT class (extension*, query+, extension*)>
-<!ATTLIST class name CDATA #REQUIRED>
-
-<!ELEMENT query (#PCDATA|extension)*>
-<!ATTLIST query name CDATA #REQUIRED>
-<!ATTLIST query language CDATA #IMPLIED>
-<!ATTLIST query unmodifiable (true|false) 'false'>
-<!ATTLIST query unique (true|false) #IMPLIED>
-<!ATTLIST query result-class CDATA #IMPLIED>
-
-<!ELEMENT extension ANY>
-<!ATTLIST extension vendor-name CDATA #REQUIRED>
-<!ATTLIST extension key CDATA #IMPLIED>
-<!ATTLIST extension value CDATA #IMPLIED>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- The DOCTYPE should be as follows for jdoquery documents.
+<!DOCTYPE jdoquery
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.0//EN"
+    "http://java.sun.com/dtd/jdoquery_2_0.dtd">
+-->
+<!ELEMENT jdoquery (extension*, (package|query)+, (extension)*)>
+
+<!ELEMENT package (extension*, (interface|class)+, (extension)*)>
+<!ATTLIST package name CDATA ''>
+
+<!ELEMENT interface (extension*, query+, extension*)>
+<!ATTLIST interface name CDATA #REQUIRED>
+
+<!ELEMENT class (extension*, query+, extension*)>
+<!ATTLIST class name CDATA #REQUIRED>
+
+<!ELEMENT query (#PCDATA|extension)*>
+<!ATTLIST query name CDATA #REQUIRED>
+<!ATTLIST query language CDATA #IMPLIED>
+<!ATTLIST query unmodifiable (true|false) 'false'>
+<!ATTLIST query unique (true|false) #IMPLIED>
+<!ATTLIST query result-class CDATA #IMPLIED>
+
+<!ELEMENT extension ANY>
+<!ATTLIST extension vendor-name CDATA #REQUIRED>
+<!ATTLIST extension key CDATA #IMPLIED>
+<!ATTLIST extension value CDATA #IMPLIED>

Modified: db/jdo/trunk/specification/imports/orm_2_0.dtd
URL: http://svn.apache.org/viewvc/db/jdo/trunk/specification/imports/orm_2_0.dtd?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/specification/imports/orm_2_0.dtd (original)
+++ db/jdo/trunk/specification/imports/orm_2_0.dtd Thu Mar  5 20:23:52 2015
@@ -1,182 +1,182 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- The DOCTYPE should be as follows for metadata documents.
-<!DOCTYPE orm
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
-    "http://java.sun.com/dtd/orm_2_0.dtd">
--->
-<!ELEMENT orm (extension*, (package|query)+, extension*)>
-<!ATTLIST orm catalog CDATA #IMPLIED>
-<!ATTLIST orm schema CDATA #IMPLIED>
-
-<!ELEMENT package (extension*, (interface|class|sequence)+, extension*)>
-<!ATTLIST package name CDATA ''>
-<!ATTLIST package catalog CDATA #IMPLIED>
-<!ATTLIST package schema CDATA #IMPLIED>
-
-<!ELEMENT interface (extension*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, property*, query*, extension*)>
-<!ATTLIST interface name CDATA #REQUIRED>
-<!ATTLIST interface table CDATA #IMPLIED>
-<!ATTLIST interface catalog CDATA #IMPLIED>
-<!ATTLIST interface schema CDATA #IMPLIED>
-
-<!ELEMENT property (extension*, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST property name CDATA #REQUIRED>
-<!ATTLIST property value-strategy CDATA #IMPLIED>
-<!ATTLIST property sequence CDATA #IMPLIED>
-<!ATTLIST property table CDATA #IMPLIED>
-<!ATTLIST property column CDATA #IMPLIED>
-<!ATTLIST property delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST property indexed (true|false|unique) #IMPLIED>
-<!ATTLIST property unique (true|false) #IMPLIED>
-<!ATTLIST property mapped-by CDATA #IMPLIED>
-
-<!ELEMENT class (extension*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, column*, field*, property*, query*, extension*)>
-<!ATTLIST class name CDATA #REQUIRED>
-<!ATTLIST class table CDATA #IMPLIED>
-<!ATTLIST class catalog CDATA #IMPLIED>
-<!ATTLIST class schema CDATA #IMPLIED>
-
-<!ELEMENT primary-key (extension*, column*, extension*)>
-<!ATTLIST primary-key name CDATA #IMPLIED>
-<!ATTLIST primary-key column CDATA #IMPLIED>
-
-<!ELEMENT join (extension*, primary-key?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST join table CDATA #IMPLIED>
-<!ATTLIST join column CDATA #IMPLIED>
-<!ATTLIST join outer (true|false) 'false'>
-<!ATTLIST join delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST join indexed (true|false|unique) #IMPLIED>
-<!ATTLIST join unique (true|false) #IMPLIED>
-
-<!ELEMENT version (extension*, column*, index?, extension*)>
-<!ATTLIST version strategy CDATA #IMPLIED>
-<!ATTLIST version column CDATA #IMPLIED>
-<!ATTLIST version indexed (true|false|unique) #IMPLIED>
-
-<!ELEMENT datastore-identity (extension*, column*, extension*)>
-<!ATTLIST datastore-identity column CDATA #IMPLIED>
-<!ATTLIST datastore-identity strategy CDATA 'native'>
-<!ATTLIST datastore-identity sequence CDATA #IMPLIED>
-
-<!ELEMENT implements (extension*, property*, extension*)>
-<!ATTLIST implements name CDATA #REQUIRED>
-
-<!ELEMENT inheritance (extension*, join?, discriminator?, extension*)>
-<!ATTLIST inheritance strategy CDATA #IMPLIED>
-
-<!ELEMENT discriminator (extension*, column*, index?, extension*)>
-<!ATTLIST discriminator column CDATA #IMPLIED>
-<!ATTLIST discriminator value CDATA #IMPLIED>
-<!ATTLIST discriminator strategy CDATA #IMPLIED>
-<!ATTLIST discriminator indexed (true|false|unique) #IMPLIED>
-
-<!ELEMENT column (extension*)>
-<!ATTLIST column name CDATA #IMPLIED>
-<!ATTLIST column target CDATA #IMPLIED>
-<!ATTLIST column target-field CDATA #IMPLIED>
-<!ATTLIST column jdbc-type CDATA #IMPLIED>
-<!ATTLIST column sql-type CDATA #IMPLIED>
-<!ATTLIST column length CDATA #IMPLIED>
-<!ATTLIST column scale CDATA #IMPLIED>
-<!ATTLIST column allows-null (true|false) #IMPLIED>
-<!ATTLIST column default-value CDATA #IMPLIED>
-<!ATTLIST column insert-value CDATA #IMPLIED>
-
-<!ELEMENT field (extension*, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST field name CDATA #REQUIRED>
-<!ATTLIST field table CDATA #IMPLIED>
-<!ATTLIST field column CDATA #IMPLIED>
-<!ATTLIST field value-strategy CDATA #IMPLIED>
-<!ATTLIST field delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST field indexed (true|false|unique) #IMPLIED>
-<!ATTLIST field unique (true|false) #IMPLIED>
-<!ATTLIST field sequence CDATA #IMPLIED>
-<!ATTLIST field mapped-by CDATA #IMPLIED>
-
-<!ELEMENT foreign-key (extension*, (column* | field* | property*), extension*)>
-<!ATTLIST foreign-key table CDATA #IMPLIED>
-<!ATTLIST foreign-key deferred (true|false) #IMPLIED>
-<!ATTLIST foreign-key delete-action (restrict|cascade|null|default|none) 'restrict'>
-<!ATTLIST foreign-key update-action (restrict|cascade|null|default|none) 'restrict'>
-<!ATTLIST foreign-key unique (true|false) #IMPLIED>
-<!ATTLIST foreign-key name CDATA #IMPLIED>
-
-<!ELEMENT key (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST key column CDATA #IMPLIED>
-<!ATTLIST key table CDATA #IMPLIED>
-<!ATTLIST key delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST key update-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST key indexed (true|false|unique) #IMPLIED>
-<!ATTLIST key unique (true|false) #IMPLIED>
-<!ATTLIST key mapped-by CDATA #IMPLIED>
-
-<!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST value column CDATA #IMPLIED>
-<!ATTLIST value table CDATA #IMPLIED>
-<!ATTLIST value delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST value update-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST value indexed (true|false|unique) #IMPLIED>
-<!ATTLIST value unique (true|false) #IMPLIED>
-<!ATTLIST value mapped-by CDATA #IMPLIED>
-
-<!ELEMENT element (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST element column CDATA #IMPLIED>
-<!ATTLIST element table CDATA #IMPLIED>
-<!ATTLIST element delete-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST element update-action (restrict|cascade|null|default|none) #IMPLIED>
-<!ATTLIST element indexed (true|false|unique) #IMPLIED>
-<!ATTLIST element unique (true|false) #IMPLIED>
-<!ATTLIST element mapped-by CDATA #IMPLIED>
-
-<!ELEMENT order (extension*, column*, index?, extension*)>
-<!ATTLIST order column CDATA #IMPLIED>
-<!ATTLIST order mapped-by CDATA #IMPLIED>
-
-<!ELEMENT embedded (extension*, (field|property)*, extension*)>
-<!ATTLIST embedded owner-field CDATA #IMPLIED>
-<!ATTLIST embedded null-indicator-column CDATA #IMPLIED>
-<!ATTLIST embedded null-indicator-value CDATA #IMPLIED>
-
-<!ELEMENT sequence (extension*)>
-<!ATTLIST sequence name CDATA #REQUIRED>
-<!ATTLIST sequence datastore-sequence CDATA #IMPLIED>
-<!ATTLIST sequence factory-class CDATA #IMPLIED>
-<!ATTLIST sequence strategy (nontransactional|contiguous|noncontiguous) #REQUIRED>
-
-<!ELEMENT index (extension*, (column* | field* | property*), extension*)>
-<!ATTLIST index name CDATA #IMPLIED>
-<!ATTLIST index table CDATA #IMPLIED>
-<!ATTLIST index unique (true|false) 'false'>
-
-<!ELEMENT query (#PCDATA|extension)*>
-<!ATTLIST query name CDATA #REQUIRED>
-<!ATTLIST query language CDATA #IMPLIED>
-<!ATTLIST query unmodifiable (true|false) 'false'>
-<!ATTLIST query unique (true|false) #IMPLIED>
-<!ATTLIST query result-class CDATA #IMPLIED>
-
-<!ELEMENT unique (extension*, (column* | field* | property*), extension*)>
-<!ATTLIST unique name CDATA #IMPLIED>
-<!ATTLIST unique table CDATA #IMPLIED>
-<!ATTLIST unique deferred (true|false) 'false'>
-
-<!ELEMENT extension ANY>
-<!ATTLIST extension vendor-name CDATA #REQUIRED>
-<!ATTLIST extension key CDATA #IMPLIED>
-<!ATTLIST extension value CDATA #IMPLIED>
-
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- The DOCTYPE should be as follows for metadata documents.
+<!DOCTYPE orm
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+    "http://java.sun.com/dtd/orm_2_0.dtd">
+-->
+<!ELEMENT orm (extension*, (package|query)+, extension*)>
+<!ATTLIST orm catalog CDATA #IMPLIED>
+<!ATTLIST orm schema CDATA #IMPLIED>
+
+<!ELEMENT package (extension*, (interface|class|sequence)+, extension*)>
+<!ATTLIST package name CDATA ''>
+<!ATTLIST package catalog CDATA #IMPLIED>
+<!ATTLIST package schema CDATA #IMPLIED>
+
+<!ELEMENT interface (extension*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, property*, query*, extension*)>
+<!ATTLIST interface name CDATA #REQUIRED>
+<!ATTLIST interface table CDATA #IMPLIED>
+<!ATTLIST interface catalog CDATA #IMPLIED>
+<!ATTLIST interface schema CDATA #IMPLIED>
+
+<!ELEMENT property (extension*, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST property name CDATA #REQUIRED>
+<!ATTLIST property value-strategy CDATA #IMPLIED>
+<!ATTLIST property sequence CDATA #IMPLIED>
+<!ATTLIST property table CDATA #IMPLIED>
+<!ATTLIST property column CDATA #IMPLIED>
+<!ATTLIST property delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST property indexed (true|false|unique) #IMPLIED>
+<!ATTLIST property unique (true|false) #IMPLIED>
+<!ATTLIST property mapped-by CDATA #IMPLIED>
+
+<!ELEMENT class (extension*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, column*, field*, property*, query*, extension*)>
+<!ATTLIST class name CDATA #REQUIRED>
+<!ATTLIST class table CDATA #IMPLIED>
+<!ATTLIST class catalog CDATA #IMPLIED>
+<!ATTLIST class schema CDATA #IMPLIED>
+
+<!ELEMENT primary-key (extension*, column*, extension*)>
+<!ATTLIST primary-key name CDATA #IMPLIED>
+<!ATTLIST primary-key column CDATA #IMPLIED>
+
+<!ELEMENT join (extension*, primary-key?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST join table CDATA #IMPLIED>
+<!ATTLIST join column CDATA #IMPLIED>
+<!ATTLIST join outer (true|false) 'false'>
+<!ATTLIST join delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST join indexed (true|false|unique) #IMPLIED>
+<!ATTLIST join unique (true|false) #IMPLIED>
+
+<!ELEMENT version (extension*, column*, index?, extension*)>
+<!ATTLIST version strategy CDATA #IMPLIED>
+<!ATTLIST version column CDATA #IMPLIED>
+<!ATTLIST version indexed (true|false|unique) #IMPLIED>
+
+<!ELEMENT datastore-identity (extension*, column*, extension*)>
+<!ATTLIST datastore-identity column CDATA #IMPLIED>
+<!ATTLIST datastore-identity strategy CDATA 'native'>
+<!ATTLIST datastore-identity sequence CDATA #IMPLIED>
+
+<!ELEMENT implements (extension*, property*, extension*)>
+<!ATTLIST implements name CDATA #REQUIRED>
+
+<!ELEMENT inheritance (extension*, join?, discriminator?, extension*)>
+<!ATTLIST inheritance strategy CDATA #IMPLIED>
+
+<!ELEMENT discriminator (extension*, column*, index?, extension*)>
+<!ATTLIST discriminator column CDATA #IMPLIED>
+<!ATTLIST discriminator value CDATA #IMPLIED>
+<!ATTLIST discriminator strategy CDATA #IMPLIED>
+<!ATTLIST discriminator indexed (true|false|unique) #IMPLIED>
+
+<!ELEMENT column (extension*)>
+<!ATTLIST column name CDATA #IMPLIED>
+<!ATTLIST column target CDATA #IMPLIED>
+<!ATTLIST column target-field CDATA #IMPLIED>
+<!ATTLIST column jdbc-type CDATA #IMPLIED>
+<!ATTLIST column sql-type CDATA #IMPLIED>
+<!ATTLIST column length CDATA #IMPLIED>
+<!ATTLIST column scale CDATA #IMPLIED>
+<!ATTLIST column allows-null (true|false) #IMPLIED>
+<!ATTLIST column default-value CDATA #IMPLIED>
+<!ATTLIST column insert-value CDATA #IMPLIED>
+
+<!ELEMENT field (extension*, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST field name CDATA #REQUIRED>
+<!ATTLIST field table CDATA #IMPLIED>
+<!ATTLIST field column CDATA #IMPLIED>
+<!ATTLIST field value-strategy CDATA #IMPLIED>
+<!ATTLIST field delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST field indexed (true|false|unique) #IMPLIED>
+<!ATTLIST field unique (true|false) #IMPLIED>
+<!ATTLIST field sequence CDATA #IMPLIED>
+<!ATTLIST field mapped-by CDATA #IMPLIED>
+
+<!ELEMENT foreign-key (extension*, (column* | field* | property*), extension*)>
+<!ATTLIST foreign-key table CDATA #IMPLIED>
+<!ATTLIST foreign-key deferred (true|false) #IMPLIED>
+<!ATTLIST foreign-key delete-action (restrict|cascade|null|default|none) 'restrict'>
+<!ATTLIST foreign-key update-action (restrict|cascade|null|default|none) 'restrict'>
+<!ATTLIST foreign-key unique (true|false) #IMPLIED>
+<!ATTLIST foreign-key name CDATA #IMPLIED>
+
+<!ELEMENT key (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST key column CDATA #IMPLIED>
+<!ATTLIST key table CDATA #IMPLIED>
+<!ATTLIST key delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST key update-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST key indexed (true|false|unique) #IMPLIED>
+<!ATTLIST key unique (true|false) #IMPLIED>
+<!ATTLIST key mapped-by CDATA #IMPLIED>
+
+<!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST value column CDATA #IMPLIED>
+<!ATTLIST value table CDATA #IMPLIED>
+<!ATTLIST value delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST value update-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST value indexed (true|false|unique) #IMPLIED>
+<!ATTLIST value unique (true|false) #IMPLIED>
+<!ATTLIST value mapped-by CDATA #IMPLIED>
+
+<!ELEMENT element (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
+<!ATTLIST element column CDATA #IMPLIED>
+<!ATTLIST element table CDATA #IMPLIED>
+<!ATTLIST element delete-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST element update-action (restrict|cascade|null|default|none) #IMPLIED>
+<!ATTLIST element indexed (true|false|unique) #IMPLIED>
+<!ATTLIST element unique (true|false) #IMPLIED>
+<!ATTLIST element mapped-by CDATA #IMPLIED>
+
+<!ELEMENT order (extension*, column*, index?, extension*)>
+<!ATTLIST order column CDATA #IMPLIED>
+<!ATTLIST order mapped-by CDATA #IMPLIED>
+
+<!ELEMENT embedded (extension*, (field|property)*, extension*)>
+<!ATTLIST embedded owner-field CDATA #IMPLIED>
+<!ATTLIST embedded null-indicator-column CDATA #IMPLIED>
+<!ATTLIST embedded null-indicator-value CDATA #IMPLIED>
+
+<!ELEMENT sequence (extension*)>
+<!ATTLIST sequence name CDATA #REQUIRED>
+<!ATTLIST sequence datastore-sequence CDATA #IMPLIED>
+<!ATTLIST sequence factory-class CDATA #IMPLIED>
+<!ATTLIST sequence strategy (nontransactional|contiguous|noncontiguous) #REQUIRED>
+
+<!ELEMENT index (extension*, (column* | field* | property*), extension*)>
+<!ATTLIST index name CDATA #IMPLIED>
+<!ATTLIST index table CDATA #IMPLIED>
+<!ATTLIST index unique (true|false) 'false'>
+
+<!ELEMENT query (#PCDATA|extension)*>
+<!ATTLIST query name CDATA #REQUIRED>
+<!ATTLIST query language CDATA #IMPLIED>
+<!ATTLIST query unmodifiable (true|false) 'false'>
+<!ATTLIST query unique (true|false) #IMPLIED>
+<!ATTLIST query result-class CDATA #IMPLIED>
+
+<!ELEMENT unique (extension*, (column* | field* | property*), extension*)>
+<!ATTLIST unique name CDATA #IMPLIED>
+<!ATTLIST unique table CDATA #IMPLIED>
+<!ATTLIST unique deferred (true|false) 'false'>
+
+<!ELEMENT extension ANY>
+<!ATTLIST extension vendor-name CDATA #REQUIRED>
+<!ATTLIST extension key CDATA #IMPLIED>
+<!ATTLIST extension value CDATA #IMPLIED>
+

Modified: db/jdo/trunk/tck/src/conf/throwOnUnknownStandardProperties.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/conf/throwOnUnknownStandardProperties.conf?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/conf/throwOnUnknownStandardProperties.conf (original)
+++ db/jdo/trunk/tck/src/conf/throwOnUnknownStandardProperties.conf Thu Mar  5 20:23:52 2015
@@ -1,21 +1,21 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-jdo.tck.description = Checks that the implementation throws JDOUserException on unknown JDO standard properties.
-jdo.tck.mapping.companyfactory =
-jdo.tck.classes = org.apache.jdo.tck.api.persistencemanagerfactory.config.ThrowOnUnknownStandardProperties
-jdo.tck.testdata = 
-jdo.tck.mapping = 
-jdo.tck.requiredOptions =
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+jdo.tck.description = Checks that the implementation throws JDOUserException on unknown JDO standard properties.
+jdo.tck.mapping.companyfactory =
+jdo.tck.classes = org.apache.jdo.tck.api.persistencemanagerfactory.config.ThrowOnUnknownStandardProperties
+jdo.tck.testdata = 
+jdo.tck.mapping = 
+jdo.tck.requiredOptions =

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/ThrowOnUnknownStandardProperties.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/ThrowOnUnknownStandardProperties.java?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/ThrowOnUnknownStandardProperties.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/ThrowOnUnknownStandardProperties.java Thu Mar  5 20:23:52 2015
@@ -1,136 +1,136 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License.
- */
-package org.apache.jdo.tck.api.persistencemanagerfactory.config;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.jdo.JDOException;
-import javax.jdo.JDOUserException;
-
-import org.apache.jdo.tck.JDO_Test;
-import org.apache.jdo.tck.util.BatchTestRunner;
-
-public class ThrowOnUnknownStandardProperties extends JDO_Test {
-
-    /**
-     * The <code>main</code> is called when the class
-     * is directly executed from the command line.
-     * @param args The arguments passed to the program.
-     */
-    public static void main(String[] args) {
-        BatchTestRunner.run(ThrowOnUnknownStandardProperties.class);
-    }
-
-    protected boolean preSetUp() {
-        return false;
-    }
-
-    protected boolean preTearDown() {
-        return false;
-    }
-
-    protected Method getStaticGetPMFMethod() {
-        Class pmfClass = getPMFClass();
-        try {
-            Method m = pmfClass.getDeclaredMethod(
-                    "getPersistenceManagerFactory", new Class[] {Map.class});
-
-            if ((m.getModifiers() & Modifier.STATIC) != Modifier.STATIC) {
-                throw new JDOException(
-                        "PMF class "
-                                + pmfClass.getName()
-                                + " method 'getPersistenceManagerFactory' is not static");
-            }
-
-            return m;
-        } catch (SecurityException e) {
-            throw new JDOException(
-                    "Cannot get method 'getPersistenceManagerFactory' from PMF class "
-                            + pmfClass.getName(), e);
-        } catch (NoSuchMethodException e) {
-            throw new JDOException(
-                    "No method 'getPersistenceManagerFactory' from PMF class "
-                            + pmfClass.getName(), e);
-        }
-    }
-
-    protected void invokeGetPMF(Object... args) throws Exception {
-        Method getPMF = getStaticGetPMFMethod();
-        getPMF.invoke(null, args);
-    }
-    
-    public void testUnknownStandardProperty() {
-        Properties p = new Properties();
-        p.setProperty("javax.jdo.unknown.standard.property", "value");
-        try {
-            invokeGetPMF(p);
-            fail("testUnknownStandardProperty should result in JDOUserException. "
-                    + "No exception was thrown.");
-        } catch (InvocationTargetException ite) {
-            Throwable cause = ite.getCause();
-            if (cause != null && cause instanceof JDOUserException) {
-            	// :)
-            } else {
-                throw new JDOException("PMF threw " + cause + " instead of JDOException");
-            }
-        } catch (Exception e) {
-            throw new JDOException(
-                    "failed to invoke static getPersistenceManagerFactory(Map) method on PMF class",
-                    e);
-        }
-    }
-
-    public void testUnknownStandardProperties() {
-        Properties p = new Properties();
-        p.setProperty("javax.jdo.unknown.standard.property.1", "value");
-        p.setProperty("javax.jdo.unknown.standard.property.2", "value");
-
-        JDOUserException x = null;
-
-        try {
-            invokeGetPMF(p);
-            fail("testUnknownStandardProperties should result in JDOUserException. "
-                    + "No exception was thrown.");
-        } catch (InvocationTargetException ite) {
-            Throwable cause = ite.getCause();
-            if (cause != null && cause instanceof JDOUserException) {
-                x = (JDOUserException) cause;
-            } else {
-                throw new JDOException("PMF threw " + cause + " instead of JDOException");
-            }
-        } catch (Exception e) {
-            throw new JDOException(
-                    "failed to invoke static getPersistenceManagerFactory(Map) method on PMF class",
-                    e);
-        }
-
-        Throwable[] nesteds = x.getNestedExceptions();
-
-        assertNotNull(nesteds);
-        assertEquals("should have been 2 nested exceptions", 2, nesteds.length);
-        for (int i = 0; i < nesteds.length; i++) {
-            Throwable t = nesteds[i];
-            assertTrue("nested exception " + i
-                    + " should have been JDOUserException",
-                    t instanceof JDOUserException);
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+package org.apache.jdo.tck.api.persistencemanagerfactory.config;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.jdo.JDOException;
+import javax.jdo.JDOUserException;
+
+import org.apache.jdo.tck.JDO_Test;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+public class ThrowOnUnknownStandardProperties extends JDO_Test {
+
+    /**
+     * The <code>main</code> is called when the class
+     * is directly executed from the command line.
+     * @param args The arguments passed to the program.
+     */
+    public static void main(String[] args) {
+        BatchTestRunner.run(ThrowOnUnknownStandardProperties.class);
+    }
+
+    protected boolean preSetUp() {
+        return false;
+    }
+
+    protected boolean preTearDown() {
+        return false;
+    }
+
+    protected Method getStaticGetPMFMethod() {
+        Class pmfClass = getPMFClass();
+        try {
+            Method m = pmfClass.getDeclaredMethod(
+                    "getPersistenceManagerFactory", new Class[] {Map.class});
+
+            if ((m.getModifiers() & Modifier.STATIC) != Modifier.STATIC) {
+                throw new JDOException(
+                        "PMF class "
+                                + pmfClass.getName()
+                                + " method 'getPersistenceManagerFactory' is not static");
+            }
+
+            return m;
+        } catch (SecurityException e) {
+            throw new JDOException(
+                    "Cannot get method 'getPersistenceManagerFactory' from PMF class "
+                            + pmfClass.getName(), e);
+        } catch (NoSuchMethodException e) {
+            throw new JDOException(
+                    "No method 'getPersistenceManagerFactory' from PMF class "
+                            + pmfClass.getName(), e);
+        }
+    }
+
+    protected void invokeGetPMF(Object... args) throws Exception {
+        Method getPMF = getStaticGetPMFMethod();
+        getPMF.invoke(null, args);
+    }
+    
+    public void testUnknownStandardProperty() {
+        Properties p = new Properties();
+        p.setProperty("javax.jdo.unknown.standard.property", "value");
+        try {
+            invokeGetPMF(p);
+            fail("testUnknownStandardProperty should result in JDOUserException. "
+                    + "No exception was thrown.");
+        } catch (InvocationTargetException ite) {
+            Throwable cause = ite.getCause();
+            if (cause != null && cause instanceof JDOUserException) {
+            	// :)
+            } else {
+                throw new JDOException("PMF threw " + cause + " instead of JDOException");
+            }
+        } catch (Exception e) {
+            throw new JDOException(
+                    "failed to invoke static getPersistenceManagerFactory(Map) method on PMF class",
+                    e);
+        }
+    }
+
+    public void testUnknownStandardProperties() {
+        Properties p = new Properties();
+        p.setProperty("javax.jdo.unknown.standard.property.1", "value");
+        p.setProperty("javax.jdo.unknown.standard.property.2", "value");
+
+        JDOUserException x = null;
+
+        try {
+            invokeGetPMF(p);
+            fail("testUnknownStandardProperties should result in JDOUserException. "
+                    + "No exception was thrown.");
+        } catch (InvocationTargetException ite) {
+            Throwable cause = ite.getCause();
+            if (cause != null && cause instanceof JDOUserException) {
+                x = (JDOUserException) cause;
+            } else {
+                throw new JDOException("PMF threw " + cause + " instead of JDOException");
+            }
+        } catch (Exception e) {
+            throw new JDOException(
+                    "failed to invoke static getPersistenceManagerFactory(Map) method on PMF class",
+                    e);
+        }
+
+        Throwable[] nesteds = x.getNestedExceptions();
+
+        assertNotNull(nesteds);
+        assertEquals("should have been 2 nested exceptions", 2, nesteds.length);
+        for (int i = 0; i < nesteds.length; i++) {
+            Throwable t = nesteds[i];
+            assertTrue("nested exception " + i
+                    + " should have been JDOUserException",
+                    t instanceof JDOUserException);
+        }
+    }
+}

Modified: db/jdo/trunk/tck/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/resources/META-INF/NOTICE.txt?rev=1664473&r1=1664472&r2=1664473&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/resources/META-INF/NOTICE.txt (original)
+++ db/jdo/trunk/tck/src/main/resources/META-INF/NOTICE.txt Thu Mar  5 20:23:52 2015
@@ -1,5 +1,5 @@
-Apache Java Data Objects (JDO)
-Copyright 2005-2006 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+Apache Java Data Objects (JDO)
+Copyright 2005-2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).



Mime
View raw message