1 files changed, 19 insertions, 9 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 3f33d7335a..098446051b 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
@@ -51,21 +51,31 @@ public class CompositeViewImpl implements CompositeView {
     }      
     
     public String getComposite(String compositeName, UriInfo uriInfo) {
+        Composite composite = getComposite(compositeName);
+        if(composite != null){
+            return "<p/><textarea rows=\"40\" cols=\"80\">" +
+                   Utils.modelToXML(composite, true, DomainViewRunner.extensionPointRegistry) +
+                  "</textarea>";
+        } else {
+            return "<p/>composite not found";
+        }
+    }
+    
+    public CompositeArtifactView getCompositeArtifact(String compositeName, String artifacturi){
+        return new CompositeArtifactViewImpl(domainName, getComposite(compositeName), artifacturi);
+    }
+     
+    // utlilities
+    
+    public Composite getComposite(String compositeName){
         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 tmpComposite;
             }
         }
         
-        return "<p/>composite not found";
-    } 
-    
-    public CompositeArtifactView getCompositeArtifact(){
-        return new CompositeArtifactViewImpl(domainName);
+        return null;
     }
-        
 }
 \ No newline at end of file