From fd1ca16b84cc7b14aba0bdc492051e092d7384f8 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 9 Feb 2010 21:55:41 +0000
Subject: Remove getDomainName

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@908247 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca/node/configuration/NodeConfiguration.java   |  6 ------
 .../configuration/impl/NodeConfigurationImpl.java   | 10 ----------
 .../org/apache/tuscany/sca/node/impl/NodeImpl.java  | 21 +--------------------
 3 files changed, 1 insertion(+), 36 deletions(-)

(limited to 'sca-java-2.x/trunk/modules')

diff --git a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
index f7021338ce..bebd9cc343 100644
--- a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
+++ b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
@@ -41,12 +41,6 @@ public interface NodeConfiguration {
      */
     String getDomainURI();
 
-    /**
-     * Get the name of the SCA domain
-     * @return The name of the SCA domain
-     */
-    String getDomainName();
-
     /**
      * Set the URI of the SCA domain
      * @param domainURI The URI of the SCA domain
diff --git a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
index 3d5cb1a94c..b4ec05cae5 100644
--- a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
+++ b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
@@ -56,16 +56,6 @@ public class NodeConfigurationImpl implements NodeConfiguration {
         return domainURI;
     }
 
-    public String getDomainName() {
-        if (domainURI != null) {
-            URI uri = URI.create(domainURI);
-            if (uri.getHost() != null) {
-                return uri.getHost();
-            }
-        }
-        return domainURI;
-    }
-
     public NodeConfiguration setDomainURI(String domainURI) {
         this.domainURI = domainURI;
         return this;
diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index 648cfe9121..f55f102807 100644
--- a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
@@ -102,7 +102,7 @@ public class NodeImpl implements Node {
     }
 
     public Node start() {
-        logger.log(Level.INFO, "Starting node: " + configuration.getURI() + " domain: " + configuration.getDomainName());
+        logger.log(Level.INFO, "Starting node: " + configuration.getURI() + " domain: " + configuration.getDomainURI());
 
         manager.init();
         manager.addNode(configuration, this);
@@ -359,23 +359,4 @@ public class NodeImpl implements Node {
         return result;
     }
 
-    public List<String> getServiceNames() {
-        List<String> serviceNames = new ArrayList<String>();
-        ExtensionPointRegistry extensionsRegistry = getExtensionPoints();
-        DomainRegistryFactory domainRegistryFactory = new ExtensibleDomainRegistry(extensionsRegistry);
-        EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry(configuration.getDomainRegistryURI(), configuration.getDomainName());
-        for (Endpoint endpoint : endpointRegistry.getEndpoints()) {
-            // Would be nice if Endpoint.getURI() returned this:
-            String name = endpoint.getComponent().getName() + "/" + endpoint.getService().getName();
-            if (endpoint.getBinding() != null) {
-                // TODO: shouldn't the binding name be null if its not explicitly specified? 
-                //       For now don't include it if the same as the default
-                if (!endpoint.getService().getName().equals(endpoint.getBinding().getName())) {
-                    name += "/" + endpoint.getBinding().getName();
-                }
-            }
-            serviceNames.add(name);
-        }
-        return serviceNames;
-    }
 }
-- 
cgit v1.2.3