Author: rfeng
Date: Tue Oct 14 17:12:32 2008
New Revision: 704746
URL: http://svn.apache.org/viewvc?rev=704746&view=rev
Log:
Remove dependency on private packages
Modified:
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
Modified:
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java?rev=704746&r1=704745&r2=704746&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
(original)
+++
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
Tue Oct 14 17:12:32 2008
@@ -79,7 +79,6 @@
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 @@
// 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);
Modified:
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java?rev=704746&r1=704745&r2=704746&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
(original)
+++
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
Tue Oct 14 17:12:32 2008
@@ -67,7 +67,6 @@
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 @@
// 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
Modified:
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java?rev=704746&r1=704745&r2=704746&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
(original)
+++
tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
Tue Oct 14 17:12:32 2008
@@ -71,8 +71,6 @@
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 @@
// 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);
