[dna-commits] DNA SVN: r381 - in trunk: connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory and 2 other directories.

Author: rhauch Date: 2008-08-05 20:53:15 -0400 (Tue, 05 Aug 2008) New Revision: 381 Modified: trunk/connectors/dna-connector-federation/src/test/java/org/jboss/dna/connector/federation/FederatedRepositorySourceTest.java trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepositorySource.java trunk/dna-repository/src/test/java/org/jboss/dna/repository/RepositoryServiceTest.java trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicNameTest.java trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicPathSegmentTest.java trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicPathTest.java Log: DNA-188 - Complete the federating command executor http://jira.jboss.com/jira/browse/DNA-188 Minor changes to use the new DnaLexicon class in SPI for the DNA standard prefix and namespace URI. Modified: trunk/connectors/dna-connector-federation/src/test/java/org/jboss/dna/connector/federation/FederatedRepositorySourceTest.java =================================================================== --- trunk/connectors/dna-connector-federation/src/test/java/org/jboss/dna/connector/federation/FederatedRepositorySourceTest.java 2008-08-06 00:45:08 UTC (rev 380) +++ trunk/connectors/dna-connector-federation/src/test/java/org/jboss/dna/connector/federation/FederatedRepositorySourceTest.java 2008-08-06 00:53:15 UTC (rev 381) @@ -39,6 +39,7 @@ import javax.naming.Reference; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; +import org.jboss.dna.spi.DnaLexicon; import org.jboss.dna.spi.ExecutionContext; import org.jboss.dna.spi.ExecutionContextFactory; import org.jboss.dna.spi.graph.connection.BasicExecutionContext; @@ -87,7 +88,7 @@ public void beforeEach() throws Exception { MockitoAnnotations.initMocks(this); context = new BasicExecutionContext(); - context.getNamespaceRegistry().register("dna", "http://www.jboss.org/dna"); + context.getNamespaceRegistry().register(DnaLexicon.NAMESPACE_PREFIX, DnaLexicon.NAMESPACE_URI); executionContextFactoryJndiName = "context factory jndi name"; connectionFactoriesJndiName = "connection factories jndi name"; configurationSourceName = "configuration source name"; Modified: trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepositorySource.java =================================================================== --- trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepositorySource.java 2008-08-06 00:45:08 UTC (rev 380) +++ trunk/connectors/dna-connector-inmemory/src/main/java/org/jboss/dna/connector/inmemory/InMemoryRepositorySource.java 2008-08-06 00:53:15 UTC (rev 381) @@ -54,9 +54,6 @@ */ private static final long serialVersionUID = 1L; - public static final String DEFAULT_UUID_PROPERTY_NAMESPACE = "http://www.jboss.org/dna/connector/jbosscache"; - public static final String DEFAULT_UUID_PROPERTY_NAME = "uuid"; - private static final ConcurrentMap<String, InMemoryRepositorySource> sources = new ConcurrentHashMap<String, InMemoryRepositorySource>(); private static final ReadWriteLock sourcesLock = new ReentrantReadWriteLock(); Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/RepositoryServiceTest.java =================================================================== --- trunk/dna-repository/src/test/java/org/jboss/dna/repository/RepositoryServiceTest.java 2008-08-06 00:45:08 UTC (rev 380) +++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/RepositoryServiceTest.java 2008-08-06 00:53:15 UTC (rev 381) @@ -39,6 +39,7 @@ import org.jboss.dna.connector.federation.FederationException; import org.jboss.dna.connector.federation.Projection; import org.jboss.dna.repository.services.ServiceAdministrator; +import org.jboss.dna.spi.DnaLexicon; import org.jboss.dna.spi.ExecutionContext; import org.jboss.dna.spi.graph.NamespaceRegistry; import org.jboss.dna.spi.graph.Path; @@ -84,7 +85,7 @@ public void beforeEach() throws Exception { MockitoAnnotations.initMocks(this); NamespaceRegistry registry = new BasicNamespaceRegistry(); - registry.register("dna", "http://www.jboss.org/dna"); + registry.register(DnaLexicon.NAMESPACE_PREFIX, DnaLexicon.NAMESPACE_URI); valueFactories = new StandardValueFactories(registry); pathFactory = valueFactories.getPathFactory(); propertyFactory = new BasicPropertyFactory(valueFactories); Modified: trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicNameTest.java =================================================================== --- trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicNameTest.java 2008-08-06 00:45:08 UTC (rev 380) +++ trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicNameTest.java 2008-08-06 00:53:15 UTC (rev 381) @@ -25,6 +25,7 @@ import static org.junit.Assert.assertThat; import static org.junit.matchers.JUnitMatchers.containsString; import org.jboss.dna.common.text.TextEncoder; +import org.jboss.dna.spi.DnaLexicon; import org.jboss.dna.spi.graph.Name; import org.jboss.dna.spi.graph.Path; import org.junit.Before; @@ -45,9 +46,9 @@ @Before public void beforeEach() { - this.validNamespaceUri = "http://www.jboss.org/dna"; + this.validNamespacePrefix = DnaLexicon.NAMESPACE_PREFIX; + this.validNamespaceUri = DnaLexicon.NAMESPACE_URI; this.validLocalName = "localPart"; - this.validNamespacePrefix = "dna"; this.name = new BasicName(validNamespaceUri, validLocalName); this.encoder = Path.URL_ENCODER; this.namespaceRegistry = new BasicNamespaceRegistry(); Modified: trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicPathSegmentTest.java =================================================================== --- trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicPathSegmentTest.java 2008-08-06 00:45:08 UTC (rev 380) +++ trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicPathSegmentTest.java 2008-08-06 00:53:15 UTC (rev 381) @@ -24,6 +24,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; import org.jboss.dna.common.text.TextEncoder; +import org.jboss.dna.spi.DnaLexicon; import org.jboss.dna.spi.graph.Name; import org.jboss.dna.spi.graph.Path; import org.jboss.dna.spi.graph.ValueFactory; @@ -48,7 +49,7 @@ @Before public void beforeEach() { this.registry = new BasicNamespaceRegistry(); - this.registry.register("dna", "http://www.jboss.org/dna/namespace"); + this.registry.register(DnaLexicon.NAMESPACE_PREFIX, DnaLexicon.NAMESPACE_URI); this.stringValueFactory = new StringValueFactory(Path.DEFAULT_DECODER, Path.DEFAULT_ENCODER); this.nameFactory = new NameValueFactory(registry, Path.DEFAULT_DECODER, stringValueFactory); this.validName = nameFactory.create("dna:something"); Modified: trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicPathTest.java =================================================================== --- trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicPathTest.java 2008-08-06 00:45:08 UTC (rev 380) +++ trunk/dna-spi/src/test/java/org/jboss/dna/spi/graph/impl/BasicPathTest.java 2008-08-06 00:53:15 UTC (rev 381) @@ -32,6 +32,7 @@ import java.util.Iterator; import java.util.List; import org.jboss.dna.common.text.TextEncoder; +import org.jboss.dna.spi.DnaLexicon; import org.jboss.dna.spi.graph.InvalidPathException; import org.jboss.dna.spi.graph.Name; import org.jboss.dna.spi.graph.Path; @@ -59,8 +60,8 @@ @Before public void beforeEach() { - validNamespacePrefix = "dna"; - validNamespaceUri = "http://www.jboss.org/dna"; + validNamespacePrefix = DnaLexicon.NAMESPACE_PREFIX; + validNamespaceUri = DnaLexicon.NAMESPACE_URI; validSegmentNames = new Name[] {new BasicName(validNamespaceUri, "a"), new BasicName(validNamespaceUri, "b"), new BasicName(validNamespaceUri, "c")}; validSegments = new Path.Segment[] {new BasicPathSegment(validSegmentNames[0]),