You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2012/05/03 18:12:27 UTC
svn commit: r1333524 - in /jackrabbit/oak/trunk: oak-it/jcr/pom.xml oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java

Author: reschke
Date: Thu May  3 16:12:27 2012
New Revision: 1333524

URL: http://svn.apache.org/viewvc?rev=1333524&view=rev
Log:
OAK-66: fix parsing of property definitions, update test exclusions

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

Modified: jackrabbit/oak/trunk/oak-it/jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/jcr/pom.xml?rev=1333524&r1=1333523&r2=1333524&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/jcr/pom.xml Thu May  3 16:12:27 2012
@@ -97,8 +97,12 @@ org.apache.jackrabbit.test.api.SessionRe
 org.apache.jackrabbit.test.api.HasPermissionTest
 org.apache.jackrabbit.test.api.WorkspaceTest
 org.apache.jackrabbit.test.api.ShareableNodeTest
-org.apache.jackrabbit.test.api.nodetype.NodeTypeTest#testGetPropertyDefs
 org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest
+org.apache.jackrabbit.test.api.nodetype.CanSetPropertyDateTest#testConversions
+org.apache.jackrabbit.test.api.nodetype.CanSetPropertyMultipleTest#testReturnFalseBecauseIsProtected
+org.apache.jackrabbit.test.api.nodetype.CanSetPropertyMultipleTest#testReturnFalseBecauseIsNotMultiple
+org.apache.jackrabbit.test.api.nodetype.CanSetPropertyPathTest#testConversions
+org.apache.jackrabbit.test.api.nodetype.CanSetPropertyTest#testReturnFalseBecauseIsProtected
 org.apache.jackrabbit.test.api.nodetype.CanAddChildNodeCallWithNodeTypeTest
 org.apache.jackrabbit.test.api.nodetype.CanAddChildNodeCallWithoutNodeTypeTest
 org.apache.jackrabbit.test.api.nodetype.CanRemoveItemTest

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=1333524&r1=1333523&r2=1333524&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 Thu May  3 16:12:27 2012
@@ -124,7 +124,7 @@ class NodeTypeImpl implements NodeType {
                             this, mapper, defName, autoCreated, mandatory,
                             onParentVersionAction, isProtected, manager,
                             defType.split(", "), matcher.group(5), false));
-                } else if ("+".equals(matcher.group(1))) {
+                } else if ("-".equals(matcher.group(1))) {
                     declaredPropertyDefinitions.add(new PropertyDefinitionImpl(
                             this, mapper, defName, autoCreated, mandatory,
                             onParentVersionAction, isProtected,