You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/05/18 17:29:42 UTC

svn commit: r775986 - /jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/nodetypes.dtd

Author: jukka
Date: Mon May 18 15:29:42 2009
New Revision: 775986

URL: http://svn.apache.org/viewvc?rev=775986&view=rev
Log:
JCR-1591: JSR 283: NodeType Management

Use #PCDATA instead of CDATA for XML elements with character content. CDATA is only applicable for XML attributes.

Modified:
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/nodetypes.dtd

Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/nodetypes.dtd
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/nodetypes.dtd?rev=775986&r1=775985&r2=775986&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/nodetypes.dtd (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/nodetypes.dtd Mon May 18 15:29:42 2009
@@ -33,7 +33,7 @@
         primaryItemName CDATA #REQUIRED
     >
     <!ELEMENT supertypes (supertype+)>
-    <!ELEMENT supertype (CDATA)>
+    <!ELEMENT supertype (#PCDATA)>
 
     <!ELEMENT propertyDefinition (valueConstraints?|defaultValues?)>
     <!ATTLIST propertyDefinition
@@ -57,9 +57,9 @@
     <!ENTITY OP_LE "{http://www.jcp.org/jcr/1.0}operatorLessThanOrEqualTo">
     <!ENTITY OP_LIKE "{http://www.jcp.org/jcr/1.0}operatorLike">
     <!ELEMENT valueConstraints (valueConstraint+)>
-    <!ELEMENT valueConstraint (CDATA)>
+    <!ELEMENT valueConstraint (#PCDATA)>
     <!ELEMENT defaultValues (defaultValue+)>
-    <!ELEMENT defaultValue (CDATA)>
+    <!ELEMENT defaultValue (#PCDATA)>
 
     <!ELEMENT childNodeDefinition (requiredPrimaryTypes)>
     <!ATTLIST childNodeDefinition
@@ -72,4 +72,4 @@
         sameNameSiblings (true|false) #REQUIRED
     >
     <!ELEMENT requiredPrimaryTypes (requiredPrimaryType+)>
-    <!ELEMENT requiredPrimaryType (CDATA)>
+    <!ELEMENT requiredPrimaryType (#PCDATA)>