From 4d56972f7c152fe8be1b0c65bd85ec9d02aec97e Mon Sep 17 00:00:00 2001 From: rfeng Date: Thu, 11 Feb 2010 23:52:07 +0000 Subject: Rename configURI to domainRegistryURI git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@909180 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tuscany/sca/node/NodeFactory.java | 21 ++++++--------------- .../tuscany/sca/node/impl/NodeUtilTestCase.java | 6 +++--- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java index 05a2a43f2d..88d62e5ac8 100644 --- a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java +++ b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java @@ -144,15 +144,6 @@ public abstract class NodeFactory extends DefaultNodeConfigurationFactory { } } - public List getServiceNames() { - try { - return (List)node.getClass().getMethod("getServiceNames").invoke(node); - } catch (Throwable e) { - handleException(e); - return null; - } - } - } /** @@ -300,18 +291,18 @@ public abstract class NodeFactory extends DefaultNodeConfigurationFactory { return createNode(configuration); } - public final Node createNode(URI configURI, String... locations) { - return createNode(configURI, null, locations); + public final Node createNode(URI domainRegistryURI, String... locations) { + return createNode(domainRegistryURI, null, locations); } - public final Node createNode(URI configURI, String deploymentCompositeURI, String[] locations) { + public final Node createNode(URI domainRegistryURI, String deploymentCompositeURI, String[] locations) { Contribution[] contributions = getContributions(Arrays.asList(locations)); NodeConfiguration configuration = createConfiguration(contributions); if (deploymentCompositeURI != null && configuration.getContributions().size() > 0) { configuration.getContributions().get(0).addDeploymentComposite(createURI(deploymentCompositeURI)); } - configuration.setDomainRegistryURI(configURI.toString()); - configuration.setDomainURI(getDomainName(configURI)); + configuration.setDomainRegistryURI(domainRegistryURI.toString()); + configuration.setDomainURI(getDomainURI(domainRegistryURI)); return createNode(configuration); } @@ -319,7 +310,7 @@ public abstract class NodeFactory extends DefaultNodeConfigurationFactory { * TODO: cleanup node use of registry uri, domain uri, and domain name * so that its consistent across the code base */ - public static String getDomainName(URI configURI) { + public static String getDomainURI(URI configURI) { String s = configURI.getHost(); if (s == null) { s = configURI.getSchemeSpecificPart(); diff --git a/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java b/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java index 9d13cdceb8..4b9dda4a71 100644 --- a/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java +++ b/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java @@ -41,8 +41,8 @@ public class NodeUtilTestCase { @Test public void testDomainURI() { - Assert.assertEquals("foo", NodeFactoryImpl.getDomainName(URI.create("tuscany:foo"))); - Assert.assertEquals("foo", NodeFactoryImpl.getDomainName(URI.create("vm:foo"))); - Assert.assertEquals("foo", NodeFactoryImpl.getDomainName(URI.create("bla://foo"))); + Assert.assertEquals("foo", NodeFactoryImpl.getDomainURI(URI.create("tuscany:foo"))); + Assert.assertEquals("foo", NodeFactoryImpl.getDomainURI(URI.create("vm:foo"))); + Assert.assertEquals("foo", NodeFactoryImpl.getDomainURI(URI.create("bla://foo"))); } } -- cgit v1.2.3