Index: pom.xml
===================================================================
--- pom.xml	(revision 972)
+++ pom.xml	(working copy)
@@ -338,6 +338,10 @@
 							<name>java.io.tmpdir</name>
 							<value>${basedir}/target</value>
 						</property>
+						<property>
+							<name>java.security.debug</name>
+							<value>configfile</value>
+						</property>
 					</systemProperties>
 				</configuration>
 			</plugin>
Index: extensions/dna-web-jcr-rest-war/pom.xml
===================================================================
--- extensions/dna-web-jcr-rest-war/pom.xml	(revision 972)
+++ extensions/dna-web-jcr-rest-war/pom.xml	(working copy)
@@ -1,5 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>dna</artifactId>
@@ -10,7 +12,8 @@
 	<artifactId>dna-web-jcr-rest-war</artifactId>
 	<packaging>war</packaging>
 	<name>JBoss DNA JCR REST Servlet</name>
-	<description>JBoss DNA servlet that provides RESTful access to JCR items</description>
+	<description>JBoss DNA servlet that provides RESTful access to
+JCR items</description>
 	<url>http://labs.jboss.org/dna</url>
 	<dependencies>
 		<dependency>
@@ -42,70 +45,81 @@
 	</dependencies>
 	<build>
 		<finalName>resources</finalName>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.cargo</groupId>
-				<artifactId>cargo-maven2-plugin</artifactId>
+	
+<artifactId>cargo-maven2-plugin</artifactId>
 				<executions>
 					<execution>
 						<id>start-container</id>
-						<phase>pre-integration-test</phase>
+	
+<phase>pre-integration-test</phase>
 						<goals>
-							<goal>start</goal>
+	
+<goal>start</goal>
 						</goals>
 					</execution>
 					<execution>
 						<id>stop-container</id>
-						<phase>post-integration-test</phase>
+	
+<phase>post-integration-test</phase>
 						<goals>
-							<goal>stop</goal>
+	
+<goal>stop</goal>
 						</goals>
 					</execution>
 				</executions>
 				<configuration>
 					<configuration>
 						<properties>
-							<cargo.logging>high</cargo.logging>
+	
+<cargo.logging>high</cargo.logging>
 						</properties>
 					</configuration>
 					<container>
 						<systemProperties>
-							<java.security.auth.login.config>${project.build.directory}/test-classes/jetty-dna.policy</java.security.auth.login.config>
+	
+<security.config>configfile</security.config>
+	
+<java.security.auth.login.config>${project.build.directory}/test-classes
+/jetty-dna.policy</java.security.auth.login.config>
 						</systemProperties>
 					</container>
 					<wait>false</wait>
 				</configuration>
 			</plugin>
 			<!--
-				Override the default Surefire behavior to run during
+				Override the default Surefire behavior
+to run during
 				integration-test phase
 			-->
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
+	
+<groupId>org.apache.maven.plugins</groupId>
+	
+<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
 				<executions>
 					<execution>
 						<id>surefire-it</id>
-						<phase>integration-test</phase>
+	
+<phase>integration-test</phase>
 						<goals>
-							<goal>test</goal>
+	
+<goal>test</goal>
 						</goals>
 						<configuration>
-							<skip>false</skip>
+	
+<skip>false</skip>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 		</plugins>
+
 	</build>
 
-</project>
+</project>
\ No newline at end of file
Index: dna-jcr/src/main/java/org/jboss/dna/jcr/RepositoryNodeTypeManager.java
===================================================================
--- dna-jcr/src/main/java/org/jboss/dna/jcr/RepositoryNodeTypeManager.java	(revision 972)
+++ dna-jcr/src/main/java/org/jboss/dna/jcr/RepositoryNodeTypeManager.java	(working copy)
@@ -1413,10 +1413,21 @@
 
                 List<JcrNodeDefinition> nodeDefs = new ArrayList<JcrNodeDefinition>(
                                                                                     nodeType.getDeclaredChildNodeDefinitions().length);
+                for (JcrNodeDefinition nodeDef : nodeType.getDeclaredChildNodeDefinitions()) {
+                    nodeDefs.add(nodeDef.with(this.context).with(this));
+                }
 
+                // Create a new node type that also has the correct property and child node definitions associated
+                JcrNodeType newNodeType = new JcrNodeType(this.context, this, nodeType.getInternalName(), supertypes,
+                                                          nodeType.getInternalPrimaryItemName(), nodeDefs, propertyDefs,
+                                                          nodeType.isMixin(), nodeType.hasOrderableChildNodes());
+                typesPendingRegistration.add(newNodeType);
+            }
+
+            // Make sure the nodes have primary types that are either already registered, or pending registration ...
+            for (JcrNodeType nodeType : typesPendingRegistration) {
                 for (JcrNodeDefinition nodeDef : nodeType.getDeclaredChildNodeDefinitions()) {
                     JcrNodeType[] requiredPrimaryTypes = new JcrNodeType[nodeDef.requiredPrimaryTypeNames().length];
-
                     int i = 0;
                     for (Name primaryTypeName : nodeDef.requiredPrimaryTypeNames()) {
                         requiredPrimaryTypes[i] = findTypeInMapOrList(primaryTypeName, typesPendingRegistration);
@@ -1427,15 +1438,7 @@
                         }
                         i++;
                     }
-
-                    nodeDefs.add(nodeDef.with(this.context).with(this));
                 }
-
-                // Create a new node type that also has the correct property and child node definitions associated
-                JcrNodeType newNodeType = new JcrNodeType(this.context, this, nodeType.getInternalName(), supertypes,
-                                                          nodeType.getInternalPrimaryItemName(), nodeDefs, propertyDefs,
-                                                          nodeType.isMixin(), nodeType.hasOrderableChildNodes());
-                typesPendingRegistration.add(newNodeType);
             }
 
             // Graph.Batch batch = graph.batch();