You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/01/26 19:49:56 UTC
svn commit: r903361 -
/tuscany/sca-java-1.x/branches/sca-java-1.6/samples/domain-management/src/main/java/manager/WireComponents.java
Author: lresende
Date: Tue Jan 26 18:49:55 2010
New Revision: 903361
URL: http://svn.apache.org/viewvc?rev=903361&view=rev
Log:
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
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/domain-management/src/main/java/manager/WireComponents.java
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6/samples/domain-management/src/main/java/manager/WireComponents.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/samples/domain-management/src/main/java/manager/WireComponents.java?rev=903361&r1=903360&r2=903361&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6/samples/domain-management/src/main/java/manager/WireComponents.java (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6/samples/domain-management/src/main/java/manager/WireComponents.java Tue Jan 26 18:49:55 2010
@@ -157,18 +157,18 @@
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();