From ae3717a3f28b7bd9459725b3dc3e8d865b6d10df Mon Sep 17 00:00:00 2001 From: ramkumar Date: Tue, 16 Dec 2008 11:55:13 +0000 Subject: Fixes for sca-contribution.xml git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@727035 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/resources/nodeA/META-INF/sca-contribution.xml | 1 - .../src/main/resources/nodeB/META-INF/sca-contribution.xml | 1 - .../src/main/resources/nodeC/META-INF/sca-contribution.xml | 1 - .../src/main/resources/META-INF/sca-contribution.xml | 1 - .../src/main/java/manager/WireComponents.java | 12 ++++++------ .../src/main/resources/META-INF/sca-contribution.xml | 1 - 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml index 1b1c0291e2..593f6df4a6 100644 --- a/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml +++ b/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml @@ -18,7 +18,6 @@ * under the License. --> \ No newline at end of file diff --git a/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml index 6c0ffe4ac0..a64d5b6be9 100644 --- a/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml +++ b/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml @@ -18,7 +18,6 @@ * under the License. --> \ No newline at end of file diff --git a/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml index 8c311553c3..feb30791f5 100644 --- a/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml +++ b/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml @@ -18,7 +18,6 @@ * under the License. --> \ No newline at end of file diff --git a/branches/sca-java-1.4/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.4/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml index 35f7f60c2e..5128c6d09f 100644 --- a/branches/sca-java-1.4/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml +++ b/branches/sca-java-1.4/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml @@ -18,7 +18,6 @@ * under the License. --> diff --git a/branches/sca-java-1.4/samples/domain-management/src/main/java/manager/WireComponents.java b/branches/sca-java-1.4/samples/domain-management/src/main/java/manager/WireComponents.java index d24d5c67c9..9eb5eb823b 100644 --- a/branches/sca-java-1.4/samples/domain-management/src/main/java/manager/WireComponents.java +++ b/branches/sca-java-1.4/samples/domain-management/src/main/java/manager/WireComponents.java @@ -157,12 +157,6 @@ public class WireComponents { Workspace workspace = workspaceFactory.createWorkspace(); workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories)); - // 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(); @@ -174,6 +168,12 @@ public class WireComponents { URL clientURL = new File("./target/sample-domain-management-client.jar").toURI().toURL(); Contribution clientContribution = contributionProcessor.read(null, clientURI, clientURL); workspace.getContributions().add(clientContribution); + + // 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); // Build the contribution dependencies Set resolved = new HashSet(); diff --git a/branches/sca-java-1.4/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.4/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml index e675fd3624..5190f402a8 100644 --- a/branches/sca-java-1.4/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml +++ b/branches/sca-java-1.4/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml @@ -19,7 +19,6 @@ --> \ No newline at end of file -- cgit v1.2.3