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@903364 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 6 deletions

diff --git a/sca-java-1.x/trunk/samples/domain-management/src/main/java/manager/WireComponents.java b/sca-java-1.x/trunk/samples/domain-management/src/main/java/manager/WireComponents.java
index 16cda9d3e7..54605acb05 100644
--- a/sca-java-1.x/trunk/samples/domain-management/src/main/java/manager/WireComponents.java
+++ b/sca-java-1.x/trunk/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();