Author: bcarothers Date: 2009-07-09 16:43:56 -0400 (Thu, 09 Jul 2009) New Revision: 1086 Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrEngine.java trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrLexicon.java trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrWorkspace.java trunk/dna-jcr/src/main/resources/org/jboss/dna/jcr/dna_builtins.cnd trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrConfigurationTest.java trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/RepositoryNodeTypeManagerTest.java Log: DNA-481 Correct path to node types under "/jcr:system" Committed patch that changes the name of the node types projection path from /jcr:system/dna:nodeTypes to /jcr:system/jcr:nodeTypes as per the -283 spec, but retains dna:nodeTypes as the name of the primary node type for this node. Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java 2009-07-09 18:25:20 UTC (rev 1085) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java 2009-07-09 20:43:56 UTC (rev 1086) @@ -591,8 +591,8 @@ protected CndImporter createCndImporter() { // The node types will be loaded into 'dna:repositories/{repositoryName}/dna:nodeTypes/' ... - Path nodeTypesPath = subpath(DnaLexicon.NODE_TYPES); - createIfMissing(DnaLexicon.NODE_TYPES).and(); + Path nodeTypesPath = subpath(JcrLexicon.NODE_TYPES); + createIfMissing(JcrLexicon.NODE_TYPES).and(); // Now set up the destination, but make it so that ... Destination destination = new GraphBatchDestination(batch, true); // will NOT be executed Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrEngine.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrEngine.java 2009-07-09 18:25:20 UTC (rev 1085) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrEngine.java 2009-07-09 20:43:56 UTC (rev 1086) @@ -164,7 +164,7 @@ JcrRepository repository = new JcrRepository(context, connectionFactory, sourceName, descriptors, options); // Register all the the node types ... - Node nodeTypesNode = subgraph.getNode(DnaLexicon.NODE_TYPES); + Node nodeTypesNode = subgraph.getNode(JcrLexicon.NODE_TYPES); if (nodeTypesNode != null) { repository.getRepositoryTypeManager().registerNodeTypes(subgraph, nodeTypesNode.getLocation());// throws exception } Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrLexicon.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrLexicon.java 2009-07-09 18:25:20 UTC (rev 1085) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrLexicon.java 2009-07-09 20:43:56 UTC (rev 1086) @@ -46,6 +46,7 @@ public static final Name LOCK_IS_DEEP = new BasicName(Namespace.URI, "lockIsDeep"); public static final Name LOCK_OWNER = new BasicName(Namespace.URI, "lockOwner"); public static final Name MERGE_FAILED = new BasicName(Namespace.URI, "mergeFailed"); + public static final Name NODE_TYPES = new BasicName(Namespace.URI, "nodeTypes"); public static final Name PREDECESSORS = new BasicName(Namespace.URI, "predecessors"); public static final Name ROOT = new BasicName(Namespace.URI, "root"); public static final Name ROOT_VERSION = new BasicName(Namespace.URI, "rootVersion"); Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrWorkspace.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrWorkspace.java 2009-07-09 18:25:20 UTC (rev 1085) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrWorkspace.java 2009-07-09 20:43:56 UTC (rev 1086) @@ -185,7 +185,7 @@ this.queryManager = new JcrQueryManager(this.session); if (Boolean.valueOf(repository.getOptions().get(Option.PROJECT_NODE_TYPES))) { - Path parentOfTypeNodes = context.getValueFactories().getPathFactory().create(systemPath, DnaLexicon.NODE_TYPES); + Path parentOfTypeNodes = context.getValueFactories().getPathFactory().create(systemPath, JcrLexicon.NODE_TYPES); repoTypeManager.projectOnto(this.graph, parentOfTypeNodes); } Modified: trunk/dna-jcr/src/main/resources/org/jboss/dna/jcr/dna_builtins.cnd =================================================================== --- trunk/dna-jcr/src/main/resources/org/jboss/dna/jcr/dna_builtins.cnd 2009-07-09 18:25:20 UTC (rev 1085) +++ trunk/dna-jcr/src/main/resources/org/jboss/dna/jcr/dna_builtins.cnd 2009-07-09 20:43:56 UTC (rev 1086) @@ -25,6 +25,7 @@ //------------------------------------------------------------------------------ // N A M E S P A C E S //------------------------------------------------------------------------------ +<jcr = "http://www.jcp.org/jcr/1.0"> <nt = "http://www.jcp.org/jcr/nt/1.0"> <mix = "http://www.jcp.org/jcr/mix/1.0"> <dna = "http://www.jboss.org/dna/1.0"> @@ -44,7 +45,7 @@ [dna:system] > nt:base + dna:namespaces (dna:namespaces) = dna:namespaces autocreated mandatory protected version -+ dna:nodeTypes (dna:nodeTypes) = dna:nodeTypes autocreated mandatory protected version ++ jcr:nodeTypes (dna:nodeTypes) = dna:nodeTypes autocreated mandatory protected version [dna:root] > nt:base, mix:referenceable orderable - * (undefined) multiple version Modified: trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrConfigurationTest.java =================================================================== --- trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrConfigurationTest.java 2009-07-09 18:25:20 UTC (rev 1085) +++ trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrConfigurationTest.java 2009-07-09 20:43:56 UTC (rev 1086) @@ -351,11 +351,11 @@ assertThat(subgraph.getNode("/dna:repositories/Car Repository"), is(notNullValue())); assertThat(subgraph.getNode("/dna:repositories/Car Repository"), hasProperty(DnaLexicon.SOURCE_NAME, "Cars")); assertThat(subgraph.getNode("/dna:repositories/Car Repository").getChildren(), hasChild(segment("dna:options"))); - assertThat(subgraph.getNode("/dna:repositories/Car Repository/dna:nodeTypes"), is(notNullValue())); + assertThat(subgraph.getNode("/dna:repositories/Car Repository/jcr:nodeTypes"), is(notNullValue())); // for (Location child : subgraph.getNode("/dna:repositories/Car Repository/dna:nodeTypes").getChildren()) { // System.out.println(child.getPath().getLastSegment().getString(context().getNamespaceRegistry())); // } - assertThat(subgraph.getNode("/dna:repositories/Car Repository/dna:nodeTypes").getChildren(), + assertThat(subgraph.getNode("/dna:repositories/Car Repository/jcr:nodeTypes").getChildren(), hasChildren(segment("dnatest:noSameNameSibs"), segment("dnatest:referenceableUnstructured"), segment("dnatest:nodeWithMandatoryProperty"), Modified: trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/RepositoryNodeTypeManagerTest.java =================================================================== --- trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/RepositoryNodeTypeManagerTest.java 2009-07-09 18:25:20 UTC (rev 1085) +++ trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/RepositoryNodeTypeManagerTest.java 2009-07-09 20:43:56 UTC (rev 1086) @@ -112,8 +112,8 @@ Node systemNode = rootNode.getNode(JcrLexicon.SYSTEM.getString(registry)); assertThat(systemNode, is(notNullValue())); - NodeIterator nodeTypesNodes = systemNode.getNodes(DnaLexicon.NODE_TYPES.getString(registry)); - assertEquals(nodeTypesNodes.getSize(), 1); + NodeIterator nodeTypesNodes = systemNode.getNodes(JcrLexicon.NODE_TYPES.getString(registry)); + assertEquals(1, nodeTypesNodes.getSize()); } @Test