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/04/23 08:05:00 UTC
svn commit: r650755 - in
/incubator/tuscany/java/sca/samples/domain-management/src:
main/java/manager/ main/java/manager/fixme/ test/resources/assets/META-INF/
test/resources/store/META-INF/
Author: jsdelfino
Date: Tue Apr 22 23:04:58 2008
New Revision: 650755
URL: http://svn.apache.org/viewvc?rev=650755&view=rev
Log:
Simplified contribution dependency handling, removed usage of contribution listeners.
Removed:
incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/fixme/
Modified:
incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListComponents.java
incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDependencies.java
incubator/tuscany/java/sca/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
Modified: incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListComponents.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListComponents.java?rev=650755&r1=650754&r2=650755&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListComponents.java (original)
+++ incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListComponents.java Tue Apr 22 23:04:58 2008
@@ -22,12 +22,11 @@
import java.io.File;
import java.net.URI;
import java.net.URL;
+import java.util.List;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
-import manager.fixme.ContributionImportFixerHack;
-
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Component;
@@ -51,7 +50,6 @@
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
import org.apache.tuscany.sca.contribution.xml.ContributionGeneratedMetadataDocumentProcessor;
import org.apache.tuscany.sca.contribution.xml.ContributionMetadataDocumentProcessor;
@@ -60,10 +58,15 @@
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.ModuleActivator;
import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
import org.apache.tuscany.sca.workspace.Workspace;
import org.apache.tuscany.sca.workspace.WorkspaceFactory;
+import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
+import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor;
/**
@@ -77,9 +80,7 @@
private static ModelResolverExtensionPoint modelResolvers;
private static ModelFactoryExtensionPoint modelFactories;
private static WorkspaceFactory workspaceFactory;
-
- //FIXME remove later
- private static ContributionImportFixerHack importFixer;
+ private static Monitor monitor;
private static void init() {
@@ -129,9 +130,10 @@
modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
contributionContentProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlExtensionProcessor);
- //FIXME remove later
- importFixer = new ContributionImportFixerHack(extensionPoints);
-
+ // Create a monitor
+ UtilityExtensionPoint services = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
+ MonitorFactory monitorFactory = services.getService(MonitorFactory.class);
+ monitor = monitorFactory.createMonitor();
}
@@ -140,26 +142,27 @@
// Create workspace model
Workspace workspace = workspaceFactory.createWorkspace();
-
- // Read the contribution info for the sample assets contribution
- URI assetsURI = URI.create("store");
- URL assetsURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
- Contribution assetsContribution = (Contribution)contributionContentProcessor.read(null, assetsURI, assetsURL);
- workspace.getContributions().add(assetsContribution);
+ workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
// Read the contribution info for the sample contribution
URI storeURI = URI.create("store");
URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
Contribution storeContribution = (Contribution)contributionContentProcessor.read(null, storeURI, storeURL);
workspace.getContributions().add(storeContribution);
-
- //FIXME remove later
- importFixer.fixContributionImports(workspace.getContributions());
+
+ // Read the contribution info for the sample assets contribution
+ URI assetsURI = URI.create("assets");
+ URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL();
+ Contribution assetsContribution = (Contribution)contributionContentProcessor.read(null, assetsURI, assetsURL);
+ workspace.getContributions().add(assetsContribution);
+
+ // Build the store contribution dependencies
+ ContributionDependencyBuilder dependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
+ List<Contribution> dependencies = dependencyBuilder.buildContributionDependencies(storeContribution, workspace);
// Resolve the contributions
- for (Contribution contribution: workspace.getContributions()) {
- ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);
- contributionContentProcessor.resolve(contribution, modelResolver);
+ for (Contribution contribution: dependencies) {
+ contributionContentProcessor.resolve(contribution, workspace.getModelResolver());
}
// List the components declared in the deployables found in the
@@ -184,11 +187,7 @@
System.out.println(" interface: " + contract.getInterface());
}
}
-
- // Write the composite out
-
}
-
}
}
Modified: incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDependencies.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDependencies.java?rev=650755&r1=650754&r2=650755&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDependencies.java (original)
+++ incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDependencies.java Tue Apr 22 23:04:58 2008
@@ -120,11 +120,11 @@
Contribution assetsContribution = (Contribution)contributionInfoProcessor.read(null, assetsURI, assetsURL);
workspace.getContributions().add(assetsContribution);
- // List the contribution dependencies
+ // List the contribution dependencies of each contribution
ContributionDependencyBuilder analyzer = new ContributionDependencyBuilderImpl(monitor);
for (Contribution contribution: workspace.getContributions()) {
System.out.println("Contribution: " + contribution.getURI());
- for (Contribution dependency: analyzer.buildContributionDependencies(workspace, contribution)) {
+ for (Contribution dependency: analyzer.buildContributionDependencies(contribution, workspace)) {
System.out.println(" dependency: " + dependency.getURI());
}
}
Modified: incubator/tuscany/java/sca/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml?rev=650755&r1=650754&r2=650755&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml Tue Apr 22 23:04:58 2008
@@ -19,9 +19,4 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
<export.java package="services"/>
- <export.java package="services.market"/>
- <export.java package="services.merger"/>
- <export.java package="services.db"/>
- <export.java package="services.map"/>
- <export.resource uri="uiservices/store.html"/>
</contribution>
Modified: incubator/tuscany/java/sca/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml?rev=650755&r1=650754&r2=650755&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml Tue Apr 22 23:04:58 2008
@@ -20,6 +20,5 @@
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:s="http://store">
<import.java package="services"/>
- <import.resource uri="uiservices/store.html"/>
<deployable composite="s:store"/>
</contribution>