Author: jukka
Date: Sat Jul  1 00:29:45 2006
New Revision: 418446

URL: http://svn.apache.org/viewvc?rev=418446&view=rev
Log:
JCR-467: Better handling of JCR names.

Modified:
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/Lexer.java
    jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/nodetype/cnd.xml

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java?rev=418446&r1=418445&r2=418446&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java Sat Jul  1 00:29:45 2006
@@ -116,7 +116,7 @@
  *
  * quoted_string :: = "'" unquoted_string "'"
  *
- * unquoted_string ::= ...a string...
+ * unquoted_string ::= [A-Za-z0-9:_]+
  * </pre>
  */
 public class CompactNodeTypeDefReader {
@@ -257,7 +257,7 @@
 
         nextToken();
         if (!currentTokenEquals(Lexer.END_NODE_TYPE_NAME)) {
-            lexer.fail("Missing '" + Lexer.END_NODE_TYPE_NAME + "' delimiter for end of node type name");
+            lexer.fail("Missing '" + Lexer.END_NODE_TYPE_NAME + "' delimiter for end of node type name, found " + currentToken);
         }
         nextToken();
     }

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/Lexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/Lexer.java?rev=418446&r1=418445&r2=418446&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/Lexer.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/Lexer.java Sat Jul  1 00:29:45 2006
@@ -101,6 +101,7 @@
         st.wordChars('a', 'z');
         st.wordChars('A', 'Z');
         st.wordChars(':', ':');
+        st.wordChars('_', '_');
 
         st.quoteChar(SINGLE_QUOTE);
         st.quoteChar(DOUBLE_QUOTE);

Modified: jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/nodetype/cnd.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/nodetype/cnd.xml?rev=418446&r1=418445&r2=418446&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/nodetype/cnd.xml (original)
+++ jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/nodetype/cnd.xml Sat Jul  1 00:29:45 2006
@@ -189,7 +189,7 @@
 
 quoted_string :: = "'" unquoted_string "'"
 
-unquoted_string ::= /* a string */]]></source>
+unquoted_string ::= [A-Za-z0-9:_]+]]></source>
         </section>
             <section name="CND Notation in Detail">
 <source><![CDATA[cnd ::= {ns_mapping | node_type_def}]]></source>