You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/03/17 17:28:39 UTC
svn commit: r924358 - in /tuscany/sca-java-2.x/trunk/itest/corba: ./
src/test/java/org/apache/tuscany/sca/test/corba/ src/test/resources/
Author: rfeng
Date: Wed Mar 17 16:28:38 2010
New Revision: 924358
URL: http://svn.apache.org/viewvc?rev=924358&view=rev
Log:
Start to port binding.corba itest (work in progress)
Added:
tuscany/sca-java-2.x/trunk/itest/corba/
- copied from r924334, tuscany/sca-java-2.x/contrib/itest/corba/
Modified:
tuscany/sca-java-2.x/trunk/itest/corba/pom.xml
tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFive.composite
tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFour.composite
tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioOne.composite
tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioSix.composite
tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioThree.composite
tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioTwo.composite
Modified: tuscany/sca-java-2.x/trunk/itest/corba/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/pom.xml?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/pom.xml Wed Mar 17 16:28:38 2010
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -65,36 +65,11 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca</artifactId>
+ <artifactId>tuscany-binding-sca-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-corba</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
-<!--
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- <version>1.2.5</version>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-axiom</artifactId>
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java Wed Mar 17 16:28:38 2010
@@ -22,7 +22,8 @@ package org.apache.tuscany.sca.test.corb
import static org.junit.Assert.fail;
import org.apache.tuscany.sca.host.corba.jse.tns.TnsDefaultCorbaHost;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.tuscany.sca.test.corba.types.ScenarioFive;
import org.apache.tuscany.sca.test.corba.types.ScenarioFiveComponent;
import org.junit.Test;
@@ -38,10 +39,11 @@ public class ScenarioFiveTestCase {
TestCorbaHost.setCorbaHost(new TnsDefaultCorbaHost());
try {
// just make sure we can obtain and use the reference with success
- SCADomain domain = SCADomain.newInstance("ScenarioFive.composite");
+ Node node = NodeFactory.getInstance().createNode("ScenarioFive.composite", getClass().getClassLoader()).start();
ScenarioFive scenarioFive =
- domain.getService(ScenarioFiveComponent.class, "ScenarioFive").getScenarioFive();
+ node.getService(ScenarioFiveComponent.class, "ScenarioFive").getScenarioFive();
scenarioFive.doNothing();
+ node.stop();
} catch (Exception e) {
e.printStackTrace();
fail();
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java Wed Mar 17 16:28:38 2010
@@ -26,7 +26,8 @@ import junit.framework.Assert;
import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourFactory;
import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo;
import org.apache.tuscany.sca.test.corba.types.ScenarioFour;
@@ -44,7 +45,7 @@ import org.junit.Test;
public class ScenarioFourTestCase {
// note that those values are also used in resources/*.composite file
- private static SCADomain domain;
+ private static Node node;
private static ScenarioFourComponent scenarioFourComponent;
private static ScenarioFour scenarioFour;
private static TransientNameServer server;
@@ -55,6 +56,7 @@ public class ScenarioFourTestCase {
*/
@BeforeClass
public static void setUp() {
+ System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", "{http://tuscany.apache.org/xmlns/sca/1.1}binding.corba");
TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
try {
server = new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
@@ -62,9 +64,9 @@ public class ScenarioFourTestCase {
if (t == null) {
Assert.fail("The naming server cannot be started");
}
- // obtain domain
- domain = SCADomain.newInstance("ScenarioFour.composite");
- scenarioFourComponent = domain.getService(ScenarioFourComponent.class, "ScenarioFour");
+ // obtain node
+ node = NodeFactory.getInstance().createNode("ScenarioFour.composite", TestCorbaHost.class.getClassLoader()).start();
+ scenarioFourComponent = node.getService(ScenarioFourComponent.class, "ScenarioFour");
scenarioFour = scenarioFourComponent.getScenarioFour();
} catch (Exception e) {
e.printStackTrace();
@@ -77,6 +79,8 @@ public class ScenarioFourTestCase {
@AfterClass
public static void tearDown() {
server.stop();
+ node.stop();
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
/**
@@ -138,7 +142,7 @@ public class ScenarioFourTestCase {
public void test_nameServerReuse() {
try {
ScenarioFour scenarioFour =
- domain.getService(ScenarioFourComponent.class, "ScenarioFourReuse").getScenarioFour();
+ node.getService(ScenarioFourComponent.class, "ScenarioFourReuse").getScenarioFour();
ScenarioFourStruct struct = new ScenarioFourStruct();
scenarioFour.setStruct(struct);
} catch (Exception e) {
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java Wed Mar 17 16:28:38 2010
@@ -26,7 +26,8 @@ import junit.framework.Assert;
import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.tuscany.sca.test.corba.generated.Color;
import org.apache.tuscany.sca.test.corba.generated.InnerStruct;
import org.apache.tuscany.sca.test.corba.generated.RichStruct;
@@ -66,7 +67,7 @@ public class ScenarioOneTestCase {
private static int ORB_INITIAL_PORT = 5060;
private static String SERVICE_NAME = "ScenarioOne";
- private static SCADomain domain;
+ private static Node node;
private static TransientNameServer server;
private static ORB orb;
@@ -97,8 +98,8 @@ public class ScenarioOneTestCase {
NameComponent path[] = {nc};
ScenarioOne scenarioOne = new ScenarioOneServant();
ncRef.rebind(path, scenarioOne);
- // obtain domain
- domain = SCADomain.newInstance("ScenarioOne.composite");
+ // obtain node
+ node = NodeFactory.getInstance().createNode("ScenarioOne.composite", TestCorbaHost.class.getClassLoader()).start();
} catch (Exception e) {
e.printStackTrace();
}
@@ -110,6 +111,7 @@ public class ScenarioOneTestCase {
@AfterClass
public static void tearDown() {
server.stop();
+ node.stop();
}
/**
@@ -207,7 +209,7 @@ public class ScenarioOneTestCase {
* @param componentName
*/
private void testClientUsingGeneratedInterface(String componentName) {
- ScenarioOneOperations component = domain.getService(ScenarioOneOperations.class, componentName);
+ ScenarioOneOperations component = node.getService(ScenarioOneOperations.class, componentName);
RichStruct richStruct = getRichStruct();
try {
@@ -243,7 +245,7 @@ public class ScenarioOneTestCase {
* @param componentName
*/
private void testClientUsingUserProvidedInterface(String componentName) {
- TScenarioOne component = domain.getService(TScenarioOne.class, componentName);
+ TScenarioOne component = node.getService(TScenarioOne.class, componentName);
TRichStruct tRichStruct = getTRichStruct();
try {
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java Wed Mar 17 16:28:38 2010
@@ -27,7 +27,8 @@ import junit.framework.Assert;
import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct;
import org.apache.tuscany.sca.test.corba.generated.InnerUnion;
import org.apache.tuscany.sca.test.corba.generated.RichUnion;
@@ -59,7 +60,7 @@ public class ScenarioSixTestCase {
private static String SERVICE_NAME = "ScenarioSix";
private static String TUSCANY_SERVICE_NAME = "ScenarioSixTuscany";
- private static SCADomain domain;
+ private static Node node;
private static TransientNameServer server;
private static ORB orb;
@@ -90,8 +91,8 @@ public class ScenarioSixTestCase {
NameComponent path[] = {nc};
ScenarioSix scenarioSix = new ScenarioSixServant();
ncRef.rebind(path, scenarioSix);
- // obtain domain
- domain = SCADomain.newInstance("ScenarioSix.composite");
+ // obtain node
+ node = NodeFactory.getInstance().createNode("ScenarioSix.composite", TestCorbaHost.class.getClassLoader()).start();
} catch (Exception e) {
e.printStackTrace();
}
@@ -103,6 +104,7 @@ public class ScenarioSixTestCase {
@AfterClass
public static void tearDown() {
server.stop();
+ node.stop();
}
private boolean areArraysEqual(String[][] arr1, String[][] arr2) {
@@ -128,7 +130,7 @@ public class ScenarioSixTestCase {
@Test
public void test_arraysPassing_tuscanyAsClient() {
try {
- TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
+ TScenarioSix ref = node.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
String[][] arrayArg = getStringArray();
String[][] arrayRes = ref.passStringArray(arrayArg);
assertTrue(areArraysEqual(arrayArg, arrayRes));
@@ -174,7 +176,7 @@ public class ScenarioSixTestCase {
@Test
public void test_unionsPassing_tuscanyAsClient() {
try {
- TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
+ TScenarioSix ref = node.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
TRichUnion arg = new TRichUnion();
TInnerUnion inner = new TInnerUnion();
inner.setY(10f);
@@ -186,7 +188,7 @@ public class ScenarioSixTestCase {
fail();
}
try {
- TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
+ TScenarioSix ref = node.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
TRichUnion arg = new TRichUnion();
arg.setY(15f);
TRichUnion result = ref.passRichUnion(arg);
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java Wed Mar 17 16:28:38 2010
@@ -26,7 +26,8 @@ import junit.framework.Assert;
import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.tuscany.sca.test.corba.types.TScenarioThree;
import org.apache.tuscany.sca.test.corba.types.TScenarioThreeComponent;
import org.junit.AfterClass;
@@ -41,7 +42,7 @@ public class ScenarioThreeTestCase {
// note that those values are also used in resources/*.composite file
private static int ORB_INITIAL_PORT = 5060;
- private static SCADomain domain;
+ private static Node node;
private static TransientNameServer server;
/**
@@ -63,8 +64,8 @@ public class ScenarioThreeTestCase {
e.printStackTrace();
Assert.fail(e.getMessage());
}
- // obtain domain
- domain = SCADomain.newInstance("ScenarioThree.composite");
+ // obtain node
+ node = NodeFactory.getInstance().createNode("ScenarioThree.composite", TestCorbaHost.class.getClassLoader()).start();
} catch (Exception e) {
e.printStackTrace();
}
@@ -76,6 +77,7 @@ public class ScenarioThreeTestCase {
@AfterClass
public static void tearDown() {
server.stop();
+ node.stop();
}
/**
@@ -85,7 +87,7 @@ public class ScenarioThreeTestCase {
public void test_getterSetter() {
try {
TScenarioThree ref =
- domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
+ node.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
ref.getIntField();
ref.setIntField(1);
} catch (Exception e) {
@@ -101,7 +103,7 @@ public class ScenarioThreeTestCase {
public void test_nameCase() {
try {
TScenarioThree ref =
- domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
+ node.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
assertEquals(0, ref.caseDifferent());
assertEquals(1, ref.CaseDifferent());
} catch (Exception e) {
@@ -117,7 +119,7 @@ public class ScenarioThreeTestCase {
public void test_overloadedNames() {
try {
TScenarioThree ref =
- domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
+ node.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
ref.overloadedName();
ref.overloadedName("");
ref.overloadedName("", 0);
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java Wed Mar 17 16:28:38 2010
@@ -26,7 +26,8 @@ import junit.framework.Assert;
import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.tuscany.sca.test.corba.generated.ScenarioTwo;
import org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper;
import org.apache.tuscany.sca.test.corba.types.ScenarioTwoServant;
@@ -50,7 +51,7 @@ public class ScenarioTwoTestCase {
// note that those values are also used in resources/*.composite file
private static int ORB_INITIAL_PORT = 5060;
- private static SCADomain domain;
+ private static Node node;
private static TransientNameServer server;
private static ORB orb;
@@ -83,8 +84,8 @@ public class ScenarioTwoTestCase {
e.printStackTrace();
Assert.fail(e.getMessage());
}
- // obtain domain
- domain = SCADomain.newInstance("ScenarioTwo.composite");
+ // obtain node
+ node = NodeFactory.getInstance().createNode("ScenarioTwo.composite", TestCorbaHost.class.getClassLoader()).start();
} catch (Exception e) {
e.printStackTrace();
}
@@ -96,6 +97,7 @@ public class ScenarioTwoTestCase {
@AfterClass
public static void tearDown() {
server.stop();
+ node.stop();
}
/**
@@ -105,7 +107,7 @@ public class ScenarioTwoTestCase {
@Test
public void test_tuscanyGetSetAttribute() {
try {
- TScenarioTwo ref = domain.getService(TScenarioTwoComponent.class, "ScenarioTwo").getScenarioTwo();
+ TScenarioTwo ref = node.getService(TScenarioTwoComponent.class, "ScenarioTwo").getScenarioTwo();
String strVal = "Whatever";
ref.setStringField(strVal);
assertEquals(strVal, ref.getStringField());
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java Wed Mar 17 16:28:38 2010
@@ -28,13 +28,22 @@ import org.apache.tuscany.sca.host.corba
* Registers TestCorbaHost as a Corba host extension.
*/
public class TestCorbaHostModuleActivator implements ModuleActivator {
+ private ExtensionPointRegistry registry;
- public void start(ExtensionPointRegistry extensionPointRegistry) {
- CorbaHostExtensionPoint chep = extensionPointRegistry.getExtensionPoint(CorbaHostExtensionPoint.class);
+ /**
+ *
+ */
+ public TestCorbaHostModuleActivator(ExtensionPointRegistry registry) {
+ super();
+ this.registry = registry;
+ }
+
+ public void start() {
+ CorbaHostExtensionPoint chep = registry.getExtensionPoint(CorbaHostExtensionPoint.class);
chep.getCorbaHosts().add(0, new TestCorbaHost());
}
- public void stop(ExtensionPointRegistry extensionPointRegistry) {
+ public void stop() {
}
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFive.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFive.composite?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFive.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFive.composite Wed Mar 17 16:28:38 2010
@@ -17,11 +17,11 @@
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://sample"
xmlns:sample="http://sample"
- name="Corba">
+ name="Corba5">
<component name="ScenarioFiveService">
<implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFiveImpl" />
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFour.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFour.composite?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFour.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFour.composite Wed Mar 17 16:28:38 2010
@@ -17,11 +17,11 @@
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://sample"
xmlns:sample="http://sample"
- name="Corba">
+ name="Corba4">
<!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioOne.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioOne.composite?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioOne.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioOne.composite Wed Mar 17 16:28:38 2010
@@ -17,11 +17,11 @@
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://sample"
xmlns:sample="http://sample"
- name="Corba">
+ name="Corba1">
<!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioSix.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioSix.composite?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioSix.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioSix.composite Wed Mar 17 16:28:38 2010
@@ -17,11 +17,11 @@
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://sample"
xmlns:sample="http://sample"
- name="Corba">
+ name="Corba6">
<component name="ScenarioSix">
<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioSixComponent" />
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioThree.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioThree.composite?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioThree.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioThree.composite Wed Mar 17 16:28:38 2010
@@ -17,11 +17,11 @@
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://sample"
xmlns:sample="http://sample"
- name="Corba">
+ name="Corba3">
<!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->
Modified: tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioTwo.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioTwo.composite?rev=924358&r1=924334&r2=924358&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioTwo.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioTwo.composite Wed Mar 17 16:28:38 2010
@@ -17,11 +17,11 @@
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://sample"
xmlns:sample="http://sample"
- name="Corba">
+ name="Corba2">
<!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->