You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/02/28 00:54:47 UTC

svn commit: r631778 - in /incubator/tuscany/java/sca/modules: contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/ contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ contribution-java/src/test/java/org/a...

Author: jsdelfino
Date: Wed Feb 27 15:54:38 2008
New Revision: 631778

URL: http://svn.apache.org/viewvc?rev=631778&view=rev
Log:
Clean up contribution Import, remove the list of exported contributions as it's only used by the ContributionClassLoader to work around model resolvers.

Added:
    incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java   (with props)
    incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java   (with props)
    incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java   (with props)
Modified:
    incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
    incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
    incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
    incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
    incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
    incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
    incubator/tuscany/java/sca/modules/workspace-impl/pom.xml

Added: incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java?rev=631778&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java (added)
+++ incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java Wed Feb 27 15:54:38 2008
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.java;
+
+import org.apache.tuscany.sca.contribution.java.impl.JavaImportExportFactoryImpl;
+
+/**
+ * Default Java Import/Export Factory implementation
+ * 
+ * @version $Rev$ $Date$
+ */
+public class DefaultJavaImportExportFactory extends JavaImportExportFactoryImpl implements JavaImportExportFactory {
+}

Propchange: incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java?rev=631778&r1=631777&r2=631778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java Wed Feb 27 15:54:38 2008
@@ -95,7 +95,7 @@
             for (Import import_ : this.contribution.getImports()) {
                 if (classNameMatchesImport(className, import_)) {
                     // Delegate the resolution to the imported contribution
-                    for (Contribution exportingContribution : import_.getExportContributions()) {
+                    for (Contribution exportingContribution : ((JavaImportModelResolver)import_.getModelResolver()).getExportContributions()) {
                                     
                         ClassLoader exportClassLoader = getExportClassLoader(exportingContribution);
                         if (exportClassLoader instanceof ContributionClassLoader) {
@@ -172,7 +172,7 @@
             for (Import import_ : this.contribution.getImports()) {
                 if (resourceNameMatchesImport(name, import_)) {
                     // Delegate the resolution to the imported contribution
-                    for (Contribution exportingContribution : import_.getExportContributions()) {
+                    for (Contribution exportingContribution : ((JavaImportModelResolver)import_.getModelResolver()).getExportContributions()) {
                                 
                         ClassLoader exportClassLoader = getExportClassLoader(exportingContribution);
                         if (exportClassLoader instanceof ContributionClassLoader) {
@@ -259,9 +259,12 @@
         addEnumerationToCollection(resources, super.findResources(name));
         
         for (Import import_ : this.contribution.getImports()) {
+            if (!(import_ instanceof JavaImport)) {
+                continue;
+            }
             if (resourceNameMatchesImport(name, import_)) {
                 // Delegate the resolution to the imported contribution
-                for (Contribution exportingContribution : import_.getExportContributions()) {
+                for (Contribution exportingContribution : ((JavaImportModelResolver)import_.getModelResolver()).getExportContributions()) {
                                 
                     ClassLoader exportClassLoader = getExportClassLoader(exportingContribution);
                     if (exportClassLoader instanceof ContributionClassLoader) {

Modified: incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java?rev=631778&r1=631777&r2=631778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java Wed Feb 27 15:54:38 2008
@@ -126,12 +126,9 @@
                             if (export instanceof JavaExport) {
                                 JavaExport javaExport = (JavaExport)export;
                                 if (javaImport.getPackage().equals(javaExport.getPackage())) {
-                                    javaImport.setModelResolver(javaExport.getModelResolver());
-                                    
                                     List<Contribution> exportingContributions = new ArrayList<Contribution>();
                                     exportingContributions.add(targetContribution);
-                                    import_.setExportContributions(exportingContributions);
-                                    
+                                    javaImport.setModelResolver(new JavaImportModelResolver(exportingContributions, javaExport.getModelResolver()));
                                     initialized = true;
                                     break;
                                 }
@@ -143,8 +140,7 @@
                 //if no location was specified, try to resolve with any contribution
                 if (!initialized) {
                     //Use a resolver that will consider all contributions
-                    import_.setModelResolver(new DefaultImportAllModelResolver(import_, repository.getContributions()));
-                    import_.setExportContributions(repository.getContributions());
+                    import_.setModelResolver(new JavaImportModelResolver(repository.getContributions(), new DefaultImportAllModelResolver(import_, repository.getContributions())));
                 }
             }
         }

Added: incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java?rev=631778&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java (added)
+++ incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java Wed Feb 27 15:54:38 2008
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.java.impl;
+
+import java.util.List;
+
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+/**
+ * A JavaImport specific model resolver. This model resolver is temporary
+ * and provides the ContributionClassLoader with the list of exporting
+ * contributions that it currently needs.
+ * 
+ * FIXME Remove this class after the ContributionClassLoader is simplified
+ * and cleaned up.
+ *
+ * @version $Rev$ $Date$
+ */
+public class JavaImportModelResolver implements ModelResolver {
+
+    private ModelResolver modelResolver;
+    private List<Contribution> contributions;
+    
+    public JavaImportModelResolver(List<Contribution> contributions, ModelResolver modelResolver) {
+        this.modelResolver = modelResolver;
+        this.contributions = contributions;
+    }
+
+    public List<Contribution> getExportContributions() {
+        return contributions;
+    }
+    
+    public void addModel(Object resolved) {
+        modelResolver.addModel(resolved);
+    }
+
+    public Object removeModel(Object resolved) {
+        return modelResolver.removeModel(resolved);
+    }
+
+    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+        return modelResolver.resolveModel(modelClass, unresolved);
+    }
+}

Propchange: incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java?rev=631778&r1=631777&r2=631778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java Wed Feb 27 15:54:38 2008
@@ -143,11 +143,11 @@
         
         JavaImport import_ = javaImportExportFactory.createJavaImport();
         import_.setPackage(this.getClass().getPackage().getName());
-        import_.setExportContributions(exportContribList);
+        import_.setModelResolver(new JavaImportModelResolver(exportContribList, null));
         contribB.getImports().add(import_);
         import_ = javaImportExportFactory.createJavaImport();
         import_.setPackage("calculator");
-        import_.setExportContributions(exportContribList);
+        import_.setModelResolver(new JavaImportModelResolver(exportContribList, null));
         contribB.getImports().add(import_);
         
         JavaExport export = javaImportExportFactory.createJavaExport();
@@ -215,11 +215,11 @@
         
         JavaImport import_ = javaImportExportFactory.createJavaImport();
         import_.setPackage(this.getClass().getPackage().getName());
-        import_.setExportContributions(exportContribList);
+        import_.setModelResolver(new JavaImportModelResolver(exportContribList, null));
         contribB.getImports().add(import_);
         JavaImport import1_ = javaImportExportFactory.createJavaImport();
         import1_.setPackage("calculator");
-        import1_.setExportContributions(exportContribList);
+        import1_.setModelResolver(new JavaImportModelResolver(exportContribList, null));
         contribB.getImports().add(import1_);
         
         JavaExport export = javaImportExportFactory.createJavaExport();

Added: incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java?rev=631778&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java (added)
+++ incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java Wed Feb 27 15:54:38 2008
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.namespace;
+
+import org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportExportFactoryImpl;
+
+/**
+ * Default Namespace Import/Export model factory implementation
+ * 
+ * @version $Rev$ $Date$
+ */
+public class DefaultNamespaceImportExportFactory extends NamespaceImportExportFactoryImpl implements NamespaceImportExportFactory {
+}

Propchange: incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java?rev=631778&r1=631777&r2=631778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java Wed Feb 27 15:54:38 2008
@@ -19,9 +19,6 @@
 
 package org.apache.tuscany.sca.contribution.namespace.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.Export;
 import org.apache.tuscany.sca.contribution.Import;
@@ -58,7 +55,6 @@
         for (Import import_: contribution.getImports()) {
             boolean initialized = false;
 
-            
             if (import_ instanceof NamespaceImport) {
                 NamespaceImport namespaceImport = (NamespaceImport)import_;
                 
@@ -73,11 +69,6 @@
                                 NamespaceExport namespaceExport = (NamespaceExport)export;
                                 if (namespaceImport.getNamespace().equals(namespaceExport.getNamespace())) {
                                     namespaceImport.setModelResolver(namespaceExport.getModelResolver());
-                                    
-                                    List<Contribution> exportingContributions = new ArrayList<Contribution>();
-                                    exportingContributions.add(targetContribution);
-                                    import_.setExportContributions(exportingContributions);
-                                    
                                     initialized = true;
                                     break;
                                 }
@@ -85,14 +76,13 @@
                         }
                     }
                 } 
+                
+                //if no location was specified, try to resolve with any contribution            
+                if( !initialized ) {
+                    // Use a resolver that will consider all contributions
+                    import_.setModelResolver(new DefaultImportAllModelResolver(import_, repository.getContributions()));
+                }
             } 
-            
-            //if no location was specified, try to resolve with any contribution            
-            if( !initialized ) {
-                // Use a resolver that will consider all contributions
-                import_.setModelResolver(new DefaultImportAllModelResolver(import_, repository.getContributions()));
-                import_.setExportContributions(repository.getContributions());
-            }
         }
 
     }

Modified: incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java?rev=631778&r1=631777&r2=631778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java Wed Feb 27 15:54:38 2008
@@ -19,9 +19,6 @@
 
 package org.apache.tuscany.sca.contribution.namespace.impl;
 
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.Export;
 import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
 import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
@@ -34,7 +31,7 @@
  */
 public class NamespaceImportImpl implements NamespaceImport {
     private ModelResolver modelResolver;
-    private List<Contribution> exportContributions;
+
     /**
      * The namespace to be imported
      */
@@ -74,14 +71,6 @@
     }
 
     
-    public List<Contribution> getExportContributions() {
-        return exportContributions;
-    }
-
-    public void setExportContributions(List<Contribution> contributions) {
-        this.exportContributions = contributions;
-    }
-
     /**
      * Match a NamespaceImport to a given NamespaceExport based on :
      *    location is not provided

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java?rev=631778&r1=631777&r2=631778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java Wed Feb 27 15:54:38 2008
@@ -19,8 +19,6 @@
 
 package org.apache.tuscany.sca.contribution;
 
-import java.util.List;
-
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 
 
@@ -48,35 +46,11 @@
     void setModelResolver(ModelResolver modelResolver);
     
     /**
-     * Returns the list of exporting contributions that can be used to match 
-     * this import.
-     * 
-     * FIXME This should be removed, imports and exports should not be
-     * tied together.
-     * 
-     * @return List of exporting contributions
-     */
-    List<Contribution> getExportContributions();
-    
-    /**
-     * Sets the list of exporting contributions that can be used to match 
-     * this import.
-     * 
-     * FIXME This should be removed, imports and exports should not be
-     * tied together.
-     * 
-     * @param contributions List of exporting contributions
-     */
-    void setExportContributions(List<Contribution> contributions);
-    
-    /**
-     * Verify is a specific export is provider of what is being imported
-     * 
-     * FIXME This should be removed, imports and exports should not be
-     * tied together.
+     * Verify that a specific export actually exports what is being imported.
      * 
      * @param export The Exported being verified
      * @return true/false
      */
     boolean match(Export export);
+    
 }

Modified: incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java?rev=631778&r1=631777&r2=631778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java Wed Feb 27 15:54:38 2008
@@ -316,7 +316,8 @@
     private void findDependentContributions(Contribution contribution, List<Contribution> dependentContributions){
         
         for (Import contribImport : contribution.getImports()) {
-            for (Contribution tmpContribution : contribImport.getExportContributions()) {
+            for (ContributionModel tmpContributionModel : domainModel.getContributions().values()) {
+                Contribution tmpContribution = tmpContributionModel.getContribution();
                 for (Export export : tmpContribution.getExports()) {
                     if (contribImport.match(export)) {
                         if (tmpContribution.getImports().isEmpty()) {

Modified: incubator/tuscany/java/sca/modules/workspace-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-impl/pom.xml?rev=631778&r1=631777&r2=631778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace-impl/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/workspace-impl/pom.xml Wed Feb 27 15:54:38 2008
@@ -43,8 +43,21 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-workspace-xml</artifactId>
+            <version>1.2-incubating-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
             <version>1.2-incubating-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-namespace</artifactId>
+            <version>1.2-incubating-SNAPSHOT</version>
+            <scope>test</scope>
         </dependency>
         
     </dependencies>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org