svn commit: r908247 - in /tuscany/sca-java-2.x/trunk/modules: node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ node-impl/src/main/java/org/apache/tuscany/sca/node/i...

[rfeng]

Author: rfeng
Date: Tue Feb  9 21:55:41 2010
New Revision: 908247

URL: http://svn.apache.org/viewvc?rev=908247&view=rev
Log:
Remove getDomainName

Modified:
    
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
    
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
    
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java?rev=908247&r1=908246&r2=908247&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
 Tue Feb  9 21:55:41 2010
@@ -42,12 +42,6 @@
     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
      */

Modified: 
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java?rev=908247&r1=908246&r2=908247&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
 Tue Feb  9 21:55:41 2010
@@ -56,16 +56,6 @@
         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;

Modified: 
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=908247&r1=908246&r2=908247&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
 Tue Feb  9 21:55:41 2010
@@ -102,7 +102,7 @@
     }
 
     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 @@
         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;
-    }
 }