tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r686901 [3/3] - in /tuscany/java/sca: distribution/bundle/ distribution/manifest/ itest/callablereferences/ itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/ itest/conversations-ws/ itest/conversations-ws/src/...
Date Tue, 19 Aug 2008 00:08:15 GMT
Modified: tuscany/java/sca/tools/maven/maven-osgi-junit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/maven/maven-osgi-junit/pom.xml?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tools/maven/maven-osgi-junit/pom.xml (original)
+++ tuscany/java/sca/tools/maven/maven-osgi-junit/pom.xml Mon Aug 18 17:08:11 2008
@@ -45,7 +45,7 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher-osgi</artifactId>
+            <artifactId>tuscany-node-launcher-osgi</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
         

Modified: tuscany/java/sca/tools/runtime-inspector/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/runtime-inspector/pom.xml?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tools/runtime-inspector/pom.xml (original)
+++ tuscany/java/sca/tools/runtime-inspector/pom.xml Mon Aug 18 17:08:11 2008
@@ -45,7 +45,7 @@
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 

Modified: tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
(original)
+++ tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
Mon Aug 18 17:08:11 2008
@@ -18,35 +18,16 @@
  */
 package org.apache.tuscany.sca.tools.inspector;
 
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
-import org.w3c.dom.Node;
 
 
 /**
@@ -55,7 +36,7 @@
 public class AssemblyInspector {
     
 
-    public String assemblyAsString(SCANode2 node) {
+    public String assemblyAsString(SCANode node) {
         StringBuffer assemblyString = new StringBuffer();
         
         // get at the node internals

Modified: tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
(original)
+++ tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
Mon Aug 18 17:08:11 2008
@@ -23,8 +23,7 @@
 import java.util.Set;
 
 import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 
@@ -33,7 +32,7 @@
  */
 public class RegistryInspector {
 
-    public String registryAsString(SCANode2 node) {
+    public String registryAsString(SCANode node) {
         StringBuffer extensionPointRegistryString = new StringBuffer("Extension Point Registry
\n");
         
         // Get the interesting extension points out of the registry and print them out

Modified: tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
(original)
+++ tuscany/java/sca/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
Mon Aug 18 17:08:11 2008
@@ -35,7 +35,7 @@
 import java.util.Set;
 
 import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 import org.w3c.dom.Node;
 
@@ -56,7 +56,7 @@
         }
     }    
 
-    public String runtimeAsString(SCANode2 node) {
+    public String runtimeAsString(SCANode node) {
         StringBuffer assemblyString = new StringBuffer();
         this.out = new PrintWriter(new OutputStreamWriter(System.out), true);
         

Modified: tuscany/java/sca/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
(original)
+++ tuscany/java/sca/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
Mon Aug 18 17:08:11 2008
@@ -20,8 +20,8 @@
 package calculator;
 
 import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 
 /**
  * This client program shows how to create an SCA runtime, start it,
@@ -30,7 +30,7 @@
 public class CalculatorClient {
     public static void main(String[] args) throws Exception {
 
-        SCANode2 node = SCANode2Factory.newInstance().createSCANodeFromClassLoader("Calculator.composite",
CalculatorClient.class.getClassLoader());
+        SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("Calculator.composite",
CalculatorClient.class.getClassLoader());
         node.start();
         
         CalculatorService calculatorService = 

Modified: tuscany/java/sca/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
(original)
+++ tuscany/java/sca/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
Mon Aug 18 17:08:11 2008
@@ -24,8 +24,8 @@
 
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 
 import calculator.CalculatorService;
 
@@ -35,11 +35,11 @@
 public class RegistryInspectorTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode2 node;
+    private SCANode node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         node = nodeFactory.createSCANode(new File("src/test/resources/Calculator.composite").toURL().toString(),
                                          new SCAContribution("TestContribution", 
                                                              new File("src/test/resources").toURL().toString()));

Modified: tuscany/java/sca/tutorials/store/catalog-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tutorials/store/catalog-webapp/pom.xml?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tutorials/store/catalog-webapp/pom.xml (original)
+++ tuscany/java/sca/tutorials/store/catalog-webapp/pom.xml Mon Aug 18 17:08:11 2008
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
+            <artifactId>tuscany-node-api</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
@@ -59,7 +59,7 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
+            <artifactId>tuscany-node-launcher</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>

Modified: tuscany/java/sca/tutorials/store/domain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tutorials/store/domain/pom.xml?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tutorials/store/domain/pom.xml (original)
+++ tuscany/java/sca/tutorials/store/domain/pom.xml Mon Aug 18 17:08:11 2008
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
+            <artifactId>tuscany-node-launcher</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 

Modified: tuscany/java/sca/tutorials/store/store-client/launch/LaunchStoreClientNode.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tutorials/store/store-client/launch/LaunchStoreClientNode.java?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tutorials/store/store-client/launch/LaunchStoreClientNode.java (original)
+++ tuscany/java/sca/tutorials/store/store-client/launch/LaunchStoreClientNode.java Mon Aug
18 17:08:11 2008
@@ -20,7 +20,7 @@
 package launch;
 
 import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.launcher.NodeLauncher;
 
 import client.Shopper;
@@ -29,7 +29,7 @@
 
     public static void main(String[] args) throws Exception {
         NodeLauncher nodeLauncher = NodeLauncher.newInstance();
-        SCANode2 storeClientNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreClientNode");
+        SCANode storeClientNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreClientNode");
         storeClientNode.start();
         SCAClient client = (SCAClient)storeClientNode;
         

Modified: tuscany/java/sca/tutorials/store/store-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tutorials/store/store-client/pom.xml?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tutorials/store/store-client/pom.xml (original)
+++ tuscany/java/sca/tutorials/store/store-client/pom.xml Mon Aug 18 17:08:11 2008
@@ -50,13 +50,13 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
+            <artifactId>tuscany-node-launcher</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
+            <artifactId>tuscany-node-api</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 

Modified: tuscany/java/sca/tutorials/store/store-test/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tutorials/store/store-test/pom.xml?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tutorials/store/store-test/pom.xml (original)
+++ tuscany/java/sca/tutorials/store/store-test/pom.xml Mon Aug 18 17:08:11 2008
@@ -50,13 +50,13 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
+            <artifactId>tuscany-node-launcher</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
+            <artifactId>tuscany-node-api</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 

Modified: tuscany/java/sca/tutorials/store/store-test/test/StoreSupplierTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tutorials/store/store-test/test/StoreSupplierTestCase.java?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/tutorials/store/store-test/test/StoreSupplierTestCase.java (original)
+++ tuscany/java/sca/tutorials/store/store-test/test/StoreSupplierTestCase.java Mon Aug 18
17:08:11 2008
@@ -23,7 +23,7 @@
 import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
 import org.apache.tuscany.sca.node.launcher.NodeLauncher;
 import org.junit.After;
@@ -40,10 +40,10 @@
  */
 public class StoreSupplierTestCase {
     
-    private SCANode2 domainManager;
-    private SCANode2 storeSupplierNode;
-    private SCANode2 storeCatalogsNode;
-    private SCANode2 storeClientNode;
+    private SCANode domainManager;
+    private SCANode storeSupplierNode;
+    private SCANode storeCatalogsNode;
+    private SCANode storeClientNode;
 
     @Before
     public void setup() throws Exception {

Modified: tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml (original)
+++ tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml Mon Aug 18 17:08:11 2008
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
         <dependency>

Modified: tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
(original)
+++ tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
Mon Aug 18 17:08:11 2008
@@ -25,8 +25,8 @@
 
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 import org.junit.Test;
 import org.osoa.sca.ServiceRuntimeException;
 
@@ -47,8 +47,8 @@
      */
     @Test
     public void atDestroyProper() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        SCANode node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
                 new SCAContribution("TestContribution", 
                                     new File("src/main/resources/proper").toURL().toString()));
         node.start();
@@ -69,9 +69,9 @@
      */
     @Test
     public void atDestroyProtectedMethod() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err1").toURL().toString()));
             Assert.fail();
@@ -94,9 +94,9 @@
      */
     @Test
     public void atDestroyPrivateMethod() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err2").toURL().toString()));
             Assert.fail();
@@ -119,9 +119,9 @@
      */
     @Test
     public void atDestroyNonVoidReturnType() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err3/AServiceErr3.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err3/AServiceErr3.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err3").toURL().toString()));
             Assert.fail();
@@ -144,9 +144,9 @@
      */
     @Test
     public void atDestroyMethodWithArgs() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err4/AServiceErr4.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err4/AServiceErr4.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err4").toURL().toString()));
             Assert.fail();

Modified: tuscany/java/sca/vtest/java-api/annotations/init/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/vtest/java-api/annotations/init/pom.xml?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/vtest/java-api/annotations/init/pom.xml (original)
+++ tuscany/java/sca/vtest/java-api/annotations/init/pom.xml Mon Aug 18 17:08:11 2008
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
         <dependency>

Modified: tuscany/java/sca/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java?rev=686901&r1=686900&r2=686901&view=diff
==============================================================================
--- tuscany/java/sca/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
(original)
+++ tuscany/java/sca/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
Mon Aug 18 17:08:11 2008
@@ -25,8 +25,8 @@
 
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 import org.junit.Test;
 import org.osoa.sca.ServiceRuntimeException;
 
@@ -50,8 +50,8 @@
      */
     @Test
     public void atInitProper() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        SCANode node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
                 new SCAContribution("TestContribution", 
                                     new File("src/main/resources/proper").toURL().toString()));
         node.start();
@@ -74,9 +74,9 @@
      */
     @Test
     public void atInitProtectedMethod() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err1").toURL().toString()));
             Assert.fail();
@@ -100,9 +100,9 @@
      */
     @Test
     public void atInitPrivateMethod() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err2").toURL().toString()));
             Assert.fail();
@@ -126,9 +126,9 @@
      */
     @Test
     public void atInitNonVoidReturnType() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err3/HelloWorldErr3.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err3/HelloWorldErr3.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err3").toURL().toString()));
             Assert.fail();
@@ -152,9 +152,9 @@
      */
     @Test
     public void atInitMethodWithArgs() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err4/HelloWorldErr4.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err4/HelloWorldErr4.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err4").toURL().toString()));
             Assert.fail();



Mime
View raw message