Author: jsdelfino
Date: Sat Jul 21 19:50:19 2007
New Revision: 558453
URL: http://svn.apache.org/viewvc?view=rev&rev=558453
Log:
Fixing import/export handling for WSDL models.
Modified:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
Modified:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java?view=diff&rev=558453&r1=558452&r2=558453
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
Sat Jul 21 19:50:19 2007
@@ -41,6 +41,7 @@
import org.apache.tuscany.sca.contribution.ContributionImport;
import org.apache.tuscany.sca.contribution.DeployedArtifact;
import
org.apache.tuscany.sca.contribution.impl.ContributionExportModelResolverImpl;
+import
org.apache.tuscany.sca.contribution.impl.ContributionImportModelResolverImpl;
import org.apache.tuscany.sca.contribution.processor.ContributionPostProcessor;
import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
@@ -286,6 +287,22 @@
// Initialize the contribution exports
for (ContributionExport contributionExport: contribution.getExports())
{
contributionExport.setModelResolver(new
ContributionExportModelResolverImpl(contributionExport, modelResolver));
+ }
+
+ // Initialize the contribution imports
+ for (ContributionImport contributionImport: contribution.getImports())
{
+
+ // Find a matching contribution
+ Contribution targetContribution =
contributionRegistry.get(contribution.getURI());
+ if (targetContribution == null)
+ continue;
+
+ // Find a matching contribution export
+ for (ContributionExport contributionExport:
targetContribution.getExports()) {
+ if
(contributionImport.getNamespace().equals(contributionExport.getNamespace())) {
+ contributionImport.setModelResolver(new
ContributionImportModelResolverImpl(contributionImport,
contributionExport.getModelResolver()));
+ }
+ }
}
List<URI> contributionArtifacts = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
