Removed more modules as in Oscar's TUSCANY-2440 reduced-set patch. Also removed newer modules added since r643746 and are not required to run the minimum set that we are porting to android. Set svn ignore properties to ignore Manifest files produced by the build.

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

66 files changed, 0 insertions, 5244 deletions

diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
deleted file mode 100644
index fde204edf8..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public interface ArraysSetter extends ArraysSetterOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface ArraysSetter
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
deleted file mode 100644
index 71b4fbbdb6..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
+++ /dev/null
@@ -1,100 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class ArraysSetterHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter 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.binding.corba.testing.generated.ArraysSetter 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.binding.corba.testing.generated.ArraysSetterHelper.id(),
-                                         "ArraysSetter");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_ArraysSetterStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter)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.binding.corba.testing.generated._ArraysSetterStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._ArraysSetterStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._ArraysSetterStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._ArraysSetterStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
deleted file mode 100644
index d758a560a9..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class ArraysSetterHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter value = null;
-
-    public ArraysSetterHolder() {
-    }
-
-    public ArraysSetterHolder(org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetterHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetterHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetterHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
deleted file mode 100644
index 464c2ccbc3..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public interface ArraysSetterOperations {
-    boolean[] setBoolean(boolean[] arg);
-
-    char[] setChar(char[] arg);
-
-    char[] setWchar(char[] arg);
-
-    byte[] setOctet(byte[] arg);
-
-    short[] setShort(short[] arg);
-
-    short[] setUnsignedShort(short[] arg);
-
-    int[] setLong(int[] arg);
-
-    int[] setUnsignedLong(int[] arg);
-
-    long[] setLongLong(long[] arg);
-
-    long[] setUnsignedLongLong(long[] arg);
-
-    float[] setFloat(float[] arg);
-
-    double[] setDouble(double[] arg);
-
-    String[] setString(String[] arg);
-
-    String[] setWstring(String[] arg);
-
-    org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] setRemoteObject(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] obj);
-} // interface ArraysSetterOperations
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
deleted file mode 100644
index c053f12a02..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
+++ /dev/null
@@ -1,31 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface PrimitivesSetter extends PrimitivesSetterOperations, org.omg.CORBA.Object,
-    org.omg.CORBA.portable.IDLEntity {
-} // interface PrimitivesSetter
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
deleted file mode 100644
index 566689960e..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
+++ /dev/null
@@ -1,100 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class PrimitivesSetterHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter 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.binding.corba.testing.generated.PrimitivesSetter 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.binding.corba.testing.generated.PrimitivesSetterHelper
-                                             .id(),
-                                         "PrimitivesSetter");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_PrimitivesSetterStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter)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.binding.corba.testing.generated._PrimitivesSetterStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._PrimitivesSetterStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._PrimitivesSetterStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._PrimitivesSetterStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
deleted file mode 100644
index 6564957081..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class PrimitivesSetterHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter value = null;
-
-    public PrimitivesSetterHolder() {
-    }
-
-    public PrimitivesSetterHolder(org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetterHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetterHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetterHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
deleted file mode 100644
index 26669de95a..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface PrimitivesSetterOperations {
-    boolean setBoolean(boolean arg);
-
-    char setChar(char arg);
-
-    char setWchar(char arg);
-
-    byte setOctet(byte arg);
-
-    short setShort(short arg);
-
-    short setUnsignedShort(short arg);
-
-    int setLong(int arg);
-
-    int setUnsignedLong(int arg);
-
-    long setLongLong(long arg);
-
-    long setUnsignedLongLong(long arg);
-
-    float setFloat(float arg);
-
-    double setDouble(double arg);
-
-    String setString(String arg);
-
-    String setWstring(String arg);
-
-    org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject setRemoteObject(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject obj);
-} // interface PrimitivesSetterOperations
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
deleted file mode 100644
index 5a140f5ecc..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface RemoteObject extends RemoteObjectOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface RemoteObject
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
deleted file mode 100644
index 2a8fe73417..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
+++ /dev/null
@@ -1,100 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class RemoteObjectHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject 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.binding.corba.testing.generated.RemoteObject 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.binding.corba.testing.generated.RemoteObjectHelper.id(),
-                                         "RemoteObject");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_RemoteObjectStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject)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.binding.corba.testing.generated._RemoteObjectStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._RemoteObjectStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._RemoteObjectStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._RemoteObjectStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
deleted file mode 100644
index 63e3926dd2..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class RemoteObjectHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject value = null;
-
-    public RemoteObjectHolder() {
-    }
-
-    public RemoteObjectHolder(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
deleted file mode 100644
index a8231236eb..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface RemoteObjectOperations {
-} // interface RemoteObjectOperations
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
deleted file mode 100644
index ca86420240..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class SimpleStruct implements org.omg.CORBA.portable.IDLEntity {
-    public String field1 = null;
-    public int field2 = (int)0;
-
-    public SimpleStruct() {
-    } // ctor
-
-    public SimpleStruct(String _field1, int _field2) {
-        field1 = _field1;
-        field2 = _field2;
-    } // ctor
-
-} // class SimpleStruct
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
deleted file mode 100644
index 2a8898d38f..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class SimpleStructHelper {
-    private static String _id =
-        "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct/SimpleStruct:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct 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.binding.corba.testing.generated.SimpleStruct 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.omg.CORBA.ORB.init().create_string_tc(0);
-                    _members0[0] = new org.omg.CORBA.StructMember("field1", _tcOf_members0, null);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_long);
-                    _members0[1] = new org.omg.CORBA.StructMember("field2", _tcOf_members0, null);
-                    __typeCode =
-                        org.omg.CORBA.ORB.init()
-                            .create_struct_tc(org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper
-                                                  .id(),
-                                              "SimpleStruct",
-                                              _members0);
-                    __active = false;
-                }
-            }
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct read(org.omg.CORBA.portable.InputStream istream) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct value =
-            new org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct();
-        value.field1 = istream.read_string();
-        value.field2 = istream.read_long();
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct value) {
-        ostream.write_string(value.field1);
-        ostream.write_long(value.field2);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
deleted file mode 100644
index bed30e00ca..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class SimpleStructHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct value = null;
-
-    public SimpleStructHolder() {
-    }
-
-    public SimpleStructHolder(org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
deleted file mode 100644
index 73dbd6c198..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class SomeStruct implements org.omg.CORBA.portable.IDLEntity {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct innerStruct = null;
-    public String str = null;
-    public String str_list[] = null;
-    public int twoDimSeq[][] = null;
-    public int threeDimSeq[][][] = null;
-
-    public SomeStruct() {
-    } // ctor
-
-    public SomeStruct(org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct _innerStruct,
-                      String _str,
-                      String[] _str_list,
-                      int[][] _twoDimSeq,
-                      int[][][] _threeDimSeq) {
-        innerStruct = _innerStruct;
-        str = _str;
-        str_list = _str_list;
-        twoDimSeq = _twoDimSeq;
-        threeDimSeq = _threeDimSeq;
-    } // ctor
-
-} // class SomeStruct
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
deleted file mode 100644
index 8f524ffeb1..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
+++ /dev/null
@@ -1,146 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class SomeStructHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct/SomeStruct:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct 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.binding.corba.testing.generated.SomeStruct 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[5];
-                    org.omg.CORBA.TypeCode _tcOf_members0 = null;
-                    _tcOf_members0 = org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.type();
-                    _members0[0] = new org.omg.CORBA.StructMember("innerStruct", _tcOf_members0, null);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_string_tc(0);
-                    _members0[1] = new org.omg.CORBA.StructMember("str", _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.binding.corba.testing.generated.string_listHelper
-                                                 .id(),
-                                             "string_list",
-                                             _tcOf_members0);
-                    _members0[2] = new org.omg.CORBA.StructMember("str_list", _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.binding.corba.testing.generated.long_seq1Helper
-                                                 .id(),
-                                             "long_seq1",
-                                             _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.binding.corba.testing.generated.long_seq2Helper
-                                                 .id(),
-                                             "long_seq2",
-                                             _tcOf_members0);
-                    _members0[3] = new org.omg.CORBA.StructMember("twoDimSeq", _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.binding.corba.testing.generated.long_seq1Helper
-                                                 .id(),
-                                             "long_seq1",
-                                             _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.binding.corba.testing.generated.long_seq2Helper
-                                                 .id(),
-                                             "long_seq2",
-                                             _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.binding.corba.testing.generated.long_seq3Helper
-                                                 .id(),
-                                             "long_seq3",
-                                             _tcOf_members0);
-                    _members0[4] = new org.omg.CORBA.StructMember("threeDimSeq", _tcOf_members0, null);
-                    __typeCode =
-                        org.omg.CORBA.ORB.init()
-                            .create_struct_tc(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper
-                                                  .id(),
-                                              "SomeStruct",
-                                              _members0);
-                    __active = false;
-                }
-            }
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct read(org.omg.CORBA.portable.InputStream istream) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct value =
-            new org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct();
-        value.innerStruct = org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.read(istream);
-        value.str = istream.read_string();
-        value.str_list = org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.read(istream);
-        value.twoDimSeq = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.read(istream);
-        value.threeDimSeq = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.read(istream);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct value) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.write(ostream, value.innerStruct);
-        ostream.write_string(value.str);
-        org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.write(ostream, value.str_list);
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.write(ostream, value.twoDimSeq);
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.write(ostream, value.threeDimSeq);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
deleted file mode 100644
index 3231a136dc..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class SomeStructHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct value = null;
-
-    public SomeStructHolder() {
-    }
-
-    public SomeStructHolder(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
deleted file mode 100644
index 28d3ecdc91..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface TestObject extends TestObjectOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface TestObject
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
deleted file mode 100644
index 29ff2edfd2..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class TestObjectHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.TestObject 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.binding.corba.testing.generated.TestObject 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.binding.corba.testing.generated.TestObjectHelper.id(),
-                                         "TestObject");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.TestObject read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_TestObjectStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.TestObject value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.TestObject narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.TestObject)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.TestObject)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.binding.corba.testing.generated._TestObjectStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._TestObjectStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.TestObject unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.TestObject)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.TestObject)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._TestObjectStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._TestObjectStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
deleted file mode 100644
index b8aea13c8d..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class TestObjectHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.TestObject value = null;
-
-    public TestObjectHolder() {
-    }
-
-    public TestObjectHolder(org.apache.tuscany.sca.binding.corba.testing.generated.TestObject initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.TestObjectHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.TestObjectHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.TestObjectHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
deleted file mode 100644
index 0bacb6746a..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface TestObjectOperations {
-    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct pickStructFromArgs(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg1,
-                                                                                         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg2,
-                                                                                         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg3,
-                                                                                         int structNumber);
-
-    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct setStruct(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg);
-
-    org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct setSimpleStruct(org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHolder arg);
-
-    int[] setLongSeq1(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Holder arg);
-
-    int[][] setLongSeq2(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Holder arg);
-
-    int[][][] setLongSeq3(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Holder arg);
-} // interface TestObjectOperations
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
deleted file mode 100644
index c6e8c2a4e0..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
+++ /dev/null
@@ -1,232 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _ArraysSetterImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("setBoolean", new java.lang.Integer(0));
-        _methods.put("setChar", new java.lang.Integer(1));
-        _methods.put("setWchar", new java.lang.Integer(2));
-        _methods.put("setOctet", new java.lang.Integer(3));
-        _methods.put("setShort", new java.lang.Integer(4));
-        _methods.put("setUnsignedShort", new java.lang.Integer(5));
-        _methods.put("setLong", new java.lang.Integer(6));
-        _methods.put("setUnsignedLong", new java.lang.Integer(7));
-        _methods.put("setLongLong", new java.lang.Integer(8));
-        _methods.put("setUnsignedLongLong", new java.lang.Integer(9));
-        _methods.put("setFloat", new java.lang.Integer(10));
-        _methods.put("setDouble", new java.lang.Integer(11));
-        _methods.put("setString", new java.lang.Integer(12));
-        _methods.put("setWstring", new java.lang.Integer(13));
-        _methods.put("setRemoteObject", new java.lang.Integer(14));
-    }
-
-    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/binding/corba/testing/generated/ArraysSetter/setBoolean
-            {
-                boolean arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.read(in);
-                boolean $result[] = null;
-                $result = this.setBoolean(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.write(out, $result);
-                break;
-            }
-
-            case 1: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setChar
-            {
-                char arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.read(in);
-                char $result[] = null;
-                $result = this.setChar(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.write(out, $result);
-                break;
-            }
-
-            case 2: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setWchar
-            {
-                char arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.read(in);
-                char $result[] = null;
-                $result = this.setWchar(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.write(out, $result);
-                break;
-            }
-
-            case 3: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setOctet
-            {
-                byte arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.read(in);
-                byte $result[] = null;
-                $result = this.setOctet(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.write(out, $result);
-                break;
-            }
-
-            case 4: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setShort
-            {
-                short arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.read(in);
-                short $result[] = null;
-                $result = this.setShort(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.write(out, $result);
-                break;
-            }
-
-            case 5: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setUnsignedShort
-            {
-                short arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.read(in);
-                short $result[] = null;
-                $result = this.setUnsignedShort(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.write(out, $result);
-                break;
-            }
-
-            case 6: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setLong
-            {
-                int arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.read(in);
-                int $result[] = null;
-                $result = this.setLong(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.write(out, $result);
-                break;
-            }
-
-            case 7: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setUnsignedLong
-            {
-                int arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.read(in);
-                int $result[] = null;
-                $result = this.setUnsignedLong(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.write(out, $result);
-                break;
-            }
-
-            case 8: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setLongLong
-            {
-                long arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.read(in);
-                long $result[] = null;
-                $result = this.setLongLong(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.write(out, $result);
-                break;
-            }
-
-            case 9: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setUnsignedLongLong
-            {
-                long arg[] =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.read(in);
-                long $result[] = null;
-                $result = this.setUnsignedLongLong(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper
-                    .write(out, $result);
-                break;
-            }
-
-            case 10: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setFloat
-            {
-                float arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.read(in);
-                float $result[] = null;
-                $result = this.setFloat(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.write(out, $result);
-                break;
-            }
-
-            case 11: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setDouble
-            {
-                double arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.read(in);
-                double $result[] = null;
-                $result = this.setDouble(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.write(out, $result);
-                break;
-            }
-
-            case 12: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setString
-            {
-                String arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.read(in);
-                String $result[] = null;
-                $result = this.setString(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.write(out, $result);
-                break;
-            }
-
-            case 13: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setWstring
-            {
-                String arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.read(in);
-                String $result[] = null;
-                $result = this.setWstring(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.write(out, $result);
-                break;
-            }
-
-            case 14: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setRemoteObject
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject obj[] =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject $result[] = null;
-                $result = this.setRemoteObject(obj);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.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/binding/corba/testing/generated/ArraysSetter:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _ArraysSetterImplBase
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
deleted file mode 100644
index 079cc6e899..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
+++ /dev/null
@@ -1,343 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public class _ArraysSetterStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter {
-
-    public boolean[] setBoolean(boolean[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setBoolean", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.write($out, arg);
-            $in = _invoke($out);
-            boolean $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.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 setBoolean(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setBoolean
-
-    public char[] setChar(char[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setChar", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.write($out, arg);
-            $in = _invoke($out);
-            char $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.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 setChar(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setChar
-
-    public char[] setWchar(char[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setWchar", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.write($out, arg);
-            $in = _invoke($out);
-            char $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.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 setWchar(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setWchar
-
-    public byte[] setOctet(byte[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setOctet", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.write($out, arg);
-            $in = _invoke($out);
-            byte $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.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 setOctet(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setOctet
-
-    public short[] setShort(short[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setShort", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.write($out, arg);
-            $in = _invoke($out);
-            short $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.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 setShort(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setShort
-
-    public short[] setUnsignedShort(short[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedShort", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.write($out, arg);
-            $in = _invoke($out);
-            short $result[] =
-                org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.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 setUnsignedShort(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedShort
-
-    public int[] setLong(int[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLong", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.write($out, arg);
-            $in = _invoke($out);
-            int $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.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 setLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLong
-
-    public int[] setUnsignedLong(int[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedLong", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.write($out, arg);
-            $in = _invoke($out);
-            int $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.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 setUnsignedLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedLong
-
-    public long[] setLongLong(long[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLongLong", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.write($out, arg);
-            $in = _invoke($out);
-            long $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.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 setLongLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLongLong
-
-    public long[] setUnsignedLongLong(long[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedLongLong", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.write($out, arg);
-            $in = _invoke($out);
-            long $result[] =
-                org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.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 setUnsignedLongLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedLongLong
-
-    public float[] setFloat(float[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setFloat", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.write($out, arg);
-            $in = _invoke($out);
-            float $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.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 setFloat(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setFloat
-
-    public double[] setDouble(double[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setDouble", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.write($out, arg);
-            $in = _invoke($out);
-            double $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.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 setDouble(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setDouble
-
-    public String[] setString(String[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setString", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.write($out, arg);
-            $in = _invoke($out);
-            String $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.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 setString(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setString
-
-    public String[] setWstring(String[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setWstring", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.write($out, arg);
-            $in = _invoke($out);
-            String $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.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 setWstring(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setWstring
-
-    public org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] setRemoteObject(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] obj) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setRemoteObject", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.write($out, obj);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject $result[] =
-                org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.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 setRemoteObject(obj);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setRemoteObject
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0"};
-
-    @Override
-    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 _ArraysSetterStub
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
deleted file mode 100644
index b444ce68d8..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _PrimitivesSetterImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("setBoolean", new java.lang.Integer(0));
-        _methods.put("setChar", new java.lang.Integer(1));
-        _methods.put("setWchar", new java.lang.Integer(2));
-        _methods.put("setOctet", new java.lang.Integer(3));
-        _methods.put("setShort", new java.lang.Integer(4));
-        _methods.put("setUnsignedShort", new java.lang.Integer(5));
-        _methods.put("setLong", new java.lang.Integer(6));
-        _methods.put("setUnsignedLong", new java.lang.Integer(7));
-        _methods.put("setLongLong", new java.lang.Integer(8));
-        _methods.put("setUnsignedLongLong", new java.lang.Integer(9));
-        _methods.put("setFloat", new java.lang.Integer(10));
-        _methods.put("setDouble", new java.lang.Integer(11));
-        _methods.put("setString", new java.lang.Integer(12));
-        _methods.put("setWstring", new java.lang.Integer(13));
-        _methods.put("setRemoteObject", new java.lang.Integer(14));
-    }
-
-    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/binding/corba/testing/generated/PrimitivesSetter/setBoolean
-            {
-                boolean arg = in.read_boolean();
-                boolean $result = false;
-                $result = this.setBoolean(arg);
-                out = $rh.createReply();
-                out.write_boolean($result);
-                break;
-            }
-
-            case 1: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setChar
-            {
-                char arg = in.read_char();
-                char $result = (char)0;
-                $result = this.setChar(arg);
-                out = $rh.createReply();
-                out.write_char($result);
-                break;
-            }
-
-            case 2: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setWchar
-            {
-                char arg = in.read_wchar();
-                char $result = (char)0;
-                $result = this.setWchar(arg);
-                out = $rh.createReply();
-                out.write_wchar($result);
-                break;
-            }
-
-            case 3: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setOctet
-            {
-                byte arg = in.read_octet();
-                byte $result = (byte)0;
-                $result = this.setOctet(arg);
-                out = $rh.createReply();
-                out.write_octet($result);
-                break;
-            }
-
-            case 4: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setShort
-            {
-                short arg = in.read_short();
-                short $result = (short)0;
-                $result = this.setShort(arg);
-                out = $rh.createReply();
-                out.write_short($result);
-                break;
-            }
-
-            case 5: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedShort
-            {
-                short arg = in.read_ushort();
-                short $result = (short)0;
-                $result = this.setUnsignedShort(arg);
-                out = $rh.createReply();
-                out.write_ushort($result);
-                break;
-            }
-
-            case 6: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setLong
-            {
-                int arg = in.read_long();
-                int $result = (int)0;
-                $result = this.setLong(arg);
-                out = $rh.createReply();
-                out.write_long($result);
-                break;
-            }
-
-            case 7: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedLong
-            {
-                int arg = in.read_ulong();
-                int $result = (int)0;
-                $result = this.setUnsignedLong(arg);
-                out = $rh.createReply();
-                out.write_ulong($result);
-                break;
-            }
-
-            case 8: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setLongLong
-            {
-                long arg = in.read_longlong();
-                long $result = (long)0;
-                $result = this.setLongLong(arg);
-                out = $rh.createReply();
-                out.write_longlong($result);
-                break;
-            }
-
-            case 9: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedLongLong
-            {
-                long arg = in.read_ulonglong();
-                long $result = (long)0;
-                $result = this.setUnsignedLongLong(arg);
-                out = $rh.createReply();
-                out.write_ulonglong($result);
-                break;
-            }
-
-            case 10: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setFloat
-            {
-                float arg = in.read_float();
-                float $result = (float)0;
-                $result = this.setFloat(arg);
-                out = $rh.createReply();
-                out.write_float($result);
-                break;
-            }
-
-            case 11: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setDouble
-            {
-                double arg = in.read_double();
-                double $result = (double)0;
-                $result = this.setDouble(arg);
-                out = $rh.createReply();
-                out.write_double($result);
-                break;
-            }
-
-            case 12: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setString
-            {
-                String arg = in.read_string();
-                String $result = null;
-                $result = this.setString(arg);
-                out = $rh.createReply();
-                out.write_string($result);
-                break;
-            }
-
-            case 13: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setWstring
-            {
-                String arg = in.read_wstring();
-                String $result = null;
-                $result = this.setWstring(arg);
-                out = $rh.createReply();
-                out.write_wstring($result);
-                break;
-            }
-
-            case 14: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setRemoteObject
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject obj =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject $result = null;
-                $result = this.setRemoteObject(obj);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.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/binding/corba/testing/generated/PrimitivesSetter:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _PrimitivesSetterImplBase
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
deleted file mode 100644
index 0b08e1fb67..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
+++ /dev/null
@@ -1,341 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public class _PrimitivesSetterStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter {
-
-    public boolean setBoolean(boolean arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setBoolean", true);
-            $out.write_boolean(arg);
-            $in = _invoke($out);
-            boolean $result = $in.read_boolean();
-            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 setBoolean(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setBoolean
-
-    public char setChar(char arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setChar", true);
-            $out.write_char(arg);
-            $in = _invoke($out);
-            char $result = $in.read_char();
-            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 setChar(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setChar
-
-    public char setWchar(char arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setWchar", true);
-            $out.write_wchar(arg);
-            $in = _invoke($out);
-            char $result = $in.read_wchar();
-            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 setWchar(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setWchar
-
-    public byte setOctet(byte arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setOctet", true);
-            $out.write_octet(arg);
-            $in = _invoke($out);
-            byte $result = $in.read_octet();
-            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 setOctet(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setOctet
-
-    public short setShort(short arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setShort", true);
-            $out.write_short(arg);
-            $in = _invoke($out);
-            short $result = $in.read_short();
-            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 setShort(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setShort
-
-    public short setUnsignedShort(short arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedShort", true);
-            $out.write_ushort(arg);
-            $in = _invoke($out);
-            short $result = $in.read_ushort();
-            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 setUnsignedShort(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedShort
-
-    public int setLong(int arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLong", true);
-            $out.write_long(arg);
-            $in = _invoke($out);
-            int $result = $in.read_long();
-            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 setLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLong
-
-    public int setUnsignedLong(int arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedLong", true);
-            $out.write_ulong(arg);
-            $in = _invoke($out);
-            int $result = $in.read_ulong();
-            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 setUnsignedLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedLong
-
-    public long setLongLong(long arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLongLong", true);
-            $out.write_longlong(arg);
-            $in = _invoke($out);
-            long $result = $in.read_longlong();
-            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 setLongLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLongLong
-
-    public long setUnsignedLongLong(long arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedLongLong", true);
-            $out.write_ulonglong(arg);
-            $in = _invoke($out);
-            long $result = $in.read_ulonglong();
-            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 setUnsignedLongLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedLongLong
-
-    public float setFloat(float arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setFloat", true);
-            $out.write_float(arg);
-            $in = _invoke($out);
-            float $result = $in.read_float();
-            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 setFloat(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setFloat
-
-    public double setDouble(double arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setDouble", true);
-            $out.write_double(arg);
-            $in = _invoke($out);
-            double $result = $in.read_double();
-            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 setDouble(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setDouble
-
-    public String setString(String arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setString", true);
-            $out.write_string(arg);
-            $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 setString(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setString
-
-    public String setWstring(String arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setWstring", true);
-            $out.write_wstring(arg);
-            $in = _invoke($out);
-            String $result = $in.read_wstring();
-            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 setWstring(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setWstring
-
-    public org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject setRemoteObject(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject obj) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setRemoteObject", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.write($out, obj);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject $result =
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.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 setRemoteObject(obj);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setRemoteObject
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0"};
-
-    @Override
-    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 _PrimitivesSetterStub
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
deleted file mode 100644
index a87534f88b..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public abstract class _RemoteObjectImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _RemoteObjectImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-    }
-
-    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);
-
-        return out;
-    } // _invoke
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _RemoteObjectImplBase
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
deleted file mode 100644
index e219dfa338..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public class _RemoteObjectStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject {
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject:1.0"};
-
-    @Override
-    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 _RemoteObjectStub
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
deleted file mode 100644
index c0bc0d6ebd..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
+++ /dev/null
@@ -1,149 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public abstract class _TestObjectImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.TestObject, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _TestObjectImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("pickStructFromArgs", new java.lang.Integer(0));
-        _methods.put("setStruct", new java.lang.Integer(1));
-        _methods.put("setSimpleStruct", new java.lang.Integer(2));
-        _methods.put("setLongSeq1", new java.lang.Integer(3));
-        _methods.put("setLongSeq2", new java.lang.Integer(4));
-        _methods.put("setLongSeq3", new java.lang.Integer(5));
-    }
-
-    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/binding/corba/testing/generated/TestObject/pickStructFromArgs
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg1 =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg2 =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg3 =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read(in);
-                int structNumber = in.read_long();
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct $result = null;
-                $result = this.pickStructFromArgs(arg1, arg2, arg3, structNumber);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write(out, $result);
-                break;
-            }
-
-            case 1: // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/setStruct
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct $result = null;
-                $result = this.setStruct(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write(out, $result);
-                break;
-            }
-
-            case 2: // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/setSimpleStruct
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHolder arg =
-                    new org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHolder();
-                arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct $result = null;
-                $result = this.setSimpleStruct(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.write(out, $result);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.write(out, arg.value);
-                break;
-            }
-
-            case 3: // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/setLongSeq1
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Holder arg =
-                    new org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Holder();
-                arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.read(in);
-                int $result[] = null;
-                $result = this.setLongSeq1(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.write(out, $result);
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.write(out, arg.value);
-                break;
-            }
-
-            case 4: // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/setLongSeq2
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Holder arg =
-                    new org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Holder();
-                arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.read(in);
-                int $result[][] = null;
-                $result = this.setLongSeq2(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.write(out, $result);
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.write(out, arg.value);
-                break;
-            }
-
-            case 5: // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/setLongSeq3
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Holder arg =
-                    new org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Holder();
-                arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.read(in);
-                int $result[][][] = null;
-                $result = this.setLongSeq3(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.write(out, $result);
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.write(out, arg.value);
-                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/binding/corba/testing/generated/TestObject:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _TestObjectImplBase
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
deleted file mode 100644
index ad47595ddf..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
+++ /dev/null
@@ -1,182 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public class _TestObjectStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.TestObject {
-
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct pickStructFromArgs(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg1,
-                                                                                                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg2,
-                                                                                                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg3,
-                                                                                                int structNumber) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("pickStructFromArgs", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write($out, arg1);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write($out, arg2);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write($out, arg3);
-            $out.write_long(structNumber);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct $result =
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.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 pickStructFromArgs(arg1, arg2, arg3, structNumber);
-        } finally {
-            _releaseReply($in);
-        }
-    } // pickStructFromArgs
-
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct setStruct(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setStruct", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write($out, arg);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct $result =
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.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 setStruct(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setStruct
-
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct setSimpleStruct(org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHolder arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setSimpleStruct", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.write($out, arg.value);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct $result =
-                org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.read($in);
-            arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.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 setSimpleStruct(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setSimpleStruct
-
-    public int[] setLongSeq1(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Holder arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLongSeq1", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.write($out, arg.value);
-            $in = _invoke($out);
-            int $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.read($in);
-            arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.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 setLongSeq1(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLongSeq1
-
-    public int[][] setLongSeq2(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Holder arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLongSeq2", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.write($out, arg.value);
-            $in = _invoke($out);
-            int $result[][] = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.read($in);
-            arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.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 setLongSeq2(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLongSeq2
-
-    public int[][][] setLongSeq3(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Holder arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLongSeq3", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.write($out, arg.value);
-            $in = _invoke($out);
-            int $result[][][] = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.read($in);
-            arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.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 setLongSeq3(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLongSeq3
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0"};
-
-    @Override
-    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 _TestObjectStub
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
deleted file mode 100644
index f3d96e8fd7..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
+++ /dev/null
@@ -1,75 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class boolean_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/boolean_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, boolean[] 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 boolean[] 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_boolean);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.id(),
-                                     "boolean_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static boolean[] read(org.omg.CORBA.portable.InputStream istream) {
-        boolean value[] = null;
-        int _len0 = istream.read_long();
-        value = new boolean[_len0];
-        istream.read_boolean_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, boolean[] value) {
-        ostream.write_long(value.length);
-        ostream.write_boolean_array(value, 0, value.length);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
deleted file mode 100644
index cb0ab8bcfd..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class boolean_listHolder implements org.omg.CORBA.portable.Streamable {
-    public boolean value[] = null;
-
-    public boolean_listHolder() {
-    }
-
-    public boolean_listHolder(boolean[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
deleted file mode 100644
index 0bde1e701c..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
+++ /dev/null
@@ -1,75 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class char_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/char_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, char[] 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 char[] 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_char);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.id(),
-                                     "char_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static char[] read(org.omg.CORBA.portable.InputStream istream) {
-        char value[] = null;
-        int _len0 = istream.read_long();
-        value = new char[_len0];
-        istream.read_char_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, char[] value) {
-        ostream.write_long(value.length);
-        ostream.write_char_array(value, 0, value.length);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
deleted file mode 100644
index 19b2942cfe..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class char_listHolder implements org.omg.CORBA.portable.Streamable {
-    public char value[] = null;
-
-    public char_listHolder() {
-    }
-
-    public char_listHolder(char[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
deleted file mode 100644
index 8bb5a9c69d..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
+++ /dev/null
@@ -1,75 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class double_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/double_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, double[] 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 double[] 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_double);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.id(),
-                                     "double_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static double[] read(org.omg.CORBA.portable.InputStream istream) {
-        double value[] = null;
-        int _len0 = istream.read_long();
-        value = new double[_len0];
-        istream.read_double_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, double[] value) {
-        ostream.write_long(value.length);
-        ostream.write_double_array(value, 0, value.length);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
deleted file mode 100644
index dc89e71092..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class double_listHolder implements org.omg.CORBA.portable.Streamable {
-    public double value[] = null;
-
-    public double_listHolder() {
-    }
-
-    public double_listHolder(double[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
deleted file mode 100644
index 7b71aa0a9f..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
+++ /dev/null
@@ -1,75 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class float_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/float_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, float[] 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 float[] 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_float);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.id(),
-                                     "float_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static float[] read(org.omg.CORBA.portable.InputStream istream) {
-        float value[] = null;
-        int _len0 = istream.read_long();
-        value = new float[_len0];
-        istream.read_float_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, float[] value) {
-        ostream.write_long(value.length);
-        ostream.write_float_array(value, 0, value.length);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
deleted file mode 100644
index 513bab37cc..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class float_listHolder implements org.omg.CORBA.portable.Streamable {
-    public float value[] = null;
-
-    public float_listHolder() {
-    }
-
-    public float_listHolder(float[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
deleted file mode 100644
index c1d06e2ba9..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
+++ /dev/null
@@ -1,75 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class long_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/long_list: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.binding.corba.testing.generated.long_listHelper.id(),
-                                     "long_list",
-                                     __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/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
deleted file mode 100644
index f9ad7b77ac..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class long_listHolder implements org.omg.CORBA.portable.Streamable {
-    public int value[] = null;
-
-    public long_listHolder() {
-    }
-
-    public long_listHolder(int[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
deleted file mode 100644
index cfb292fc01..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
+++ /dev/null
@@ -1,75 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class long_long_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/long_long_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, long[] 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 long[] 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_longlong);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.id(),
-                                     "long_long_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static long[] read(org.omg.CORBA.portable.InputStream istream) {
-        long value[] = null;
-        int _len0 = istream.read_long();
-        value = new long[_len0];
-        istream.read_longlong_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, long[] value) {
-        ostream.write_long(value.length);
-        ostream.write_longlong_array(value, 0, value.length);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
deleted file mode 100644
index 02f46a7d85..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class long_long_listHolder implements org.omg.CORBA.portable.Streamable {
-    public long value[] = null;
-
-    public long_long_listHolder() {
-    }
-
-    public long_long_listHolder(long[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
deleted file mode 100644
index 505aa3f026..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
+++ /dev/null
@@ -1,75 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class long_seq1Helper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1: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.binding.corba.testing.generated.long_seq1Helper.id(),
-                                     "long_seq1",
-                                     __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/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
deleted file mode 100644
index 5cbaa109ee..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class long_seq1Holder implements org.omg.CORBA.portable.Streamable {
-    public int value[] = null;
-
-    public long_seq1Holder() {
-    }
-
-    public long_seq1Holder(int[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
deleted file mode 100644
index 2f792888fb..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class long_seq2Helper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2: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.binding.corba.testing.generated.long_seq1Helper.id(),
-                                     "long_seq1",
-                                     __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.binding.corba.testing.generated.long_seq2Helper.id(),
-                                     "long_seq2",
-                                     __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.binding.corba.testing.generated.long_seq1Helper.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.binding.corba.testing.generated.long_seq1Helper.write(ostream, value[_i0]);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
deleted file mode 100644
index 8b2ccc1f73..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class long_seq2Holder implements org.omg.CORBA.portable.Streamable {
-    public int value[][] = null;
-
-    public long_seq2Holder() {
-    }
-
-    public long_seq2Holder(int[][] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
deleted file mode 100644
index 67e224f0be..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
+++ /dev/null
@@ -1,89 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class long_seq3Helper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3: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.binding.corba.testing.generated.long_seq1Helper.id(),
-                                     "long_seq1",
-                                     __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.binding.corba.testing.generated.long_seq2Helper.id(),
-                                     "long_seq2",
-                                     __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.binding.corba.testing.generated.long_seq3Helper.id(),
-                                     "long_seq3",
-                                     __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.binding.corba.testing.generated.long_seq2Helper.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.binding.corba.testing.generated.long_seq2Helper.write(ostream, value[_i0]);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
deleted file mode 100644
index 5d4adfba2d..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class long_seq3Holder implements org.omg.CORBA.portable.Streamable {
-    public int value[][][] = null;
-
-    public long_seq3Holder() {
-    }
-
-    public long_seq3Holder(int[][][] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
deleted file mode 100644
index c7d86d9179..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
+++ /dev/null
@@ -1,75 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class octet_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/octet_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, byte[] 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 byte[] 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_octet);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.id(),
-                                     "octet_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static byte[] read(org.omg.CORBA.portable.InputStream istream) {
-        byte value[] = null;
-        int _len0 = istream.read_long();
-        value = new byte[_len0];
-        istream.read_octet_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, byte[] value) {
-        ostream.write_long(value.length);
-        ostream.write_octet_array(value, 0, value.length);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
deleted file mode 100644
index 09b2b85c6a..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class octet_listHolder implements org.omg.CORBA.portable.Streamable {
-    public byte value[] = null;
-
-    public octet_listHolder() {
-    }
-
-    public octet_listHolder(byte[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
deleted file mode 100644
index e88b1e06c4..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
+++ /dev/null
@@ -1,80 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class remote_object_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] 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.binding.corba.testing.generated.RemoteObject[] 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.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.type();
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper
-                                         .id(),
-                                     "remote_object_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] read(org.omg.CORBA.portable.InputStream istream) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject value[] = null;
-        int _len0 = istream.read_long();
-        value = new org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[_len0];
-        for (int _o1 = 0; _o1 < value.length; ++_o1)
-            value[_o1] = org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.read(istream);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] value) {
-        ostream.write_long(value.length);
-        for (int _i0 = 0; _i0 < value.length; ++_i0)
-            org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.write(ostream, value[_i0]);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
deleted file mode 100644
index d3f996c5b4..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class remote_object_listHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject value[] = null;
-
-    public remote_object_listHolder() {
-    }
-
-    public remote_object_listHolder(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
deleted file mode 100644
index 7c58d47f7c..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
+++ /dev/null
@@ -1,75 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class short_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/short_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, short[] 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 short[] 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_short);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.id(),
-                                     "short_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static short[] read(org.omg.CORBA.portable.InputStream istream) {
-        short value[] = null;
-        int _len0 = istream.read_long();
-        value = new short[_len0];
-        istream.read_short_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, short[] value) {
-        ostream.write_long(value.length);
-        ostream.write_short_array(value, 0, value.length);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
deleted file mode 100644
index 5be5a65c43..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class short_listHolder implements org.omg.CORBA.portable.Streamable {
-    public short value[] = null;
-
-    public short_listHolder() {
-    }
-
-    public short_listHolder(short[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
deleted file mode 100644
index a40d5fa8de..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
+++ /dev/null
@@ -1,77 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class string_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/string_list: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.binding.corba.testing.generated.string_listHelper.id(),
-                                     "string_list",
-                                     __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/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
deleted file mode 100644
index 76f99408f2..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class string_listHolder implements org.omg.CORBA.portable.Streamable {
-    public String value[] = null;
-
-    public string_listHolder() {
-    }
-
-    public string_listHolder(String[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
deleted file mode 100644
index d7594b0815..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
+++ /dev/null
@@ -1,76 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class unsigned_long_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_list: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_ulong);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper
-                                         .id(),
-                                     "unsigned_long_list",
-                                     __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_ulong_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_ulong_array(value, 0, value.length);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
deleted file mode 100644
index e9fbcccc36..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class unsigned_long_listHolder implements org.omg.CORBA.portable.Streamable {
-    public int value[] = null;
-
-    public unsigned_long_listHolder() {
-    }
-
-    public unsigned_long_listHolder(int[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
deleted file mode 100644
index 6ef187c4e5..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
+++ /dev/null
@@ -1,78 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class unsigned_long_long_listHelper {
-    private static String _id =
-        "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, long[] 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 long[] 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_ulonglong);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB
-                    .init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper
-                                         .id(),
-                                     "unsigned_long_long_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static long[] read(org.omg.CORBA.portable.InputStream istream) {
-        long value[] = null;
-        int _len0 = istream.read_long();
-        value = new long[_len0];
-        istream.read_ulonglong_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, long[] value) {
-        ostream.write_long(value.length);
-        ostream.write_ulonglong_array(value, 0, value.length);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
deleted file mode 100644
index 59bc015c38..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class unsigned_long_long_listHolder implements org.omg.CORBA.portable.Streamable {
-    public long value[] = null;
-
-    public unsigned_long_long_listHolder() {
-    }
-
-    public unsigned_long_long_listHolder(long[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
deleted file mode 100644
index ec4526cebf..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
+++ /dev/null
@@ -1,76 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class unsigned_short_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, short[] 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 short[] 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_ushort);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper
-                                         .id(),
-                                     "unsigned_short_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static short[] read(org.omg.CORBA.portable.InputStream istream) {
-        short value[] = null;
-        int _len0 = istream.read_long();
-        value = new short[_len0];
-        istream.read_ushort_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, short[] value) {
-        ostream.write_long(value.length);
-        ostream.write_ushort_array(value, 0, value.length);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
deleted file mode 100644
index 56ab28f0be..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class unsigned_short_listHolder implements org.omg.CORBA.portable.Streamable {
-    public short value[] = null;
-
-    public unsigned_short_listHolder() {
-    }
-
-    public unsigned_short_listHolder(short[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
deleted file mode 100644
index 73a10d3b7f..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
+++ /dev/null
@@ -1,75 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class wchar_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/wchar_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, char[] 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 char[] 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_wchar);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.id(),
-                                     "wchar_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static char[] read(org.omg.CORBA.portable.InputStream istream) {
-        char value[] = null;
-        int _len0 = istream.read_long();
-        value = new char[_len0];
-        istream.read_wchar_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, char[] value) {
-        ostream.write_long(value.length);
-        ostream.write_wchar_array(value, 0, value.length);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
deleted file mode 100644
index c5c1e87756..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class wchar_listHolder implements org.omg.CORBA.portable.Streamable {
-    public char value[] = null;
-
-    public wchar_listHolder() {
-    }
-
-    public wchar_listHolder(char[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.type();
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
deleted file mode 100644
index 3e45568f01..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
+++ /dev/null
@@ -1,77 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class wstring_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/wstring_list: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_wstring_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.binding.corba.testing.generated.wstring_listHelper.id(),
-                                     "wstring_list",
-                                     __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_wstring();
-        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_wstring(value[_i0]);
-    }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
deleted file mode 100644
index bdbf9d995b..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class wstring_listHolder implements org.omg.CORBA.portable.Streamable {
-    public String value[] = null;
-
-    public wstring_listHolder() {
-    }
-
-    public wstring_listHolder(String[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.type();
-    }
-
-}