Return-Path: 
 <jdo-commits-return-1151-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 81693 invoked from network); 7 Dec 2005 23:31:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 7 Dec 2005 23:31:51 -0000
Received: (qmail 34611 invoked by uid 500); 7 Dec 2005 23:31:50 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 34599 invoked by uid 99); 7 Dec 2005 23:31:50 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2005 15:31:50 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 07 Dec 2005 15:31:50 -0800
Received: (qmail 81322 invoked by uid 65534); 7 Dec 2005 23:31:29 -0000
Message-ID: <20051207233129.81317.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r354904 - in
 /incubator/jdo/trunk/api20/src/dtd/javax/jdo:
 jdo.dtd orm.dtd
Date: Wed, 07 Dec 2005 23:31:29 -0000
To: jdo-commits@db.apache.org
From: clr@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: clr
Date: Wed Dec  7 15:31:23 2005
New Revision: 354904

URL: http://svn.apache.org/viewcvs?rev=354904&view=rev
Log:
JDO-212 Add persistent property support to jdo.dtd and orm.dtd

Modified:
    incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd
    incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd

Modified: incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd?rev=354904&r1=354903&r2=354904&view=diff
==============================================================================
--- incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd (original)
+++ incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd Wed Dec  7 15:31:23 2005
@@ -18,11 +18,13 @@
 <!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'>
@@ -180,11 +182,11 @@
 <!ATTLIST order indexed (true|false|unique) #IMPLIED>
 <!ATTLIST order mapped-by CDATA #IMPLIED>
 
-<!ELEMENT fetch-group (fetch-group|field)*>
+<!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*, extension*)>
+<!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>

Modified: incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd?rev=354904&r1=354903&r2=354904&view=diff
==============================================================================
--- incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd (original)
+++ incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd Wed Dec  7 15:31:23 2005
@@ -134,7 +134,7 @@
 <!ATTLIST order indexed (true|false|unique) #IMPLIED>
 <!ATTLIST order mapped-by CDATA #IMPLIED>
 
-<!ELEMENT embedded (extension*, field*, extension*)>
+<!ELEMENT embedded (extension*, (field|property)*, extension*)>
 <!ATTLIST embedded null-indicator-column CDATA #IMPLIED>
 <!ATTLIST embedded null-indicator-value CDATA #IMPLIED>
 <!ATTLIST embedded owner-field CDATA #IMPLIED>