applying tuscany_2552_domain_search_phillipe_ramalho_08_08_2009.patch and tuscany_2552_domain_manager_phillipe_ramalho_08_08_2009.patch submitted to TUSCANY-2552

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@802637 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 7 deletions

diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
index 6d13e38937..5dcd09770b 100644
--- a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
+++ b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
@@ -74,6 +74,7 @@ import org.apache.tuscany.sca.data.collection.ItemCollection;
 import org.apache.tuscany.sca.data.collection.LocalItemCollection;
 import org.apache.tuscany.sca.data.collection.NotFoundException;
 import org.apache.tuscany.sca.domain.manager.impl.ContributionCollectionImpl.Cache.ContributionCache;
+import org.apache.tuscany.sca.domain.search.DomainSearch;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
@@ -97,8 +98,8 @@ import org.w3c.dom.Document;
  * @version $Rev$ $Date$
  */
 @Scope("COMPOSITE")
-@Service(interfaces={ItemCollection.class, LocalItemCollection.class, WorkspaceReader.class})
-public class ContributionCollectionImpl implements ItemCollection, LocalItemCollection, WorkspaceReader {
+@Service(interfaces={ItemCollection.class, LocalItemCollection.class})
+public class ContributionCollectionImpl implements ItemCollection, LocalItemCollection {
 
     private static final Logger logger = Logger.getLogger(ContributionCollectionImpl.class.getName());
 
@@ -111,6 +112,9 @@ public class ContributionCollectionImpl implements ItemCollection, LocalItemColl
     @Reference
     public DomainManagerConfiguration domainManagerConfiguration;
     
+    @Reference
+    public DomainSearch domainSearch;
+    
     private Monitor monitor;
     private ContributionFactory contributionFactory;
     private WorkspaceFactory workspaceFactory;
@@ -256,6 +260,7 @@ public class ContributionCollectionImpl implements ItemCollection, LocalItemColl
                 // Write the workspace
                 writeWorkspace(workspace);
                 return;
+                
             }
         }
         throw new NotFoundException(key);
@@ -479,7 +484,6 @@ public class ContributionCollectionImpl implements ItemCollection, LocalItemColl
     private static String title(String contributionURI) {
         return contributionURI;
     }
-
     
     /**
      * Read the workspace.
@@ -652,9 +656,5 @@ public class ContributionCollectionImpl implements ItemCollection, LocalItemColl
         }
         return contributions;
     }
-
-	public Workspace getWorkspace() {
-		return readContributions(readWorkspace());
-	}
     
 }