From 843186c4c3014fa218fe31586353b1f465941e06 Mon Sep 17 00:00:00 2001 From: lresende Date: Tue, 26 Jan 2010 18:49:55 +0000 Subject: TUSCANY-3430 - Processing asset contribution first to avoid NPE while processing contribution dependency. This looks like the issue that got fixed in 2.x by providing a pre-resolve phase to process/resolve the contribution dependencies git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@903361 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/manager/WireComponents.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sca-java-1.x/branches/sca-java-1.6/samples') diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/domain-management/src/main/java/manager/WireComponents.java b/sca-java-1.x/branches/sca-java-1.6/samples/domain-management/src/main/java/manager/WireComponents.java index 16cda9d3e7..54605acb05 100644 --- a/sca-java-1.x/branches/sca-java-1.6/samples/domain-management/src/main/java/manager/WireComponents.java +++ b/sca-java-1.x/branches/sca-java-1.6/samples/domain-management/src/main/java/manager/WireComponents.java @@ -157,18 +157,18 @@ public class WireComponents { Workspace workspace = workspaceFactory.createWorkspace(); workspace.setModelResolver(new ExtensibleModelResolver(workspace, extensionPoints)); - // Read the sample store contribution - URI storeURI = URI.create("store"); - URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL(); - Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL); - workspace.getContributions().add(storeContribution); - // Read the sample assets contribution URI assetsURI = URI.create("assets"); URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL(); Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL); workspace.getContributions().add(assetsContribution); + // Read the sample store contribution + URI storeURI = URI.create("store"); + URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL(); + Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL); + workspace.getContributions().add(storeContribution); + // Read the sample client contribution URI clientURI = URI.create("client"); URL clientURL = new File("./target/sample-domain-management-client.jar").toURI().toURL(); -- cgit v1.2.3