From jackrabbit-commits-return-761-apmail-incubator-jackrabbit-commits-archive=www.apache.org@incubator.apache.org Thu Apr 14 11:58:21 2005 Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 85725 invoked from network); 14 Apr 2005 11:58:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Apr 2005 11:58:20 -0000 Received: (qmail 17767 invoked by uid 500); 14 Apr 2005 11:58:11 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 17697 invoked by uid 500); 14 Apr 2005 11:58:07 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 17670 invoked by uid 99); 14 Apr 2005 11:58:06 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 14 Apr 2005 04:58:01 -0700 Received: (qmail 82703 invoked by uid 65534); 14 Apr 2005 11:51:04 -0000 Message-ID: <20050414115104.82701.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Thu, 14 Apr 2005 11:51:04 -0000 Subject: svn commit: r161260 [6/7] - in incubator/jackrabbit/trunk: ./ applications/test/ applications/test/repository/nodetypes/ contrib/orm-persistence/applications/test/ contrib/orm-persistence/applications/test/repository/nodetypes/ src/java/org/apache/jackrabbit/core/ src/java/org/apache/jackrabbit/core/lock/ src/java/org/apache/jackrabbit/core/nodetype/ src/java/org/apache/jackrabbit/core/nodetype/virtual/ src/java/org/apache/jackrabbit/core/nodetype/xml/ src/java/org/apache/jackrabbit/core/observation/ src/java/org/apache/jackrabbit/core/search/ src/java/org/apache/jackrabbit/core/search/lucene/ src/java/org/apache/jackrabbit/core/security/ src/java/org/apache/jackrabbit/core/util/ src/java/org/apache/jackrabbit/core/version/ src/java/org/apache/jackrabbit/core/virtual/ src/java/org/apache/jackrabbit/core/xml/ src/test/org/apache/jackrabbit/core/nodetype/xml/ src/test/org/apache/jackrabbit/core/observation/ src/test/org/apache/jackrabbit/core/search/ src/test/org/apache/jackrabbit/test/api/ src/test/org/apache/jackrabbit/test/api/lock/ src/test/org/apache/jackrabbit/test/api/nodetype/ src/test/org/apache/jackrabbit/test/api/nodetype/spec/ src/test/org/apache/jackrabbit/test/api/observation/ src/test/org/apache/jackrabbit/test/api/query/ src/test/org/apache/jackrabbit/test/api/version/ To: jackrabbit-cvs@incubator.apache.org From: stefan@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/CanSetPropertyBooleanTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/CanSetPropertyBooleanTest.java?view=3Dd= iff&r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyBooleanTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyBooleanTest.java Thu Apr 14 04:50:38 2005 @@ -19,12 +19,12 @@ import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; =20 -import javax.jcr.nodetype.PropertyDef; -import javax.jcr.nodetype.NodeType; -import javax.jcr.Session; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; +import javax.jcr.Session; import javax.jcr.Value; +import javax.jcr.nodetype.NodeType; +import javax.jcr.nodetype.PropertyDefinition; import java.text.ParseException; =20 /** @@ -71,7 +71,7 @@ public void testConversions() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.BOOLE= AN, false, false, false, false); =20 if (propDef =3D=3D null) { @@ -132,7 +132,7 @@ public void testConversionsMultiple() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.BOOLE= AN, true, false, false, false); =20 if (propDef =3D=3D null) { @@ -195,12 +195,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value value) returns f= alse - * if value does not match the value constraints of the property def + * if value does not satisfy the value constraints of the property def */ - public void testOutOfValueConstraint() + public void testValueConstraintNotSatisfied() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.BOOLE= AN, false, false, true, false); =20 if (propDef =3D=3D null) { @@ -225,12 +225,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value[] values) returns - * false if values do not match the value constraints of the property = def + * false if values do not satisfy the value constraints of the propert= y def */ - public void testOutOfValueConstraintMultiple() + public void testValueConstraintNotSatisfiedMultiple() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.BOOLE= AN, true, false, true, false); =20 if (propDef =3D=3D null) { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/CanSetPropertyDateTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/CanSetPropertyDateTest.java?view=3Ddiff= &r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyDateTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyDateTest.java Thu Apr 14 04:50:38 2005 @@ -19,14 +19,14 @@ import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; =20 -import javax.jcr.nodetype.PropertyDef; -import javax.jcr.nodetype.NodeType; -import javax.jcr.Session; +import javax.jcr.BinaryValue; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; -import javax.jcr.Value; +import javax.jcr.Session; import javax.jcr.StringValue; -import javax.jcr.BinaryValue; +import javax.jcr.Value; +import javax.jcr.nodetype.NodeType; +import javax.jcr.nodetype.PropertyDefinition; import java.text.ParseException; =20 /** @@ -73,7 +73,7 @@ public void testConversions() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.DATE,= false, false, false, false); =20 if (propDef =3D=3D null) { @@ -148,7 +148,7 @@ public void testConversionsMultiple() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.DATE,= true, false, false, false); =20 if (propDef =3D=3D null) { @@ -233,10 +233,10 @@ * Tests if canSetProperty(String propertyName, Value value) returns f= alse * if value does not match the value constraints of the property def */ - public void testOutOfValueConstraint() + public void testValueConstraintNotSatisfied() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.DATE,= false, false, true, false); =20 if (propDef =3D=3D null) { @@ -260,12 +260,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value[] values) returns - * false if values do not match the value constraints of the property = def + * false if values do not satisfy the value constraints of the propert= y def */ - public void testOutOfValueConstraintMultiple() + public void testValueConstraintNotSatisfiedMultiple() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.DATE,= true, false, true, false); =20 if (propDef =3D=3D null) { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/CanSetPropertyDoubleTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/CanSetPropertyDoubleTest.java?view=3Ddi= ff&r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyDoubleTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyDoubleTest.java Thu Apr 14 04:50:38 2005 @@ -19,14 +19,14 @@ import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; =20 -import javax.jcr.nodetype.PropertyDef; -import javax.jcr.nodetype.NodeType; -import javax.jcr.Session; +import javax.jcr.BinaryValue; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; -import javax.jcr.Value; +import javax.jcr.Session; import javax.jcr.StringValue; -import javax.jcr.BinaryValue; +import javax.jcr.Value; +import javax.jcr.nodetype.NodeType; +import javax.jcr.nodetype.PropertyDefinition; import java.text.ParseException; =20 /** @@ -73,7 +73,7 @@ public void testConversions() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBL= E, false, false, false, false); =20 if (propDef =3D=3D null) { @@ -148,7 +148,7 @@ public void testConversionsMultiple() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBL= E, true, false, false, false); =20 if (propDef =3D=3D null) { @@ -229,12 +229,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value value) returns f= alse - * if value does not match the value constraints of the property def + * if value does not satsfy the value constraints of the property def */ - public void testOutOfValueConstraint() + public void testValueConstraintNotSatisfied() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBL= E, false, false, true, false); =20 if (propDef =3D=3D null) { @@ -258,12 +258,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value[] values) returns - * false if values do not match the value constraints of the property = def + * false if values do not satisfy the value constraints of the propert= y def */ - public void testOutOfValueConstraintMultiple() + public void testValueConstraintNotSatisfiedMultiple() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBL= E, true, false, true, false); =20 if (propDef =3D=3D null) { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/CanSetPropertyLongTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/CanSetPropertyLongTest.java?view=3Ddiff= &r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyLongTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyLongTest.java Thu Apr 14 04:50:38 2005 @@ -19,14 +19,14 @@ import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; =20 -import javax.jcr.nodetype.PropertyDef; -import javax.jcr.nodetype.NodeType; -import javax.jcr.Session; +import javax.jcr.BinaryValue; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; -import javax.jcr.Value; +import javax.jcr.Session; import javax.jcr.StringValue; -import javax.jcr.BinaryValue; +import javax.jcr.Value; +import javax.jcr.nodetype.NodeType; +import javax.jcr.nodetype.PropertyDefinition; import java.text.ParseException; =20 /** @@ -73,7 +73,7 @@ public void testConversions() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBL= E, false, false, false, false); =20 if (propDef =3D=3D null) { @@ -148,7 +148,7 @@ public void testConversionsMultiple() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBL= E, true, false, false, false); =20 if (propDef =3D=3D null) { @@ -229,12 +229,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value value) returns f= alse - * if value does not match the value constraints of the property def + * if value does not satisfy the value constraints of the property def */ - public void testOutOfValueConstraint() + public void testValueConstraintNotSatisfied() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.LONG,= false, false, true, false); =20 if (propDef =3D=3D null) { @@ -258,12 +258,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value[] values) returns - * false if values do not match the value constraints of the property = def + * false if values do not satisfy the value constraints of the propert= y def */ - public void testOutOfValueConstraintMultiple() + public void testValueConstraintNotSatisfiedMultiple() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.LONG,= true, false, true, false); =20 if (propDef =3D=3D null) { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/CanSetPropertyMultipleTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/CanSetPropertyMultipleTest.java?view=3D= diff&r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyMultipleTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyMultipleTest.java Thu Apr 14 04:50:38 2005 @@ -19,7 +19,7 @@ import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; =20 -import javax.jcr.nodetype.PropertyDef; +import javax.jcr.nodetype.PropertyDefinition; import javax.jcr.nodetype.NodeType; import javax.jcr.Session; import javax.jcr.RepositoryException; @@ -70,7 +70,7 @@ public void testReturnFalseBecauseIsProtected() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEF= INED, true, true, false, false); =20 // will never happen since at least jcr:mixinTypes of nt:base acco= mplish the request @@ -95,7 +95,7 @@ public void testReturnFalseBecauseIsNotMultiple() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEF= INED, false, false, false, false); =20 if (propDef =3D=3D null) { @@ -118,7 +118,7 @@ public void testMultipleValuesNull() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEF= INED, true, false, false, false); =20 if (propDef =3D=3D null) { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/CanSetPropertyNameTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/CanSetPropertyNameTest.java?view=3Ddiff= &r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyNameTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyNameTest.java Thu Apr 14 04:50:38 2005 @@ -19,15 +19,15 @@ import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; =20 -import javax.jcr.nodetype.PropertyDef; -import javax.jcr.nodetype.NodeType; -import javax.jcr.Session; +import javax.jcr.BinaryValue; +import javax.jcr.PathValue; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; -import javax.jcr.Value; +import javax.jcr.Session; import javax.jcr.StringValue; -import javax.jcr.BinaryValue; -import javax.jcr.PathValue; +import javax.jcr.Value; +import javax.jcr.nodetype.NodeType; +import javax.jcr.nodetype.PropertyDefinition; import java.text.ParseException; =20 /** @@ -74,7 +74,7 @@ public void testConversions() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.NAME,= false, false, false, false); =20 if (propDef =3D=3D null) { @@ -154,7 +154,7 @@ public void testConversionsMultiple() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.NAME,= true, false, false, false); =20 if (propDef =3D=3D null) { @@ -241,12 +241,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value value) returns f= alse - * if value does not match the value constraints of the property def + * if value does not satisfy the value constraints of the property def */ - public void testOutOfValueConstraint() + public void testValueConstraintNotSatisfied() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.NAME,= false, false, true, false); =20 if (propDef =3D=3D null) { @@ -270,12 +270,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value[] values) returns - * false if values do not match the value constraints of the property = def + * false if values do not satisfy the value constraints of the propert= y def */ - public void testOutOfValueConstraintMultiple() + public void testValueConstraintNotSatisfiedMultiple() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.NAME,= true, false, true, false); =20 if (propDef =3D=3D null) { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/CanSetPropertyPathTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/CanSetPropertyPathTest.java?view=3Ddiff= &r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyPathTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyPathTest.java Thu Apr 14 04:50:38 2005 @@ -19,7 +19,7 @@ import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; =20 -import javax.jcr.nodetype.PropertyDef; +import javax.jcr.nodetype.PropertyDefinition; import javax.jcr.nodetype.NodeType; import javax.jcr.Session; import javax.jcr.PropertyType; @@ -74,7 +74,7 @@ public void testConversions() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.PATH,= false, false, false, false); =20 if (propDef =3D=3D null) { @@ -152,7 +152,7 @@ public void testConversionsMultiple() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.PATH,= true, false, false, false); =20 if (propDef =3D=3D null) { @@ -231,12 +231,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value value) returns f= alse - * if value does not match the value constraints of the property def + * if value does not satisfy the value constraints of the property def */ - public void testOutOfValueConstraint() + public void testValueConstraintNotSatisfied() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.PATH,= false, false, true, false); =20 if (propDef =3D=3D null) { @@ -260,12 +260,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value[] values) returns - * false if values do not match the value constraints of the property = def + * false if values do not satisfy the value constraints of the propert= y def */ - public void testOutOfValueConstraintMultiple() + public void testValueConstraintNotSatisfiedMultiple() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.PATH,= true, false, true, false); =20 if (propDef =3D=3D null) { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/CanSetPropertyStringTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/CanSetPropertyStringTest.java?view=3Ddi= ff&r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyStringTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyStringTest.java Thu Apr 14 04:50:38 2005 @@ -19,7 +19,7 @@ import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; =20 -import javax.jcr.nodetype.PropertyDef; +import javax.jcr.nodetype.PropertyDefinition; import javax.jcr.nodetype.NodeType; import javax.jcr.Session; import javax.jcr.PropertyType; @@ -71,7 +71,7 @@ public void testConversions() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.STRIN= G, false, false, false, false); =20 if (propDef =3D=3D null) { @@ -132,7 +132,7 @@ public void testConversionsMultiple() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.STRIN= G, true, false, false, false); =20 if (propDef =3D=3D null) { @@ -195,12 +195,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value value) returns f= alse - * if value does not match the value constraints of the property def + * if value does not satisfy the value constraints of the property def */ - public void testOutOfValueConstraint() + public void testValueConstraintNotSatisfied() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.STRIN= G, false, false, true, false); =20 if (propDef =3D=3D null) { @@ -224,12 +224,12 @@ =20 /** * Tests if canSetProperty(String propertyName, Value[] values) returns - * false if values do not match the value constraints of the property = def + * false if values do not satisfy the value constraints of the propert= y def */ - public void testOutOfValueConstraintMultiple() + public void testValueConstraintNotSatisfiedMultiple() throws NotExecutableException, ParseException, RepositoryExcep= tion { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.STRIN= G, true, false, true, false); =20 if (propDef =3D=3D null) { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/CanSetPropertyTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/CanSetPropertyTest.java?view=3Ddiff&r1= =3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/CanSetPropertyTest.java Thu Apr 14 04:50:38 2005 @@ -20,7 +20,7 @@ import org.apache.jackrabbit.test.NotExecutableException; =20 import javax.jcr.nodetype.NodeType; -import javax.jcr.nodetype.PropertyDef; +import javax.jcr.nodetype.PropertyDefinition; import javax.jcr.Session; import javax.jcr.RepositoryException; import javax.jcr.PropertyType; @@ -69,7 +69,7 @@ public void testReturnFalseBecauseIsProtected() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEF= INED, false, true, false, false); =20 // will never happen since at least jcr:primaryType of nt:base acc= omplish the request @@ -93,7 +93,7 @@ public void testReturnFalseBecauseIsMultiple() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEF= INED, true, false, false, false); =20 if (propDef =3D=3D null) { @@ -115,7 +115,7 @@ public void testValueNull() throws NotExecutableException, RepositoryException { =20 - PropertyDef propDef =3D + PropertyDefinition propDef =3D NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEF= INED, false, false, false, false); =20 if (propDef =3D=3D null) { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/NodeDefTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/NodeDefTest.java?view=3Ddiff&r1=3D16125= 9&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/NodeDefTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/NodeDefTest.java Thu Apr 14 04:50:38 2005 @@ -19,15 +19,15 @@ import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; =20 -import javax.jcr.Session; import javax.jcr.Node; -import javax.jcr.RepositoryException; -import javax.jcr.PathNotFoundException; import javax.jcr.NodeIterator; -import javax.jcr.nodetype.NodeTypeManager; -import javax.jcr.nodetype.NodeTypeIterator; +import javax.jcr.PathNotFoundException; +import javax.jcr.RepositoryException; +import javax.jcr.Session; +import javax.jcr.nodetype.NodeDefinition; import javax.jcr.nodetype.NodeType; -import javax.jcr.nodetype.NodeDef; +import javax.jcr.nodetype.NodeTypeIterator; +import javax.jcr.nodetype.NodeTypeManager; =20 /** * Tests if node definitions are respected in node instances in the worksp= ace. @@ -92,17 +92,17 @@ // loop all node types while (types.hasNext()) { NodeType currentType =3D types.nextNodeType(); - NodeDef defsOfCurrentType[] =3D - currentType.getChildNodeDefs(); + NodeDefinition defsOfCurrentType[] =3D + currentType.getChildNodeDefinitions(); =20 // loop all child node defs of each node type for (int i =3D 0; i < defsOfCurrentType.length; i++) { - NodeDef def =3D defsOfCurrentType[i]; + NodeDefinition def =3D defsOfCurrentType[i]; NodeType type =3D def.getDeclaringNodeType(); =20 // check if def is part of the child node defs of the // declaring node type - NodeDef defs[] =3D type.getChildNodeDefs(); + NodeDefinition defs[] =3D type.getChildNodeDefinitions(); boolean hasType =3D false; for (int j =3D 0; j < defs.length; j++) { if (defs[j].getName().equals(def.getName())) { @@ -129,9 +129,9 @@ // loop all node types while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - NodeDef defs[] =3D type.getChildNodeDefs(); + NodeDefinition defs[] =3D type.getChildNodeDefinitions(); for (int i =3D 0; i < defs.length; i++) { - if (defs[i].isAutoCreate()) { + if (defs[i].isAutoCreated()) { assertFalse("An auto create node must not be a " + "residual set definition.", defs[i].getName().equals("*")); @@ -168,7 +168,7 @@ // loop all node types while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - NodeDef defs[] =3D type.getChildNodeDefs(); + NodeDefinition defs[] =3D type.getChildNodeDefinitions(); =20 for (int i =3D 0; i < defs.length; i++) { assertTrue("getRequiredPrimaryTypes() must never return an= " + @@ -190,11 +190,11 @@ // loop all node types while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - NodeDef defs[] =3D type.getChildNodeDefs(); + NodeDefinition defs[] =3D type.getChildNodeDefinitions(); =20 for (int i =3D 0; i < defs.length; i++) { =20 - NodeDef def =3D defs[i]; + NodeDefinition def =3D defs[i]; NodeType defaultType =3D def.getDefaultPrimaryType(); if (defaultType !=3D null) { =20 @@ -254,9 +254,9 @@ throws RepositoryException { =20 // test if node contains all mandatory nodes of current type - NodeDef nodeDefs[] =3D type.getChildNodeDefs(); + NodeDefinition nodeDefs[] =3D type.getChildNodeDefinitions(); for (int i =3D 0; i < nodeDefs.length; i++) { - NodeDef nodeDef =3D nodeDefs[i]; + NodeDefinition nodeDef =3D nodeDefs[i]; if (nodeDef.isMandatory()) { foundMandatoryNode =3D true; try { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/NodeTypeTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/NodeTypeTest.java?view=3Ddiff&r1=3D1612= 59&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/NodeTypeTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/NodeTypeTest.java Thu Apr 14 04:50:38 2005 @@ -19,16 +19,16 @@ import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; =20 -import javax.jcr.Session; -import javax.jcr.Node; -import javax.jcr.RepositoryException; import javax.jcr.ItemNotFoundException; +import javax.jcr.Node; import javax.jcr.NodeIterator; -import javax.jcr.nodetype.NodeTypeManager; +import javax.jcr.RepositoryException; +import javax.jcr.Session; +import javax.jcr.nodetype.NodeDefinition; import javax.jcr.nodetype.NodeType; import javax.jcr.nodetype.NodeTypeIterator; -import javax.jcr.nodetype.PropertyDef; -import javax.jcr.nodetype.NodeDef; +import javax.jcr.nodetype.NodeTypeManager; +import javax.jcr.nodetype.PropertyDefinition; =20 /** * Tests if the node type hierarchy is correctly mapped to the methods @@ -266,8 +266,8 @@ while (types.hasNext()) { NodeType type =3D types.nextNodeType(); =20 - PropertyDef declaredDefs[] =3D type.getDeclaredPropertyDefs(); - PropertyDef defs[] =3D type.getPropertyDefs(); + PropertyDefinition declaredDefs[] =3D type.getDeclaredProperty= Definitions(); + PropertyDefinition defs[] =3D type.getPropertyDefinitions(); =20 try { for (int i =3D 0; i < declaredDefs.length; i++) { @@ -302,7 +302,7 @@ NodeTypeIterator types =3D manager.getPrimaryNodeTypes(); while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - PropertyDef defs[] =3D type.getPropertyDefs(); + PropertyDefinition defs[] =3D type.getPropertyDefinitions(); boolean hasJCRPrimaryType =3D false; for (int i =3D 0; i < defs.length; i++) { if (defs[i].getName().equals(jcrPrimaryType)) { @@ -327,8 +327,8 @@ while (types.hasNext()) { NodeType type =3D types.nextNodeType(); =20 - NodeDef declaredDefs[] =3D type.getDeclaredChildNodeDefs(); - NodeDef defs[] =3D type.getChildNodeDefs(); + NodeDefinition declaredDefs[] =3D type.getDeclaredChildNodeDef= initions(); + NodeDefinition defs[] =3D type.getChildNodeDefinitions(); =20 try { for (int i =3D 0; i < declaredDefs.length; i++) { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/NodeTypeUtil.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/NodeTypeUtil.java?view=3Ddiff&r1=3D1612= 59&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/NodeTypeUtil.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/NodeTypeUtil.java Thu Apr 14 04:50:38 2005 @@ -16,11 +16,6 @@ */ package org.apache.jackrabbit.test.api.nodetype; =20 -import javax.jcr.Session; -import javax.jcr.RepositoryException; -import javax.jcr.PropertyType; -import javax.jcr.Value; -import javax.jcr.ValueFormatException; import javax.jcr.BinaryValue; import javax.jcr.BooleanValue; import javax.jcr.DateValue; @@ -28,17 +23,22 @@ import javax.jcr.LongValue; import javax.jcr.NameValue; import javax.jcr.PathValue; +import javax.jcr.PropertyType; +import javax.jcr.RepositoryException; +import javax.jcr.Session; import javax.jcr.StringValue; -import javax.jcr.nodetype.NodeDef; -import javax.jcr.nodetype.NodeTypeManager; -import javax.jcr.nodetype.NodeTypeIterator; +import javax.jcr.Value; +import javax.jcr.ValueFormatException; +import javax.jcr.nodetype.NodeDefinition; import javax.jcr.nodetype.NodeType; -import javax.jcr.nodetype.PropertyDef; +import javax.jcr.nodetype.NodeTypeIterator; +import javax.jcr.nodetype.NodeTypeManager; +import javax.jcr.nodetype.PropertyDefinition; import javax.jcr.util.ISO8601; +import java.text.ParseException; import java.util.Calendar; -import java.util.regex.Pattern; import java.util.regex.Matcher; -import java.text.ParseException; +import java.util.regex.Pattern; =20 /** * Utility class to locate item definitions in the NodeTyeManager. @@ -48,27 +48,25 @@ /** * Locate a child node def parsing all node types * - * @param session: the session to access the node types - * @param regardDefaultPrimaryType: - * if true, the default primary type of the retur= ned - * NodeDef is according to param - * defaultPrimaryType. If false, the= returned - * NodeDef might have a default prim= ary type - * or not. - * @param defaultPrimaryType: - * if regardDefaultPrimaryType is tr= ue: - * if true, the returned NodeDef has= a - * default primary type, else not - * @param residual: if true, the returned NodeDef is = of - * the residual name "*", else not + * @param session: the session to access the node typ= es + * @param regardDefaultPrimaryType: if true, the default primary type = of the returned + * NodeDef is according = to param + * defaultPrimaryType. I= f false, the returned + * NodeDef might have a = default primary type + * or not. + * @param defaultPrimaryType: if regardDefaultPrimaryType<= /code> is true: + * if true, the returned NodeDe= f has a + * default primary type, else not + * @param residual: if true, the returned NodeDe= f is of + * the residual name "*", else not * @return * @throws RepositoryException */ - public static NodeDef locateChildNodeDef(Session session, - boolean regardDefaultPrimaryT= ype, - boolean defaultPrimaryType, - boolean residual) - throws RepositoryException { + public static NodeDefinition locateChildNodeDef(Session session, + boolean regardDefaultP= rimaryType, + boolean defaultPrimary= Type, + boolean residual) + throws RepositoryException { =20 NodeTypeManager manager =3D session.getWorkspace().getNodeTypeMana= ger(); NodeTypeIterator types =3D manager.getAllNodeTypes(); @@ -77,10 +75,10 @@ =20 while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - NodeDef nodeDefs[] =3D type.getDeclaredChildNodeDefs(); + NodeDefinition nodeDefs[] =3D type.getDeclaredChildNodeDefinit= ions(); =20 for (int i =3D 0; i < nodeDefs.length; i++) { - NodeDef nodeDef =3D nodeDefs[i]; + NodeDefinition nodeDef =3D nodeDefs[i]; =20 if (nodeDef.getRequiredPrimaryTypes().length > 1) { // behaviour of implementations that support multiple = multiple inheritance @@ -106,7 +104,7 @@ if (!residual && i =3D=3D 0) { // if another child node def is a residual definition // overjump the current node type - NodeDef nodeDefsAll[] =3D type.getChildNodeDefs(); + NodeDefinition nodeDefsAll[] =3D type.getChildNodeDefi= nitions(); for (int j =3D 0; j < nodeDefsAll.length; j++) { if (nodeDefsAll[j].getName().equals("*")) { overjump =3D true; @@ -129,28 +127,28 @@ /** * Locate a child node def parsing all node types * - * @param session: the session to access the node types - * @param isProtected: if true, the returned NodeDef is - * protected, else not - * @param mandatory: if true, the returned NodeDef is - * mandatory, else not + * @param session: the session to access the node types + * @param isProtected: if true, the returned NodeDef is + * protected, else not + * @param mandatory: if true, the returned NodeDef is + * mandatory, else not * @return the first NodeDef found fitting the * requirements */ - public static NodeDef locateChildNodeDef(Session session, - boolean isProtected, - boolean mandatory) - throws RepositoryException { + public static NodeDefinition locateChildNodeDef(Session session, + boolean isProtected, + boolean mandatory) + throws RepositoryException { =20 NodeTypeManager manager =3D session.getWorkspace().getNodeTypeMana= ger(); NodeTypeIterator types =3D manager.getAllNodeTypes(); =20 while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - NodeDef nodeDefs[] =3D type.getDeclaredChildNodeDefs(); + NodeDefinition nodeDefs[] =3D type.getDeclaredChildNodeDefinit= ions(); =20 for (int i =3D 0; i < nodeDefs.length; i++) { - NodeDef nodeDef =3D nodeDefs[i]; + NodeDefinition nodeDef =3D nodeDefs[i]; =20 if (nodeDef.getName().equals("*")) { continue; @@ -191,12 +189,12 @@ * @return the first PropertyDef found fitting the * requirements */ - public static PropertyDef locatePropertyDef(Session session, - int propertyType, - boolean multiple, - boolean isProtected, - boolean constraints, - boolean residual) + public static PropertyDefinition locatePropertyDef(Session session, + int propertyType, + boolean multiple, + boolean isProtected, + boolean constraints, + boolean residual) throws RepositoryException { =20 NodeTypeManager manager =3D session.getWorkspace().getNodeTypeMana= ger(); @@ -204,9 +202,9 @@ =20 while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - PropertyDef propDefs[] =3D type.getDeclaredPropertyDefs(); + PropertyDefinition propDefs[] =3D type.getDeclaredPropertyDefi= nitions(); for (int i =3D 0; i < propDefs.length; i++) { - PropertyDef propDef =3D propDefs[i]; + PropertyDefinition propDef =3D propDefs[i]; =20 // PropertyType.UNDEFINED is in use to get a property of a= ny type if (propertyType !=3D PropertyType.UNDEFINED && @@ -238,15 +236,10 @@ // property def has no constraints continue; } - try { - // check if a value out of constraint is buildable - Value v =3D getValueOutOfContstraint(propDef); - if (v =3D=3D null) { - // no value out of the constraint range availa= ble - continue; - } - } catch (ParseException e) { - // an error occured + // check if a value out of constraint is buildable + Value v =3D getValueOutOfContstraint(propDef); + if (v =3D=3D null) { + // no value out of the constraint range available continue; } } @@ -268,17 +261,17 @@ /** * Locate a property def parsing all node types * - * @param session: the session to access the node types - * @param isProtected: if true, the returned PropertyDef= is - * protected, else not - * @param mandatory: if true, the returned PropertyDef= is - * mandatory, else not + * @param session: the session to access the node types + * @param isProtected: if true, the returned PropertyDef = is + * protected, else not + * @param mandatory: if true, the returned PropertyDef = is + * mandatory, else not * @return the first PropertyDef found fitting the * requirements */ - public static PropertyDef locatePropertyDef(Session session, - boolean isProtected, - boolean mandatory) + public static PropertyDefinition locatePropertyDef(Session session, + boolean isProtected, + boolean mandatory) throws RepositoryException { =20 NodeTypeManager manager =3D session.getWorkspace().getNodeTypeMana= ger(); @@ -286,9 +279,9 @@ =20 while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - PropertyDef propDefs[] =3D type.getDeclaredPropertyDefs(); + PropertyDefinition propDefs[] =3D type.getDeclaredPropertyDefi= nitions(); for (int i =3D 0; i < propDefs.length; i++) { - PropertyDef propDef =3D propDefs[i]; + PropertyDefinition propDef =3D propDefs[i]; =20 if (propDef.getName().equals("*")) { continue; @@ -319,7 +312,7 @@ */ public static String getUndefinedChildNodeName(NodeType nodeType) { =20 - NodeDef nodeDefs[] =3D nodeType.getChildNodeDefs(); + NodeDefinition nodeDefs[] =3D nodeType.getChildNodeDefinitions(); StringBuffer s =3D new StringBuffer("X"); =20 for (int i =3D 0; i < nodeDefs.length; i++) { @@ -364,7 +357,7 @@ switch (type) { case (PropertyType.BINARY): // note: If binary is not UTF-8 behavior is implementation= -specific - return new BinaryValue("abc"); + return new BinaryValue("abc"); case (PropertyType.BOOLEAN): return new BooleanValue(true); case (PropertyType.DATE): @@ -387,8 +380,8 @@ /** * Returns a value out of the value constraints */ - public static Value getValueOutOfContstraint(PropertyDef propDef) - throws ValueFormatException, RepositoryException, ParseExcepti= on { + public static Value getValueOutOfContstraint(PropertyDefinition propDe= f) + throws ValueFormatException, RepositoryException { =20 int type =3D propDef.getRequiredType(); String constraints[] =3D propDef.getValueConstraints(); Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/PredefinedNodeTypeTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java?view=3Ddiff= &r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/PredefinedNodeTypeTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/PredefinedNodeTypeTest.java Thu Apr 14 04:50:38 2005 @@ -28,12 +28,12 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.Value; -import javax.jcr.nodetype.ItemDef; -import javax.jcr.nodetype.NodeDef; +import javax.jcr.nodetype.ItemDefinition; +import javax.jcr.nodetype.NodeDefinition; import javax.jcr.nodetype.NodeType; import javax.jcr.nodetype.NodeTypeIterator; import javax.jcr.nodetype.NodeTypeManager; -import javax.jcr.nodetype.PropertyDef; +import javax.jcr.nodetype.PropertyDefinition; import javax.jcr.version.OnParentVersionAction; =20 import org.apache.jackrabbit.test.AbstractJCRTest; @@ -146,12 +146,12 @@ =20 /** Test for the predefined nt:propertyDef node type. */ public void testPropertyDef() { - testPredefinedNodeType("nt:propertyDef"); + testPredefinedNodeType("nt:propertyDefinition"); } =20 /** Test for the predefined nt:childNodeDef node type. */ public void testChildNodeDef() { - testPredefinedNodeType("nt:childNodeDef"); + testPredefinedNodeType("nt:childNodeDefinition"); } =20 /** Test for the predefined nt:versionHistory node type. */ @@ -259,12 +259,12 @@ writer.println(" " + type.hasOrderableChildNodes()); writer.println("PrimaryItemName"); writer.println(" " + type.getPrimaryItemName()); - NodeDef[] nodes =3D type.getDeclaredChildNodeDefs(); + NodeDefinition[] nodes =3D type.getDeclaredChildNodeDefinitions(); Arrays.sort(nodes, ITEM_DEF_COMPARATOR); for (int i =3D 0; i < nodes.length; i++) { writer.print(getChildNodeDefSpec(nodes[i])); } - PropertyDef[] properties =3D type.getDeclaredPropertyDefs(); + PropertyDefinition[] properties =3D type.getDeclaredPropertyDefini= tions(); Arrays.sort(properties, ITEM_DEF_COMPARATOR); for (int i =3D 0; i < properties.length; i++) { writer.print(getPropertyDefSpec(properties[i])); @@ -281,11 +281,11 @@ * @param node child node definition * @return spec string */ - private static String getChildNodeDefSpec(NodeDef node) { + private static String getChildNodeDefSpec(NodeDefinition node) { StringWriter buffer =3D new StringWriter(); =20 PrintWriter writer =3D new PrintWriter(buffer); - writer.println("ChildNodeDef"); + writer.println("ChildNodeDefinition"); if (node.getName().equals("*")) { writer.println(" Name \"*\""); } else { @@ -304,12 +304,12 @@ } else { writer.println(" DefaultPrimaryType null"); } - writer.println(" AutoCreate " + node.isAutoCreate()); + writer.println(" AutoCreated " + node.isAutoCreated()); writer.println(" Mandatory " + node.isMandatory()); writer.println(" OnParentVersion " + OnParentVersionAction.nameFromValue(node.getOnParentVers= ion())); writer.println(" Protected " + node.isProtected()); - writer.println(" SameNameSibs " + node.allowSameNameSibs()); + writer.println(" SameNameSiblings " + node.allowsSameNameSiblings= ()); =20 return buffer.toString(); } @@ -323,12 +323,12 @@ * @return spec string * @throws RepositoryException on repository errors */ - private static String getPropertyDefSpec(PropertyDef property) + private static String getPropertyDefSpec(PropertyDefinition property) throws RepositoryException { StringWriter buffer =3D new StringWriter(); =20 PrintWriter writer =3D new PrintWriter(buffer); - writer.println("PropertyDef"); + writer.println("PropertyDefinition"); if (property.getName().equals("*")) { writer.println(" Name \"*\""); } else { @@ -352,7 +352,7 @@ } else { writer.println(" DefaultValues null"); } - writer.println(" AutoCreate " + property.isAutoCreate()); + writer.println(" AutoCreated " + property.isAutoCreated()); writer.println(" Mandatory " + property.isMandatory()); String action =3D OnParentVersionAction.nameFromValue( property.getOnParentVersion()); @@ -370,8 +370,8 @@ */ private static final Comparator ITEM_DEF_COMPARATOR =3D new Comparator= () { public int compare(Object a, Object b) { - ItemDef ida =3D (ItemDef) a; - ItemDef idb =3D (ItemDef) b; + ItemDefinition ida =3D (ItemDefinition) a; + ItemDefinition idb =3D (ItemDefinition) b; if (ida.getName().equals("*") && !idb.getName().equals("*")) { return 1; } else if (!ida.getName().equals("*") && idb.getName().equals(= "*")) { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/PropertyDefTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/PropertyDefTest.java?view=3Ddiff&r1=3D1= 61259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/PropertyDefTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/PropertyDefTest.java Thu Apr 14 04:50:38 2005 @@ -30,7 +30,7 @@ import javax.jcr.nodetype.NodeTypeManager; import javax.jcr.nodetype.NodeTypeIterator; import javax.jcr.nodetype.NodeType; -import javax.jcr.nodetype.PropertyDef; +import javax.jcr.nodetype.PropertyDefinition; import java.util.regex.Pattern; import java.util.regex.Matcher; =20 @@ -117,17 +117,17 @@ // loop all node types while (types.hasNext()) { NodeType currentType =3D types.nextNodeType(); - PropertyDef defsOfCurrentType[] =3D - currentType.getPropertyDefs(); + PropertyDefinition defsOfCurrentType[] =3D + currentType.getPropertyDefinitions(); =20 // loop all property defs of each node type for (int i =3D 0; i < defsOfCurrentType.length; i++) { - PropertyDef def =3D defsOfCurrentType[i]; + PropertyDefinition def =3D defsOfCurrentType[i]; NodeType type =3D def.getDeclaringNodeType(); =20 // check if def is part of the property defs of the // declaring node type - PropertyDef defs[] =3D type.getPropertyDefs(); + PropertyDefinition defs[] =3D type.getPropertyDefinitions(= ); boolean hasType =3D false; for (int j =3D 0; j < defs.length; j++) { if (defs[j].getName().equals(def.getName())) { @@ -152,9 +152,9 @@ // loop all node types while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - PropertyDef defs[] =3D type.getPropertyDefs(); + PropertyDefinition defs[] =3D type.getPropertyDefinitions(); for (int i =3D 0; i < defs.length; i++) { - if (defs[i].isAutoCreate()) { + if (defs[i].isAutoCreated()) { assertFalse("An auto create property must not be a " + "residual set definition.", defs[i].getName().equals("*")); @@ -189,7 +189,7 @@ // loop all node types while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - PropertyDef defs[] =3D type.getPropertyDefs(); + PropertyDefinition defs[] =3D type.getPropertyDefinitions(); for (int i =3D 0; i < defs.length; i++) { switch (defs[i].getRequiredType()) { case PropertyType.STRING: @@ -223,9 +223,9 @@ // loop all node types while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - PropertyDef defs[] =3D type.getPropertyDefs(); + PropertyDefinition defs[] =3D type.getPropertyDefinitions(); for (int i =3D 0; i < defs.length; i++) { - PropertyDef def =3D defs[i]; + PropertyDefinition def =3D defs[i]; =20 String constraints[] =3D def.getValueConstraints(); if (constraints !=3D null) { @@ -328,9 +328,9 @@ // loop all node types while (types.hasNext()) { NodeType type =3D types.nextNodeType(); - PropertyDef defs[] =3D type.getPropertyDefs(); + PropertyDefinition defs[] =3D type.getPropertyDefinitions(); for (int i =3D 0; i < defs.length; i++) { - PropertyDef def =3D defs[i]; + PropertyDefinition def =3D defs[i]; =20 Value values[] =3D def.getDefaultValues(); if (values !=3D null) { @@ -381,9 +381,9 @@ throws RepositoryException { =20 // test if node contains all mandatory properties of current type - PropertyDef propDefs[] =3D type.getPropertyDefs(); + PropertyDefinition propDefs[] =3D type.getPropertyDefinitions(); for (int i =3D 0; i < propDefs.length; i++) { - PropertyDef propDef =3D propDefs[i]; + PropertyDefinition propDef =3D propDefs[i]; =20 if (propDef.isMandatory()) { foundMandatoryProperty =3D true; Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/mix-lockable.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/mix-lockable.txt?view=3Ddiff&r1=3D= 161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/mix-lockable.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/mix-lockable.txt Thu Apr 14 04:50:38 2005 @@ -8,22 +8,22 @@ false PrimaryItemName null -PropertyDef +PropertyDefinition Name jcr:lockIsDeep RequiredType BOOLEAN ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion IGNORE Protected true Multiple false -PropertyDef +PropertyDefinition Name jcr:lockOwner RequiredType STRING ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion IGNORE Protected true Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/mix-referenceable.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/mix-referenceable.txt?view=3Ddiff&= r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/mix-referenceable.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/mix-referenceable.txt Thu Apr 14 04:50:38 2005 @@ -8,12 +8,12 @@ false PrimaryItemName null -PropertyDef +PropertyDefinition Name jcr:uuid RequiredType STRING ValueConstraints [] DefaultValues null - AutoCreate true + AutoCreated true Mandatory true OnParentVersion INITIALIZE Protected true Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/mix-versionable.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/mix-versionable.txt?view=3Ddiff&r1= =3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/mix-versionable.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/mix-versionable.txt Thu Apr 14 04:50:38 2005 @@ -8,52 +8,52 @@ false PrimaryItemName null -PropertyDef +PropertyDefinition Name jcr:baseVersion RequiredType REFERENCE ValueConstraints [nt:version] DefaultValues null - AutoCreate true + AutoCreated false Mandatory true OnParentVersion IGNORE Protected true Multiple false -PropertyDef +PropertyDefinition Name jcr:isCheckedOut RequiredType BOOLEAN ValueConstraints [] DefaultValues [true] - AutoCreate true + AutoCreated true Mandatory true OnParentVersion IGNORE Protected true Multiple false -PropertyDef +PropertyDefinition Name jcr:mergeFailed RequiredType REFERENCE ValueConstraints [] DefaultValues null - AutoCreate true + AutoCreated false Mandatory false - OnParentVersion COPY + OnParentVersion ABORT Protected true Multiple true -PropertyDef +PropertyDefinition Name jcr:predecessors RequiredType REFERENCE ValueConstraints [nt:version] DefaultValues null - AutoCreate true + AutoCreated false Mandatory true OnParentVersion COPY Protected true Multiple true -PropertyDef +PropertyDefinition Name jcr:versionHistory RequiredType REFERENCE ValueConstraints [nt:versionHistory] DefaultValues null - AutoCreate true + AutoCreated false Mandatory true OnParentVersion COPY Protected true Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-base.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-base.txt?view=3Ddiff&r1=3D16125= 9&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-base.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-base.txt Thu Apr 14 04:50:38 2005 @@ -8,22 +8,22 @@ false PrimaryItemName null -PropertyDef +PropertyDefinition Name jcr:mixinTypes RequiredType NAME ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion COMPUTE Protected true Multiple true -PropertyDef +PropertyDefinition Name jcr:primaryType RequiredType NAME ValueConstraints [] DefaultValues null - AutoCreate true + AutoCreated true Mandatory true OnParentVersion COMPUTE Protected true Added: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/n= odetype/spec/nt-childNodeDefinition.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-childNodeDefinition.txt?view=3D= auto&rev=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-childNodeDefinition.txt (added) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-childNodeDefinition.txt Thu Apr 14 04:50:38 2005 @@ -0,0 +1,90 @@ +NodeTypeName + nt:childNodeDefinition +Supertypes + nt:base +IsMixin + false +HasOrderableChildNodes + false +PrimaryItemName + null +PropertyDefinition + Name jcr:autoCreated + RequiredType BOOLEAN + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:defaultPrimaryType + RequiredType NAME + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory false + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:mandatory + RequiredType BOOLEAN + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:name + RequiredType NAME + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory false + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:onParentVersion + RequiredType STRING + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:protected + RequiredType BOOLEAN + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:requiredPrimaryTypes + RequiredType NAME + ValueConstraints [] + DefaultValues [nt:base] + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple true +PropertyDefinition + Name jcr:sameNameSiblings + RequiredType BOOLEAN + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple false Propchange: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/= api/nodetype/spec/nt-childNodeDefinition.txt ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-file.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-file.txt?view=3Ddiff&r1=3D16125= 9&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-file.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-file.txt Thu Apr 14 04:50:38 2005 @@ -8,12 +8,12 @@ false PrimaryItemName jcr:content -ChildNodeDef +ChildNodeDefinition Name jcr:content RequiredPrimaryTypes [nt:base] DefaultPrimaryType null - AutoCreate false + AutoCreated false Mandatory true OnParentVersion COPY Protected false - SameNameSibs false + SameNameSiblings false Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-folder.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-folder.txt?view=3Ddiff&r1=3D161= 259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-folder.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-folder.txt Thu Apr 14 04:50:38 2005 @@ -8,12 +8,12 @@ false PrimaryItemName null -ChildNodeDef +ChildNodeDefinition Name "*" RequiredPrimaryTypes [nt:hierarchyNode] DefaultPrimaryType null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion VERSION Protected false - SameNameSibs false + SameNameSiblings false Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-frozenNode.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-frozenNode.txt?view=3Ddiff&r1= =3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-frozenNode.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-frozenNode.txt Thu Apr 14 04:50:38 2005 @@ -9,61 +9,61 @@ true PrimaryItemName null -ChildNodeDef +ChildNodeDefinition Name "*" RequiredPrimaryTypes [nt:base] DefaultPrimaryType null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion ABORT Protected true - SameNameSibs true -PropertyDef + SameNameSiblings true +PropertyDefinition Name jcr:frozenMixinTypes - RequiredType STRING + RequiredType NAME ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion ABORT Protected true Multiple true -PropertyDef +PropertyDefinition Name jcr:frozenPrimaryType - RequiredType STRING + RequiredType NAME ValueConstraints [] DefaultValues null - AutoCreate true + AutoCreated true Mandatory true OnParentVersion ABORT Protected true Multiple false -PropertyDef +PropertyDefinition Name jcr:frozenUuid RequiredType STRING ValueConstraints [] DefaultValues null - AutoCreate true + AutoCreated true Mandatory true OnParentVersion ABORT Protected true Multiple false -PropertyDef +PropertyDefinition Name "*" RequiredType UNDEFINED ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion ABORT Protected true Multiple false -PropertyDef +PropertyDefinition Name "*" RequiredType UNDEFINED ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion ABORT Protected true Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-hierarchyNode.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-hierarchyNode.txt?view=3Ddiff&r= 1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-hierarchyNode.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-hierarchyNode.txt Thu Apr 14 04:50:38 2005 @@ -8,12 +8,12 @@ false PrimaryItemName null -PropertyDef +PropertyDefinition Name jcr:created RequiredType DATE ValueConstraints [] DefaultValues null - AutoCreate true + AutoCreated true Mandatory true OnParentVersion INITIALIZE Protected true Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-linkedFile.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-linkedFile.txt?view=3Ddiff&r1= =3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-linkedFile.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-linkedFile.txt Thu Apr 14 04:50:38 2005 @@ -8,12 +8,12 @@ false PrimaryItemName jcr:content -PropertyDef +PropertyDefinition Name jcr:content RequiredType REFERENCE ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory true OnParentVersion COPY Protected false Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-nodeType.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-nodeType.txt?view=3Ddiff&r1=3D1= 61259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-nodeType.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-nodeType.txt Thu Apr 14 04:50:38 2005 @@ -8,70 +8,70 @@ false PrimaryItemName null -ChildNodeDef - Name jcr:childNodeDef - RequiredPrimaryTypes [nt:childNodeDef] - DefaultPrimaryType nt:childNodeDef - AutoCreate false +ChildNodeDefinition + Name jcr:childNodeDefinition + RequiredPrimaryTypes [nt:childNodeDefinition] + DefaultPrimaryType nt:childNodeDefinition + AutoCreated false Mandatory false OnParentVersion VERSION Protected false - SameNameSibs true -ChildNodeDef - Name jcr:propertyDef - RequiredPrimaryTypes [nt:propertyDef] - DefaultPrimaryType nt:propertyDef - AutoCreate false + SameNameSiblings true +ChildNodeDefinition + Name jcr:propertyDefinition + RequiredPrimaryTypes [nt:propertyDefinition] + DefaultPrimaryType nt:propertyDefinition + AutoCreated false Mandatory false OnParentVersion VERSION Protected false - SameNameSibs true -PropertyDef + SameNameSiblings true +PropertyDefinition Name jcr:hasOrderableChildNodes RequiredType BOOLEAN ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory true OnParentVersion COPY Protected false Multiple false -PropertyDef +PropertyDefinition Name jcr:isMixin RequiredType BOOLEAN ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory true OnParentVersion COPY Protected false Multiple false -PropertyDef +PropertyDefinition Name jcr:nodeTypeName RequiredType NAME ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory true OnParentVersion COPY Protected false Multiple false -PropertyDef +PropertyDefinition Name jcr:primaryItemName RequiredType NAME ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion COPY Protected false Multiple false -PropertyDef +PropertyDefinition Name jcr:supertypes RequiredType NAME ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory true OnParentVersion COPY Protected false Added: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/n= odetype/spec/nt-propertyDefinition.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-propertyDefinition.txt?view=3Da= uto&rev=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-propertyDefinition.txt (added) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-propertyDefinition.txt Thu Apr 14 04:50:38 2005 @@ -0,0 +1,100 @@ +NodeTypeName + nt:propertyDefinition +Supertypes + nt:base +IsMixin + false +HasOrderableChildNodes + false +PrimaryItemName + null +PropertyDefinition + Name jcr:autoCreated + RequiredType BOOLEAN + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:defaultValues + RequiredType UNDEFINED + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory false + OnParentVersion COPY + Protected false + Multiple true +PropertyDefinition + Name jcr:mandatory + RequiredType BOOLEAN + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:multiple + RequiredType BOOLEAN + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:name + RequiredType NAME + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory false + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:onParentVersion + RequiredType STRING + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:protected + RequiredType BOOLEAN + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:requiredType + RequiredType STRING + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory true + OnParentVersion COPY + Protected false + Multiple false +PropertyDefinition + Name jcr:valueConstraints + RequiredType STRING + ValueConstraints [] + DefaultValues null + AutoCreated false + Mandatory false + OnParentVersion COPY + Protected false + Multiple true Propchange: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/= api/nodetype/spec/nt-propertyDefinition.txt ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-query.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-query.txt?view=3Ddiff&r1=3D1612= 59&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-query.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-query.txt Thu Apr 14 04:50:38 2005 @@ -8,22 +8,22 @@ false PrimaryItemName null -PropertyDef +PropertyDefinition Name jcr:language RequiredType STRING ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion COPY Protected false Multiple false -PropertyDef +PropertyDefinition Name jcr:statement RequiredType STRING ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion COPY Protected false Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-resource.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-resource.txt?view=3Ddiff&r1=3D1= 61259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-resource.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-resource.txt Thu Apr 14 04:50:38 2005 @@ -9,42 +9,42 @@ false PrimaryItemName jcr:data -PropertyDef +PropertyDefinition Name jcr:data RequiredType BINARY ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory true OnParentVersion COPY Protected false Multiple false -PropertyDef +PropertyDefinition Name jcr:encoding RequiredType STRING ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory true OnParentVersion COPY Protected false Multiple false -PropertyDef +PropertyDefinition Name jcr:lastModified RequiredType DATE ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory true OnParentVersion IGNORE Protected false Multiple false -PropertyDef - Name jcr:mimetype +PropertyDefinition + Name jcr:mimeType RequiredType STRING ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory true OnParentVersion COPY Protected false Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-unstructured.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-unstructured.txt?view=3Ddiff&r1= =3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-unstructured.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-unstructured.txt Thu Apr 14 04:50:38 2005 @@ -8,31 +8,31 @@ true PrimaryItemName null -ChildNodeDef +ChildNodeDefinition Name "*" RequiredPrimaryTypes [nt:base] DefaultPrimaryType nt:unstructured - AutoCreate false + AutoCreated false Mandatory false OnParentVersion VERSION Protected false - SameNameSibs true -PropertyDef + SameNameSiblings true +PropertyDefinition Name "*" RequiredType UNDEFINED ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion COPY Protected false Multiple true -PropertyDef +PropertyDefinition Name "*" RequiredType UNDEFINED ValueConstraints [] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion COPY Protected false Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-version.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-version.txt?view=3Ddiff&r1=3D16= 1259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-version.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-version.txt Thu Apr 14 04:50:38 2005 @@ -9,41 +9,41 @@ false PrimaryItemName null -ChildNodeDef +ChildNodeDefinition Name jcr:frozenNode RequiredPrimaryTypes [nt:frozenNode] DefaultPrimaryType null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion ABORT Protected true - SameNameSibs true -PropertyDef + SameNameSiblings false +PropertyDefinition Name jcr:created RequiredType DATE ValueConstraints [] DefaultValues null - AutoCreate true + AutoCreated true Mandatory true OnParentVersion ABORT Protected true Multiple false -PropertyDef +PropertyDefinition Name jcr:predecessors RequiredType REFERENCE ValueConstraints [nt:version] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion ABORT Protected true Multiple true -PropertyDef +PropertyDefinition Name jcr:successors RequiredType REFERENCE ValueConstraints [nt:version] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion ABORT Protected true Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-versionHistory.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-versionHistory.txt?view=3Ddiff&= r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-versionHistory.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-versionHistory.txt Thu Apr 14 04:50:38 2005 @@ -9,30 +9,30 @@ false PrimaryItemName null -ChildNodeDef +ChildNodeDefinition Name jcr:rootVersion RequiredPrimaryTypes [nt:version] DefaultPrimaryType nt:version - AutoCreate true + AutoCreated true Mandatory true OnParentVersion ABORT Protected true - SameNameSibs false -ChildNodeDef + SameNameSiblings false +ChildNodeDefinition Name jcr:versionLabels RequiredPrimaryTypes [nt:versionLabels] DefaultPrimaryType nt:versionLabels - AutoCreate true + AutoCreated true Mandatory true OnParentVersion ABORT Protected true - SameNameSibs false -ChildNodeDef + SameNameSiblings false +ChildNodeDefinition Name "*" RequiredPrimaryTypes [nt:version] DefaultPrimaryType nt:version - AutoCreate false + AutoCreated false Mandatory false OnParentVersion ABORT Protected true - SameNameSibs false + SameNameSiblings false Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-versionLabels.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-versionLabels.txt?view=3Ddiff&r= 1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-versionLabels.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-versionLabels.txt Thu Apr 14 04:50:38 2005 @@ -8,12 +8,12 @@ false PrimaryItemName null -PropertyDef +PropertyDefinition Name "*" RequiredType REFERENCE ValueConstraints [nt:version] DefaultValues null - AutoCreate false + AutoCreated false Mandatory false OnParentVersion ABORT Protected true Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/nodetype/spec/nt-versionedChild.txt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/nodetype/spec/nt-versionedChild.txt?view=3Ddiff&= r1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-versionedChild.txt (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/node= type/spec/nt-versionedChild.txt Thu Apr 14 04:50:38 2005 @@ -8,12 +8,12 @@ false PrimaryItemName null -PropertyDef +PropertyDefinition Name jcr:child RequiredType REFERENCE ValueConstraints [nt:versionHistory] DefaultValues null - AutoCreate true + AutoCreated true Mandatory true OnParentVersion ABORT Protected true Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/observation/EventIteratorTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/observation/EventIteratorTest.java?view=3Ddiff&r= 1=3D161259&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/obse= rvation/EventIteratorTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/obse= rvation/EventIteratorTest.java Thu Apr 14 04:50:38 2005 @@ -27,7 +27,7 @@ * Tests the methods the following methods: *
    *
  • {@link javax.jcr.observation.EventIterator#getSize()}
    • - *
  • {@link javax.jcr.observation.EventIterator#getPos()}
    • + *
  • {@link javax.jcr.observation.EventIterator#getPosition()}
    • *
  • {@link javax.jcr.observation.EventIterator#skip(long)}
    • *
*

@@ -64,9 +64,9 @@ } =20 /** - * Tests if getPos() returns the correct values. + * Tests if getPosition() returns the correct values. */ - public void testGetPos() throws RepositoryException { + public void testGetPosition() throws RepositoryException { EventResult listener =3D new EventResult(log); addEventListener(listener, Event.NODE_ADDED); testRootNode.addNode(nodeName1, testNodeType); @@ -76,13 +76,13 @@ removeEventListener(listener); EventIterator events =3D listener.getEventIterator(DEFAULT_WAIT_TI= MEOUT); assertNotNull("No events delivered within " + DEFAULT_WAIT_TIMEOUT= + "ms.", events); - assertEquals("Initial call to getPos() must return 0.", 0, events.= getPos()); + assertEquals("Initial call to getPosition() must return 0.", 0, ev= ents.getPosition()); events.nextEvent(); - assertEquals("Wrong value for getPos()", 1, events.getPos()); + assertEquals("Wrong value for getPosition()", 1, events.getPositio= n()); events.nextEvent(); - assertEquals("Wrong value for getPos()", 2, events.getPos()); + assertEquals("Wrong value for getPosition()", 2, events.getPositio= n()); events.nextEvent(); - assertEquals("Wrong value for getPos()", 3, events.getPos()); + assertEquals("Wrong value for getPosition()", 3, events.getPositio= n()); } =20 /** @@ -100,10 +100,10 @@ assertNotNull("No events delivered within " + DEFAULT_WAIT_TIMEOUT= + "ms.", events); // skip zero elements events.skip(0); - assertEquals("getPos() for first element must return 0.", 0, event= s=2EgetPos()); + assertEquals("getPosition() for first element must return 0.", 0, = events.getPosition()); // skip one element events.skip(2); - assertEquals("Wrong value for getPos()", 2, events.getPos()); + assertEquals("Wrong value for getPosition()", 2, events.getPositio= n()); // skip past end try { events.skip(2); Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/observation/EventTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/observation/EventTest.java?view=3Ddiff&r1=3D1612= 59&r2=3D161260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/obse= rvation/EventTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/obse= rvation/EventTest.java Thu Apr 14 04:50:38 2005 @@ -51,8 +51,8 @@ } =20 /** - * Tests if {@link javax.jcr.observation.Event#getUserId()} returns th= e same - * value as {@link javax.jcr.Session#getUserId()}. + * Tests if {@link javax.jcr.observation.Event#getUserID()} returns th= e same + * value as {@link javax.jcr.Session#getUserID()}. */ public void testGetUserId() throws RepositoryException{ EventResult result =3D new EventResult(log); @@ -62,8 +62,8 @@ Event[] events =3D result.getEvents(DEFAULT_WAIT_TIMEOUT); removeEventListener(result); assertEquals("Wrong number of events returned", 1, events.length); - String userId =3D events[0].getUserId(); - String sessionUId =3D superuser.getUserId(); + String userId =3D events[0].getUserID(); + String sessionUId =3D superuser.getUserID(); assertEquals("UserId of event is not equal to userId of session", = userId, sessionUId); } =20