Remove dependency on private packages
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@704746 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
7f82d2c393
commit
30483f4681
3 changed files with 7 additions and 7 deletions
|
@ -79,7 +79,6 @@ import org.apache.tuscany.sca.workspace.WorkspaceFactory;
|
|||
import org.apache.tuscany.sca.workspace.builder.ContributionBuilder;
|
||||
import org.apache.tuscany.sca.workspace.builder.ContributionBuilderException;
|
||||
import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint;
|
||||
import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor;
|
||||
import org.osoa.sca.annotations.Init;
|
||||
import org.osoa.sca.annotations.Reference;
|
||||
import org.osoa.sca.annotations.Scope;
|
||||
|
@ -154,7 +153,8 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se
|
|||
|
||||
// Create contribution processor
|
||||
modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
|
||||
contributionProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlProcessor, staxProcessor, monitor);
|
||||
// contributionProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlProcessor, staxProcessor, monitor);
|
||||
contributionProcessor = urlProcessors.getProcessor(Contribution.class);
|
||||
|
||||
// Get a contribution dependency builder
|
||||
ContributionBuilderExtensionPoint contributionBuilders = extensionPoints.getExtensionPoint(ContributionBuilderExtensionPoint.class);
|
||||
|
|
|
@ -67,7 +67,6 @@ import org.apache.tuscany.sca.data.collection.NotFoundException;
|
|||
import org.apache.tuscany.sca.domain.manager.impl.CompositeGeneratorServiceImpl.Cache.ContributionCache;
|
||||
import org.apache.tuscany.sca.monitor.Monitor;
|
||||
import org.apache.tuscany.sca.monitor.MonitorFactory;
|
||||
import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor;
|
||||
import org.osoa.sca.annotations.Init;
|
||||
import org.osoa.sca.annotations.Reference;
|
||||
import org.osoa.sca.annotations.Scope;
|
||||
|
@ -139,7 +138,9 @@ public class CompositeGeneratorServiceImpl extends HttpServlet implements Servle
|
|||
|
||||
// Create contribution processor
|
||||
modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
|
||||
contributionProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlProcessor, staxProcessor, monitor);
|
||||
// contributionProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlProcessor, staxProcessor, monitor);
|
||||
contributionProcessor = urlProcessors.getProcessor(Contribution.class);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -71,8 +71,6 @@ import org.apache.tuscany.sca.monitor.Monitor;
|
|||
import org.apache.tuscany.sca.monitor.MonitorFactory;
|
||||
import org.apache.tuscany.sca.workspace.builder.ContributionBuilder;
|
||||
import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint;
|
||||
import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
|
||||
import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor;
|
||||
import org.osoa.sca.annotations.Init;
|
||||
import org.osoa.sca.annotations.Reference;
|
||||
import org.osoa.sca.annotations.Scope;
|
||||
|
@ -143,7 +141,8 @@ public class DeployableCompositeCollectionImpl implements ItemCollection, LocalI
|
|||
|
||||
// Create contribution processor
|
||||
modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
|
||||
contributionProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlProcessor, staxProcessor, monitor);
|
||||
// contributionProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlProcessor, staxProcessor, monitor);
|
||||
contributionProcessor = urlProcessors.getProcessor(Contribution.class);
|
||||
|
||||
// Get a contribution dependency builder
|
||||
ContributionBuilderExtensionPoint contributionBuilders = extensionPoints.getExtensionPoint(ContributionBuilderExtensionPoint.class);
|
||||
|
|
Loading…
Add table
Reference in a new issue