svn commit: r882273 - in /tuscany/java/sca/samples: calculator/src/main/java/calculator/CalculatorClient.java helloworld-bpel/src/main/java/helloworld/BPELClient.java

[lresende]

Author: lresende
Date: Thu Nov 19 20:08:45 2009
New Revision: 882273

URL: http://svn.apache.org/viewvc?rev=882273&view=rev
Log:
Changing client application to discover contribution location and avoid default 
node behaviour that is finding multiple contributions based on existent 
sca-contribution.xmlin tuscany modules

Modified:
    
tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java
    
tuscany/java/sca/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java

Modified: 
tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java?rev=882273&r1=882272&r2=882273&view=diff
==============================================================================
--- 
tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java
 (original)
+++ 
tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java
 Thu Nov 19 20:08:45 2009
@@ -20,6 +20,8 @@
 package calculator;
 
 import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
 
@@ -30,7 +32,8 @@
 public class CalculatorClient {
     public static void main(String[] args) throws Exception {
 
-        Node node = NodeFactory.newInstance().createNode();
+        String contribution = 
ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
+        Node node = 
NodeFactory.newInstance().createNode("Calculator.composite", new 
Contribution("calculator", contribution));
 
         node.start();
         

Modified: 
tuscany/java/sca/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java?rev=882273&r1=882272&r2=882273&view=diff
==============================================================================
--- 
tuscany/java/sca/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
 (original)
+++ 
tuscany/java/sca/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
 Thu Nov 19 20:08:45 2009
@@ -19,6 +19,8 @@
 
 package helloworld;
 
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
 
@@ -30,7 +32,8 @@
 public class BPELClient {
     public static void main(String[] args) throws Exception {
 
-        Node node = NodeFactory.newInstance().createNode();
+        String contribution = 
ContributionLocationHelper.getContributionLocation(BPELClient.class);
+        Node node = 
NodeFactory.newInstance().createNode("helloworld.composite", new 
Contribution("calculator", contribution));
         node.start();
         
         Hello bpelService = node.getService(Hello.class, 
"BPELHelloWorldComponent");