You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2007/06/19 23:57:16 UTC

svn commit: r548861 - in /incubator/tuscany/java/sca/samples/calculator-distributed: ./ src/main/java/calculator/ src/main/resources/ src/main/resources/META-INF/ src/test/java/calculator/

Author: slaws
Date: Tue Jun 19 14:57:15 2007
New Revision: 548861

URL: http://svn.apache.org/viewvc?view=rev&rev=548861
Log:
Set up to test the distributed domain automatically
TUSCANY-1338

Added:
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java   (with props)
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeA.java   (with props)
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeB.java   (with props)
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml   (with props)
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/default.node
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/runtime.topology
Removed:
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain.topology
Modified:
    incubator/tuscany/java/sca/samples/calculator-distributed/build.xml
    incubator/tuscany/java/sca/samples/calculator-distributed/pom.xml
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorClientA.java
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorClientB.java
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/Calculator.composite
    incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java

Modified: incubator/tuscany/java/sca/samples/calculator-distributed/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/build.xml?view=diff&rev=548861&r1=548860&r2=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/build.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/build.xml Tue Jun 19 14:57:15 2007
@@ -17,7 +17,7 @@
  * under the License.    
 -->
 <project name="calculator" default="compile">
-    <property name="test.class" value="calculator.CalculatorClient" />
+    <property name="test.class" value="calculator.CalculatorNode" />
 	<property name="test.jar"   value="sample-calculator.jar" />
 	
 	<!-- a classpath so I can test without building the distribution jars -->
@@ -54,6 +54,11 @@
     	<pathelement location="${m2.repo}/org/apache/tuscany/sca/tuscany-host-embedded/1.0-incubating-SNAPSHOT/tuscany-host-embedded-1.0-incubating-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}/org/apache/tuscany/sca/tuscany-binding-jms/1.0-incubating-SNAPSHOT/tuscany-binding-jms-1.0-incubating-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}/org/apache/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.jar"/>
+    	<!--pathelement location="${m2.repo}/org/apache/activemq/apache-activemq/4.2-SNAPSHOT/apache-activemq-4.2-SNAPSHOT.jar"/-->
+    	<pathelement location="${m2.repo}/org/apache/tuscany/sca/tuscany-binding-sca/1.0-incubating-SNAPSHOT/tuscany-binding-sca-1.0-incubating-SNAPSHOT.jar"/>    	
+    	<pathelement location="${m2.repo}/org/apache/tuscany/sca/tuscany-distributed/1.0-incubating-SNAPSHOT/tuscany-distributed-1.0-incubating-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}/org/apache/tuscany/sca/tuscany-topology/1.0-incubating-SNAPSHOT/tuscany-topology-1.0-incubating-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}/org/apache/tuscany/sca/tuscany-topology-xml/1.0-incubating-SNAPSHOT/tuscany-topology-xml-1.0-incubating-SNAPSHOT.jar"/>    	
     	<pathelement location="target/classes"/>    	
     </path>	
     		
@@ -81,7 +86,7 @@
         </jar>    	
     </target>	
 	
-    <target name="run-classesA">
+    <target name="runA">
         <java classname="${test.class}A"
               fork="true">
             <classpath>
@@ -92,7 +97,7 @@
         </java>
     </target>
 	
-    <target name="run-classesB">
+    <target name="runB">
         <java classname="${test.class}B"
               fork="true">
             <classpath>
@@ -103,25 +108,6 @@
         </java>
     </target>	
 	
-    <target name="runA">
-        <java classname="${test.class}A"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="runB">
-        <java classname="${test.class}B"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>	
 	
     <target name="clean">
         <delete quiet="true" includeemptydirs="true">

Modified: incubator/tuscany/java/sca/samples/calculator-distributed/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/pom.xml?view=diff&rev=548861&r1=548860&r2=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/pom.xml Tue Jun 19 14:57:15 2007
@@ -46,16 +46,45 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distributed</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+        </dependency>   
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-topology</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-topology-xml</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+        </dependency>                       
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+        </dependency>    
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+        </dependency>           
+        
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.2</version>
             <scope>test</scope>
         </dependency>
-
+                
     </dependencies>
 
     <build>

Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java?view=diff&rev=548861&r1=548860&r2=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java Tue Jun 19 14:57:15 2007
@@ -24,6 +24,7 @@
 public class AddServiceImpl implements AddService {
 
     public double add(double n1, double n2) {
+        System.out.println("AddService - add " + n1 + " and " + n2);
         return n1 + n2;
     }
 

Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorClientA.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorClientA.java?view=diff&rev=548861&r1=548860&r2=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorClientA.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorClientA.java Tue Jun 19 14:57:15 2007
@@ -19,27 +19,94 @@
 
 package calculator;
 
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
+import org.apache.tuscany.sca.assembly.xml.ComponentTypeDocumentProcessor;
+import org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;
+import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeDocumentProcessor;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.distributed.host.impl.DistributedSCADomain;
+import org.apache.tuscany.sca.distributed.node.ComponentRegistry;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
+import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.topology.DefaultTopologyFactory;
+import org.apache.tuscany.sca.topology.Node;
+import org.apache.tuscany.sca.topology.TopologyFactory;
+import org.apache.tuscany.sca.topology.xml.TopologyDocumentProcessor;
+import org.apache.tuscany.sca.topology.xml.TopologyProcessor;
 
 /**
  * This client program shows how to create an SCA runtime, start it,
  * and locate and invoke a SCA component
  */
 public class CalculatorClientA {
-    public static void main(String[] args) throws Exception {
 
-        SCADomain scaDomain = SCADomain.newInstance("sca://mydomain/A", "/", "Calculator.composite");
+    public static void main(String[] args) throws Exception {
+              
+        ClassLoader cl = CalculatorClientA.class.getClassLoader();
+        DistributedSCADomain domain = new DistributedSCADomain(cl,
+                                                               "TheDomain",
+                                                               "nodeA");
+        //Start the domain
+        domain.start();
+        
+        // configure the topology - should be done by file or remotely
+        ComponentRegistry componentRegistry = 
+            domain.getNodeService(ComponentRegistry.class, "ComponentRegistry");
+        
+        componentRegistry.setComponentNode("CalculatorServiceComponent", "nodeA");
+        componentRegistry.setComponentNode("AddServiceComponent", "nodeB");        
         
+        // Contribute the SCA application
+        ContributionService contributionService = domain.getContributionService();
+        ModelResolver resolver = new ModelResolverImpl(cl);
+        URL contributionURL = new URL("file:/C:/simon/Projects/Tuscany/java/java-head/sca/samples/calculator-distributed/target/sample-calculator-distributed.jar");
+        Contribution contribution = contributionService.contribute("http://calculator", 
+                                                                   contributionURL, 
+                                                                   resolver, 
+                                                                   false);
+        Composite composite = contribution.getDeployables().get(0);
+        
+        // add the contributed composite to the domain
+        domain.getDomainCompositeHelper().addComposite(composite);  
+        
+        // activate the domain, i.e. build the composite and
+        // create the wires
+        domain.getDomainCompositeHelper().activateDomain();
+        
+        // start the components, i.e. bring any exposed services on line
+        domain.getDomainCompositeHelper().startComponents();
+        
+        // do some application stuff
         CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
+            domain.getService(CalculatorService.class, "CalculatorServiceComponent");
 
         // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
- //       System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
- //       System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
- //       System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        scaDomain.close();
+        System.out.println("3 + 2=" + calculatorService.add(3, 2));     
+        
+        //Start the domain
+        domain.close();        
     }
 
 }

Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorClientB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorClientB.java?view=diff&rev=548861&r1=548860&r2=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorClientB.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorClientB.java Tue Jun 19 14:57:15 2007
@@ -20,7 +20,15 @@
 package calculator;
 
 import java.io.IOException;
+import java.net.URL;
 
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.distributed.host.impl.DistributedSCADomain;
+import org.apache.tuscany.sca.distributed.node.ComponentRegistry;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 
 /**
@@ -29,16 +37,47 @@
  */
 public class CalculatorClientB {
     public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("sca://mydomain/B","/","Calculator.composite");
-
+        ClassLoader cl = CalculatorClientA.class.getClassLoader();
+        DistributedSCADomain domain = new DistributedSCADomain(cl,
+                                                               "TheDomain",
+                                                               "nodeB");
+        //Start the domain
+        domain.start();
+        
+        // configure the topology - should be done by file or remotely
+        ComponentRegistry componentRegistry = 
+            domain.getNodeService(ComponentRegistry.class, "ComponentRegistry");
+        
+        componentRegistry.setComponentNode("CalculatorServiceComponent", "nodeA");
+        componentRegistry.setComponentNode("AddServiceComponent", "nodeB");        
+        
+        // Contribute the SCA application
+        ContributionService contributionService = domain.getContributionService();
+        ModelResolver resolver = new ModelResolverImpl(cl);
+        URL contributionURL = new URL("file:/C:/simon/Projects/Tuscany/java/java-head/sca/samples/calculator-distributed/target/sample-calculator-distributed.jar");
+        Contribution contribution = contributionService.contribute("http://calculator", 
+                                                                   contributionURL, 
+                                                                   resolver, 
+                                                                   false);
+        Composite composite = contribution.getDeployables().get(0);
+        
+        // add the contributed composite to the domain
+        domain.getDomainCompositeHelper().addComposite(composite);  
+        
+        // activate the domain, i.e. build the composite and
+        // create the wires
+        domain.getDomainCompositeHelper().activateDomain();
+        
+        // start the components, i.e. bring any exposed services on line
+        domain.getDomainCompositeHelper().startComponents();
+        
         try {
             System.out.println("Runtime sca://mydomain/B started (press enter to shutdown)");
             System.in.read();
         } catch (IOException e) {
             e.printStackTrace();
         }
-        scaDomain.close();
+        domain.close();
     }
 
 }

Added: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java?view=auto&rev=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java (added)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java Tue Jun 19 14:57:15 2007
@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package calculator;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
+import org.apache.tuscany.sca.assembly.xml.ComponentTypeDocumentProcessor;
+import org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;
+import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeDocumentProcessor;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.distributed.host.impl.DistributedSCADomain;
+import org.apache.tuscany.sca.distributed.node.ComponentRegistry;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
+import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.topology.DefaultTopologyFactory;
+import org.apache.tuscany.sca.topology.Node;
+import org.apache.tuscany.sca.topology.TopologyFactory;
+import org.apache.tuscany.sca.topology.xml.TopologyDocumentProcessor;
+import org.apache.tuscany.sca.topology.xml.TopologyProcessor;
+
+/**
+ * This is an example node implementation that uses the 
+ * distributed runtime to run the calculator sample
+ * We need to remove some of the function from here and 
+ * put it in the runtime proper 
+ */
+public class CalculatorNode {
+    
+    private DistributedSCADomain domain;
+    private String domainName;
+    private String nodeName;
+    
+    public CalculatorNode(String domainName, String nodeName) {
+        this.domainName = domainName;
+        this.nodeName = nodeName;
+    }
+    
+
+    public SCADomain startDomain()
+      throws Exception {
+              
+        ClassLoader cl = CalculatorNode.class.getClassLoader();
+        domain = new DistributedSCADomain(cl,
+                                          domainName,
+                                          nodeName);
+        //Start the domain
+        domain.start();
+        
+        // configure the topology - should be done by file or remotely
+        ComponentRegistry componentRegistry = 
+            domain.getNodeService(ComponentRegistry.class, "ComponentRegistry");
+        
+        componentRegistry.setComponentNode("CalculatorServiceComponent", "nodeA");
+        componentRegistry.setComponentNode("AddServiceComponent", "nodeB");        
+        
+        // Contribute the SCA application
+        ContributionService contributionService = domain.getContributionService();
+        ModelResolver resolver = new ModelResolverImpl(cl);
+        URL contributionURL = new URL("file:/C:/simon/Projects/Tuscany/java/java-head/sca/samples/calculator-distributed/target/sample-calculator-distributed.jar");
+        Contribution contribution = contributionService.contribute("http://calculator", 
+                                                                   contributionURL, 
+                                                                   resolver, 
+                                                                   false);
+        Composite composite = contribution.getDeployables().get(0);
+        
+        // add the contributed composite to the domain
+        domain.getDomainCompositeHelper().addComposite(composite);  
+        
+        // activate the domain, i.e. build the composite and
+        // create the wires
+        domain.getDomainCompositeHelper().activateDomain();
+        
+        // start the components, i.e. bring any exposed services on line
+        domain.getDomainCompositeHelper().startComponents();   
+        
+        return domain;        
+    }
+    
+    public void stopDomain() {
+        //Stop the domain
+        domain.close();        
+    }
+
+}

Propchange: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeA.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeA.java?view=auto&rev=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeA.java (added)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeA.java Tue Jun 19 14:57:15 2007
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package calculator;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+/**
+ * This client program shows how to create an SCA runtime, start it,
+ * and locate and invoke a SCA component
+ */
+public class CalculatorNodeA {
+
+    public static void main(String[] args) throws Exception {
+              
+        // start the node that runs the 
+        // calculator component
+        CalculatorNode node = new CalculatorNode("domainA","nodeA");
+        SCADomain domain = node.startDomain();
+        
+        // do some application stuff
+        CalculatorService calculatorService = 
+            domain.getService(CalculatorService.class, "CalculatorServiceComponent");
+
+        // Calculate
+        System.out.println("3 + 2=" + calculatorService.add(3, 2)); 
+        
+        node.stopDomain();        
+             
+    }
+
+}

Propchange: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeA.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeA.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeB.java?view=auto&rev=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeB.java (added)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeB.java Tue Jun 19 14:57:15 2007
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package calculator;
+
+import java.io.IOException;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+/**
+ * This client program shows how to create an SCA runtime, start it,
+ * and locate and invoke a SCA component
+ */
+public class CalculatorNodeB {
+
+    public static void main(String[] args) throws Exception {
+              
+        // start the node that runs the 
+        // calculator component
+        CalculatorNode node = new CalculatorNode("domainA","nodeB");
+        node.startDomain();
+        
+        // Calculate
+        try {
+            System.out.println("Node started (press enter to shutdown)");
+            System.in.read();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }  
+        
+        node.stopDomain();
+             
+    }
+
+}

Propchange: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeB.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeB.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java?view=diff&rev=548861&r1=548860&r2=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java Tue Jun 19 14:57:15 2007
@@ -52,6 +52,7 @@
     }
 
     public double add(double n1, double n2) {
+        System.out.println("CalculatorService - add " + n1 + " and " + n2);
         return addService.add(n1, n2);
     }
 

Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/Calculator.composite?view=diff&rev=548861&r1=548860&r2=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/Calculator.composite (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/Calculator.composite Tue Jun 19 14:57:15 2007
@@ -18,9 +18,11 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           targetNamespace="http://sample"
+           xmlns:sample="http://sample"
            name="Calculator">
 
-    <component name="CalculatorServiceComponent" runtimeId="sca://mydomain/A">
+    <component name="CalculatorServiceComponent">
 		<implementation.java class="calculator.CalculatorServiceImpl"/>
         <reference name="addService" target="AddServiceComponent" />
 <!--        
@@ -30,19 +32,19 @@
 -->
     </component>
 
-    <component name="AddServiceComponent" runtimeId="sca://mydomain/B">
+    <component name="AddServiceComponent">
         <implementation.java class="calculator.AddServiceImpl" />
     </component>
 <!--
-    <component name="SubtractServiceComponent" runtimeId="sca://mydomain/B">
+    <component name="SubtractServiceComponent">
         <implementation.java class="calculator.SubtractServiceImpl" />
     </component>
 
-    <component name="MultiplyServiceComponent" runtimeId="sca://mydomain/B">
+    <component name="MultiplyServiceComponent">
         <implementation.java class="calculator.MultiplyServiceImpl" />
     </component>
 
-    <component name="DivideServiceComponent" runtimeId="sca://mydomain/B">
+    <component name="DivideServiceComponent">
         <implementation.java class="calculator.DivideServiceImpl" />
     </component>
 -->

Added: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml?view=auto&rev=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml (added)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml Tue Jun 19 14:57:15 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	targetNamespace="http://sample"
+    xmlns:sample="http://sample">
+   <deployable composite="sample:Calculator"/>
+</contribution>
\ No newline at end of file

Propchange: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/default.node
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/default.node?view=auto&rev=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/default.node (added)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/default.node Tue Jun 19 14:57:15 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           name="nodeA">
+    <component name="ComponentRegistry">
+        <implementation.java class="org.apache.tuscany.sca.distributed.node.impl.DefaultComponentRegistry"/>
+    </component>  
+</composite>
\ No newline at end of file

Added: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/runtime.topology
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/runtime.topology?view=auto&rev=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/runtime.topology (added)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/runtime.topology Tue Jun 19 14:57:15 2007
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+
+<runtime>
+    <node name="nodeA">
+        <schema name="http" baseURL="http://localhost:80" domain="DomainA"/> 
+        <schema name="https" baseURL="https://localhost:443" domain="DomainA"/>
+        <component name="CalculatorServiceComponent" domain="DomainA"/>
+    </node>
+    <node name="nodeB">
+        <schema name="http" baseURL="http://localhost:81" domain="DomainA"/> 
+        <schema name="https" baseURL="https://localhost:444" domain="DomainA"/>
+        <component name="AddServiceComponent" domain="DomainA"/>
+    </node>    
+</runtime>
+

Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java?view=diff&rev=548861&r1=548860&r2=548861
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java Tue Jun 19 14:57:15 2007
@@ -18,41 +18,64 @@
  */
 package calculator;
 
-import java.util.Properties;
-
-import junit.framework.TestCase;
+import junit.framework.Assert;
 
+import org.apache.activemq.broker.BrokerService;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 /**
- * This shows how to test the Calculator service component.
+ * This shows how to test the Calculator service component in a 
+ * distributed runtime
  */
-public class CalculatorTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCADomain scaDomain;
-
-    protected void setUp() throws Exception {
-        // set system properties in order to get a 
-        // distributed domain
-        Properties properties = new Properties(System.getProperties());
-        properties.put("org.apache.tuscany.sca.host.embedded.SCADomain",
-                       "org.apache.tuscany.sca.host.embedded.impl.DistributedSCADomain");
-        System.setProperties(properties);
-
-        // construct the portion of the distributed domain 
-        // that this process represents
-        scaDomain = SCADomain.newInstance("Calculator.composite");
-        calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
+public class CalculatorTestCase {
 
-    protected void tearDown() throws Exception {
-        scaDomain.close();
+    private static BrokerService broker;
+    private static CalculatorNode nodeA;
+    private static SCADomain domainA;
+    private static CalculatorNode nodeB;
+    private static SCADomain domainB;
+    private static CalculatorService calculatorService;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        System.out.println("Setting but distributed nodes");
+        
+        // start the activemq broker
+        broker = new BrokerService();
+        broker.addConnector("tcp://localhost:61616");
+        broker.start();        
+        
+        // start the node that runs the 
+        // calculator component
+        nodeA = new CalculatorNode("domainA","nodeA");
+        domainA = nodeA.startDomain();
+        
+        // start the node that runs the 
+        // add component
+        nodeB = new CalculatorNode("domainA","nodeB");
+        domainB = nodeB.startDomain();
+        
+        calculatorService = domainA.getService(CalculatorService.class, "CalculatorServiceComponent");
+   }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        // stop the domains
+        nodeA.stopDomain();
+        nodeB.stopDomain();
+        
+        // stop the ActiveMQ broker
+        broker.stop();
     }
 
+    @Test
     public void testCalculator() throws Exception {
+        
         // Calculate
-        assertEquals(calculatorService.add(3, 2), 5.0);
+        Assert.assertEquals(calculatorService.add(3, 2), 5.0);
 //        assertEquals(calculatorService.subtract(3, 2), 1.0);
 //        assertEquals(calculatorService.multiply(3, 2), 6.0);
 //        assertEquals(calculatorService.divide(3, 2), 1.5);



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org