svn commit: r813753 [3/3] - in /jackrabbit/sandbox/JCR-2170/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/ main/java/org/apache/jackrabbit/core/lock/ main/java/org/apache/jackrabbit/core/nodetype/ main/java/org/apache/jackrabbit/core/nodety...

[mr...@apache.org]

Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java?rev=813753&r1=813752&r2=813753&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java Fri Sep 11 10:05:33 2009
@@ -18,6 +18,8 @@
 
 import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl;
 import org.apache.jackrabbit.spi.commons.name.NameConstants;
+import org.apache.jackrabbit.spi.commons.QPropertyDefinitionImpl;
+import org.apache.jackrabbit.spi.commons.QNodeDefinitionImpl;
 import org.apache.jackrabbit.test.AbstractJCRTest;
 import org.apache.jackrabbit.spi.NameFactory;
 import org.apache.jackrabbit.spi.Name;
@@ -119,18 +121,18 @@
         bar.setName(nameFactory.create("", "bar"));
         bar.setSupertypes(new Name[]{NameConstants.NT_BASE});
 
-        NodeDefImpl myBarInFoo = new NodeDefImpl();
+        QNodeDefinitionImpl myBarInFoo = new QNodeDefinitionImpl();
         myBarInFoo.setRequiredPrimaryTypes(new Name[]{bar.getName()});
         myBarInFoo.setName(nameFactory.create("", "myBarInFoo"));
         myBarInFoo.setDeclaringNodeType(foo.getName());
 
-        NodeDefImpl myFooInBar = new NodeDefImpl();
+        QNodeDefinitionImpl myFooInBar = new QNodeDefinitionImpl();
         myFooInBar.setRequiredPrimaryTypes(new Name[]{foo.getName()});
         myFooInBar.setName(nameFactory.create("", "myFooInBar"));
         myFooInBar.setDeclaringNodeType(bar.getName());
 
-        foo.setChildNodeDefs(new NodeDefImpl[]{myBarInFoo});
-        bar.setChildNodeDefs(new NodeDefImpl[]{myFooInBar});
+        foo.setChildNodeDefs(new QNodeDefinitionImpl[]{myBarInFoo});
+        bar.setChildNodeDefs(new QNodeDefinitionImpl[]{myFooInBar});
         ntDefCollection = new LinkedList();
         ntDefCollection.add(foo);
         ntDefCollection.add(bar);
@@ -164,12 +166,12 @@
         foo.setSupertypes(new Name[]{NameConstants.NT_BASE});
 
 
-        NodeDefImpl myBarInFoo = new NodeDefImpl();
+        QNodeDefinitionImpl myBarInFoo = new QNodeDefinitionImpl();
         myBarInFoo.setRequiredPrimaryTypes(new Name[]{nameFactory.create("", "I_am_an_invalid_required_primary_type")});
         myBarInFoo.setName(nameFactory.create("", "myNTInFoo"));
         myBarInFoo.setDeclaringNodeType(foo.getName());
 
-        foo.setChildNodeDefs(new NodeDefImpl[]{myBarInFoo});
+        foo.setChildNodeDefs(new QNodeDefinitionImpl[]{myBarInFoo});
         ntDefCollection = new LinkedList();
         ntDefCollection.add(foo);
 
@@ -209,36 +211,36 @@
         final NodeTypeDef cmsObject = new NodeTypeDef();
         cmsObject.setName(nameFactory.create("", "CmsObject"));
         cmsObject.setSupertypes(new Name[]{NameConstants.NT_BASE});
-        NodeDefImpl parentFolder = new NodeDefImpl();
+        QNodeDefinitionImpl parentFolder = new QNodeDefinitionImpl();
         parentFolder.setRequiredPrimaryTypes(new Name[]{folder.getName()});
         parentFolder.setName(nameFactory.create("", "parentFolder"));
         parentFolder.setDeclaringNodeType(cmsObject.getName());
-        cmsObject.setChildNodeDefs(new NodeDefImpl[]{parentFolder});
+        cmsObject.setChildNodeDefs(new QNodeDefinitionImpl[]{parentFolder});
 
 
         final NodeTypeDef document = new NodeTypeDef();
         document.setName(nameFactory.create("", "Document"));
         document.setSupertypes(new Name[]{cmsObject.getName()});
-        PropDefImpl sizeProp = new PropDefImpl();
+        QPropertyDefinitionImpl sizeProp = new QPropertyDefinitionImpl();
         sizeProp.setName(nameFactory.create("", "size"));
         sizeProp.setRequiredType(PropertyType.LONG);
         sizeProp.setDeclaringNodeType(document.getName());
-        document.setPropertyDefs(new PropDef[]{sizeProp});
+        document.setPropertyDefs(new QPropertyDefinition[]{sizeProp});
 
 
         folder.setSupertypes(new Name[]{cmsObject.getName()});
 
-        NodeDefImpl folders = new NodeDefImpl();
+        QNodeDefinitionImpl folders = new QNodeDefinitionImpl();
         folders.setRequiredPrimaryTypes(new Name[]{folder.getName()});
         folders.setName(nameFactory.create("", "folders"));
         folders.setDeclaringNodeType(folder.getName());
 
-        NodeDefImpl documents = new NodeDefImpl();
+        QNodeDefinitionImpl documents = new QNodeDefinitionImpl();
         documents.setRequiredPrimaryTypes(new Name[]{document.getName()});
         documents.setName(nameFactory.create("", "documents"));
         documents.setDeclaringNodeType(folder.getName());
 
-        folder.setChildNodeDefs(new NodeDefImpl[]{folders, documents});
+        folder.setChildNodeDefs(new QNodeDefinitionImpl[]{folders, documents});
         ntDefCollection = new LinkedList();
         ntDefCollection.add(folder);
         ntDefCollection.add(document);