jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
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/
Date Thu, 14 Apr 2005 11:51:04 GMT
Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyBooleanTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyBooleanTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyBooleanTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
-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;
 
 /**
@@ -71,7 +71,7 @@
     public void testConversions()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.BOOLEAN, false, false, false, false);
 
         if (propDef == null) {
@@ -132,7 +132,7 @@
     public void testConversionsMultiple()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.BOOLEAN, true, false, false, false);
 
         if (propDef == null) {
@@ -195,12 +195,12 @@
 
     /**
      * Tests if canSetProperty(String propertyName, Value value) returns false
-     * 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, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.BOOLEAN, false, false, true, false);
 
         if (propDef == null) {
@@ -225,12 +225,12 @@
 
     /**
      * 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 property def
      */
-    public void testOutOfValueConstraintMultiple()
+    public void testValueConstraintNotSatisfiedMultiple()
             throws NotExecutableException, ParseException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.BOOLEAN, true, false, true, false);
 
         if (propDef == null) {

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyDateTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyDateTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyDateTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
-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;
 
 /**
@@ -73,7 +73,7 @@
     public void testConversions()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.DATE, false, false, false, false);
 
         if (propDef == null) {
@@ -148,7 +148,7 @@
     public void testConversionsMultiple()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.DATE, true, false, false, false);
 
         if (propDef == null) {
@@ -233,10 +233,10 @@
      * Tests if canSetProperty(String propertyName, Value value) returns false
      * if value does not match the value constraints of the property def
      */
-    public void testOutOfValueConstraint()
+    public void testValueConstraintNotSatisfied()
             throws NotExecutableException, ParseException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.DATE, false, false, true, false);
 
         if (propDef == null) {
@@ -260,12 +260,12 @@
 
     /**
      * 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 property def
      */
-    public void testOutOfValueConstraintMultiple()
+    public void testValueConstraintNotSatisfiedMultiple()
             throws NotExecutableException, ParseException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.DATE, true, false, true, false);
 
         if (propDef == null) {

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyDoubleTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyDoubleTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyDoubleTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
-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;
 
 /**
@@ -73,7 +73,7 @@
     public void testConversions()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBLE, false, false, false, false);
 
         if (propDef == null) {
@@ -148,7 +148,7 @@
     public void testConversionsMultiple()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBLE, true, false, false, false);
 
         if (propDef == null) {
@@ -229,12 +229,12 @@
 
     /**
      * Tests if canSetProperty(String propertyName, Value value) returns false
-     * 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, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBLE, false, false, true, false);
 
         if (propDef == null) {
@@ -258,12 +258,12 @@
 
     /**
      * 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 property def
      */
-    public void testOutOfValueConstraintMultiple()
+    public void testValueConstraintNotSatisfiedMultiple()
             throws NotExecutableException, ParseException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBLE, true, false, true, false);
 
         if (propDef == null) {

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyLongTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyLongTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyLongTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
-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;
 
 /**
@@ -73,7 +73,7 @@
     public void testConversions()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBLE, false, false, false, false);
 
         if (propDef == null) {
@@ -148,7 +148,7 @@
     public void testConversionsMultiple()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.DOUBLE, true, false, false, false);
 
         if (propDef == null) {
@@ -229,12 +229,12 @@
 
     /**
      * Tests if canSetProperty(String propertyName, Value value) returns false
-     * 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, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.LONG, false, false, true, false);
 
         if (propDef == null) {
@@ -258,12 +258,12 @@
 
     /**
      * 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 property def
      */
-    public void testOutOfValueConstraintMultiple()
+    public void testValueConstraintNotSatisfiedMultiple()
             throws NotExecutableException, ParseException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.LONG, true, false, true, false);
 
         if (propDef == null) {

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyMultipleTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyMultipleTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyMultipleTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
-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 {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEFINED, true, true, false, false);
 
         // will never happen since at least jcr:mixinTypes of nt:base accomplish the request
@@ -95,7 +95,7 @@
     public void testReturnFalseBecauseIsNotMultiple()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEFINED, false, false, false, false);
 
         if (propDef == null) {
@@ -118,7 +118,7 @@
     public void testMultipleValuesNull()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEFINED, true, false, false, false);
 
         if (propDef == null) {

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyNameTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyNameTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyNameTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
-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;
 
 /**
@@ -74,7 +74,7 @@
     public void testConversions()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.NAME, false, false, false, false);
 
         if (propDef == null) {
@@ -154,7 +154,7 @@
     public void testConversionsMultiple()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.NAME, true, false, false, false);
 
         if (propDef == null) {
@@ -241,12 +241,12 @@
 
     /**
      * Tests if canSetProperty(String propertyName, Value value) returns false
-     * 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, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.NAME, false, false, true, false);
 
         if (propDef == null) {
@@ -270,12 +270,12 @@
 
     /**
      * 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 property def
      */
-    public void testOutOfValueConstraintMultiple()
+    public void testValueConstraintNotSatisfiedMultiple()
             throws NotExecutableException, ParseException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.NAME, true, false, true, false);
 
         if (propDef == null) {

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyPathTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyPathTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyPathTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
-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 {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.PATH, false, false, false, false);
 
         if (propDef == null) {
@@ -152,7 +152,7 @@
     public void testConversionsMultiple()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.PATH, true, false, false, false);
 
         if (propDef == null) {
@@ -231,12 +231,12 @@
 
     /**
      * Tests if canSetProperty(String propertyName, Value value) returns false
-     * 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, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.PATH, false, false, true, false);
 
         if (propDef == null) {
@@ -260,12 +260,12 @@
 
     /**
      * 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 property def
      */
-    public void testOutOfValueConstraintMultiple()
+    public void testValueConstraintNotSatisfiedMultiple()
             throws NotExecutableException, ParseException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.PATH, true, false, true, false);
 
         if (propDef == null) {

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyStringTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyStringTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyStringTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
-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 {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.STRING, false, false, false, false);
 
         if (propDef == null) {
@@ -132,7 +132,7 @@
     public void testConversionsMultiple()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.STRING, true, false, false, false);
 
         if (propDef == null) {
@@ -195,12 +195,12 @@
 
     /**
      * Tests if canSetProperty(String propertyName, Value value) returns false
-     * 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, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.STRING, false, false, true, false);
 
         if (propDef == null) {
@@ -224,12 +224,12 @@
 
     /**
      * 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 property def
      */
-    public void testOutOfValueConstraintMultiple()
+    public void testValueConstraintNotSatisfiedMultiple()
             throws NotExecutableException, ParseException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.STRING, true, false, true, false);
 
         if (propDef == null) {

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyTest.java Thu Apr 14 04:50:38 2005
@@ -20,7 +20,7 @@
 import org.apache.jackrabbit.test.NotExecutableException;
 
 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 {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEFINED, false, true, false, false);
 
         // will never happen since at least jcr:primaryType of nt:base accomplish the request
@@ -93,7 +93,7 @@
     public void testReturnFalseBecauseIsMultiple()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEFINED, true, false, false, false);
 
         if (propDef == null) {
@@ -115,7 +115,7 @@
     public void testValueNull()
             throws NotExecutableException, RepositoryException {
 
-        PropertyDef propDef =
+        PropertyDefinition propDef =
                 NodeTypeUtil.locatePropertyDef(session, PropertyType.UNDEFINED, false, false, false, false);
 
         if (propDef == null) {

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/NodeDefTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/NodeDefTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/NodeDefTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
-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;
 
 /**
  * Tests if node definitions are respected in node instances in the workspace.
@@ -92,17 +92,17 @@
         // loop all node types
         while (types.hasNext()) {
             NodeType currentType = types.nextNodeType();
-            NodeDef defsOfCurrentType[] =
-                    currentType.getChildNodeDefs();
+            NodeDefinition defsOfCurrentType[] =
+                    currentType.getChildNodeDefinitions();
 
             // loop all child node defs of each node type
             for (int i = 0; i < defsOfCurrentType.length; i++) {
-                NodeDef def = defsOfCurrentType[i];
+                NodeDefinition def = defsOfCurrentType[i];
                 NodeType type = def.getDeclaringNodeType();
 
                 // check if def is part of the child node defs of the
                 // declaring node type
-                NodeDef defs[] = type.getChildNodeDefs();
+                NodeDefinition defs[] = type.getChildNodeDefinitions();
                 boolean hasType = false;
                 for (int j = 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 = types.nextNodeType();
-            NodeDef defs[] = type.getChildNodeDefs();
+            NodeDefinition defs[] = type.getChildNodeDefinitions();
             for (int i = 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 = types.nextNodeType();
-            NodeDef defs[] = type.getChildNodeDefs();
+            NodeDefinition defs[] = type.getChildNodeDefinitions();
 
             for (int i = 0; i < defs.length; i++) {
                 assertTrue("getRequiredPrimaryTypes() must never return an " +
@@ -190,11 +190,11 @@
         // loop all node types
         while (types.hasNext()) {
             NodeType type = types.nextNodeType();
-            NodeDef defs[] = type.getChildNodeDefs();
+            NodeDefinition defs[] = type.getChildNodeDefinitions();
 
             for (int i = 0; i < defs.length; i++) {
 
-                NodeDef def = defs[i];
+                NodeDefinition def = defs[i];
                 NodeType defaultType = def.getDefaultPrimaryType();
                 if (defaultType != null) {
 
@@ -254,9 +254,9 @@
             throws RepositoryException {
 
         // test if node contains all mandatory nodes of current type
-        NodeDef nodeDefs[] = type.getChildNodeDefs();
+        NodeDefinition nodeDefs[] = type.getChildNodeDefinitions();
         for (int i = 0; i < nodeDefs.length; i++) {
-            NodeDef nodeDef = nodeDefs[i];
+            NodeDefinition nodeDef = nodeDefs[i];
             if (nodeDef.isMandatory()) {
                 foundMandatoryNode = true;
                 try {

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/NodeTypeTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/NodeTypeTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/NodeTypeTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
-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;
 
 /**
  * Tests if the node type hierarchy is correctly mapped to the methods
@@ -266,8 +266,8 @@
         while (types.hasNext()) {
             NodeType type = types.nextNodeType();
 
-            PropertyDef declaredDefs[] = type.getDeclaredPropertyDefs();
-            PropertyDef defs[] = type.getPropertyDefs();
+            PropertyDefinition declaredDefs[] = type.getDeclaredPropertyDefinitions();
+            PropertyDefinition defs[] = type.getPropertyDefinitions();
 
             try {
                 for (int i = 0; i < declaredDefs.length; i++) {
@@ -302,7 +302,7 @@
         NodeTypeIterator types = manager.getPrimaryNodeTypes();
         while (types.hasNext()) {
             NodeType type = types.nextNodeType();
-            PropertyDef defs[] = type.getPropertyDefs();
+            PropertyDefinition defs[] = type.getPropertyDefinitions();
             boolean hasJCRPrimaryType = false;
             for (int i = 0; i < defs.length; i++) {
                 if (defs[i].getName().equals(jcrPrimaryType)) {
@@ -327,8 +327,8 @@
         while (types.hasNext()) {
             NodeType type = types.nextNodeType();
 
-            NodeDef declaredDefs[] = type.getDeclaredChildNodeDefs();
-            NodeDef defs[] = type.getChildNodeDefs();
+            NodeDefinition declaredDefs[] = type.getDeclaredChildNodeDefinitions();
+            NodeDefinition defs[] = type.getChildNodeDefinitions();
 
             try {
                 for (int i = 0; i < declaredDefs.length; i++) {

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/NodeTypeUtil.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/NodeTypeUtil.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/NodeTypeUtil.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/NodeTypeUtil.java Thu Apr 14 04:50:38 2005
@@ -16,11 +16,6 @@
  */
 package org.apache.jackrabbit.test.api.nodetype;
 
-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;
 
 /**
  * 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 returned
-     *                      <code>NodeDef</code> is according to param
-     *                      <code>defaultPrimaryType</code>. If false, the returned
-     *                      <code>NodeDef</code> might have a default primary type
-     *                      or not.
-     * @param defaultPrimaryType:
-     *                      if <code>regardDefaultPrimaryType</code> is true:
-     *                      if true, the returned <code>NodeDef</code> has a
-     *                      default primary type, else not
-     * @param residual:     if true, the returned <code>NodeDef</code> is of
-     *                      the residual name "*", else not
+     * @param session:                  the session to access the node types
+     * @param regardDefaultPrimaryType: if true, the default primary type of the returned
+     *                                  <code>NodeDef</code> is according to param
+     *                                  <code>defaultPrimaryType</code>. If false, the returned
+     *                                  <code>NodeDef</code> might have a default primary type
+     *                                  or not.
+     * @param defaultPrimaryType:       if <code>regardDefaultPrimaryType</code> is true:
+     *                                  if true, the returned <code>NodeDef</code> has a
+     *                                  default primary type, else not
+     * @param residual:                 if true, the returned <code>NodeDef</code> is of
+     *                                  the residual name "*", else not
      * @return
      * @throws RepositoryException
      */
-    public static NodeDef locateChildNodeDef(Session session,
-                                             boolean regardDefaultPrimaryType,
-                                             boolean defaultPrimaryType,
-                                             boolean residual)
-        throws RepositoryException {
+    public static NodeDefinition locateChildNodeDef(Session session,
+                                                    boolean regardDefaultPrimaryType,
+                                                    boolean defaultPrimaryType,
+                                                    boolean residual)
+            throws RepositoryException {
 
         NodeTypeManager manager = session.getWorkspace().getNodeTypeManager();
         NodeTypeIterator types = manager.getAllNodeTypes();
@@ -77,10 +75,10 @@
 
         while (types.hasNext()) {
             NodeType type = types.nextNodeType();
-            NodeDef nodeDefs[] = type.getDeclaredChildNodeDefs();
+            NodeDefinition nodeDefs[] = type.getDeclaredChildNodeDefinitions();
 
             for (int i = 0; i < nodeDefs.length; i++) {
-                NodeDef nodeDef = nodeDefs[i];
+                NodeDefinition nodeDef = nodeDefs[i];
 
                 if (nodeDef.getRequiredPrimaryTypes().length > 1) {
                     // behaviour of implementations that support multiple multiple inheritance
@@ -106,7 +104,7 @@
                 if (!residual && i == 0) {
                     // if another child node def is a residual definition
                     // overjump the current node type
-                    NodeDef nodeDefsAll[] = type.getChildNodeDefs();
+                    NodeDefinition nodeDefsAll[] = type.getChildNodeDefinitions();
                     for (int j = 0; j < nodeDefsAll.length; j++) {
                         if (nodeDefsAll[j].getName().equals("*")) {
                             overjump = 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 <code>NodeDef</code> is
-     *                      protected, else not
-     * @param mandatory:    if true, the returned <code>NodeDef</code> is
-     *                      mandatory, else not
+     * @param session:     the session to access the node types
+     * @param isProtected: if true, the returned <code>NodeDef</code> is
+     *                     protected, else not
+     * @param mandatory:   if true, the returned <code>NodeDef</code> is
+     *                     mandatory, else not
      * @return the first <code>NodeDef</code> 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 {
 
         NodeTypeManager manager = session.getWorkspace().getNodeTypeManager();
         NodeTypeIterator types = manager.getAllNodeTypes();
 
         while (types.hasNext()) {
             NodeType type = types.nextNodeType();
-            NodeDef nodeDefs[] = type.getDeclaredChildNodeDefs();
+            NodeDefinition nodeDefs[] = type.getDeclaredChildNodeDefinitions();
 
             for (int i = 0; i < nodeDefs.length; i++) {
-                NodeDef nodeDef = nodeDefs[i];
+                NodeDefinition nodeDef = nodeDefs[i];
 
                 if (nodeDef.getName().equals("*")) {
                     continue;
@@ -191,12 +189,12 @@
      * @return the first <code>PropertyDef</code> 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 {
 
         NodeTypeManager manager = session.getWorkspace().getNodeTypeManager();
@@ -204,9 +202,9 @@
 
         while (types.hasNext()) {
             NodeType type = types.nextNodeType();
-            PropertyDef propDefs[] = type.getDeclaredPropertyDefs();
+            PropertyDefinition propDefs[] = type.getDeclaredPropertyDefinitions();
             for (int i = 0; i < propDefs.length; i++) {
-                PropertyDef propDef = propDefs[i];
+                PropertyDefinition propDef = propDefs[i];
 
                 // PropertyType.UNDEFINED is in use to get a property of any type
                 if (propertyType != PropertyType.UNDEFINED &&
@@ -238,15 +236,10 @@
                         // property def has no constraints
                         continue;
                     }
-                    try {
-                        // check if a value out of constraint is buildable
-                        Value v = getValueOutOfContstraint(propDef);
-                        if (v == null) {
-                            // no value out of the constraint range available
-                            continue;
-                        }
-                    } catch (ParseException e) {
-                        // an error occured
+                    // check if a value out of constraint is buildable
+                    Value v = getValueOutOfContstraint(propDef);
+                    if (v == 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 <code>PropertyDef</code> is
-     *                      protected, else not
-     * @param mandatory:    if true, the returned <code>PropertyDef</code> is
-     *                      mandatory, else not
+     * @param session:     the session to access the node types
+     * @param isProtected: if true, the returned <code>PropertyDef</code> is
+     *                     protected, else not
+     * @param mandatory:   if true, the returned <code>PropertyDef</code> is
+     *                     mandatory, else not
      * @return the first <code>PropertyDef</code> 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 {
 
         NodeTypeManager manager = session.getWorkspace().getNodeTypeManager();
@@ -286,9 +279,9 @@
 
         while (types.hasNext()) {
             NodeType type = types.nextNodeType();
-            PropertyDef propDefs[] = type.getDeclaredPropertyDefs();
+            PropertyDefinition propDefs[] = type.getDeclaredPropertyDefinitions();
             for (int i = 0; i < propDefs.length; i++) {
-                PropertyDef propDef = propDefs[i];
+                PropertyDefinition propDef = propDefs[i];
 
                 if (propDef.getName().equals("*")) {
                     continue;
@@ -319,7 +312,7 @@
      */
     public static String getUndefinedChildNodeName(NodeType nodeType) {
 
-        NodeDef nodeDefs[] = nodeType.getChildNodeDefs();
+        NodeDefinition nodeDefs[] = nodeType.getChildNodeDefinitions();
         StringBuffer s = new StringBuffer("X");
 
         for (int i = 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, ParseException {
+    public static Value getValueOutOfContstraint(PropertyDefinition propDef)
+            throws ValueFormatException, RepositoryException {
 
         int type = propDef.getRequiredType();
         String constraints[] = propDef.getValueConstraints();

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
 import org.apache.jackrabbit.test.AbstractJCRTest;
@@ -146,12 +146,12 @@
 
     /** Test for the predefined nt:propertyDef node type. */
     public void testPropertyDef() {
-        testPredefinedNodeType("nt:propertyDef");
+        testPredefinedNodeType("nt:propertyDefinition");
     }
 
     /** Test for the predefined nt:childNodeDef node type. */
     public void testChildNodeDef() {
-        testPredefinedNodeType("nt:childNodeDef");
+        testPredefinedNodeType("nt:childNodeDefinition");
     }
 
     /** 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 = type.getDeclaredChildNodeDefs();
+        NodeDefinition[] nodes = type.getDeclaredChildNodeDefinitions();
         Arrays.sort(nodes, ITEM_DEF_COMPARATOR);
         for (int i = 0; i < nodes.length; i++) {
             writer.print(getChildNodeDefSpec(nodes[i]));
         }
-        PropertyDef[] properties = type.getDeclaredPropertyDefs();
+        PropertyDefinition[] properties = type.getDeclaredPropertyDefinitions();
         Arrays.sort(properties, ITEM_DEF_COMPARATOR);
         for (int i = 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 = new StringWriter();
 
         PrintWriter writer = 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.getOnParentVersion()));
         writer.println("  Protected " + node.isProtected());
-        writer.println("  SameNameSibs " + node.allowSameNameSibs());
+        writer.println("  SameNameSiblings " + node.allowsSameNameSiblings());
 
         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 = new StringWriter();
 
         PrintWriter writer = 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 = OnParentVersionAction.nameFromValue(
                 property.getOnParentVersion());
@@ -370,8 +370,8 @@
      */
     private static final Comparator ITEM_DEF_COMPARATOR = new Comparator() {
         public int compare(Object a, Object b) {
-            ItemDef ida = (ItemDef) a;
-            ItemDef idb = (ItemDef) b;
+            ItemDefinition ida = (ItemDefinition) a;
+            ItemDefinition idb = (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/api/nodetype/PropertyDefTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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;
 
@@ -117,17 +117,17 @@
         // loop all node types
         while (types.hasNext()) {
             NodeType currentType = types.nextNodeType();
-            PropertyDef defsOfCurrentType[] =
-                    currentType.getPropertyDefs();
+            PropertyDefinition defsOfCurrentType[] =
+                    currentType.getPropertyDefinitions();
 
             // loop all property defs of each node type
             for (int i = 0; i < defsOfCurrentType.length; i++) {
-                PropertyDef def = defsOfCurrentType[i];
+                PropertyDefinition def = defsOfCurrentType[i];
                 NodeType type = def.getDeclaringNodeType();
 
                 // check if def is part of the property defs of the
                 // declaring node type
-                PropertyDef defs[] = type.getPropertyDefs();
+                PropertyDefinition defs[] = type.getPropertyDefinitions();
                 boolean hasType = false;
                 for (int j = 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 = types.nextNodeType();
-            PropertyDef defs[] = type.getPropertyDefs();
+            PropertyDefinition defs[] = type.getPropertyDefinitions();
             for (int i = 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 = types.nextNodeType();
-            PropertyDef defs[] = type.getPropertyDefs();
+            PropertyDefinition defs[] = type.getPropertyDefinitions();
             for (int i = 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 = types.nextNodeType();
-            PropertyDef defs[] = type.getPropertyDefs();
+            PropertyDefinition defs[] = type.getPropertyDefinitions();
             for (int i = 0; i < defs.length; i++) {
-                PropertyDef def = defs[i];
+                PropertyDefinition def = defs[i];
 
                 String constraints[] = def.getValueConstraints();
                 if (constraints != null) {
@@ -328,9 +328,9 @@
         // loop all node types
         while (types.hasNext()) {
             NodeType type = types.nextNodeType();
-            PropertyDef defs[] = type.getPropertyDefs();
+            PropertyDefinition defs[] = type.getPropertyDefinitions();
             for (int i = 0; i < defs.length; i++) {
-                PropertyDef def = defs[i];
+                PropertyDefinition def = defs[i];
 
                 Value values[] = def.getDefaultValues();
                 if (values != null) {
@@ -381,9 +381,9 @@
             throws RepositoryException {
 
         // test if node contains all mandatory properties of current type
-        PropertyDef propDefs[] = type.getPropertyDefs();
+        PropertyDefinition propDefs[] = type.getPropertyDefinitions();
         for (int i = 0; i < propDefs.length; i++) {
-            PropertyDef propDef = propDefs[i];
+            PropertyDefinition propDef = propDefs[i];
 
             if (propDef.isMandatory()) {
                 foundMandatoryProperty = true;

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/mix-lockable.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/mix-referenceable.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/mix-versionable.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-base.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/nodetype/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=auto&rev=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-childNodeDefinition.txt (added)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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 = native

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-file.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-folder.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-frozenNode.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-hierarchyNode.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-linkedFile.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-nodeType.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/nodetype/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=auto&rev=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-propertyDefinition.txt (added)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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 = native

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-query.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-resource.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-unstructured.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-version.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-versionHistory.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-versionLabels.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/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=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-versionedChild.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/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/api/observation/EventIteratorTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/observation/EventIteratorTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/observation/EventIteratorTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/observation/EventIteratorTest.java Thu Apr 14 04:50:38 2005
@@ -27,7 +27,7 @@
  * Tests the methods the following methods:
  * <ul>
  * <li>{@link javax.jcr.observation.EventIterator#getSize()}</li>
- * <li>{@link javax.jcr.observation.EventIterator#getPos()}</li>
+ * <li>{@link javax.jcr.observation.EventIterator#getPosition()}</li>
  * <li>{@link javax.jcr.observation.EventIterator#skip(long)}</li>
  * </ul>
  * <p/>
@@ -64,9 +64,9 @@
     }
 
     /**
-     * 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 = new EventResult(log);
         addEventListener(listener, Event.NODE_ADDED);
         testRootNode.addNode(nodeName1, testNodeType);
@@ -76,13 +76,13 @@
         removeEventListener(listener);
         EventIterator events = listener.getEventIterator(DEFAULT_WAIT_TIMEOUT);
         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, events.getPosition());
         events.nextEvent();
-        assertEquals("Wrong value for getPos()", 1, events.getPos());
+        assertEquals("Wrong value for getPosition()", 1, events.getPosition());
         events.nextEvent();
-        assertEquals("Wrong value for getPos()", 2, events.getPos());
+        assertEquals("Wrong value for getPosition()", 2, events.getPosition());
         events.nextEvent();
-        assertEquals("Wrong value for getPos()", 3, events.getPos());
+        assertEquals("Wrong value for getPosition()", 3, events.getPosition());
     }
 
     /**
@@ -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, events.getPos());
+        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.getPosition());
         // skip past end
         try {
             events.skip(2);

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/observation/EventTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/observation/EventTest.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/observation/EventTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/observation/EventTest.java Thu Apr 14 04:50:38 2005
@@ -51,8 +51,8 @@
     }
 
     /**
-     * Tests if {@link javax.jcr.observation.Event#getUserId()} returns the same
-     * value as {@link javax.jcr.Session#getUserId()}.
+     * Tests if {@link javax.jcr.observation.Event#getUserID()} returns the same
+     * value as {@link javax.jcr.Session#getUserID()}.
      */
     public void testGetUserId() throws RepositoryException{
         EventResult result = new EventResult(log);
@@ -62,8 +62,8 @@
         Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
         removeEventListener(result);
         assertEquals("Wrong number of events returned", 1, events.length);
-        String userId = events[0].getUserId();
-        String sessionUId = superuser.getUserId();
+        String userId = events[0].getUserID();
+        String sessionUId = superuser.getUserID();
         assertEquals("UserId of event is not equal to userId of session", userId, sessionUId);
     }
 



Mime
View raw message