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

17 files changed, 0 insertions, 1296 deletions

diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
deleted file mode 100644
index f4ca1577f5..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public interface ArraysUnionsTests extends ArraysUnionsTestsOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
-{
-} // interface ArraysUnionsTests
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
deleted file mode 100644
index d10bc498b7..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-abstract public class ArraysUnionsTestsHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests 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.arrays_unions.ArraysUnionsTests 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.arrays_unions.ArraysUnionsTestsHelper.id (), "ArraysUnionsTests");
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests read (org.omg.CORBA.portable.InputStream istream)
-  {
-    return narrow (istream.read_Object (_ArraysUnionsTestsStub.class));
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests value)
-  {
-    ostream.write_Object ((org.omg.CORBA.Object) value);
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests)
-      return (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests)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.arrays_unions._ArraysUnionsTestsStub stub = new org.apache.tuscany.sca.binding.corba.testing.arrays_unions._ArraysUnionsTestsStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests unchecked_narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests)
-      return (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests)obj;
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.binding.corba.testing.arrays_unions._ArraysUnionsTestsStub stub = new org.apache.tuscany.sca.binding.corba.testing.arrays_unions._ArraysUnionsTestsStub ();
-      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/arrays_unions/ArraysUnionsTestsHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
deleted file mode 100644
index 98987c1252..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public final class ArraysUnionsTestsHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests value = null;
-
-  public ArraysUnionsTestsHolder ()
-  {
-  }
-
-  public ArraysUnionsTestsHolder (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTestsHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTestsHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTestsHelper.type ();
-  }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
deleted file mode 100644
index d80adb476a..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public interface ArraysUnionsTestsOperations 
-{
-  org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct passTestStruct (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct arg);
-  String[][] passStringArray (String[][] arg);
-  org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion passRichUnion (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion arg);
-} // interface ArraysUnionsTestsOperations
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
deleted file mode 100644
index 9f520f3c5d..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public final class InnerUnion implements org.omg.CORBA.portable.IDLEntity
-{
-  private int ___x;
-  private float ___y;
-  private int __discriminator;
-  private boolean __uninitialized = true;
-
-  public InnerUnion ()
-  {
-  }
-
-  public int discriminator ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    return __discriminator;
-  }
-
-  public int x ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyx (__discriminator);
-    return ___x;
-  }
-
-  public void x (int value)
-  {
-    __discriminator = 1;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  public void x (int discriminator, int value)
-  {
-    verifyx (discriminator);
-    __discriminator = discriminator;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  private void verifyx (int discriminator)
-  {
-    if (discriminator != 1)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public float y ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyy (__discriminator);
-    return ___y;
-  }
-
-  public void y (float value)
-  {
-    __discriminator = 2;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  public void y (int discriminator, float value)
-  {
-    verifyy (discriminator);
-    __discriminator = discriminator;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  private void verifyy (int discriminator)
-  {
-    if (discriminator != 2)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public void _default ()
-  {
-    __discriminator = -2147483648;
-    __uninitialized = false;
-  }
-
-  public void _default (int discriminator)
-  {
-    verifyDefault( discriminator ) ;
-    __discriminator = discriminator ;
-    __uninitialized = false;
-  }
-
-  private void verifyDefault( int value )
-  {
-    switch (value) {
-      case 1:
-      case 2:
-        throw new org.omg.CORBA.BAD_OPERATION() ;
-
-      default:
-        return;
-    }
-  }
-
-} // class InnerUnion
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
deleted file mode 100644
index 11c22f1d72..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-abstract public class InnerUnionHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion/InnerUnion:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      org.omg.CORBA.TypeCode _disTypeCode0;
-      _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [2];
-      org.omg.CORBA.TypeCode _tcOf_members0;
-      org.omg.CORBA.Any _anyOf_members0;
-
-      // Branch for x (case label 1)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)1);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      _members0[0] = new org.omg.CORBA.UnionMember (
-        "x",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for y (case label 2)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)2);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);
-      _members0[1] = new org.omg.CORBA.UnionMember (
-        "y",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-      __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.id (), "InnerUnion", _disTypeCode0, _members0);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion value = new org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion ();
-    int _dis0 = (int)0;
-    _dis0 = istream.read_long ();
-    switch (_dis0)
-    {
-      case 1:
-        int _x = (int)0;
-        _x = istream.read_long ();
-        value.x (_x);
-        break;
-      case 2:
-        float _y = (float)0;
-        _y = istream.read_float ();
-        value.y (_y);
-        break;
-      default:
-        value._default( _dis0 ) ;
-        break;
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion value)
-  {
-    ostream.write_long (value.discriminator ());
-    switch (value.discriminator ())
-    {
-      case 1:
-        ostream.write_long (value.x ());
-        break;
-      case 2:
-        ostream.write_float (value.y ());
-        break;
-    }
-  }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
deleted file mode 100644
index ca9233c77f..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public final class InnerUnionHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion value = null;
-
-  public InnerUnionHolder ()
-  {
-  }
-
-  public InnerUnionHolder (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.type ();
-  }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
deleted file mode 100644
index 1a1a36fd16..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public final class RichUnion implements org.omg.CORBA.portable.IDLEntity
-{
-  private int ___x;
-  private float ___y;
-  private String ___z;
-  private org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion ___iu;
-  private boolean ___a;
-  private int __discriminator;
-  private boolean __uninitialized = true;
-
-  public RichUnion ()
-  {
-  }
-
-  public int discriminator ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    return __discriminator;
-  }
-
-  public int x ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyx (__discriminator);
-    return ___x;
-  }
-
-  public void x (int value)
-  {
-    __discriminator = 1;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  public void x (int discriminator, int value)
-  {
-    verifyx (discriminator);
-    __discriminator = discriminator;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  private void verifyx (int discriminator)
-  {
-    if (discriminator != 1)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public float y ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyy (__discriminator);
-    return ___y;
-  }
-
-  public void y (float value)
-  {
-    __discriminator = 2;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  public void y (int discriminator, float value)
-  {
-    verifyy (discriminator);
-    __discriminator = discriminator;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  private void verifyy (int discriminator)
-  {
-    if (discriminator != 2)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public String z ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyz (__discriminator);
-    return ___z;
-  }
-
-  public void z (String value)
-  {
-    __discriminator = 3;
-    ___z = value;
-    __uninitialized = false;
-  }
-
-  public void z (int discriminator, String value)
-  {
-    verifyz (discriminator);
-    __discriminator = discriminator;
-    ___z = value;
-    __uninitialized = false;
-  }
-
-  private void verifyz (int discriminator)
-  {
-    if (discriminator != 3)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion iu ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyiu (__discriminator);
-    return ___iu;
-  }
-
-  public void iu (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion value)
-  {
-    __discriminator = 4;
-    ___iu = value;
-    __uninitialized = false;
-  }
-
-  public void iu (int discriminator, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion value)
-  {
-    verifyiu (discriminator);
-    __discriminator = discriminator;
-    ___iu = value;
-    __uninitialized = false;
-  }
-
-  private void verifyiu (int discriminator)
-  {
-    if (discriminator != 4)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public boolean a ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifya (__discriminator);
-    return ___a;
-  }
-
-  public void a (boolean value)
-  {
-    __discriminator = -2147483648;
-    ___a = value;
-    __uninitialized = false;
-  }
-
-  public void a (int discriminator, boolean value)
-  {
-    verifya (discriminator);
-    __discriminator = discriminator;
-    ___a = value;
-    __uninitialized = false;
-  }
-
-  private void verifya (int discriminator)
-  {
-    if (discriminator == 1 || discriminator == 2 || discriminator == 3 || discriminator == 4)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-} // class RichUnion
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
deleted file mode 100644
index 7cef0ea189..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-abstract public class RichUnionHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion/RichUnion:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      org.omg.CORBA.TypeCode _disTypeCode0;
-      _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [5];
-      org.omg.CORBA.TypeCode _tcOf_members0;
-      org.omg.CORBA.Any _anyOf_members0;
-
-      // Branch for x (case label 1)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)1);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      _members0[0] = new org.omg.CORBA.UnionMember (
-        "x",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for y (case label 2)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)2);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);
-      _members0[1] = new org.omg.CORBA.UnionMember (
-        "y",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for z (case label 3)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)3);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-      _members0[2] = new org.omg.CORBA.UnionMember (
-        "z",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for iu (case label 4)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)4);
-      _tcOf_members0 = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.type ();
-      _members0[3] = new org.omg.CORBA.UnionMember (
-        "iu",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for a (Default case)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_octet ((byte)0); // default member label
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_boolean);
-      _members0[4] = new org.omg.CORBA.UnionMember (
-        "a",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-      __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.id (), "RichUnion", _disTypeCode0, _members0);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion value = new org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion ();
-    int _dis0 = (int)0;
-    _dis0 = istream.read_long ();
-    switch (_dis0)
-    {
-      case 1:
-        int _x = (int)0;
-        _x = istream.read_long ();
-        value.x (_x);
-        break;
-      case 2:
-        float _y = (float)0;
-        _y = istream.read_float ();
-        value.y (_y);
-        break;
-      case 3:
-        String _z = null;
-        _z = istream.read_string ();
-        value.z (_z);
-        break;
-      case 4:
-        org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion _iu = null;
-        _iu = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.read (istream);
-        value.iu (_iu);
-        break;
-      default:
-        boolean _a = false;
-        _a = istream.read_boolean ();
-        value.a (_dis0, _a);
-        break;
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion value)
-  {
-    ostream.write_long (value.discriminator ());
-    switch (value.discriminator ())
-    {
-      case 1:
-        ostream.write_long (value.x ());
-        break;
-      case 2:
-        ostream.write_float (value.y ());
-        break;
-      case 3:
-        ostream.write_string (value.z ());
-        break;
-      case 4:
-        org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.write (ostream, value.iu ());
-        break;
-      default:
-        ostream.write_boolean (value.a ());
-        break;
-    }
-  }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
deleted file mode 100644
index 5498104905..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public final class RichUnionHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion value = null;
-
-  public RichUnionHolder ()
-  {
-  }
-
-  public RichUnionHolder (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.type ();
-  }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
deleted file mode 100644
index 72beff0537..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-abstract public class StringArrayHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArray:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, String[][] that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static String[][] extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0);
-      __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode );
-      __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode );
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.id (), "StringArray", __typeCode);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static String[][] read (org.omg.CORBA.portable.InputStream istream)
-  {
-    String value[][] = null;
-    value = new String[2][];
-    for (int _o0 = 0;_o0 < (2); ++_o0)
-    {
-      value[_o0] = new String[2];
-      for (int _o1 = 0;_o1 < (2); ++_o1)
-      {
-        value[_o0][_o1] = istream.read_string ();
-      }
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, String[][] value)
-  {
-    if (value.length != (2))
-      throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    for (int _i0 = 0;_i0 < (2); ++_i0)
-    {
-      if (value[_i0].length != (2))
-        throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-      for (int _i1 = 0;_i1 < (2); ++_i1)
-      {
-        ostream.write_string (value[_i0][_i1]);
-      }
-    }
-  }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
deleted file mode 100644
index 747337597c..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public final class StringArrayHolder implements org.omg.CORBA.portable.Streamable
-{
-  public String value[][] = null;
-
-  public StringArrayHolder ()
-  {
-  }
-
-  public StringArrayHolder (String[][] initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.type ();
-  }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
deleted file mode 100644
index 2b239deadc..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public final class TestStruct implements org.omg.CORBA.portable.IDLEntity
-{
-  public String oneDimArray[] = null;
-  public int twoDimArray[][] = null;
-  public float threeDimArray[][][] = null;
-
-  public TestStruct ()
-  {
-  } // ctor
-
-  public TestStruct (String[] _oneDimArray, int[][] _twoDimArray, float[][][] _threeDimArray)
-  {
-    oneDimArray = _oneDimArray;
-    twoDimArray = _twoDimArray;
-    threeDimArray = _threeDimArray;
-  } // ctor
-
-} // class TestStruct
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
deleted file mode 100644
index 6427d9d200..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-abstract public class TestStructHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct/TestStruct:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct 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.arrays_unions.TestStruct extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "oneDimArray",
-            _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_array_tc (2, _tcOf_members0 );
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (4, _tcOf_members0 );
-          _members0[1] = new org.omg.CORBA.StructMember (
-            "twoDimArray",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (4, _tcOf_members0 );
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
-          _members0[2] = new org.omg.CORBA.StructMember (
-            "threeDimArray",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.id (), "TestStruct", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct value = new org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct ();
-    value.oneDimArray = new String[2];
-    for (int _o0 = 0;_o0 < (2); ++_o0)
-    {
-      value.oneDimArray[_o0] = istream.read_string ();
-    }
-    value.twoDimArray = new int[2][];
-    for (int _o1 = 0;_o1 < (2); ++_o1)
-    {
-      value.twoDimArray[_o1] = new int[4];
-      for (int _o2 = 0;_o2 < (4); ++_o2)
-      {
-        value.twoDimArray[_o1][_o2] = istream.read_long ();
-      }
-    }
-    value.threeDimArray = new float[2][][];
-    for (int _o3 = 0;_o3 < (2); ++_o3)
-    {
-      value.threeDimArray[_o3] = new float[4][];
-      for (int _o4 = 0;_o4 < (4); ++_o4)
-      {
-        value.threeDimArray[_o3][_o4] = new float[2];
-        for (int _o5 = 0;_o5 < (2); ++_o5)
-        {
-          value.threeDimArray[_o3][_o4][_o5] = istream.read_float ();
-        }
-      }
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct value)
-  {
-    if (value.oneDimArray.length != (2))
-      throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    for (int _i0 = 0;_i0 < (2); ++_i0)
-    {
-      ostream.write_string (value.oneDimArray[_i0]);
-    }
-    if (value.twoDimArray.length != (2))
-      throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    for (int _i1 = 0;_i1 < (2); ++_i1)
-    {
-      if (value.twoDimArray[_i1].length != (4))
-        throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-      for (int _i2 = 0;_i2 < (4); ++_i2)
-      {
-        ostream.write_long (value.twoDimArray[_i1][_i2]);
-      }
-    }
-    if (value.threeDimArray.length != (2))
-      throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    for (int _i3 = 0;_i3 < (2); ++_i3)
-    {
-      if (value.threeDimArray[_i3].length != (4))
-        throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-      for (int _i4 = 0;_i4 < (4); ++_i4)
-      {
-        if (value.threeDimArray[_i3][_i4].length != (2))
-          throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        for (int _i5 = 0;_i5 < (2); ++_i5)
-        {
-          ostream.write_float (value.threeDimArray[_i3][_i4][_i5]);
-        }
-      }
-    }
-  }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
deleted file mode 100644
index 94683e0327..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public final class TestStructHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct value = null;
-
-  public TestStructHolder ()
-  {
-  }
-
-  public TestStructHolder (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.type ();
-  }
-
-}
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
deleted file mode 100644
index e4cac28e4f..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public abstract class _ArraysUnionsTestsImplBase extends org.omg.CORBA.portable.ObjectImpl
-                implements org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests, org.omg.CORBA.portable.InvokeHandler
-{
-
-  // Constructors
-  public _ArraysUnionsTestsImplBase ()
-  {
-  }
-
-  private static java.util.Hashtable _methods = new java.util.Hashtable ();
-  static
-  {
-    _methods.put ("passTestStruct", new java.lang.Integer (0));
-    _methods.put ("passStringArray", new java.lang.Integer (1));
-    _methods.put ("passRichUnion", new java.lang.Integer (2));
-  }
-
-  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
-                                org.omg.CORBA.portable.InputStream in,
-                                org.omg.CORBA.portable.ResponseHandler $rh)
-  {
-    org.omg.CORBA.portable.OutputStream out = null;
-    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
-    if (__method == null)
-      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-    switch (__method.intValue ())
-    {
-       case 0:  // org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests/passTestStruct
-       {
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct arg = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.read (in);
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct $result = null;
-         $result = this.passTestStruct (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.write (out, $result);
-         break;
-       }
-
-       case 1:  // org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests/passStringArray
-       {
-         String arg[][] = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.read (in);
-         String $result[][] = null;
-         $result = this.passStringArray (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.write (out, $result);
-         break;
-       }
-
-       case 2:  // org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests/passRichUnion
-       {
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion arg = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.read (in);
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion $result = null;
-         $result = this.passRichUnion (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.write (out, $result);
-         break;
-       }
-
-       default:
-         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    }
-
-    return out;
-  } // _invoke
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-
-} // class _ArraysUnionsTestsImplBase
diff --git a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java b/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
deleted file mode 100644
index 38e29c0d63..0000000000
--- a/branches/sca-android/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpień 2008 15:45:39 CEST
-*/
-
-public class _ArraysUnionsTestsStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests
-{
-
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct passTestStruct (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passTestStruct", true);
-                org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.write ($out, arg);
-                $in = _invoke ($out);
-                org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct $result = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.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 passTestStruct (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passTestStruct
-
-  public String[][] passStringArray (String[][] arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passStringArray", true);
-                org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.write ($out, arg);
-                $in = _invoke ($out);
-                String $result[][] = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return passStringArray (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passStringArray
-
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion passRichUnion (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passRichUnion", true);
-                org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.write ($out, arg);
-                $in = _invoke ($out);
-                org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion $result = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return passRichUnion (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passRichUnion
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
-  {
-     String str = s.readUTF ();
-     String[] args = null;
-     java.util.Properties props = null;
-     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
-     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
-     _set_delegate (delegate);
-  }
-
-  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
-  {
-     String[] args = null;
-     java.util.Properties props = null;
-     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
-     s.writeUTF (str);
-  }
-} // class _ArraysUnionsTestsStub