Author: ramkumar
Date: Tue Dec 16 03:55:13 2008
New Revision: 727035
URL: http://svn.apache.org/viewvc?rev=727035&view=rev
Log:
Fixes for sca-contribution.xml
Modified:
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.4/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.4/samples/domain-management/src/main/java/manager/WireComponents.java
tuscany/branches/sca-java-1.4/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
Modified:
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml?rev=727035&r1=727034&r2=727035&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
(original)
+++
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
Tue Dec 16 03:55:13 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
xmlns:sample="http://sample";>
<deployable composite="sample:CalculatorA"/>
</contribution>
\ No newline at end of file
Modified:
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml?rev=727035&r1=727034&r2=727035&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
(original)
+++
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
Tue Dec 16 03:55:13 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
xmlns:sample="http://sample";>
<deployable composite="sample:CalculatorB"/>
</contribution>
\ No newline at end of file
Modified:
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml?rev=727035&r1=727034&r2=727035&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
(original)
+++
tuscany/branches/sca-java-1.4/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
Tue Dec 16 03:55:13 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
xmlns:sample="http://sample";>
<deployable composite="sample:CalculatorC"/>
</contribution>
\ No newline at end of file
Modified:
tuscany/branches/sca-java-1.4/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml?rev=727035&r1=727034&r2=727035&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.4/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/branches/sca-java-1.4/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
Tue Dec 16 03:55:13 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://callbackws";
xmlns:cbws="http://callbackws";>
<deployable composite="cbws:callbackws" />
</contribution>
Modified:
tuscany/branches/sca-java-1.4/samples/domain-management/src/main/java/manager/WireComponents.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/samples/domain-management/src/main/java/manager/WireComponents.java?rev=727035&r1=727034&r2=727035&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.4/samples/domain-management/src/main/java/manager/WireComponents.java
(original)
+++
tuscany/branches/sca-java-1.4/samples/domain-management/src/main/java/manager/WireComponents.java
Tue Dec 16 03:55:13 2008
@@ -157,12 +157,6 @@
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 @@
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<Contribution> resolved = new HashSet<Contribution>();
Modified:
tuscany/branches/sca-java-1.4/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml?rev=727035&r1=727034&r2=727035&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.4/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/branches/sca-java-1.4/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
Tue Dec 16 03:55:13 2008
@@ -19,7 +19,6 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
xmlns:sample="http://sample";>
<deployable composite="sample:OuterComposite"/>
</contribution>
\ No newline at end of file
