1 files changed, 32 insertions, 20 deletions
diff --git a/sandbox/slaws/domain-view/src/main/java/org/apache/tuscany/sca/domain/DomainImpl.java b/sandbox/slaws/domain-view/src/main/java/org/apache/tuscany/sca/domain/DomainImpl.java
index 41ca341763..5aab3d922e 100644
--- a/sandbox/slaws/domain-view/src/main/java/org/apache/tuscany/sca/domain/DomainImpl.java
+++ b/sandbox/slaws/domain-view/src/main/java/org/apache/tuscany/sca/domain/DomainImpl.java
@@ -21,8 +21,17 @@ package org.apache.tuscany.sca.domain;
 
 import java.io.File;
 import java.util.List;
+import java.util.Map;
 
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Base;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.xml.Utils;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.impl.NodeImpl;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
 
 
 /**
@@ -46,14 +55,13 @@ public class DomainImpl implements Domain {
     } 
     
     public String getContributions(String domainName) {
-        NodeImpl node = (NodeImpl)DomainView.domainAccessPointNode;
-        List<String> contributions = node.getInstalledContributionURIs();
+        DomainRegistry domainRegistry = DomainView.domainRegistry;
+        List<String> contributions = domainRegistry.getInstalledContributionURIs();
         return contributions.toString();
     }
     
     public String getComposites(String domainName){
-        NodeImpl node = (NodeImpl)DomainView.domainAccessPointNode;
-        return node.getDomainLevelCompositeAsString();
+        return Utils.modelToXML(getDomainComposite(domainName), true, DomainView.extensionPointRegistry);
     } 
     
     public String getComponents(String domainName) {
@@ -62,29 +70,33 @@ public class DomainImpl implements Domain {
     }
     
     public String getEndpoints(String domainName) {
-        NodeImpl node = (NodeImpl)DomainView.domainAccessPointNode;
-        return node.getEndpointRegistry().getEndpoints().toString();
+        DomainRegistry domainRegistry = DomainView.domainRegistry;
+        return domainRegistry.getEndpoints().toString();
     }
     
     public String getNodes(String domainName){
-        // use the domain on the file system in lieu of info in the registry
-        File domainDir = new File("target/test-classes/" + domainName);
-        String nodes = "";
-        
-        for (File subDir : domainDir.listFiles()){
-            if (subDir.isDirectory()){
-                nodes += subDir.getName() + "\n";
-            }
-        }
-        return nodes;
+        DomainRegistry domainRegistry = DomainView.domainRegistry;
+        return domainRegistry.getMembers().toString();
     }     
     
     // utilities
     
-    public String prettyPrintXMLString(String inXML){
-        return inXML.replaceAll("<", "&lt;").replaceAll(">", "&gt;");
-        
-        // etc. need to read and write a structured version
+    // copied from domain node
+    public Composite getDomainComposite(String domainName) {
+        FactoryExtensionPoint factories = DomainView.extensionPointRegistry.getExtensionPoint(FactoryExtensionPoint.class);
+        AssemblyFactory assemblyFactory = factories.getFactory(AssemblyFactory.class);
+        Composite domainComposite = assemblyFactory.createComposite();
+        domainComposite.setName(new QName(Base.SCA11_TUSCANY_NS, domainName));
+        domainComposite.setAutowire(false);
+        domainComposite.setLocal(false);
+        List<Composite> domainIncludes = domainComposite.getIncludes();
+        Map<String, List<String>> runningCompositeURIs = DomainView.domainRegistry.getRunningCompositeURIs();
+        for (String curi : runningCompositeURIs.keySet()) {
+            for (String compositeURI : runningCompositeURIs.get(curi)) {
+                domainIncludes.add(DomainView.domainRegistry.getRunningComposite(curi, compositeURI));
+            }
+        }
+        return domainComposite;
     }
 
 }
 \ No newline at end of file