svn commit: r650752 - in /incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace: Workspace.java builder/ContributionDependencyBuilder.java impl/WorkspaceImpl.java

[js...@apache.org]

Author: jsdelfino
Date: Tue Apr 22 22:54:31 2008
New Revision: 650752

URL: http://svn.apache.org/viewvc?rev=650752&view=rev
Log:
Made workspace a contribution as well.

Modified:
    incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
    incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
    incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java

Modified: incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java?rev=650752&r1=650751&r2=650752&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java (original)
+++ incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java Tue Apr 22 22:54:31 2008
@@ -21,7 +21,6 @@
 
 import java.util.List;
 
-import org.apache.tuscany.sca.contribution.Artifact;
 import org.apache.tuscany.sca.contribution.Contribution;
 
 /**
@@ -29,7 +28,7 @@
  *
  * @version $Rev$ $Date$
  */
-public interface Workspace extends Artifact {
+public interface Workspace extends Contribution {
 
     /**
      * Returns the list of contributions in the workspace. 

Modified: incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java?rev=650752&r1=650751&r2=650752&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java Tue Apr 22 22:54:31 2008
@@ -25,7 +25,7 @@
 import org.apache.tuscany.sca.workspace.Workspace;
 
 /**
- * A contribution dependency analyzer.
+ * A contribution dependency builder.
  *
  * @version $Rev$ $Date$
  */
@@ -37,6 +37,6 @@
      * @param contribution
      * @return
      */
-    List<Contribution> buildContributionDependencies(Workspace workspace, Contribution contribution);
+    List<Contribution> buildContributionDependencies(Contribution contribution, Workspace workspace);
 
 }

Modified: incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java?rev=650752&r1=650751&r2=650752&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java Tue Apr 22 22:54:31 2008
@@ -22,7 +22,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Artifact;
 import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.Export;
+import org.apache.tuscany.sca.contribution.Import;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.workspace.Workspace;
 
 /**
@@ -31,13 +36,14 @@
  * @version $Rev$ $Date$
  */
 class WorkspaceImpl implements Workspace {
-    
+
+    private List<Contribution> contributions = new ArrayList<Contribution>();
     private String location;
     private String uri;
     private Object model;
     private byte[] contents;
     private boolean unresolved;
-    private List<Contribution> contributions = new ArrayList<Contribution>();
+    private ModelResolver modelResolver; 
     
     /**
      * Constructs a new workspace. 
@@ -88,5 +94,49 @@
     public List<Contribution> getContributions() {
         return contributions;
     }
+    
+    public List<Artifact> getArtifacts() {
+        return (List<Artifact>)(Object)contributions;
+    }
 
+    public ClassLoader getClassLoader() {
+        //FIXME Remove later
+        return null;
+    }
+    
+    public void setClassLoader(ClassLoader classLoader) {
+        //FIXME Remove later
+    }
+    
+    public List<Composite> getDeployables() {
+        List<Composite> deployables = new ArrayList<Composite>();
+        for (Contribution contribution: contributions) {
+            deployables.addAll(contribution.getDeployables());
+        }
+        return deployables;
+    }
+    
+    public List<Export> getExports() {
+        List<Export> exports = new ArrayList<Export>();
+        for (Contribution contribution: contributions) {
+            exports.addAll(contribution.getExports());
+        }
+        return exports;
+    }
+    
+    public List<Import> getImports() {
+        List<Import> imports = new ArrayList<Import>();
+        for (Contribution contribution: contributions) {
+            imports.addAll(contribution.getImports());
+        }
+        return imports;
+    }
+    
+    public ModelResolver getModelResolver() {
+        return modelResolver;
+    }
+    
+    public void setModelResolver(ModelResolver modelResolver) {
+        this.modelResolver = modelResolver;
+    }
 }