delete the beta2 branch as i'd not seen raymonds mail when i made it and we might as well wait till he's got his changes in before creating the beta2 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1040700 13f79535-47bb-0310-9956-ffa450edef68

98 files changed, 0 insertions, 6968 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/pom.xml b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/pom.xml
deleted file mode 100644
index 43e0691e6c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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.    
--->
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-itest</artifactId>
-		<version>2.0-Beta2-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>itest-corba-binding</artifactId>
-	<name>Apache Tuscany SCA CORBA Binding Integration Tests</name>
-	<dependencies>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-node-impl</artifactId>
-			<version>2.0-Beta2-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-Beta2-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-corba-runtime</artifactId>
-			<version>2.0-Beta2-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>2.0-Beta2-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-corba-jse-tns</artifactId>
-			<version>2.0-Beta2-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-sca-runtime</artifactId>
-			<version>2.0-Beta2-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>2.0-Beta2-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.5</version>
-			<scope>compile</scope>
-		</dependency>
-
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.0</version>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>target/sdo-source</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.1.1</version>
-				<executions>
-					<execution>
-						<id>generate-scenariofour-sdo</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>
-								${basedir}/src/test/resources/scenariofour.xsd
-							</schemaFile>
-							<javaPackage>
-								org.apache.tuscany.sca.test.corba.scenariofour
-							</javaPackage>
-							<prefix>ScenarioFour</prefix>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noUnsettable>true</noUnsettable>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
deleted file mode 100644
index 6c362b0062..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba;
-
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.host.corba.jse.tns.TnsDefaultCorbaHost;
-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;
-
-/**
- * @version $Rev$ $Date$
- * Tests usage of TNS JSE Corba host
- */
-public class ScenarioFiveTestCase {
-
-    @Test
-    public void test_providedNameServer() {
-        TestCorbaHost.setCorbaHost(new TnsDefaultCorbaHost());
-        try {
-            // just make sure we can obtain and use the reference with success
-            Node node = NodeFactory.getInstance().createNode("ScenarioFive.composite", getClass().getClassLoader()).start();
-            ScenarioFive scenarioFive =
-                node.getService(ScenarioFiveComponent.class, "ScenarioFive").getScenarioFive();
-            scenarioFive.doNothing();
-            node.stop();
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
deleted file mode 100644
index da4644057e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-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.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;
-import org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent;
-import org.apache.tuscany.sca.test.corba.types.ScenarioFourException;
-import org.apache.tuscany.sca.test.corba.types.ScenarioFourStruct;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- * Tests SCA default binding over CORBA binding
- */
-public class ScenarioFourTestCase {
-
-    // note that those values are also used in resources/*.composite file
-    private static Node node;
-    private static ScenarioFourComponent scenarioFourComponent;
-    private static ScenarioFour scenarioFour;
-    private static TransientNameServer server;
-    private static final int ORB_INITIAL_PORT = 5080;
-    
-    /**
-     * Initial configuration
-     */
-    @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);
-            Thread t = server.start();
-            if (t == null) {
-                Assert.fail("The naming server cannot be started");
-            }
-            // 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();
-        }
-    }
-
-    /**
-     * Test cleanup
-     */
-    @AfterClass
-    public static void tearDown() {
-        server.stop();
-        node.stop();
-        System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
-    }
-
-    /**
-     * General tests for passing JAXB objects
-     */
-    @Test
-    public void test_generalJAXB() {
-        try {
-            ScenarioFourStruct input = new ScenarioFourStruct();
-            input.field1 = "Test";
-            input.field2 = 1;
-            input.field3 = new double[1];
-            ScenarioFourStruct output = scenarioFour.setStruct(input);
-            assertTrue(input.equals(output));
-        } catch (Exception e) {
-            e.printStackTrace();
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    /**
-     * Test for JAXB exceptions
-     */
-    @Test
-    public void test_exceptionsJAXB() {
-        try {
-            scenarioFour.exceptionTest();
-            fail();
-        } catch (ScenarioFourException e) {
-            assertTrue(ScenarioFourException.DEFAULT_CONTENT.equals(e.getContent()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * General test for passing SDO objects
-     */
-    @Test
-    public void test_generalSDO() {
-        try {
-            ScenarioFourSdo scenarioFourSdo = ScenarioFourFactory.INSTANCE.createScenarioFourSdo();
-            scenarioFourSdo.setMessage("Test1");
-            scenarioFourSdo.setSymbol("Test2");
-            ScenarioFourSdo result = scenarioFour.passScenarioFourStruct(scenarioFourSdo);
-            assertTrue(scenarioFourSdo.getMessage().equals(result.getMessage()) && scenarioFourSdo.getSymbol()
-                .equals(result.getSymbol()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests reusing local name server with multiple bindings
-     */
-    @Test
-    public void test_nameServerReuse() {
-        try {
-            ScenarioFour scenarioFour =
-                node.getService(ScenarioFourComponent.class, "ScenarioFourReuse").getScenarioFour();
-            ScenarioFourStruct struct = new ScenarioFourStruct();
-            scenarioFour.setStruct(struct);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
deleted file mode 100644
index 4b58fab1f0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-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.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;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioOne;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations;
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-import org.apache.tuscany.sca.test.corba.types.ScenarioOneServant;
-import org.apache.tuscany.sca.test.corba.types.TColor;
-import org.apache.tuscany.sca.test.corba.types.TInnerStruct;
-import org.apache.tuscany.sca.test.corba.types.TRichStruct;
-import org.apache.tuscany.sca.test.corba.types.TScenarioOne;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextHelper;
-
-/**
- * @version $Rev$ $Date$
- * This test class contains three main tests:<br>
- * 1. Tuscany is being used as a consumer of some non-Tuscany CORBA service<br>
- * 2. Tuscany is being used as a service provider, which will be consumed by
- * non-Tuscany CORBA client<br>
- * 3. Tuscany is being used as a service provider, which will be consumed by
- * Tuscany client<br>
- * But that's not all, there are some other variations. Tuscany CORBA binding
- * supports using Java interface generated by IDLJ, also it supports interfaces
- * provided by user - I combined those cases in each test.<br>
- */
-public class ScenarioOneTestCase {
-
-    // note that those values are also used in resources/*.composite file
-    private static int ORB_INITIAL_PORT = 5060;
-    private static String SERVICE_NAME = "ScenarioOne";
-
-    private static Node node;
-
-    private static TransientNameServer server;
-    private static ORB orb;
-
-    /**
-     * Sets up name service, creates and registers traditional CORBA service,
-     * obtains SCADomain
-     */
-    @BeforeClass
-    public static void setUp() {
-        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
-        try {
-            try {
-                server =
-                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
-                Thread t = server.start();
-                if (t == null) {
-                    Assert.fail("The naming server cannot be started");
-                }
-                orb = server.getORB();
-            } catch (Throwable e) {
-                e.printStackTrace();
-                Assert.fail(e.getMessage());
-            }
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(SERVICE_NAME, "");
-            NameComponent path[] = {nc};
-            ScenarioOne scenarioOne = new ScenarioOneServant();
-            ncRef.rebind(path, scenarioOne);
-            // obtain node
-            node = NodeFactory.getInstance().createNode("ScenarioOne.composite", TestCorbaHost.class.getClassLoader()).start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Kills previously spawned name service.
-     */
-    @AfterClass
-    public static void tearDown() {
-        server.stop();
-        node.stop();
-    }
-
-    /**
-     * Creates nicely filled structure for user provided interface.
-     * 
-     * @return
-     */
-    private static TRichStruct getTRichStruct() {
-        int[][] intArr = new int[][] { {1, 2}, {3, 4}};
-        TInnerStruct innerStruct = new TInnerStruct(intArr, "Test", TColor.green);
-        String[] strSeq = {"i", "Test"};
-        return new TRichStruct(innerStruct, strSeq, 1);
-
-    }
-
-    /**
-     * Creates nicely filled structure for generated interface.
-     * 
-     * @return
-     */
-    private static RichStruct getRichStruct() {
-        int[][] intArr = new int[][] { {1, 2}, {3, 4}};
-        InnerStruct innerStruct2 = new InnerStruct(intArr, "Test", Color.green);
-        String[] strSeq = {"i", "Test"};
-        return new RichStruct(innerStruct2, strSeq, 1);
-    }
-
-    /**
-     * Compares String arrays
-     * 
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    private boolean areSrringArraysEqual(String[] arg1, String[] arg2) {
-        try {
-            for (int i = 0; i < arg1.length; i++) {
-                if (!arg1[i].equals(arg2[i])) {
-                    return false;
-                }
-            }
-        } catch (Exception e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Compares two dimensional int arrays
-     * 
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    private boolean areTwoDimIntArraysEqual(int[][] arg1, int[][] arg2) {
-        try {
-            for (int i = 0; i < arg1.length; i++) {
-                for (int j = 0; j < arg1[i].length; j++) {
-                    if (arg1[i][j] != arg2[i][j]) {
-                        return false;
-                    }
-                }
-            }
-        } catch (Exception e) {
-            return false;
-        }
-        return true;
-    }
-
-    private boolean equalTo(TInnerStruct arg1, TInnerStruct arg2) {
-        return (arg1.color.value() == arg2.color.value() && arg1.stringField.equals(arg2.stringField) && areTwoDimIntArraysEqual(arg1.twoDimLongSequence,
-                                                                                                                                 arg2.twoDimLongSequence));
-    }
-
-    private boolean equalTo(InnerStruct arg1, InnerStruct arg2) {
-        return (arg1.color.value() == arg2.color.value() && arg1.stringField.equals(arg2.stringField) && areTwoDimIntArraysEqual(arg1.twoDimLongSequence,
-                                                                                                                                 arg2.twoDimLongSequence));
-    }
-
-    private boolean equalTo(TRichStruct arg1, TRichStruct arg2) {
-        return (equalTo(arg1.innerStruct, arg2.innerStruct) && arg2.longField == arg1.longField && areSrringArraysEqual(arg1.stringSequence,
-                                                                                                                        arg2.stringSequence));
-    }
-
-    private boolean equalTo(RichStruct arg1, RichStruct arg2) {
-        return (equalTo(arg1.innerStruct, arg2.innerStruct) && arg2.longField == arg1.longField && areSrringArraysEqual(arg1.stringSequence,
-                                                                                                                        arg2.stringSequence));
-    }
-
-    /**
-     * Helper method used several times for various components. Executes several
-     * tests using Tuscany reference binding. This helper uses generated Java
-     * interface.
-     * 
-     * @param componentName
-     */
-    private void testClientUsingGeneratedInterface(String componentName) {
-        ScenarioOneOperations component = node.getService(ScenarioOneOperations.class, componentName);
-        RichStruct richStruct = getRichStruct();
-
-        try {
-            RichStruct result = component.setRichStruct(richStruct);
-            assertTrue(equalTo(result, richStruct));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-
-        try {
-            richStruct.longField = 0;
-            component.setRichStruct(richStruct);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof UnexpectedException);
-        }
-
-        try {
-            richStruct.longField = 1;
-            richStruct.innerStruct.color = Color.red;
-            component.setRichStruct(richStruct);
-        } catch (Exception e) {
-            assertTrue(e instanceof WrongColor);
-        }
-    }
-
-    /**
-     * Helper method used several times for various components. Executes several
-     * tests using Tuscany reference binding. This helper uses user provided
-     * Java interface.
-     * 
-     * @param componentName
-     */
-    private void testClientUsingUserProvidedInterface(String componentName) {
-        TScenarioOne component = node.getService(TScenarioOne.class, componentName);
-        TRichStruct tRichStruct = getTRichStruct();
-
-        try {
-            TRichStruct result = component.setRichStruct(tRichStruct);
-            assertTrue(equalTo(result, tRichStruct));
-        } catch (Exception e) {
-            fail();
-        }
-
-        try {
-            tRichStruct.longField = 0;
-            component.setRichStruct(tRichStruct);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof UnexpectedException);
-        }
-
-        try {
-            tRichStruct.longField = 1;
-            tRichStruct.innerStruct.color = TColor.red;
-            component.setRichStruct(tRichStruct);
-        } catch (Exception e) {
-            assertTrue(e instanceof WrongColor);
-        }
-    }
-
-    public void testServiceUsingGeneratedClient(String serviceName) {
-        try {
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(serviceName, "");
-            NameComponent path[] = {nc};
-            ScenarioOne so = ScenarioOneHelper.narrow(ncRef.resolve(path));
-
-            RichStruct richStruct = getRichStruct();
-            RichStruct result = so.setRichStruct(richStruct);
-            assertTrue(equalTo(result, richStruct));
-
-            try {
-                richStruct.innerStruct.color = Color.red;
-                result = so.setRichStruct(richStruct);
-                fail();
-            } catch (Exception e) {
-                assertTrue(e instanceof WrongColor);
-            }
-
-            try {
-                richStruct.innerStruct.color = Color.green;
-                richStruct.longField = 0;
-                result = so.setRichStruct(richStruct);
-                fail();
-            } catch (Exception e) {
-                assertTrue(e instanceof UnexpectedException);
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Service is exposed in traditional way (using CORBA API from JDK).
-     * Reference is obtained from Tuscany.
-     */
-    @Test
-    public void test_TraditionalService_TuscanyClient() {
-
-        // Client is using user provided interface
-        testClientUsingUserProvidedInterface("ScenarioOne");
-
-        // Client is using generated interface
-        testClientUsingGeneratedInterface("ScenarioOneGenerated");
-    }
-
-    /**
-     * Service is exposed by Tuscany. Reference is obtained in traditional way.
-     * (using CORBA API from JDK)
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void test_TuscanyService_TraditionalClient() throws Exception {
-
-        // tests service which uses user provided interface
-        testServiceUsingGeneratedClient("ScenarioOneTuscany");
-
-        // tests service which uses generated interface
-        testServiceUsingGeneratedClient("ScenarioOneTuscanyGenerated");
-    }
-
-    /**
-     * Service is exposed by Tuscany. Reference is obtained from Tuscany. There
-     * are 4 combinations (basing on if we are using generated or user provided
-     * interfaces, both on service and reference side).
-     */
-    @Test
-    public void test_TuscanyService_TuscanyClient() {
-
-        // Client is using user provided interface, service is using user
-        // provided interface.
-        testClientUsingUserProvidedInterface("TU2TS1");
-
-        // Client is using user provided interface, service is using generated
-        // interface.
-        testClientUsingUserProvidedInterface("TU2TS2");
-
-        // Client is using generated interface, service is using user provided
-        // interface.
-        testClientUsingGeneratedInterface("TG2TS1");
-
-        // Client is using generated interface, service is using generated
-        // interface.
-        testClientUsingGeneratedInterface("TG2TS2");
-    }
-    
-    /**
-     * Tests using reference obtained by corbaname URI
-     */
-    @Test
-    public void test_serviceAndReferenceByURI() {
-        testClientUsingUserProvidedInterface("UriBinding");
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
deleted file mode 100644
index 3d3efb9c29..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-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.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;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioSix;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper;
-import org.apache.tuscany.sca.test.corba.types.ScenarioSixServant;
-import org.apache.tuscany.sca.test.corba.types.TAnnotatedStruct;
-import org.apache.tuscany.sca.test.corba.types.TInnerUnion;
-import org.apache.tuscany.sca.test.corba.types.TRichUnion;
-import org.apache.tuscany.sca.test.corba.types.TScenarioSix;
-import org.apache.tuscany.sca.test.corba.types.TScenarioSixComponent;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextHelper;
-
-/**
- * Tests using enhanced Java interfaces (annotations)
- * 
- * @version $Rev$ $Date$
- */
-public class ScenarioSixTestCase {
-
-    // note that those values are also used in resources/*.composite file
-    private static int ORB_INITIAL_PORT = 5050;
-    private static String SERVICE_NAME = "ScenarioSix";
-    private static String TUSCANY_SERVICE_NAME = "ScenarioSixTuscany";
-
-    private static Node node;
-
-    private static TransientNameServer server;
-    private static ORB orb;
-
-    /**
-     * Sets up name service, creates and registers traditional CORBA service,
-     * obtains SCADomain
-     */
-    @BeforeClass
-    public static void setUp() {
-        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
-        try {
-            try {
-                server =
-                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
-                Thread t = server.start();
-                if (t == null) {
-                    Assert.fail("The naming server cannot be started");
-                }
-                orb = server.getORB();
-            } catch (Throwable e) {
-                e.printStackTrace();
-                Assert.fail(e.getMessage());
-            }
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(SERVICE_NAME, "");
-            NameComponent path[] = {nc};
-            ScenarioSix scenarioSix = new ScenarioSixServant();
-            ncRef.rebind(path, scenarioSix);
-            // obtain node
-            node = NodeFactory.getInstance().createNode("ScenarioSix.composite", TestCorbaHost.class.getClassLoader()).start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Kills previously spawned name service.
-     */
-    @AfterClass
-    public static void tearDown() {
-        server.stop();
-        node.stop();
-    }
-
-    private boolean areArraysEqual(String[][] arr1, String[][] arr2) {
-        for (int i = 0; i < arr1.length; i++) {
-            for (int j = 0; j < arr1[i].length; j++) {
-                if (!arr1[i][j].equals(arr2[i][j])) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private String[][] getStringArray() {
-        String[][] result = { {"Hello", "World"}, {"Hi", "Again"}};
-        return result;
-    }
-
-    /**
-     * Tests passing arrays. Tuscany acts as a client, servant object is served
-     * in a traditional way
-     */
-    @Test
-    public void test_arraysPassing_tuscanyAsClient() {
-        try {
-            TScenarioSix ref = node.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
-            String[][] arrayArg = getStringArray();
-            String[][] arrayRes = ref.passStringArray(arrayArg);
-            assertTrue(areArraysEqual(arrayArg, arrayRes));
-            TAnnotatedStruct structArg = new TAnnotatedStruct();
-            structArg.stringArray = getStringArray();
-            TAnnotatedStruct structRes = ref.passAnnotatedStruct(structArg);
-            assertTrue(areArraysEqual(structArg.stringArray, structRes.stringArray));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests passing arrays. Servant object is served by Tuscany and it is
-     * accessed by traditional Corba client
-     */
-    @Test
-    public void test_arraysPassing_tuscanyAsService() {
-        try {
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, "");
-            NameComponent path[] = {nc};
-            ScenarioSix ref = ScenarioSixHelper.narrow(ncRef.resolve(path));
-            String[][] stringArg = getStringArray();
-            String[][] stringRes = ref.passStringArray(stringArg);
-            assertTrue(areArraysEqual(stringArg, stringRes));
-            AnnotatedStruct structArg = new AnnotatedStruct();
-            structArg.stringArray = getStringArray();
-            AnnotatedStruct structRes = ref.passAnnotatedStruct(structArg);
-            assertTrue(areArraysEqual(structArg.stringArray, structRes.stringArray));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests passing unions. Tuscany acts as a client, servant object is served
-     * in a traditional way
-     */
-    @Test
-    public void test_unionsPassing_tuscanyAsClient() {
-        try {
-            TScenarioSix ref = node.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
-            TRichUnion arg = new TRichUnion();
-            TInnerUnion inner = new TInnerUnion();
-            inner.setY(10f);
-            arg.setIu(inner);
-            TRichUnion result = ref.passRichUnion(arg);
-            assertEquals(arg.getIu().getY(), result.getIu().getY(), 0.0f);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-        try {
-            TScenarioSix ref = node.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
-            TRichUnion arg = new TRichUnion();
-            arg.setY(15f);
-            TRichUnion result = ref.passRichUnion(arg);
-            assertEquals(arg.getY(), result.getY(), 0.0f);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-    
-    /**
-     * Tests passing unions. Servant object is served by Tuscany and it is
-     * accessed by traditional Corba client
-     */
-    @Test
-    public void test_unionsPassing_tuscanyAsService() {
-        try {
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, "");
-            NameComponent path[] = {nc};
-            ScenarioSix ref = ScenarioSixHelper.narrow(ncRef.resolve(path));
-            RichUnion arg = new RichUnion();
-            InnerUnion inner = new InnerUnion();
-            inner.y(20f);
-            arg.iu(inner);
-            RichUnion result = ref.passRichUnion(arg);
-            assertEquals(arg.iu().y(), result.iu().y(), 0.0f);
-            arg = new RichUnion();
-            arg.y(15f);
-            result = ref.passRichUnion(arg);
-            assertEquals(arg.y(), result.y(), 0.0f);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
deleted file mode 100644
index 0190df2d1c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-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.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;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- * Tests various mapping scenarios.
- */
-public class ScenarioThreeTestCase {
-
-    // note that those values are also used in resources/*.composite file
-    private static int ORB_INITIAL_PORT = 5060;
-    private static Node node;
-    private static TransientNameServer server;
-
-    /**
-     * Sets up name service, creates and registers traditional CORBA service,
-     * obtains SCADomain
-     */
-    @BeforeClass
-    public static void setUp() {
-        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
-        try {
-            try {
-                server =
-                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
-                Thread t = server.start();
-                if (t == null) {
-                    Assert.fail("The naming server cannot be started");
-                }
-            } catch (Throwable e) {
-                e.printStackTrace();
-                Assert.fail(e.getMessage());
-            }
-            // obtain node
-            node = NodeFactory.getInstance().createNode("ScenarioThree.composite", TestCorbaHost.class.getClassLoader()).start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Kills previously spawned name service.
-     */
-    @AfterClass
-    public static void tearDown() {
-        server.stop();
-        node.stop();
-    }
-
-    /**
-     * Tests mapping for getters and setters
-     */
-    @Test
-    public void test_getterSetter() {
-        try {
-            TScenarioThree ref =
-                node.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
-            ref.getIntField();
-            ref.setIntField(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests mapping the same operation names but with different cases
-     */
-    @Test
-    public void test_nameCase() {
-        try {
-            TScenarioThree ref =
-                node.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
-            assertEquals(0, ref.caseDifferent());
-            assertEquals(1, ref.CaseDifferent());
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests mappings for operations with overloaded names
-     */
-    @Test
-    public void test_overloadedNames() {
-        try {
-            TScenarioThree ref =
-                node.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
-            ref.overloadedName();
-            ref.overloadedName("");
-            ref.overloadedName("", 0);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
deleted file mode 100644
index af2c9ea711..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-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.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;
-import org.apache.tuscany.sca.test.corba.types.TScenarioTwo;
-import org.apache.tuscany.sca.test.corba.types.TScenarioTwoComponent;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextHelper;
-
-/**
- * @version $Rev$ $Date$
- * Tests attribute get/set mapping using cooperation between traditional CORBA
- * and Tuscany CORBA
- */
-public class ScenarioTwoTestCase {
-
-    // note that those values are also used in resources/*.composite file
-    private static int ORB_INITIAL_PORT = 5060;
-
-    private static Node node;
-
-    private static TransientNameServer server;
-    private static ORB orb;
-    private static String TUSCANY_SERVICE_NAME = "ScenarioTwo";
-    private static String GENERATED_SERVICE_NAME = "ScenarioTwoGenerated";
-
-    /**
-     * Sets up name service, creates and registers traditional CORBA service,
-     * obtains SCADomain
-     */
-    @BeforeClass
-    public static void setUp() {
-        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
-        try {
-            try {
-                server =
-                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
-                Thread t = server.start();
-                if (t == null) {
-                    Assert.fail("The naming server cannot be started");
-                }
-                orb = server.getORB();
-                org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-                NamingContext ncRef = NamingContextHelper.narrow(objRef);
-                NameComponent nc = new NameComponent(GENERATED_SERVICE_NAME, "");
-                NameComponent path[] = {nc};
-                ScenarioTwo scenarioTwo = new ScenarioTwoServant();
-                ncRef.rebind(path, scenarioTwo);
-            } catch (Throwable e) {
-                e.printStackTrace();
-                Assert.fail(e.getMessage());
-            }
-            // obtain node
-            node = NodeFactory.getInstance().createNode("ScenarioTwo.composite", TestCorbaHost.class.getClassLoader()).start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Kills previously spawned name service.
-     */
-    @AfterClass
-    public static void tearDown() {
-        server.stop();
-        node.stop();
-    }
-
-    /**
-     * Tests using objects attribute (which is server in traditional way) by
-     * Tuscany CORBA binding
-     */
-    @Test
-    public void test_tuscanyGetSetAttribute() {
-        try {
-            TScenarioTwo ref = node.getService(TScenarioTwoComponent.class, "ScenarioTwo").getScenarioTwo();
-            String strVal = "Whatever";
-            ref.setStringField(strVal);
-            assertEquals(strVal, ref.getStringField());
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests using objects attribute (which is served by Tuscany) in traditional
-     * way (by idlj generated code)
-     */
-    @Test
-    public void test_getneratedGetSetAttribute() {
-        try {
-            orb = server.getORB();
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, "");
-            NameComponent path[] = {nc};
-            ScenarioTwo st = ScenarioTwoHelper.narrow(ncRef.resolve(path));
-            st.stringField("");
-            assertEquals("", st.stringField());
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
deleted file mode 100644
index bd1ce8cb49..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba;
-
-import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.host.corba.CorbaHostException;
-import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
-import org.omg.CORBA.Object;
-
-/**
- * @version $Rev$ $Date$
- * Mock Corba host which proxies to configured Corba host
- */
-public class TestCorbaHost implements CorbaHost {
-
-    private static CorbaHost corbaHost = new DefaultCorbaHost();
-
-    /**
-     * Configures environment to use given Corba host
-     * 
-     * @param corbaHost Corba host to use
-     */
-    public static void setCorbaHost(CorbaHost corbaHost) {
-       TestCorbaHost.corbaHost = corbaHost;
-    }
-    
-    public Object lookup(String arg0) throws CorbaHostException {
-        return TestCorbaHost.corbaHost.lookup(arg0);
-    }
-
-    public void registerServant(String arg0, Object arg1) throws CorbaHostException {
-        TestCorbaHost.corbaHost.registerServant(arg0, arg1);
-    }
-
-    public void unregisterServant(String arg0) throws CorbaHostException {
-        TestCorbaHost.corbaHost.unregisterServant(arg0);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
deleted file mode 100644
index 3639ba812d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
-
-/**
- * @version $Rev$ $Date$
- * Registers TestCorbaHost as a Corba host extension. 
- */
-public class TestCorbaHostModuleActivator implements ModuleActivator {
-    private ExtensionPointRegistry registry;
-
-    /**
-     * 
-     */
-    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() {
-
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
deleted file mode 100644
index abcec43d0e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-public final class AnnotatedStruct implements org.omg.CORBA.portable.IDLEntity
-{
-  public String stringArray[][] = null;
-
-  public AnnotatedStruct ()
-  {
-  } // ctor
-
-  public AnnotatedStruct (String[][] _stringArray)
-  {
-    stringArray = _stringArray;
-  } // ctor
-
-} // class AnnotatedStruct
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
deleted file mode 100644
index 171a7919a2..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-abstract public class AnnotatedStructHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct/AnnotatedStruct:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [1];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.id (), "StringArray", _tcOf_members0);
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "stringArray",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.id (), "AnnotatedStruct", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value = new org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct ();
-    value.stringArray = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (istream);
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value)
-  {
-    org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (ostream, value.stringArray);
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
deleted file mode 100644
index 5f2dc56033..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-public final class AnnotatedStructHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value = null;
-
-  public AnnotatedStructHolder ()
-  {
-  }
-
-  public AnnotatedStructHolder (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
deleted file mode 100644
index 24a628d406..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/Color.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public class Color implements org.omg.CORBA.portable.IDLEntity
-{
-  private        int __value;
-  private static int __size = 3;
-  private static org.apache.tuscany.sca.test.corba.generated.Color[] __array = new org.apache.tuscany.sca.test.corba.generated.Color [__size];
-
-  public static final int _red = 0;
-  public static final org.apache.tuscany.sca.test.corba.generated.Color red = new org.apache.tuscany.sca.test.corba.generated.Color(_red);
-  public static final int _yellow = 1;
-  public static final org.apache.tuscany.sca.test.corba.generated.Color yellow = new org.apache.tuscany.sca.test.corba.generated.Color(_yellow);
-  public static final int _green = 2;
-  public static final org.apache.tuscany.sca.test.corba.generated.Color green = new org.apache.tuscany.sca.test.corba.generated.Color(_green);
-
-  public int value ()
-  {
-    return __value;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.Color from_int (int value)
-  {
-    if (value >= 0 && value < __size)
-      return __array[value];
-    else
-      throw new org.omg.CORBA.BAD_PARAM ();
-  }
-
-  protected Color (int value)
-  {
-    __value = value;
-    __array[__value] = this;
-  }
-} // class Color
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
deleted file mode 100644
index da37f28e39..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ColorHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class ColorHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/Color:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.Color that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.Color extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_enum_tc (org.apache.tuscany.sca.test.corba.generated.ColorHelper.id (), "Color", new String[] { "red", "yellow", "green"} );
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.Color read (org.omg.CORBA.portable.InputStream istream)
-  {
-    return org.apache.tuscany.sca.test.corba.generated.Color.from_int (istream.read_long ());
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.Color value)
-  {
-    ostream.write_long (value.value ());
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
deleted file mode 100644
index 7b2466f791..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ColorHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class ColorHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.Color value = null;
-
-  public ColorHolder ()
-  {
-  }
-
-  public ColorHolder (org.apache.tuscany.sca.test.corba.generated.Color initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
deleted file mode 100644
index 27052a1549..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class InnerStruct implements org.omg.CORBA.portable.IDLEntity
-{
-  public int twoDimLongSequence[][] = null;
-  public String stringField = null;
-  public org.apache.tuscany.sca.test.corba.generated.Color color = null;
-
-  public InnerStruct ()
-  {
-  } // ctor
-
-  public InnerStruct (int[][] _twoDimLongSequence, String _stringField, org.apache.tuscany.sca.test.corba.generated.Color _color)
-  {
-    twoDimLongSequence = _twoDimLongSequence;
-    stringField = _stringField;
-    color = _color;
-  } // ctor
-
-} // class InnerStruct
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
deleted file mode 100644
index 57daa51f42..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class InnerStructHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/InnerStruct/InnerStruct:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.InnerStruct that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.InnerStruct extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", _tcOf_members0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.id (), "TwoDimLongSequence", _tcOf_members0);
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "twoDimLongSequence",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-          _members0[1] = new org.omg.CORBA.StructMember (
-            "stringField",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
-          _members0[2] = new org.omg.CORBA.StructMember (
-            "color",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.id (), "InnerStruct", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.InnerStruct read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.InnerStruct value = new org.apache.tuscany.sca.test.corba.generated.InnerStruct ();
-    value.twoDimLongSequence = org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.read (istream);
-    value.stringField = istream.read_string ();
-    value.color = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream);
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.InnerStruct value)
-  {
-    org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.write (ostream, value.twoDimLongSequence);
-    ostream.write_string (value.stringField);
-    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.color);
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
deleted file mode 100644
index 88fef0b4fb..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class InnerStructHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.InnerStruct value = null;
-
-  public InnerStructHolder ()
-  {
-  }
-
-  public InnerStructHolder (org.apache.tuscany.sca.test.corba.generated.InnerStruct initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
deleted file mode 100644
index c5d2aab203..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerUnion.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public final class InnerUnion implements org.omg.CORBA.portable.IDLEntity
-{
-  private int ___x;
-  private float ___y;
-  private int __discriminator;
-  private boolean __uninitialized = true;
-
-  public InnerUnion ()
-  {
-  }
-
-  public int discriminator ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    return __discriminator;
-  }
-
-  public int x ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyx (__discriminator);
-    return ___x;
-  }
-
-  public void x (int value)
-  {
-    __discriminator = 1;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  public void x (int discriminator, int value)
-  {
-    verifyx (discriminator);
-    __discriminator = discriminator;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  private void verifyx (int discriminator)
-  {
-    if (discriminator != 1)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public float y ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyy (__discriminator);
-    return ___y;
-  }
-
-  public void y (float value)
-  {
-    __discriminator = 2;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  public void y (int discriminator, float value)
-  {
-    verifyy (discriminator);
-    __discriminator = discriminator;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  private void verifyy (int discriminator)
-  {
-    if (discriminator != 2)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public void _default ()
-  {
-    __discriminator = -2147483648;
-    __uninitialized = false;
-  }
-
-  public void _default (int discriminator)
-  {
-    verifyDefault( discriminator ) ;
-    __discriminator = discriminator ;
-    __uninitialized = false;
-  }
-
-  private void verifyDefault( int value )
-  {
-    switch (value) {
-      case 1:
-      case 2:
-        throw new org.omg.CORBA.BAD_OPERATION() ;
-
-      default:
-        return;
-    }
-  }
-
-} // class InnerUnion
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
deleted file mode 100644
index db57fc5cba..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-abstract public class InnerUnionHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/InnerUnion/InnerUnion:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.InnerUnion that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.InnerUnion extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      org.omg.CORBA.TypeCode _disTypeCode0;
-      _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [2];
-      org.omg.CORBA.TypeCode _tcOf_members0;
-      org.omg.CORBA.Any _anyOf_members0;
-
-      // Branch for x (case label 1)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)1);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      _members0[0] = new org.omg.CORBA.UnionMember (
-        "x",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for y (case label 2)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)2);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);
-      _members0[1] = new org.omg.CORBA.UnionMember (
-        "y",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-      __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.id (), "InnerUnion", _disTypeCode0, _members0);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.InnerUnion read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.InnerUnion value = new org.apache.tuscany.sca.test.corba.generated.InnerUnion ();
-    int _dis0 = (int)0;
-    _dis0 = istream.read_long ();
-    switch (_dis0)
-    {
-      case 1:
-        int _x = (int)0;
-        _x = istream.read_long ();
-        value.x (_x);
-        break;
-      case 2:
-        float _y = (float)0;
-        _y = istream.read_float ();
-        value.y (_y);
-        break;
-      default:
-        value._default( _dis0 ) ;
-        break;
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.InnerUnion value)
-  {
-    ostream.write_long (value.discriminator ());
-    switch (value.discriminator ())
-    {
-      case 1:
-        ostream.write_long (value.x ());
-        break;
-      case 2:
-        ostream.write_float (value.y ());
-        break;
-    }
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
deleted file mode 100644
index ec25e703c5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public final class InnerUnionHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.InnerUnion value = null;
-
-  public InnerUnionHolder ()
-  {
-  }
-
-  public InnerUnionHolder (org.apache.tuscany.sca.test.corba.generated.InnerUnion initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
deleted file mode 100644
index 940b391499..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class LongSequenceHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/LongSequence:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, int[] that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static int[] extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", __typeCode);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static int[] read (org.omg.CORBA.portable.InputStream istream)
-  {
-    int value[] = null;
-    int _len0 = istream.read_long ();
-    value = new int[_len0];
-    istream.read_long_array (value, 0, _len0);
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, int[] value)
-  {
-    ostream.write_long (value.length);
-    ostream.write_long_array (value, 0, value.length);
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
deleted file mode 100644
index 63a11dc56a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class LongSequenceHolder implements org.omg.CORBA.portable.Streamable
-{
-  public int value[] = null;
-
-  public LongSequenceHolder ()
-  {
-  }
-
-  public LongSequenceHolder (int[] initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
deleted file mode 100644
index 8c0bfc9e39..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class RichStruct implements org.omg.CORBA.portable.IDLEntity
-{
-  public org.apache.tuscany.sca.test.corba.generated.InnerStruct innerStruct = null;
-  public String stringSequence[] = null;
-  public int longField = (int)0;
-
-  public RichStruct ()
-  {
-  } // ctor
-
-  public RichStruct (org.apache.tuscany.sca.test.corba.generated.InnerStruct _innerStruct, String[] _stringSequence, int _longField)
-  {
-    innerStruct = _innerStruct;
-    stringSequence = _stringSequence;
-    longField = _longField;
-  } // ctor
-
-} // class RichStruct
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
deleted file mode 100644
index 72ff55a711..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class RichStructHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/RichStruct/RichStruct:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.RichStruct that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.RichStruct extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.type ();
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "innerStruct",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.id (), "StringSequence", _tcOf_members0);
-          _members0[1] = new org.omg.CORBA.StructMember (
-            "stringSequence",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-          _members0[2] = new org.omg.CORBA.StructMember (
-            "longField",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.RichStructHelper.id (), "RichStruct", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.RichStruct read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.RichStruct value = new org.apache.tuscany.sca.test.corba.generated.RichStruct ();
-    value.innerStruct = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.read (istream);
-    value.stringSequence = org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.read (istream);
-    value.longField = istream.read_long ();
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.RichStruct value)
-  {
-    org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.write (ostream, value.innerStruct);
-    org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.write (ostream, value.stringSequence);
-    ostream.write_long (value.longField);
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
deleted file mode 100644
index 8a063b8b9d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class RichStructHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.RichStruct value = null;
-
-  public RichStructHolder ()
-  {
-  }
-
-  public RichStructHolder (org.apache.tuscany.sca.test.corba.generated.RichStruct initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.RichStructHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
deleted file mode 100644
index bc42d57ac3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichUnion.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public final class RichUnion implements org.omg.CORBA.portable.IDLEntity
-{
-  private int ___x;
-  private float ___y;
-  private String ___z;
-  private org.apache.tuscany.sca.test.corba.generated.InnerUnion ___iu;
-  private boolean ___a;
-  private int __discriminator;
-  private boolean __uninitialized = true;
-
-  public RichUnion ()
-  {
-  }
-
-  public int discriminator ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    return __discriminator;
-  }
-
-  public int x ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyx (__discriminator);
-    return ___x;
-  }
-
-  public void x (int value)
-  {
-    __discriminator = 1;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  public void x (int discriminator, int value)
-  {
-    verifyx (discriminator);
-    __discriminator = discriminator;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  private void verifyx (int discriminator)
-  {
-    if (discriminator != 1)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public float y ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyy (__discriminator);
-    return ___y;
-  }
-
-  public void y (float value)
-  {
-    __discriminator = 2;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  public void y (int discriminator, float value)
-  {
-    verifyy (discriminator);
-    __discriminator = discriminator;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  private void verifyy (int discriminator)
-  {
-    if (discriminator != 2)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public String z ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyz (__discriminator);
-    return ___z;
-  }
-
-  public void z (String value)
-  {
-    __discriminator = 3;
-    ___z = value;
-    __uninitialized = false;
-  }
-
-  public void z (int discriminator, String value)
-  {
-    verifyz (discriminator);
-    __discriminator = discriminator;
-    ___z = value;
-    __uninitialized = false;
-  }
-
-  private void verifyz (int discriminator)
-  {
-    if (discriminator != 3)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public org.apache.tuscany.sca.test.corba.generated.InnerUnion iu ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyiu (__discriminator);
-    return ___iu;
-  }
-
-  public void iu (org.apache.tuscany.sca.test.corba.generated.InnerUnion value)
-  {
-    __discriminator = 4;
-    ___iu = value;
-    __uninitialized = false;
-  }
-
-  public void iu (int discriminator, org.apache.tuscany.sca.test.corba.generated.InnerUnion value)
-  {
-    verifyiu (discriminator);
-    __discriminator = discriminator;
-    ___iu = value;
-    __uninitialized = false;
-  }
-
-  private void verifyiu (int discriminator)
-  {
-    if (discriminator != 4)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public boolean a ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifya (__discriminator);
-    return ___a;
-  }
-
-  public void a (boolean value)
-  {
-    __discriminator = -2147483648;
-    ___a = value;
-    __uninitialized = false;
-  }
-
-  public void a (int discriminator, boolean value)
-  {
-    verifya (discriminator);
-    __discriminator = discriminator;
-    ___a = value;
-    __uninitialized = false;
-  }
-
-  private void verifya (int discriminator)
-  {
-    if (discriminator == 1 || discriminator == 2 || discriminator == 3 || discriminator == 4)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-} // class RichUnion
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
deleted file mode 100644
index 1cb1ed295e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-abstract public class RichUnionHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/RichUnion/RichUnion:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.RichUnion that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.RichUnion extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      org.omg.CORBA.TypeCode _disTypeCode0;
-      _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [5];
-      org.omg.CORBA.TypeCode _tcOf_members0;
-      org.omg.CORBA.Any _anyOf_members0;
-
-      // Branch for x (case label 1)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)1);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      _members0[0] = new org.omg.CORBA.UnionMember (
-        "x",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for y (case label 2)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)2);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);
-      _members0[1] = new org.omg.CORBA.UnionMember (
-        "y",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for z (case label 3)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)3);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-      _members0[2] = new org.omg.CORBA.UnionMember (
-        "z",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for iu (case label 4)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)4);
-      _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.type ();
-      _members0[3] = new org.omg.CORBA.UnionMember (
-        "iu",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for a (Default case)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_octet ((byte)0); // default member label
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_boolean);
-      _members0[4] = new org.omg.CORBA.UnionMember (
-        "a",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-      __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.id (), "RichUnion", _disTypeCode0, _members0);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.RichUnion read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.RichUnion value = new org.apache.tuscany.sca.test.corba.generated.RichUnion ();
-    int _dis0 = (int)0;
-    _dis0 = istream.read_long ();
-    switch (_dis0)
-    {
-      case 1:
-        int _x = (int)0;
-        _x = istream.read_long ();
-        value.x (_x);
-        break;
-      case 2:
-        float _y = (float)0;
-        _y = istream.read_float ();
-        value.y (_y);
-        break;
-      case 3:
-        String _z = null;
-        _z = istream.read_string ();
-        value.z (_z);
-        break;
-      case 4:
-        org.apache.tuscany.sca.test.corba.generated.InnerUnion _iu = null;
-        _iu = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.read (istream);
-        value.iu (_iu);
-        break;
-      default:
-        boolean _a = false;
-        _a = istream.read_boolean ();
-        value.a (_dis0, _a);
-        break;
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.RichUnion value)
-  {
-    ostream.write_long (value.discriminator ());
-    switch (value.discriminator ())
-    {
-      case 1:
-        ostream.write_long (value.x ());
-        break;
-      case 2:
-        ostream.write_float (value.y ());
-        break;
-      case 3:
-        ostream.write_string (value.z ());
-        break;
-      case 4:
-        org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.write (ostream, value.iu ());
-        break;
-      default:
-        ostream.write_boolean (value.a ());
-        break;
-    }
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
deleted file mode 100644
index e2221541c5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public final class RichUnionHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.RichUnion value = null;
-
-  public RichUnionHolder ()
-  {
-  }
-
-  public RichUnionHolder (org.apache.tuscany.sca.test.corba.generated.RichUnion initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
deleted file mode 100644
index 13f294b871..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public interface ScenarioOne extends ScenarioOneOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
-{
-} // interface ScenarioOne
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
deleted file mode 100644
index 66cc1d1e82..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class ScenarioOneHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioOne that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.id (), "ScenarioOne");
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne read (org.omg.CORBA.portable.InputStream istream)
-  {
-    return narrow (istream.read_Object (_ScenarioOneStub.class));
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioOne value)
-  {
-    ostream.write_Object ((org.omg.CORBA.Object) value);
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioOne)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioOne)obj;
-    else if (!obj._is_a (id ()))
-      throw new org.omg.CORBA.BAD_PARAM ();
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne unchecked_narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioOne)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioOne)obj;
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
deleted file mode 100644
index f14394b400..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class ScenarioOneHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.ScenarioOne value = null;
-
-  public ScenarioOneHolder ()
-  {
-  }
-
-  public ScenarioOneHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioOne initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
deleted file mode 100644
index 56388624d7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public interface ScenarioOneOperations 
-{
-  org.apache.tuscany.sca.test.corba.generated.RichStruct setRichStruct (org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct) throws org.apache.tuscany.sca.test.corba.generated.WrongColor, org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-} // interface ScenarioOneOperations
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
deleted file mode 100644
index 1897d0682c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-public interface ScenarioSix extends ScenarioSixOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
-{
-} // interface ScenarioSix
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
deleted file mode 100644
index c8c88ef91d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-abstract public class ScenarioSixHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioSix that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.id (), "ScenarioSix");
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix read (org.omg.CORBA.portable.InputStream istream)
-  {
-    return narrow (istream.read_Object (_ScenarioSixStub.class));
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioSix value)
-  {
-    ostream.write_Object ((org.omg.CORBA.Object) value);
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioSix)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioSix)obj;
-    else if (!obj._is_a (id ()))
-      throw new org.omg.CORBA.BAD_PARAM ();
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix unchecked_narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioSix)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioSix)obj;
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
deleted file mode 100644
index 5540b98c21..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-public final class ScenarioSixHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.ScenarioSix value = null;
-
-  public ScenarioSixHolder ()
-  {
-  }
-
-  public ScenarioSixHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioSix initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
deleted file mode 100644
index 648144299c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public interface ScenarioSixOperations 
-{
-  String[][] passStringArray (String[][] arg);
-  org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct passAnnotatedStruct (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg);
-  org.apache.tuscany.sca.test.corba.generated.RichUnion passRichUnion (org.apache.tuscany.sca.test.corba.generated.RichUnion arg);
-} // interface ScenarioSixOperations
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
deleted file mode 100644
index b57e098a56..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-public interface ScenarioTwo extends ScenarioTwoOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
-{
-} // interface ScenarioTwo
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
deleted file mode 100644
index 8ddfa10575..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-abstract public class ScenarioTwoHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioTwo that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.id (), "ScenarioTwo");
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo read (org.omg.CORBA.portable.InputStream istream)
-  {
-    return narrow (istream.read_Object (_ScenarioTwoStub.class));
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioTwo value)
-  {
-    ostream.write_Object ((org.omg.CORBA.Object) value);
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)obj;
-    else if (!obj._is_a (id ()))
-      throw new org.omg.CORBA.BAD_PARAM ();
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo unchecked_narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)obj;
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
deleted file mode 100644
index 9717629711..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-public final class ScenarioTwoHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.ScenarioTwo value = null;
-
-  public ScenarioTwoHolder ()
-  {
-  }
-
-  public ScenarioTwoHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
deleted file mode 100644
index 1247b4618d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-public interface ScenarioTwoOperations 
-{
-  String stringField ();
-  void stringField (String newStringField);
-} // interface ScenarioTwoOperations
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
deleted file mode 100644
index f2cc3adad5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-abstract public class StringArrayHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/StringArray:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, String[][] that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static String[][] extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0);
-      __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode );
-      __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode );
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.id (), "StringArray", __typeCode);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static String[][] read (org.omg.CORBA.portable.InputStream istream)
-  {
-    String value[][] = null;
-    value = new String[2][];
-    for (int _o0 = 0;_o0 < (2); ++_o0)
-    {
-      value[_o0] = new String[2];
-      for (int _o1 = 0;_o1 < (2); ++_o1)
-      {
-        value[_o0][_o1] = istream.read_string ();
-      }
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, String[][] value)
-  {
-    if (value.length != (2))
-      throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    for (int _i0 = 0;_i0 < (2); ++_i0)
-    {
-      if (value[_i0].length != (2))
-        throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-      for (int _i1 = 0;_i1 < (2); ++_i1)
-      {
-        ostream.write_string (value[_i0][_i1]);
-      }
-    }
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
deleted file mode 100644
index dbad550222..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-public final class StringArrayHolder implements org.omg.CORBA.portable.Streamable
-{
-  public String value[][] = null;
-
-  public StringArrayHolder ()
-  {
-  }
-
-  public StringArrayHolder (String[][] initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
deleted file mode 100644
index d29129236c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class StringSequenceHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/StringSequence:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, String[] that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static String[] extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0);
-      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.id (), "StringSequence", __typeCode);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static String[] read (org.omg.CORBA.portable.InputStream istream)
-  {
-    String value[] = null;
-    int _len0 = istream.read_long ();
-    value = new String[_len0];
-    for (int _o1 = 0;_o1 < value.length; ++_o1)
-      value[_o1] = istream.read_string ();
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, String[] value)
-  {
-    ostream.write_long (value.length);
-    for (int _i0 = 0;_i0 < value.length; ++_i0)
-      ostream.write_string (value[_i0]);
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
deleted file mode 100644
index 837ba04cea..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class StringSequenceHolder implements org.omg.CORBA.portable.Streamable
-{
-  public String value[] = null;
-
-  public StringSequenceHolder ()
-  {
-  }
-
-  public StringSequenceHolder (String[] initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
deleted file mode 100644
index 0b24056642..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class TwoDimLongSequenceHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequence:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, int[][] that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static int[][] extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", __typeCode);
-      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.id (), "TwoDimLongSequence", __typeCode);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static int[][] read (org.omg.CORBA.portable.InputStream istream)
-  {
-    int value[][] = null;
-    int _len0 = istream.read_long ();
-    value = new int[_len0][];
-    for (int _o1 = 0;_o1 < value.length; ++_o1)
-      value[_o1] = org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.read (istream);
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, int[][] value)
-  {
-    ostream.write_long (value.length);
-    for (int _i0 = 0;_i0 < value.length; ++_i0)
-      org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.write (ostream, value[_i0]);
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
deleted file mode 100644
index e2ed1ab037..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class TwoDimLongSequenceHolder implements org.omg.CORBA.portable.Streamable
-{
-  public int value[][] = null;
-
-  public TwoDimLongSequenceHolder ()
-  {
-  }
-
-  public TwoDimLongSequenceHolder (int[][] initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
deleted file mode 100644
index 46888399ed..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class UnexpectedException extends org.omg.CORBA.UserException
-{
-  public String info = null;
-
-  public UnexpectedException ()
-  {
-    super(UnexpectedExceptionHelper.id());
-  } // ctor
-
-  public UnexpectedException (String _info)
-  {
-    super(UnexpectedExceptionHelper.id());
-    info = _info;
-  } // ctor
-
-
-  public UnexpectedException (String $reason, String _info)
-  {
-    super(UnexpectedExceptionHelper.id() + "  " + $reason);
-    info = _info;
-  } // ctor
-
-} // class UnexpectedException
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
deleted file mode 100644
index c276038050..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class UnexpectedExceptionHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/UnexpectedException:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.UnexpectedException that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.UnexpectedException extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [1];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "info",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.id (), "UnexpectedException", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.UnexpectedException read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.UnexpectedException value = new org.apache.tuscany.sca.test.corba.generated.UnexpectedException ();
-    // read and discard the repository ID
-    istream.read_string ();
-    value.info = istream.read_string ();
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.UnexpectedException value)
-  {
-    // write the repository ID
-    ostream.write_string (id ());
-    ostream.write_string (value.info);
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
deleted file mode 100644
index 079a56b446..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class UnexpectedExceptionHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.UnexpectedException value = null;
-
-  public UnexpectedExceptionHolder ()
-  {
-  }
-
-  public UnexpectedExceptionHolder (org.apache.tuscany.sca.test.corba.generated.UnexpectedException initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
deleted file mode 100644
index 0407184598..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/WrongColor.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class WrongColor extends org.omg.CORBA.UserException
-{
-  public org.apache.tuscany.sca.test.corba.generated.Color givenColor = null;
-  public org.apache.tuscany.sca.test.corba.generated.Color correctColor = null;
-
-  public WrongColor ()
-  {
-    super(WrongColorHelper.id());
-  } // ctor
-
-  public WrongColor (org.apache.tuscany.sca.test.corba.generated.Color _givenColor, org.apache.tuscany.sca.test.corba.generated.Color _correctColor)
-  {
-    super(WrongColorHelper.id());
-    givenColor = _givenColor;
-    correctColor = _correctColor;
-  } // ctor
-
-
-  public WrongColor (String $reason, org.apache.tuscany.sca.test.corba.generated.Color _givenColor, org.apache.tuscany.sca.test.corba.generated.Color _correctColor)
-  {
-    super(WrongColorHelper.id() + "  " + $reason);
-    givenColor = _givenColor;
-    correctColor = _correctColor;
-  } // ctor
-
-} // class WrongColor
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
deleted file mode 100644
index 16e099cfa3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class WrongColorHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/WrongColor:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.WrongColor that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.WrongColor extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [2];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "givenColor",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
-          _members0[1] = new org.omg.CORBA.StructMember (
-            "correctColor",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.id (), "WrongColor", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.WrongColor read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.WrongColor value = new org.apache.tuscany.sca.test.corba.generated.WrongColor ();
-    // read and discard the repository ID
-    istream.read_string ();
-    value.givenColor = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream);
-    value.correctColor = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream);
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.WrongColor value)
-  {
-    // write the repository ID
-    ostream.write_string (id ());
-    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.givenColor);
-    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.correctColor);
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
deleted file mode 100644
index b4883cb35c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class WrongColorHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.WrongColor value = null;
-
-  public WrongColorHolder ()
-  {
-  }
-
-  public WrongColorHolder (org.apache.tuscany.sca.test.corba.generated.WrongColor initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.type ();
-  }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
deleted file mode 100644
index c96fb61204..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public abstract class _ScenarioOneImplBase extends org.omg.CORBA.portable.ObjectImpl
-                implements org.apache.tuscany.sca.test.corba.generated.ScenarioOne, org.omg.CORBA.portable.InvokeHandler
-{
-
-  // Constructors
-  public _ScenarioOneImplBase ()
-  {
-  }
-
-  private static java.util.Hashtable _methods = new java.util.Hashtable ();
-  static
-  {
-    _methods.put ("setRichStruct", new java.lang.Integer (0));
-  }
-
-  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
-                                org.omg.CORBA.portable.InputStream in,
-                                org.omg.CORBA.portable.ResponseHandler $rh)
-  {
-    org.omg.CORBA.portable.OutputStream out = null;
-    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
-    if (__method == null)
-      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-    switch (__method.intValue ())
-    {
-       case 0:  // org/apache/tuscany/sca/test/corba/generated/ScenarioOne/setRichStruct
-       {
-         try {
-           org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read (in);
-           org.apache.tuscany.sca.test.corba.generated.RichStruct $result = null;
-           $result = this.setRichStruct (richStruct);
-           out = $rh.createReply();
-           org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write (out, $result);
-         } catch (org.apache.tuscany.sca.test.corba.generated.WrongColor $ex) {
-           out = $rh.createExceptionReply ();
-           org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.write (out, $ex);
-         } catch (org.apache.tuscany.sca.test.corba.generated.UnexpectedException $ex) {
-           out = $rh.createExceptionReply ();
-           org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.write (out, $ex);
-         }
-         break;
-       }
-
-       default:
-         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    }
-
-    return out;
-  } // _invoke
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-
-} // class _ScenarioOneImplBase
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
deleted file mode 100644
index 3427c127ec..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public class _ScenarioOneStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioOne
-{
-
-  public org.apache.tuscany.sca.test.corba.generated.RichStruct setRichStruct (org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct) throws org.apache.tuscany.sca.test.corba.generated.WrongColor, org.apache.tuscany.sca.test.corba.generated.UnexpectedException
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("setRichStruct", true);
-                org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write ($out, richStruct);
-                $in = _invoke ($out);
-                org.apache.tuscany.sca.test.corba.generated.RichStruct $result = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                if (_id.equals ("IDL:org/apache/tuscany/sca/test/corba/generated/WrongColor:1.0"))
-                    throw org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.read ($in);
-                else if (_id.equals ("IDL:org/apache/tuscany/sca/test/corba/generated/UnexpectedException:1.0"))
-                    throw org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.read ($in);
-                else
-                    throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return setRichStruct (richStruct        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // setRichStruct
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
-  {
-     String str = s.readUTF ();
-     String[] args = null;
-     java.util.Properties props = null;
-     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
-     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
-     _set_delegate (delegate);
-  }
-
-  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
-  {
-     String[] args = null;
-     java.util.Properties props = null;
-     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
-     s.writeUTF (str);
-  }
-} // class _ScenarioOneStub
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
deleted file mode 100644
index 78464fe40d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 23:35:36 CEST
-*/
-
-public abstract class _ScenarioSixImplBase extends org.omg.CORBA.portable.ObjectImpl
-                implements org.apache.tuscany.sca.test.corba.generated.ScenarioSix, org.omg.CORBA.portable.InvokeHandler
-{
-
-  // Constructors
-  public _ScenarioSixImplBase ()
-  {
-  }
-
-  private static java.util.Hashtable _methods = new java.util.Hashtable ();
-  static
-  {
-    _methods.put ("passStringArray", new java.lang.Integer (0));
-    _methods.put ("passAnnotatedStruct", new java.lang.Integer (1));
-    _methods.put ("passRichUnion", new java.lang.Integer (2));
-  }
-
-  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
-                                org.omg.CORBA.portable.InputStream in,
-                                org.omg.CORBA.portable.ResponseHandler $rh)
-  {
-    org.omg.CORBA.portable.OutputStream out = null;
-    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
-    if (__method == null)
-      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-    switch (__method.intValue ())
-    {
-       case 0:  // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passStringArray
-       {
-         String arg[][] = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (in);
-         String $result[][] = null;
-         $result = this.passStringArray (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (out, $result);
-         break;
-       }
-
-       case 1:  // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passAnnotatedStruct
-       {
-         org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read (in);
-         org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct $result = null;
-         $result = this.passAnnotatedStruct (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write (out, $result);
-         break;
-       }
-
-       case 2:  // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passRichUnion
-       {
-         org.apache.tuscany.sca.test.corba.generated.RichUnion arg = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read (in);
-         org.apache.tuscany.sca.test.corba.generated.RichUnion $result = null;
-         $result = this.passRichUnion (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write (out, $result);
-         break;
-       }
-
-       default:
-         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    }
-
-    return out;
-  } // _invoke
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-
-} // class _ScenarioSixImplBase
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
deleted file mode 100644
index faff36c2a4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public class _ScenarioSixStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioSix
-{
-
-  public String[][] passStringArray (String[][] arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passStringArray", true);
-                org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write ($out, arg);
-                $in = _invoke ($out);
-                String $result[][] = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return passStringArray (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passStringArray
-
-  public org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct passAnnotatedStruct (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passAnnotatedStruct", true);
-                org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write ($out, arg);
-                $in = _invoke ($out);
-                org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct $result = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return passAnnotatedStruct (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passAnnotatedStruct
-
-  public org.apache.tuscany.sca.test.corba.generated.RichUnion passRichUnion (org.apache.tuscany.sca.test.corba.generated.RichUnion arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passRichUnion", true);
-                org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write ($out, arg);
-                $in = _invoke ($out);
-                org.apache.tuscany.sca.test.corba.generated.RichUnion $result = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return passRichUnion (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passRichUnion
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
-  {
-     String str = s.readUTF ();
-     String[] args = null;
-     java.util.Properties props = null;
-     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
-     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
-     _set_delegate (delegate);
-  }
-
-  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
-  {
-     String[] args = null;
-     java.util.Properties props = null;
-     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
-     s.writeUTF (str);
-  }
-} // class _ScenarioSixStub
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
deleted file mode 100644
index 750006cec6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-public abstract class _ScenarioTwoImplBase extends org.omg.CORBA.portable.ObjectImpl
-                implements org.apache.tuscany.sca.test.corba.generated.ScenarioTwo, org.omg.CORBA.portable.InvokeHandler
-{
-
-  // Constructors
-  public _ScenarioTwoImplBase ()
-  {
-  }
-
-  private static java.util.Hashtable _methods = new java.util.Hashtable ();
-  static
-  {
-    _methods.put ("_get_stringField", new java.lang.Integer (0));
-    _methods.put ("_set_stringField", new java.lang.Integer (1));
-  }
-
-  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
-                                org.omg.CORBA.portable.InputStream in,
-                                org.omg.CORBA.portable.ResponseHandler $rh)
-  {
-    org.omg.CORBA.portable.OutputStream out = null;
-    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
-    if (__method == null)
-      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-    switch (__method.intValue ())
-    {
-       case 0:  // org/apache/tuscany/sca/test/corba/generated/ScenarioTwo/_get_stringField
-       {
-         String $result = null;
-         $result = this.stringField ();
-         out = $rh.createReply();
-         out.write_string ($result);
-         break;
-       }
-
-       case 1:  // org/apache/tuscany/sca/test/corba/generated/ScenarioTwo/_set_stringField
-       {
-         String newStringField = in.read_string ();
-         this.stringField (newStringField);
-         out = $rh.createReply();
-         break;
-       }
-
-       default:
-         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    }
-
-    return out;
-  } // _invoke
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-
-} // class _ScenarioTwoImplBase
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
deleted file mode 100644
index ef9f561d1b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-public class _ScenarioTwoStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioTwo
-{
-
-  public String stringField ()
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("_get_stringField", true);
-                $in = _invoke ($out);
-                String $result = $in.read_string ();
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return stringField (        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // stringField
-
-  public void stringField (String newStringField)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("_set_stringField", true);
-                $out.write_string (newStringField);
-                $in = _invoke ($out);
-                return;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                stringField (newStringField        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // stringField
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
-  {
-     String str = s.readUTF ();
-     String[] args = null;
-     java.util.Properties props = null;
-     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
-     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
-     _set_delegate (delegate);
-  }
-
-  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
-  {
-     String[] args = null;
-     java.util.Properties props = null;
-     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
-     s.writeUTF (str);
-  }
-} // class _ScenarioTwoStub
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
deleted file mode 100644
index 1bc2156183..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $Rev$ $Date$
- * Operations for scenario five
- */
-@Remotable
-public interface ScenarioFive {
-
-    void doNothing();
-    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
deleted file mode 100644
index a198eaf646..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for obtaining ScenarioFive reference
- */
-public class ScenarioFiveComponent {
-
-    private ScenarioFive scenarioFive;
-
-    @Reference
-    public void setScenarioFive(ScenarioFive scenarioFive) {
-        this.scenarioFive = scenarioFive;
-    }
-    
-    public ScenarioFive getScenarioFive() {
-        return scenarioFive;
-    }
-    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
deleted file mode 100644
index dc752a2aea..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Implementation of ScenarioFive service
- */
-public class ScenarioFiveImpl implements ScenarioFive {
-
-    public void doNothing() {
-        // does nothing
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
deleted file mode 100644
index aa2f06909b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $Rev$ $Date$
- * Operations for ScenarioFour
- */
-@Remotable
-public interface ScenarioFour {
-
-    ScenarioFourStruct setStruct(ScenarioFourStruct struct);
-
-    void exceptionTest() throws ScenarioFourException;
-
-    ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
deleted file mode 100644
index c7569720f0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for obtaining ScenarioFour reference
- */
-public class ScenarioFourComponent {
-
-    private ScenarioFour scenarioFour;
-
-    @Reference
-    public void setScenarioFour(ScenarioFour scenarioFour) {
-        this.scenarioFour = scenarioFour;
-    }
-
-    public ScenarioFour getScenarioFour() {
-        return scenarioFour;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
deleted file mode 100644
index bc76373633..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Exception for ScenarioFour tests
- */
-public class ScenarioFourException extends Exception {
-
-    public static final String DEFAULT_CONTENT = "Test";
-    
-    private static final long serialVersionUID = 1L;
-    private String content;
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
deleted file mode 100644
index 2f10177bd0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo;
-
-/**
- * @version $Rev$ $Date$
- * Implementation of ScenarioFour service
- */
-public class ScenarioFourImpl implements ScenarioFour {
-
-    public ScenarioFourStruct setStruct(ScenarioFourStruct struct) {
-        return struct;
-    }
-
-    public void exceptionTest() throws ScenarioFourException {
-        ScenarioFourException exception = new ScenarioFourException();
-        exception.setContent(ScenarioFourException.DEFAULT_CONTENT);
-        throw exception;
-    }
-
-    public ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo) {
-        return scenarioFourSdo;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
deleted file mode 100644
index de8624455f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Type for ScenarioFour test
- */
-public class ScenarioFourStruct {
-
-    public String field1;
-    public int field2;
-    public double[] field3;
-
-    public boolean equals(ScenarioFourStruct arg) {
-        return (field1 != null && arg.field1 != null
-            && field1.equals(arg.field1)
-            && field2 == arg.field2
-            && field3 != null
-            && arg.field3 != null && field3.length == arg.field3.length);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
deleted file mode 100644
index 1813de4e67..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.RichStruct;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioOne;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations;
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for reference using generated interface.
- */
-public class ScenarioOneComponent implements ScenarioOneOperations {
-
-    private ScenarioOne scenarionOne;
-
-    @Reference
-    public void setScenarioOne(ScenarioOne scenarioOne) {
-        this.scenarionOne = scenarioOne;
-    }
-
-    public RichStruct setRichStruct(RichStruct richStruct) throws WrongColor, UnexpectedException {
-        return scenarionOne.setRichStruct(richStruct);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
deleted file mode 100644
index 9b49adbfbb..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.Color;
-import org.apache.tuscany.sca.test.corba.generated.RichStruct;
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-import org.apache.tuscany.sca.test.corba.generated._ScenarioOneImplBase;
-
-/**
- * @version $Rev$ $Date$
- * Servant for generated interface. Uses generated classes.
- */
-public class ScenarioOneServant extends _ScenarioOneImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public RichStruct setRichStruct(RichStruct richStruct) throws WrongColor, UnexpectedException {
-        if (richStruct.innerStruct.color.value() == Color.red.value()) {
-            throw new WrongColor(richStruct.innerStruct.color, Color.green);
-        } else if (richStruct.longField == 0) {
-            throw new UnexpectedException("Expected richStruct.longField != 0");
-        }
-        return richStruct;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
deleted file mode 100644
index 7889a80bf1..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct;
-import org.apache.tuscany.sca.test.corba.generated.RichUnion;
-import org.apache.tuscany.sca.test.corba.generated._ScenarioSixImplBase;
-
-/**
- * @version $Rev$ $Date$
- * Scenario six servant for generated interface. 
- */
-public class ScenarioSixServant extends _ScenarioSixImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public String[][] passStringArray(String[][] arg) {
-        return arg;
-    }
-
-    public AnnotatedStruct passAnnotatedStruct(AnnotatedStruct arg) {
-        return arg;
-    }
-    
-    public RichUnion passRichUnion(RichUnion arg) {
-        return arg;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
deleted file mode 100644
index cdd49904d3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated._ScenarioTwoImplBase;
-
-/**
- * @version $Rev$ $Date$
- * Servant for generated interface. 
- */
-public class ScenarioTwoServant extends _ScenarioTwoImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    private String stringField = "";
-
-    public String stringField() {
-        return stringField;
-    }
-
-    public void stringField(String newStringField) {
-        this.stringField = newStringField;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
deleted file mode 100644
index 6f0ef584da..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray;
-
-/**
- * @version $Rev$ $Date$ Scenario six structure used by Tuscany.
- */
-public final class TAnnotatedStruct {
-
-    @CorbaArray( {2, 2})
-    public String[][] stringArray;
-
-    public TAnnotatedStruct() {
-
-    }
-
-    public TAnnotatedStruct(String[][] stringArray) {
-        this.stringArray = stringArray;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
deleted file mode 100644
index 71003d008f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * User provided enum representation for Color type.
- */
-public class TColor {
-
-    private int value;
-
-    public static final int _red = 0;
-    public static final int _yellow = 1;
-    public static final int _green = 2;
-
-    public static final TColor red = new TColor(_red);
-    public static final TColor yellow = new TColor(_yellow);
-    public static final TColor green = new TColor(_green);
-
-    public int value() {
-        return value;
-    }
-
-    public static TColor from_int(int value) {
-        switch (value) {
-            case 0:
-                return red;
-            case 1:
-                return yellow;
-            case 2:
-                return green;
-        }
-        return green;
-    }
-
-    protected TColor(int value) {
-        this.value = value;
-    }
-    
-    public TColor() {
-        
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
deleted file mode 100644
index 271f1e669b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * User provided interface representation for InnerStruct type.
- */
-public final class TInnerStruct {
-
-    public int[][] twoDimLongSequence;
-    public String stringField;
-    public TColor color;
-
-    public TInnerStruct() {
-
-    }
-
-    public TInnerStruct(int[][] a1, String a2, TColor a3) {
-        twoDimLongSequence = a1;
-        stringField = a2;
-        color = a3;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
deleted file mode 100644
index f2baffce9a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-/**
- * @version $Rev$ $Date$
- * User provided interface representation for CORBA InnerUnion type.
- */
-public final class TInnerUnion {
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1)
-    private int x;
-   
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2)
-    private float y;
-    
-    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
-    @SuppressWarnings("unused")
-    private int discriminator;
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        discriminator = 1;
-        this.x = x;
-    }
-
-    public float getY() {
-        return y;
-    }
-
-    public void setY(float y) {
-        discriminator = 2;
-        this.y = y;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
deleted file mode 100644
index 1b44da9752..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * User provided interface representation for RichStruct type.
- */
-public final class TRichStruct {
-
-    public TInnerStruct innerStruct;
-    public String[] stringSequence;
-    public int longField;
-
-    public TRichStruct() {
-
-    }
-
-    public TRichStruct(TInnerStruct a1, String[] a2, int a3) {
-        innerStruct = a1;
-        stringSequence = a2;
-        longField = a3;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
deleted file mode 100644
index 8270ba1a8c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-/**
- * @version $Rev$ $Date$
- * User provided interface representation for CORBA RichUnion type.
- */
-public final class TRichUnion {
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1)
-    private int x;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2)
-    private float y;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 3)
-    private String z;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 4)
-    private TInnerUnion iu;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.defaultOption)
-    private boolean def;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
-    @SuppressWarnings("unused")
-    private int discriminator = -1;
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        this.discriminator = 1;
-        this.x = x;
-    }
-
-    public float getY() {
-        return y;
-    }
-
-    public void setY(float y) {
-        this.discriminator = 2;
-        this.y = y;
-    }
-
-    public String getZ() {
-        return z;
-    }
-
-    public void setZ(String z) {
-        this.discriminator = 3;
-        this.z = z;
-    }
-
-    public boolean isDef() {
-        return def;
-    }
-
-    public void setDef(boolean def) {
-        this.discriminator = -1;
-        this.def = def;
-    }
-
-    public TInnerUnion getIu() {
-        return iu;
-    }
-
-    public void setIu(TInnerUnion iu) {
-        this.discriminator = 4;
-        this.iu = iu;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
deleted file mode 100644
index 922759cd8d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-
-/**
- * @version $Rev$ $Date$
- * User provided CORBA service interface.
- */
-public interface TScenarioOne {
-
-    TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException;
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
deleted file mode 100644
index ac7b0af175..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for reference using user provided interface.
- */
-public class TScenarioOneComponent implements TScenarioOne {
-
-    private TScenarioOne scenarionOne;
-
-    @Reference
-    public void setScenarioOne(TScenarioOne scenarioOne) {
-        this.scenarionOne = scenarioOne;
-    }
-
-    public TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException {
-        return scenarionOne.setRichStruct(richStruct);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
deleted file mode 100644
index 47f0775c16..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.Color;
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-
-/**
- * @version $Rev$ $Date$
- * Servant for user provided interface. Uses T* classes.
- */
-public class TScenarioOneServant implements TScenarioOne {
-
-    private static final long serialVersionUID = 1L;
-
-    public TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException {
-        if (richStruct.innerStruct.color.value() == Color.red.value()) {
-            Color translatedColor = Color.from_int(richStruct.innerStruct.color.value());
-            throw new WrongColor(translatedColor, Color.green);
-        } else if (richStruct.longField == 0) {
-            throw new UnexpectedException("Expected richStruct.longField != 0");
-        }
-        return richStruct;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
deleted file mode 100644
index 0e894cb7ea..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray;
-
-/**
- * @version $Rev$ $Date$
- * Operations for scenario six.
- */
-public interface TScenarioSix {
-
-    @CorbaArray( {2, 2})
-    public String[][] passStringArray(@CorbaArray( {2, 2})String[][] arg);
-
-    public TAnnotatedStruct passAnnotatedStruct(TAnnotatedStruct arg);
-    
-    public TRichUnion passRichUnion(TRichUnion arg);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
deleted file mode 100644
index 13bc1d499e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for obtaining ScenartioSix reference.
- */
-public class TScenarioSixComponent {
-
-    private TScenarioSix scenarioSix;
-
-    @Reference
-    public void setScenarioSix(TScenarioSix scenarioSix) {
-        this.scenarioSix = scenarioSix;
-    }
-    
-    public TScenarioSix getScenarioSix() {
-        return scenarioSix;
-    }
-    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
deleted file mode 100644
index 8e76958e31..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Tuscany scenario six servant.
- */
-public class TScenarioSixServant implements TScenarioSix {
-
-    private static final long serialVersionUID = 1L;
-
-    public String[][] passStringArray(String[][] arg) {
-        return arg;
-    }
-
-    public TAnnotatedStruct passAnnotatedStruct(TAnnotatedStruct arg) {
-        return arg;
-    }
-    
-    public TRichUnion passRichUnion(TRichUnion arg) {
-        return arg;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
deleted file mode 100644
index 1e4264256b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Operations for ScenarioThree.
- */
-public interface TScenarioThree {
-
-    int getIntField();
-
-    void setIntField(int intField);
-
-    void overloadedName();
-
-    void overloadedName(String arg1);
-
-    void overloadedName(String arg1, int arg2);
-
-    int caseDifferent();
-
-    int CaseDifferent();
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
deleted file mode 100644
index 12b0f404ae..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for obtaining ScenartioThree reference.
- */
-public class TScenarioThreeComponent {
-
-    private TScenarioThree scenarionThree;
-
-    @Reference
-    public void setScenarioThree(TScenarioThree scenarioThree) {
-        this.scenarionThree = scenarioThree;
-    }
-
-    public TScenarioThree getScenarioThree() {
-        return scenarionThree;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
deleted file mode 100644
index b679214c6c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Servant for user provided interface.
- */
-public class TScenarioThreeServant implements TScenarioThree {
-
-    public int getIntField() {
-        return 0;
-    }
-
-    public void overloadedName() {
-    }
-
-    public void overloadedName(String arg1) {
-    }
-
-    public void overloadedName(String arg1, int arg2) {
-    }
-
-    public void setIntField(int intField) {
-    }
-
-    public int CaseDifferent() {
-        return 1;
-    }
-
-    public int caseDifferent() {
-        return 0;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
deleted file mode 100644
index 415634c80f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Operations for ScenarioTwo.
- */
-public interface TScenarioTwo {
-
-    String getStringField();
-
-    void setStringField(String stringField);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
deleted file mode 100644
index 937d82b33e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for obtaining ScenartioTwo reference.
- */
-public class TScenarioTwoComponent {
-
-    private TScenarioTwo scenarioTwo;
-
-    @Reference
-    public void setScenarioTwo(TScenarioTwo scenarioTwo) {
-        this.scenarioTwo = scenarioTwo;
-    }
-
-    public TScenarioTwo getScenarioTwo() {
-        return scenarioTwo;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
deleted file mode 100644
index cb868d18a0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Servant for user provided interface.
- */
-public class TScenarioTwoServant implements TScenarioTwo {
-
-    private static String stringField = "";
-
-    public String getStringField() {
-        return stringField;
-    }
-
-    public void setStringField(String stringField) {
-        TScenarioTwoServant.stringField = stringField;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 3e77527d73..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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. 

-

-org.apache.tuscany.sca.test.corba.TestCorbaHostModuleActivator

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioFive.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioFive.composite
deleted file mode 100644
index b3675a0194..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioFive.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--

- * 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://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="Corba5">

-    

-    <component name="ScenarioFiveService">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFiveImpl" />

-    </component>

-	<service name="ScenarioFive" promote="ScenarioFiveService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFive"/>

-        <binding.sca uri="corbaname::localhost:5090#ScenarioFive"/>

-    </service>

-    

-    <component name="ScenarioFive">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFiveComponent" />

-        <reference name="scenarioFive">

-			<binding.sca uri="corbaname::localhost:5090#ScenarioFive"/>        

-        </reference>

-    </component>

-        

-</composite>

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioFour.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioFour.composite
deleted file mode 100644
index 50bfc02803..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioFour.composite
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--

- * 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://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="Corba4">

-    

-    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

-    

-    <component name="ScenarioFourService">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourImpl" />

-    </component>

-	<service name="ScenarioFour" promote="ScenarioFourService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFour"/>

-        <binding.sca uri="corbaname::localhost:5080#ScenarioFour"/>

-    </service>

-    

-    <component name="ScenarioFour">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent" />

-        <reference name="scenarioFour">

-			<binding.sca uri="corbaname::localhost:5080#ScenarioFour"/>        

-        </reference>

-    </component>

-    

-    <!-- doubled service and reference to test reuse of name server --> 

-    <service name="ScenarioFourDoubled" promote="ScenarioFourService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFour"/>

-        <binding.sca uri="corbaname::localhost:5080#ScenarioFourReuse"/>

-    </service>

-    

-    <component name="ScenarioFourReuse">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent" />

-        <reference name="scenarioFour">

-			<binding.sca uri="corbaname::localhost:5080#ScenarioFourReuse"/>        

-        </reference>

-    </component>

-    

-</composite>

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioOne.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioOne.composite
deleted file mode 100644
index 495ca2a41f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioOne.composite
+++ /dev/null
@@ -1,111 +0,0 @@
-<!--

- * 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://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="Corba1">

-    

-    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

-    

-    <!-- reference 1 - consuming traditional CORBA service using USER PROVIDED Java interface -->

-	<component name="ScenarioOne">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOne"/>        

-        </reference>

-    </component>

-    

-    <!-- reference 2 - consuming traditional CORBA service using GENERATED Java interface -->

-    <component name="ScenarioOneGenerated">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOne"/>        

-        </reference>

-    </component>

-    

-    <!-- TUSCANY CORBA SERVICE 1 (TS1) - CORBA service using USER PROVIDED Java interface -->

-    <component name="ScenarionOneService">

-    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneServant" />

-    </component>

-    <service name="ScenarionOneService" promote="ScenarionOneService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioOne"/>

-        <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"/>

-    </service>

-    

-    <!-- TUSCANY CORBA SERVICE 2 (TS2) - CORBA service using GENERATED provided Java interface -->

-    <component name="ScenarionOneServiceGenerated">

-    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneServant" />

-    </component>

-    <service name="ScenarionOneServiceGenerated" promote="ScenarionOneServiceGenerated">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations"/>

-        <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"/>

-    </service>

-    

-    <!-- reference 3 - user provided interface combined with TUSCANY SERVICE 1 (TS1) -->

-	<component name="TU2TS1">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany"/>        

-        </reference>

-    </component>

-    

-    <!-- reference 4 - generated interface combined with TUSCANY SERVICE 1 (TS1) -->

-    <component name="TG2TS1">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany"/>        

-        </reference>

-    </component>

-    

-    <!-- reference 5 - user provided interface combined with TUSCANY SERVICE 2 (TS2) -->

-    <component name="TU2TS2">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated"/>        

-        </reference>

-    </component>

-    

-    <!-- reference 6 - generated interface combined with TUSCANY SERVICE 2 (TS2) -->

-    <component name="TG2TS2">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated"/>        

-        </reference>

-    </component>

-    

-    <!-- TUSCANY CORBA SERVICE 3 (TS3) - CORBA service using registered using URI -->

-    <component name="ScenarionOneServiceURI">

-    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneServant" />

-    </component>

-    <service name="ScenarionOneServiceGenerated" promote="ScenarionOneServiceGenerated">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations"/>

-        <tuscany:binding.corba uri="corbaname::localhost:5060#NamedWithURI"/>

-    </service>

-    

-    <!-- reference 7 - ... -->

-    <component name="UriBinding">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba uri="corbaname::localhost:5060#NamedWithURI"/>        

-        </reference>

-    </component>

-    

-</composite>

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioSix.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioSix.composite
deleted file mode 100644
index 840cd076b1..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioSix.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--

- * 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://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="Corba6">

-    

-	<component name="ScenarioSix">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioSixComponent" />

-        <reference name="scenarioSix">

-			<tuscany:binding.corba host="localhost" port="5050" name="ScenarioSix"/>        

-        </reference>

-    </component>

-    

-    <component name="ScenarionSixService">

-    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioSixServant" />

-    </component>

-    <service name="ScenarionSixService" promote="ScenarionSixService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioSix"/>

-        <tuscany:binding.corba host="localhost" port="5050" name="ScenarioSixTuscany" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"/>

-    </service>

-        

-</composite>

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioThree.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioThree.composite
deleted file mode 100644
index f02ba89496..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioThree.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--

- * 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://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="Corba3">

-    

-    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

-    

-    <component name="ScenarioThreeService">

-    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioThreeServant" />

-    </component>

-    <service name="ScenarioThreeServiceTuscany" promote="ScenarioThreeService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioThree"/>

-        <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioThree"/>

-    </service>

-        

-    <component name="ScenarioThreeReference">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioThreeComponent" />

-        <reference name="scenarioThree">

-			<tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioThree"/>        

-        </reference>

-    </component>

-    

-</composite>

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioTwo.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioTwo.composite
deleted file mode 100644
index ed3f545f72..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/ScenarioTwo.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--

- * 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://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="Corba2">

-    

-    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

-    

-    <component name="ScenarioTwoService">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioTwoServant" />

-    </component>

-	<service name="ScenarioTwoServiceTuscany" promote="ScenarioTwoService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioTwo"/>

-        <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioTwo" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"/>

-    </service>

-    

-    <component name="ScenarioTwo">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioTwoComponent" />

-        <reference name="scenarioTwo">

-			<tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioTwoGenerated"/>        

-        </reference>

-    </component>

-    

-</composite>

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/itest_scenario.idl b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/itest_scenario.idl
deleted file mode 100644
index 41489a4565..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/itest_scenario.idl
+++ /dev/null
@@ -1,110 +0,0 @@
-/*

- * 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.    

- */

-

-/*

- * compile by

- * idlj -fall -oldImplBase itest_scenario.idl

- */

- 

-module org {

-	module apache {

-		module tuscany {

-			module sca {

-				module test {

-					module corba {

-						module generated { 

-						

-							// objects for ScenarioOne

-						

-							enum Color {red, yellow, green};

-							

-							typedef sequence<string> StringSequence;

-							typedef sequence<long> LongSequence;

-							typedef sequence<LongSequence> TwoDimLongSequence;

-							

-							struct InnerStruct {

-								TwoDimLongSequence twoDimLongSequence;

-								string stringField;

-								Color color;

-							};

-							

-							struct RichStruct {

-								InnerStruct innerStruct;

-								StringSequence stringSequence;

-								long longField;

-							};

-							

-							exception WrongColor { 

-								Color givenColor;

-								Color correctColor;

-							};

-							

-							exception UnexpectedException { 

-								string info;

-							};

-							

-							interface ScenarioOne {

-							

-								RichStruct setRichStruct(in RichStruct richStruct) raises (WrongColor, UnexpectedException);

-							

-							};

-							

-							// objects for ScenarioTwo

-							

-							interface ScenarioTwo {

-								

-								attribute string stringField;

-								

-							};

-							

-							typedef string StringArray[2][2];

-							

-							struct AnnotatedStruct {

-									StringArray stringArray;

-							};

-							

-                        	union InnerUnion switch (long) {	

-	                                case 1: long x;

-	                                case 2: float y;

-	                        };

-

-	                        union RichUnion switch (long) {

-	                            case 1: long x;

-	                                case 2: float y;

-	                            case 3: string z;

-	                            case 4: InnerUnion iu;

-	                            default: boolean a;

-	                        };

-							

-							interface ScenarioSix {

-								

-								StringArray passStringArray(in StringArray arg);

-								

-								AnnotatedStruct passAnnotatedStruct(in AnnotatedStruct arg);

-								

-								RichUnion passRichUnion(in RichUnion arg);

-								

-							};

-						};

-					};

-				};

-			};

-		};

-	};

-};

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/scenariofour.xsd b/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/scenariofour.xsd
deleted file mode 100644
index 2669b54be3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/corba/src/test/resources/scenariofour.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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.    
--->
-<schema targetNamespace="http://example.com/scenariofour" xmlns="http://www.w3.org/2001/XMLSchema">
-
-    <element name="ScenarioFourSdo">
-        <complexType>
-            <sequence>
-                <element name="message" minOccurs="1" type="string" />
-                <element name="symbol" minOccurs="1" type="string" />
-            </sequence>
-        </complexType>
-    </element>
-
-</schema>