svn commit: r1331562 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype: NodeTypeImpl.java NodeTypeManagerImpl.java

[jukka]

Author: jukka
Date: Fri Apr 27 19:58:27 2012
New Revision: 1331562

URL: http://svn.apache.org/viewvc?rev=1331562&view=rev
Log:
OAK-66: JCR Node Type Management

Fix CND parsing on windows

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeManagerImpl.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java?rev=1331562&r1=1331561&r2=1331562&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java
 Fri Apr 27 19:58:27 2012
@@ -80,7 +80,7 @@ class NodeTypeImpl implements NodeType {
         this.mapper = mapper;
         this.name = name;
 
-        Matcher matcher = CND_PATTERN.matcher(cnd.replace("\r\n", "\n"));
+        Matcher matcher = CND_PATTERN.matcher(cnd);
         matcher.matches();
 
         this.isAbstract = matcher.group(5) != null;

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeManagerImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeManagerImpl.java?rev=1331562&r1=1331561&r2=1331562&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeManagerImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeManagerImpl.java
 Fri Apr 27 19:58:27 2012
@@ -56,7 +56,7 @@ public class NodeTypeManagerImpl impleme
                     "builtin_nodetypes.cnd");
             try {
                 String cnd = IOUtils.toString(stream, "UTF-8");
-                Matcher matcher = CND_PATTERN.matcher(cnd);
+                Matcher matcher = CND_PATTERN.matcher(cnd.replace("\r\n", 
"\n"));
                 while (matcher.find()) {
                     String name = matcher.group(1);
                     types.put(name, new NodeTypeImpl(