1 files changed, 32 insertions, 34 deletions
diff --git a/sandbox/slaws/domain-view/src/main/java/org/apache/tuscany/sca/domain/CompositeViewImpl.java b/sandbox/slaws/domain-view/src/main/java/org/apache/tuscany/sca/domain/CompositeViewImpl.java
index 8220672a8b..3f33d7335a 100644
--- a/sandbox/slaws/domain-view/src/main/java/org/apache/tuscany/sca/domain/CompositeViewImpl.java
+++ b/sandbox/slaws/domain-view/src/main/java/org/apache/tuscany/sca/domain/CompositeViewImpl.java
@@ -19,55 +19,53 @@
 
 package org.apache.tuscany.sca.domain;
 
-import java.util.List;
-import java.util.Map;
+import java.util.Date;
 
-import javax.xml.namespace.QName;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
 
-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.runtime.DomainRegistry;
+import org.apache.wink.common.model.atom.AtomEntry;
+import org.apache.wink.common.model.atom.AtomFeed;
+import org.apache.wink.common.model.atom.AtomLink;
+import org.apache.wink.common.model.atom.AtomText;
 
 /**
  * Some hand crafted HTTP code to help me think about what info is missing
  * from the domain registry
- *  
  */
 public class CompositeViewImpl implements CompositeView {
     
-    public String get() {
-        String outputHTML = "<p/>get";
-        return outputHTML;
-        
-//        Utils.modelToXML(getDomainComposite(domainName), true, DomainViewRunner.extensionPointRegistry);        
-    }    
+    private String domainName;
     
-   
-    public String getComposite(String domainName) {
-        String outputHTML = "<p/>get composite";
-        return outputHTML;
-    } 
+    public CompositeViewImpl(String domainName){
+        this.domainName = domainName;
+    }
     
-    // utilities
+    public String getComposites() {
+        DomainRegistry domainRegistry = DomainViewRunner.domainRegistry;
+        Composite composite = domainRegistry.getDomainComposite();
+        return composite.getIncludes().toString();       
+    }      
     
-    // copied from domain node
-    public Composite getDomainComposite(String domainName) {
-        FactoryExtensionPoint factories = DomainViewRunner.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 = DomainViewRunner.domainRegistry.getRunningCompositeURIs();
-        for (String curi : runningCompositeURIs.keySet()) {
-            for (String compositeURI : runningCompositeURIs.get(curi)) {
-                domainIncludes.add(DomainViewRunner.domainRegistry.getRunningComposite(curi, compositeURI));
+    public String getComposite(String compositeName, UriInfo uriInfo) {
+        DomainRegistry domainRegistry = DomainViewRunner.domainRegistry;
+        Composite composite = domainRegistry.getDomainComposite();
+        for (Composite tmpComposite : composite.getIncludes()){
+            if (tmpComposite.getName().getLocalPart().equals(compositeName)){
+                return "<p/><textarea rows=\"40\" cols=\"80\">" +
+                       Utils.modelToXML(tmpComposite, true, DomainViewRunner.extensionPointRegistry) +
+                       "</textarea>";
             }
         }
-        return domainComposite;
-    }    
+        
+        return "<p/>composite not found";
+    } 
     
+    public CompositeArtifactView getCompositeArtifact(){
+        return new CompositeArtifactViewImpl(domainName);
+    }
+        
 }
 \ No newline at end of file