diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-13 07:34:35 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-13 07:34:35 +0000 |
commit | c953debbe7d1e8785c4c401c1314d9b176281e95 (patch) | |
tree | 750ab88cb6ca4aca96aef3aa0a754e899d6fdcf8 /branches/sca-java-1.x/itest/validation/src/test/java/domain/CustomCompositeBuilder.java | |
parent | 4c39d8c12de316d28abe711557c60ef000014e62 (diff) |
Fix for TUSCANT-2763 & TUSCANY-2764
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@734063 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | branches/sca-java-1.x/itest/validation/src/test/java/domain/CustomCompositeBuilder.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/branches/sca-java-1.x/itest/validation/src/test/java/domain/CustomCompositeBuilder.java index 65814470a4..7f3199d472 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/domain/CustomCompositeBuilder.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/domain/CustomCompositeBuilder.java @@ -47,7 +47,6 @@ import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint; import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.ModuleActivator; @@ -66,8 +65,8 @@ import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; public class CustomCompositeBuilder { + private ExtensionPointRegistry extensionPoints; private URLArtifactProcessor<Contribution> contributionProcessor; - private ModelResolverExtensionPoint modelResolvers; private ModelFactoryExtensionPoint modelFactories; private WorkspaceFactory workspaceFactory; private AssemblyFactory assemblyFactory; @@ -98,7 +97,7 @@ public class CustomCompositeBuilder { private void init() { // Create extension point registry - ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); + extensionPoints = new DefaultExtensionPointRegistry(); // Create a monitor UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); @@ -136,9 +135,6 @@ public class CustomCompositeBuilder { URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class); - // Get the model resolvers - modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); - // Create a contribution dependency builder contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor); @@ -157,7 +153,7 @@ public class CustomCompositeBuilder { // Create workspace model workspace = workspaceFactory.createWorkspace(); - workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories)); + workspace.setModelResolver(new ExtensibleModelResolver(workspace, extensionPoints)); // Read the sample store contribution URI artifactURI = URI.create(sourceURI); @@ -218,7 +214,7 @@ public class CustomCompositeBuilder { // Create workspace model workspace = workspaceFactory.createWorkspace(); - workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories)); + workspace.setModelResolver(new ExtensibleModelResolver(workspace, extensionPoints)); // Read the sample store contribution URI artifactURI = URI.create(sourceURI); |