[dna-commits] DNA SVN: r654 - in trunk: extensions/dna-sequencer-xml/src/test/java/org/jboss/dna/sequencer/xml and 1 other directory.

Author: rhauch Date: 2008-12-04 16:34:49 -0500 (Thu, 04 Dec 2008) New Revision: 654 Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrLexicon.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrNtLexicon.java trunk/extensions/dna-sequencer-xml/src/test/java/org/jboss/dna/sequencer/xml/XmlSequencerHandlerTest.java Log: Added some additional names to the JcrLexicon and JcrNtLexicon classes, which represent the corresponding namespaces. Also changed a connector to use them. Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrLexicon.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrLexicon.java 2008-12-04 21:33:19 UTC (rev 653) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrLexicon.java 2008-12-04 21:34:49 UTC (rev 654) @@ -37,4 +37,5 @@ public static final Name UUID = new BasicName(Namespace.URI, "uuid"); public static final Name NAME = new BasicName(Namespace.URI, "name"); public static final Name PRIMARY_TYPE = new BasicName(Namespace.URI, "primaryType"); + public static final Name CONTENT = new BasicName(Namespace.URI, "content"); } Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrNtLexicon.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrNtLexicon.java 2008-12-04 21:33:19 UTC (rev 653) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrNtLexicon.java 2008-12-04 21:34:49 UTC (rev 654) @@ -35,4 +35,7 @@ } public static final Name UNSTRUCTURED = new BasicName(Namespace.URI, "unstructured"); + public static final Name FILE = new BasicName(Namespace.URI, "file"); + public static final Name FOLDER = new BasicName(Namespace.URI, "folder"); + public static final Name RESOURCE = new BasicName(Namespace.URI, "resource"); } Modified: trunk/extensions/dna-sequencer-xml/src/test/java/org/jboss/dna/sequencer/xml/XmlSequencerHandlerTest.java =================================================================== --- trunk/extensions/dna-sequencer-xml/src/test/java/org/jboss/dna/sequencer/xml/XmlSequencerHandlerTest.java 2008-12-04 21:33:19 UTC (rev 653) +++ trunk/extensions/dna-sequencer-xml/src/test/java/org/jboss/dna/sequencer/xml/XmlSequencerHandlerTest.java 2008-12-04 21:34:49 UTC (rev 654) @@ -56,8 +56,6 @@ */ public class XmlSequencerHandlerTest { - private static final String NT_NAMESPACE_URI = "http://www.jcp.org/jcr/nt/1.0"; - private XmlSequencerHandler handler; private SequencerContext context; private MockSequencerOutput output; @@ -72,7 +70,7 @@ context = new MockSequencerContext(); output = new MockSequencerOutput(context, true); context.getNamespaceRegistry().register(JcrLexicon.Namespace.PREFIX, JcrLexicon.Namespace.URI); - context.getNamespaceRegistry().register("nt", NT_NAMESPACE_URI); + context.getNamespaceRegistry().register(JcrNtLexicon.Namespace.PREFIX, JcrNtLexicon.Namespace.URI); context.getNamespaceRegistry().register(DnaXmlLexicon.Namespace.PREFIX, DnaXmlLexicon.Namespace.URI); context.getNamespaceRegistry().register(DnaDtdLexicon.Namespace.PREFIX, DnaDtdLexicon.Namespace.URI); decoder = null; @@ -180,10 +178,10 @@ public void shouldParseXmlDocumentWithNamespacesThatAreNotYetInRegistry() throws IOException, SAXException { NamespaceRegistry reg = context.getNamespaceRegistry(); reg.unregister(JcrLexicon.Namespace.URI); - reg.unregister(NT_NAMESPACE_URI); + reg.unregister(JcrNtLexicon.Namespace.URI); // Verify the prefixes don't exist ... assertThat(reg.getPrefixForNamespaceUri(JcrLexicon.Namespace.URI, false), is(nullValue())); - assertThat(reg.getPrefixForNamespaceUri(NT_NAMESPACE_URI, false), is(nullValue())); + assertThat(reg.getPrefixForNamespaceUri(JcrNtLexicon.Namespace.URI, false), is(nullValue())); assertThat(reg.getPrefixForNamespaceUri("http://default.namespace.com", false), is(nullValue())); // Parse the XML file ... parse("docWithNestedNamespaces.xml");