svn commit: r909180 - in /tuscany/sca-java-2.x/trunk/modules: node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java

[rfeng]

Author: rfeng
Date: Thu Feb 11 23:52:07 2010
New Revision: 909180

URL: http://svn.apache.org/viewvc?rev=909180&view=rev
Log:
Rename configURI to domainRegistryURI

Modified:
    
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
    
tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java?rev=909180&r1=909179&r2=909180&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
 Thu Feb 11 23:52:07 2010
@@ -144,15 +144,6 @@
             }
         }
 
-        public List<String> getServiceNames() {
-            try {
-                return 
(List<String>)node.getClass().getMethod("getServiceNames").invoke(node);
-            } catch (Throwable e) {
-                handleException(e);
-                return null;
-            }
-        }
-
     }
 
     /**
@@ -300,18 +291,18 @@
         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 @@
      * 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();

Modified: 
tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java?rev=909180&r1=909179&r2=909180&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
 Thu Feb 11 23:52:07 2010
@@ -41,8 +41,8 @@
 
     @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")));
     }
 }