Apply the patch from Wojtek for TUSCANY-2357 (service-api-tests-jira-2357-23-june-2008-patch). Thanks.

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

83 files changed, 1798 insertions, 334 deletions

diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
index dc2224d7a8..178a0fdc8a 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
@@ -27,6 +27,7 @@ import org.apache.tuscany.sca.binding.corba.impl.exceptions.RequestConfiguration
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTree;
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeCreator;
 import org.apache.tuscany.sca.binding.corba.impl.types.util.TypeHelpersProxy;
+import org.apache.tuscany.sca.binding.corba.impl.types.util.Utils;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.Object;
 import org.omg.CORBA.SystemException;
@@ -82,17 +83,6 @@ public class DynaCorbaRequest {
 		returnTree = TypeTreeCreator.createTypeTree(forClass);
 	}
 
-	private String getExceptionId(Class<?> forClass) {
-		String result = forClass.getName().replace('.', '/');
-		result = result.replaceAll("Package", "");
-		if (result.endsWith("Exception")) {
-			result = result
-					.substring(0, result.length() - "Exception".length());
-		}
-		result = "IDL:" + result + ":1.0";
-		return result;
-	}
-
 	/**
 	 * Configures possible exceptions
 	 * 
@@ -101,7 +91,7 @@ public class DynaCorbaRequest {
 	public void addExceptionType(Class<?> forClass)
 			throws RequestConfigurationException {
 		TypeTree tree = TypeTreeCreator.createTypeTree(forClass);
-		String exceptionId = getExceptionId(forClass);
+		String exceptionId = Utils.getExceptionId(forClass);
 		exceptions.put(exceptionId, tree);
 	}
 
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
new file mode 100644
index 0000000000..52d1383025
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
@@ -0,0 +1,143 @@
+/*
+ * 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.impl.service;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.binding.corba.impl.exceptions.RequestConfigurationException;
+import org.apache.tuscany.sca.binding.corba.impl.types.TypeTree;
+import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeCreator;
+import org.apache.tuscany.sca.binding.corba.impl.types.util.TypeHelpersProxy;
+import org.apache.tuscany.sca.binding.corba.impl.types.util.Utils;
+import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.InvokeHandler;
+import org.omg.CORBA.portable.ObjectImpl;
+import org.omg.CORBA.portable.OutputStream;
+import org.omg.CORBA.portable.ResponseHandler;
+
+/**
+ * General servant which provides target component implementation via CORBA
+ */
+public class DynaCorbaServant extends ObjectImpl implements InvokeHandler {
+
+	private static String[] DEFAULT_IDS = { "IDL:default:1.0" };
+	private RuntimeComponentService service;
+	private Binding binding;
+	private String[] ids = DEFAULT_IDS;
+
+	public DynaCorbaServant(RuntimeComponentService service, Binding binding) {
+		this.service = service;
+		this.binding = binding;
+	}
+
+	public void setIds(String[] ids) {
+		if (ids != null) {
+			this.ids = ids;
+		} else {
+			this.ids = DEFAULT_IDS;
+		}
+	}
+
+	public OutputStream _invoke(String method, InputStream in,
+			ResponseHandler rh) {
+
+		DataType outputType = null;
+		DataType<List<DataType>> inputType = null;
+		Operation operation = null;
+
+		List<Operation> operations = service.getInterfaceContract()
+				.getInterface().getOperations();
+		// searching for proper operation
+		for (Operation oper : operations) {
+			if (oper.getName().equals(method)) {
+				outputType = oper.getOutputType();
+				inputType = oper.getInputType();
+				operation = oper;
+				break;
+			}
+		}
+		if (operation == null) {
+			// operation wasn't found
+			throw new org.omg.CORBA.BAD_OPERATION(0,
+					org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+		} else {
+			List<Object> inputInstances = new ArrayList<Object>();
+			try {
+				// retrieving in arguments
+				for (DataType type : inputType.getLogical()) {
+					Class<?> forClass = type.getPhysical();
+					TypeTree tree = TypeTreeCreator.createTypeTree(forClass);
+					Object o = TypeHelpersProxy.read(tree.getRootNode(), in);
+					inputInstances.add(o);
+
+				}
+			} catch (RequestConfigurationException e) {
+				// TODO: raise remote exception, BAD_PARAM exception maybe?
+				e.printStackTrace();
+			}
+			try {
+				// invocation and sending result
+				Object result = service.getRuntimeWire(binding).invoke(
+						operation, inputInstances.toArray());
+				if (outputType != null) {
+					OutputStream out = rh.createReply();
+					TypeTree tree = TypeTreeCreator.createTypeTree(outputType
+							.getPhysical());
+					TypeHelpersProxy.write(tree.getRootNode(), out, result);
+					return out;
+				}
+			} catch (InvocationTargetException ie) {
+				// handling user exception
+				try {
+					OutputStream out = rh.createExceptionReply();
+					Class<?> exceptionClass = ie.getTargetException()
+							.getClass();
+					TypeTree tree = TypeTreeCreator
+							.createTypeTree(exceptionClass);
+					String exceptionId = Utils.getExceptionId(exceptionClass);
+					out.write_string(exceptionId);
+					TypeHelpersProxy.write(tree.getRootNode(), out, ie
+							.getTargetException());
+					return out;
+				} catch (RequestConfigurationException e) {
+					// TODO: raise remote exception - exception while handling
+					// target exception
+					e.printStackTrace();
+				}
+			} catch (Exception e) {
+				// TODO: raise remote exception
+				e.printStackTrace();
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public String[] _ids() {
+		return ids;
+	}
+
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
new file mode 100644
index 0000000000..e4b1efe41d
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
@@ -0,0 +1,40 @@
+/*
+ * 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.impl.types.util;
+
+public class Utils {
+
+	/**
+	 * Creates CORBA id for Java class
+	 * @param forClass
+	 * @return
+	 */
+	public static String getExceptionId(Class<?> forClass) {
+		String result = forClass.getName().replace('.', '/');
+		result = result.replaceAll("Package", "");
+		if (result.endsWith("Exception")) {
+			result = result
+					.substring(0, result.length() - "Exception".length());
+		}
+		result = "IDL:" + result + ":1.0";
+		return result;
+	}
+	
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
new file mode 100644
index 0000000000..607695f971
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
@@ -0,0 +1,440 @@
+/*
+ * 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;
+
+import java.io.IOException;
+import java.lang.reflect.Array;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.binding.corba.impl.exceptions.CorbaException;
+import org.apache.tuscany.sca.binding.corba.impl.reference.DynaCorbaRequest;
+import org.apache.tuscany.sca.binding.corba.impl.reference.DynaCorbaResponse;
+import org.apache.tuscany.sca.binding.corba.impl.service.DynaCorbaServant;
+import org.apache.tuscany.sca.binding.corba.testing.enums.Color;
+import org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager;
+import org.apache.tuscany.sca.binding.corba.testing.enums.EnumManagerHelper;
+import org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc;
+import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcHelper;
+import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero;
+import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported;
+import org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter;
+import org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetterHelper;
+import org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter;
+import org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetterHelper;
+import org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct;
+import org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct;
+import org.apache.tuscany.sca.binding.corba.testing.generated.TestObject;
+import org.apache.tuscany.sca.binding.corba.testing.generated.TestObjectHelper;
+import org.apache.tuscany.sca.binding.corba.testing.hierarchy.NonCorbaException;
+import org.apache.tuscany.sca.binding.corba.testing.servants.ArraysSetterServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.CalcServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.EnumManagerServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.InvalidTestObjectServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.NonCorbaServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.PrimitivesSetterServant;
+import org.apache.tuscany.sca.binding.corba.testing.servants.TestObjectServant;
+import org.apache.tuscany.sca.binding.corba.testing.service.mocks.TestRuntimeComponentService;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Object;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
+public class CorbaServantTestCase extends TestCase {
+
+	private Process process;
+	private ORB orb;
+
+	/**
+	 * Spawns tnamserv an initiates ORB
+	 */
+	public void setUp() throws IOException {
+		String[] args = { "-ORBInitialPort",
+				"" + TestConstants.ORB_INITIAL_PORT };
+		process = Runtime.getRuntime().exec(
+				"tnameserv " + args[0] + " " + args[1]);
+		try {
+			// let the tnameserv have time to start
+			Thread.sleep(TestConstants.TNAMESERV_SPAWN_WAIT);
+			orb = ORB.init(args, null);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Kills tnameserv
+	 */
+	public void tearDown() {
+		try {
+			if (process != null) {
+				process.destroy();
+			}
+			// let the tnameserv have time to die
+			Thread.sleep(TestConstants.TNAMESERV_SPAWN_WAIT);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Binds servant implementation to name
+	 */
+	private void bindServant(DynaCorbaServant servant, String name) {
+		try {
+			Object nameService = orb.resolve_initial_references("NameService");
+			NamingContext namingContext = NamingContextHelper
+					.narrow(nameService);
+
+			NameComponent nc = new NameComponent(name, "");
+			NameComponent[] path = new NameComponent[] { nc };
+			namingContext.rebind(path, servant);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Returns object reference which is binded to given name
+	 * 
+	 * @param name
+	 * @return
+	 */
+	private org.omg.CORBA.Object bindReference(String name) {
+		try {
+			org.omg.CORBA.Object objRef = orb
+					.resolve_initial_references("NameService");
+			NamingContext ncRef = NamingContextHelper.narrow(objRef);
+			NameComponent nc = new NameComponent(name, "");
+			NameComponent path[] = { nc };
+			return ncRef.resolve(path);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	/**
+	 * Tests primitives (arguments, return types)
+	 */
+	public void test_primitivesSetter() {
+		try {
+			PrimitivesSetter primitivesSetter = new PrimitivesSetterServant();
+			TestRuntimeComponentService service = new TestRuntimeComponentService(
+					primitivesSetter);
+			DynaCorbaServant servant = new DynaCorbaServant(service, null);
+			String[] ids = new String[] { "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0" };
+			servant.setIds(ids);
+			bindServant(servant, "PrimitivesSetter");
+			PrimitivesSetter psClient = PrimitivesSetterHelper
+					.narrow(bindReference("PrimitivesSetter"));
+			assertTrue(psClient.setBoolean(true) == true);
+			assertTrue(psClient.setChar('A') == 'A');
+			assertTrue(psClient.setString("SomeTest").equals("SomeTest"));
+			assertTrue(psClient.setDouble(2d) == 2d);
+			assertTrue(psClient.setFloat(3f) == 3f);
+			assertTrue(psClient.setLong(1) == 1);
+			assertTrue(psClient.setLongLong(0L) == 0L);
+			assertTrue(psClient.setOctet((byte) 8) == (byte) 8);
+			assertTrue(psClient.setShort((short) 6) == (short) 6);
+			assertTrue(psClient.setUnsignedLong(9) == 9);
+			assertTrue(psClient.setUnsignedLongLong(11L) == 11L);
+			assertTrue(psClient.setUnsignedShort((short) 15) == (short) 15);
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail();
+		}
+	}
+
+	/**
+	 * Tests if array values are equal
+	 */
+	private boolean areArraysEqual(java.lang.Object arr1,
+			java.lang.Object arr2, int arrLen) {
+		try {
+			for (int i = 0; i < arrLen; i++) {
+				if (!Array.get(arr1, i).equals(Array.get(arr2, i))) {
+					return false;
+				}
+			}
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return false;
+	}
+
+	/**
+	 * Tests arrays (arguments, return types)
+	 */
+	public void test_arraysSetter() {
+		try {
+			ArraysSetter arraysSetter = new ArraysSetterServant();
+			TestRuntimeComponentService service = new TestRuntimeComponentService(
+					arraysSetter);
+			DynaCorbaServant servant = new DynaCorbaServant(service, null);
+			String[] ids = new String[] { "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0" };
+			servant.setIds(ids);
+			java.lang.Object result = null;
+			bindServant(servant, "ArraysSetter");
+			ArraysSetter asClient = ArraysSetterHelper
+					.narrow(bindReference("ArraysSetter"));
+
+			boolean[] bArr = new boolean[] { true, false };
+			result = (java.lang.Object) asClient.setBoolean(bArr);
+			assertTrue(areArraysEqual(bArr, result, bArr.length));
+
+			byte[] byArr = new byte[] { 1, 2 };
+			result = (java.lang.Object) asClient.setOctet(byArr);
+			assertTrue(areArraysEqual(byArr, result, byArr.length));
+
+			short[] shArr = new short[] { 1, 2 };
+			result = (java.lang.Object) asClient.setShort(shArr);
+			assertTrue(areArraysEqual(shArr, result, shArr.length));
+
+			int[] iArr = new int[] { 1, 2 };
+			result = (java.lang.Object) asClient.setLong(iArr);
+			assertTrue(areArraysEqual(iArr, result, iArr.length));
+
+			long[] lArr = new long[] { 1, 2 };
+			result = (java.lang.Object) asClient.setLongLong(lArr);
+			assertTrue(areArraysEqual(lArr, result, lArr.length));
+
+			String[] strArr = new String[] { "Some", "Test" };
+			result = (java.lang.Object) asClient.setString(strArr);
+			assertTrue(areArraysEqual(strArr, result, strArr.length));
+
+			char[] chArr = new char[] { 'A', 'B' };
+			result = (java.lang.Object) asClient.setChar(chArr);
+			assertTrue(areArraysEqual(chArr, result, chArr.length));
+
+			float[] flArr = new float[] { 1, 2 };
+			result = (java.lang.Object) asClient.setFloat(flArr);
+			assertTrue(areArraysEqual(flArr, result, flArr.length));
+
+			double[] dbArr = new double[] { 1, 2 };
+			result = (java.lang.Object) asClient.setDouble(dbArr);
+			assertTrue(areArraysEqual(dbArr, result, dbArr.length));
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail();
+		}
+	}
+
+	/**
+	 * Tests structures (arguments, return types)
+	 */
+	public void test_TestObject_setStruct() {
+		try {
+			TestObject to = new TestObjectServant();
+			TestRuntimeComponentService service = new TestRuntimeComponentService(
+					to);
+			DynaCorbaServant servant = new DynaCorbaServant(service, null);
+			String[] ids = new String[] { "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0" };
+			servant.setIds(ids);
+			bindServant(servant, "TestObject");
+			TestObject testObject = TestObjectHelper
+					.narrow(bindReference("TestObject"));
+			SomeStruct ss = new SomeStruct();
+			SimpleStruct inner = new SimpleStruct();
+			inner.field1 = TestConstants.STR_1;
+			inner.field2 = TestConstants.INT_1;
+			ss.innerStruct = inner;
+			ss.str = TestConstants.STR_2;
+			ss.str_list = TestConstants.STR_ARR_1;
+			ss.threeDimSeq = TestConstants.INT_ARRAY_3_DIM;
+			ss.twoDimSeq = TestConstants.INT_ARRAY_2_DIM;
+			SomeStruct result = testObject.setStruct(ss);
+			assertTrue(TestConstants.are2DimArraysEqual(result.twoDimSeq,
+					TestConstants.INT_ARRAY_2_DIM));
+			assertTrue(TestConstants.are3DimArraysEqual(result.threeDimSeq,
+					TestConstants.INT_ARRAY_3_DIM));
+			assertTrue(result.str.equals(ss.str));
+			assertTrue(result.innerStruct.field1.equals(ss.innerStruct.field1));
+			assertTrue(result.innerStruct.field2 == ss.innerStruct.field2);
+			assertTrue(areArraysEqual(result.str_list, ss.str_list,
+					ss.str_list.length));
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail();
+		}
+	}
+
+	/**
+	 * Tests handling BAD_OPERATION system exception
+	 */
+	public void test_noSuchOperation() {
+		try {
+			TestObjectServant tos = new TestObjectServant();
+			TestRuntimeComponentService service = new TestRuntimeComponentService(
+					tos);
+			DynaCorbaServant servant = new DynaCorbaServant(service, null);
+			String[] ids = new String[] { "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0" };
+			servant.setIds(ids);
+			bindServant(servant, "TestObject");
+			DynaCorbaRequest request = new DynaCorbaRequest(
+					bindReference("TestObject"), "methodThatSurelyDoesNotExist");
+			request.invoke();
+		} catch (Exception e) {
+			if (e instanceof CorbaException) {
+				assertTrue(true);
+			} else {
+				e.printStackTrace();
+			}
+		}
+
+		try {
+			InvalidTestObjectServant tos = new InvalidTestObjectServant();
+			TestRuntimeComponentService service = new TestRuntimeComponentService(
+					tos);
+			DynaCorbaServant servant = new DynaCorbaServant(service, null);
+			String[] ids = new String[] { "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0" };
+			servant.setIds(ids);
+			bindServant(servant, "InvalidTestObject");
+			TestObject to = TestObjectHelper
+					.narrow(bindReference("InvalidTestObject"));
+			SomeStruct str = new SomeStruct();
+			str.innerStruct = new SimpleStruct();
+			str.innerStruct.field1 = "Whatever";
+			str.str = "Whatever";
+			str.str_list = new String[] {};
+			str.threeDimSeq = new int[][][] {};
+			str.twoDimSeq = new int[][] {};
+			to.setStruct(str);
+		} catch (Exception e) {
+			if (e instanceof BAD_OPERATION) {
+				assertTrue(true);
+			} else {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * Tests handling user exceptions
+	 */
+	public void test_userExceptions() {
+		try {
+			CalcServant calc = new CalcServant();
+			TestRuntimeComponentService service = new TestRuntimeComponentService(
+					calc);
+			DynaCorbaServant servant = new DynaCorbaServant(service, null);
+			String[] ids = { "IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc:1.0" };
+			servant.setIds(ids);
+			bindServant(servant, "Calc");
+			Calc calcClient = CalcHelper.narrow(bindReference("Calc"));
+			calcClient.div(1, 0);
+			fail();
+		} catch (Exception e) {
+			if (e instanceof DivByZero) {
+				assertTrue(true);
+			} else {
+				e.printStackTrace();
+				fail();
+			}
+		}
+
+		try {
+			CalcServant calc = new CalcServant();
+			TestRuntimeComponentService service = new TestRuntimeComponentService(
+					calc);
+			DynaCorbaServant servant = new DynaCorbaServant(service, null);
+			String[] ids = { "IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc:1.0" };
+			servant.setIds(ids);
+			bindServant(servant, "Calc");
+			Calc calcClient = CalcHelper.narrow(bindReference("Calc"));
+			calcClient.divForSmallArgs(255, 255);
+			fail();
+		} catch (Exception e) {
+			if (e instanceof NotSupported) {
+				assertTrue(true);
+			} else {
+				e.printStackTrace();
+				fail();
+			}
+		}
+	}
+
+	/**
+	 * Tests enums (arguments, return types)
+	 */
+	public void test_enums() {
+		try {
+			EnumManagerServant ems = new EnumManagerServant();
+			TestRuntimeComponentService service = new TestRuntimeComponentService(
+					ems);
+			DynaCorbaServant servant = new DynaCorbaServant(service, null);
+			String[] ids = { "IDL:org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager:1.0" };
+			servant.setIds(ids);
+			bindServant(servant, "Enum");
+			EnumManager em = EnumManagerHelper.narrow(bindReference("Enum"));
+			Color color = Color.red;
+			assertTrue(em.getColor(color).value() == color.value());
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail();
+		}
+	}
+
+	public void test_nonCorbaServants() {
+		try {
+			NonCorbaServant ncs = new NonCorbaServant();
+			TestRuntimeComponentService service = new TestRuntimeComponentService(
+					ncs);
+			DynaCorbaServant servant = new DynaCorbaServant(service, null);
+			bindServant(servant, "NonCorbaServant");
+			// it's non corba servant so we don't have stubs to test them
+			DynaCorbaRequest request = new DynaCorbaRequest(
+					bindReference("NonCorbaServant"), "setString");
+			request.addArgument(TestConstants.STR_1);
+			request.setOutputType(String.class);
+			DynaCorbaResponse response = request.invoke();
+			assertTrue(response.getContent().equals(TestConstants.STR_1));
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail();
+		}
+
+		try {
+			NonCorbaServant ncs = new NonCorbaServant();
+			TestRuntimeComponentService service = new TestRuntimeComponentService(
+					ncs);
+			DynaCorbaServant servant = new DynaCorbaServant(service, null);
+			bindServant(servant, "NonCorbaServant");
+			// it's non corba servant so we don't have stubs to test them
+			DynaCorbaRequest request = new DynaCorbaRequest(
+					bindReference("NonCorbaServant"), "throwException");
+			request.addExceptionType(NonCorbaException.class);
+			request.invoke();
+			fail();
+		} catch (Exception e) {
+			if (e instanceof NonCorbaException) {
+				assertTrue(true);
+			} else {
+				e.printStackTrace();
+				fail();
+			}
+		}
+	}
+
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
index 9bfcdaa5d1..d68510b6af 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
@@ -290,24 +290,8 @@ public class CorbaTypesTestCase extends TestCase {
 			request.setOutputType(SomeStruct.class);
 			DynaCorbaResponse response = request.invoke();
 			SomeStruct result = (SomeStruct) response.getContent();
-			int sum = 0;
-			for (int i = 0; i < result.twoDimSeq.length; i++) {
-				for (int j = 0; j < result.twoDimSeq[i].length; j++) {
-					sum++;
-					assertEquals(TestConstants.INT_ARRAY_2_DIM[i][j],
-							result.twoDimSeq[i][j]);
-				}
-			}
-			sum = 0;
-			for (int i = 0; i < result.threeDimSeq.length; i++) {
-				for (int j = 0; j < result.threeDimSeq[i].length; j++) {
-					for (int k = 0; k < result.threeDimSeq[i][j].length; k++) {
-						sum++;
-						assertEquals(TestConstants.INT_ARRAY_3_DIM[i][j][k],
-								result.threeDimSeq[i][j][k]);
-					}
-				}
-			}
+			assertTrue(TestConstants.are2DimArraysEqual(result.twoDimSeq, TestConstants.INT_ARRAY_2_DIM));
+			assertTrue(TestConstants.are3DimArraysEqual(result.threeDimSeq, TestConstants.INT_ARRAY_3_DIM));
 			assertEquals(TestConstants.STR_1, result.str);
 			assertEquals(TestConstants.STR_ARR_2[0], result.str_list[0]);
 			assertEquals(TestConstants.STR_ARR_2[1], result.str_list[1]);
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
index 80a188db50..1b37b9ad10 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
@@ -20,6 +20,7 @@
 package org.apache.tuscany.sca.binding.corba.testing;
 
 /**
+ * Some constants and utilities for module tests
  * @version $Rev$ $Date$
  */
 public class TestConstants {
@@ -31,10 +32,53 @@ public class TestConstants {
 	public static final String[] STR_ARR_2 = { "Another", "string", "array" };
 	public static final int INT_1 = 0;
 
+	public static final int ORB_INITIAL_PORT = 11100;
+
 	public static final int[][] INT_ARRAY_2_DIM = { { 1, 2 }, { 3, 4 } };
 	public static final int[][][] INT_ARRAY_3_DIM = { { { 1, 2 }, { 3, 4 } },
 			{ { 5, 6 }, { 7, 8 } } };
 
-
 	public static final long TNAMESERV_SPAWN_WAIT = 300;
+
+	/**
+	 * Tests if given 2D arrays values are equal
+	 * @param arr1
+	 * @param arr2
+	 * @return
+	 */
+	public static boolean are2DimArraysEqual(int[][] arr1, int[][] arr2) {
+		int sum = 0;
+		int expSum = 0;
+		for (int i = 0; i < arr1.length; i++) {
+			for (int j = 0; j < arr1[i].length; j++) {
+				expSum++;
+				if (arr1[i][j] == arr2[i][j]) {
+					sum++;
+				}
+			}
+		}
+		return sum == expSum;
+	}
+
+	/**
+	 * Tests if given 3D arrays values are equal
+	 * @param arr1
+	 * @param arr2
+	 * @return
+	 */
+	public static boolean are3DimArraysEqual(int[][][] arr1, int[][][] arr2) {
+		int sum = 0;
+		int expSum = 0;
+		for (int i = 0; i < arr1.length; i++) {
+			for (int j = 0; j < arr1[i].length; j++) {
+				for (int k = 0; k < arr1[i][j].length; k++) {
+					expSum++;
+					if (arr1[i][j][k] == arr2[i][j][k]) {
+						sum++;
+					}
+				}
+			}
+		}
+		return sum == expSum;
+	}
 }
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
index 17552b572d..e4c71afeb2 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/ArraysSetter.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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 
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
index 7c0ccba3aa..5ea6faf4fc 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/ArraysSetterHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 abstract public class ArraysSetterHelper
 {
-  private static String  _id = "IDL:Tester/ArraysSetter:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
index 987c42d0cf..c870c13f04 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
@@ -20,10 +20,10 @@
 package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 /**
-* Tester/ArraysSetterHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public final class ArraysSetterHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
index 75a552dc58..647d91c460 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/ArraysSetterOperations.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public interface ArraysSetterOperations 
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
index 12cfbbeda4..0e1e6884e1 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/PrimitivesSetter.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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 
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
index c4855e085c..b675f58204 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/PrimitivesSetterHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class PrimitivesSetterHelper
 {
-  private static String  _id = "IDL:Tester/PrimitivesSetter:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
index b33a2c6d01..c7f475824a 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
@@ -20,10 +20,10 @@
 package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 /**
-* Tester/PrimitivesSetterHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class PrimitivesSetterHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
index b40631f00e..bd11cbd92e 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/PrimitivesSetterOperations.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public interface PrimitivesSetterOperations 
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
index dc9ed3522b..baa68314ba 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/RemoteObject.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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 
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
index 3762b8bc6b..c1b8544747 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/RemoteObjectHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class RemoteObjectHelper
 {
-  private static String  _id = "IDL:Tester/RemoteObject:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
index 79fe98e0bb..b74f00c51c 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
@@ -20,10 +20,10 @@
 package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 /**
-* Tester/RemoteObjectHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class RemoteObjectHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
index 3f4a7ad76d..82b9be81c0 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/RemoteObjectOperations.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public interface RemoteObjectOperations 
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
index 1f2337dba5..42f7279aef 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/SimpleStruct.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class SimpleStruct implements org.omg.CORBA.portable.IDLEntity
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
index a6ce203d01..0335db5341 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/SimpleStructHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class SimpleStructHelper
 {
-  private static String  _id = "IDL:Tester/SimpleStruct/SimpleStruct:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
index 5fe7310826..1f597ab430 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
@@ -20,10 +20,10 @@
 package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 /**
-* Tester/SimpleStructHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class SimpleStructHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
index 83d1c12510..253eb6c892 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/SomeStruct.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class SomeStruct implements org.omg.CORBA.portable.IDLEntity
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
index 10dc161e32..70af7bf820 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/SomeStructHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class SomeStructHelper
 {
-  private static String  _id = "IDL:Tester/SomeStruct/SomeStruct:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
index d1d4e2d432..28e0673c54 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
@@ -20,10 +20,10 @@
 package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 /**
-* Tester/SomeStructHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class SomeStructHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
index 650ea23106..121700cdec 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/TestObject.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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 
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
index 2c8e1cd494..a707dbc06b 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/TestObjectHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class TestObjectHelper
 {
-  private static String  _id = "IDL:Tester/TestObject:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
index 9c49918c04..ae9b343072 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
@@ -20,10 +20,10 @@
 package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 /**
-* Tester/TestObjectHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class TestObjectHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
index 9d89f5426d..534297c96e 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
@@ -21,16 +21,16 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/TestObjectOperations.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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.SomeStructHolder arg1, org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg2, org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg3, int structNumber);
-  org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct setStruct (org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg);
+  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);
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
index 9ffea78f14..eabb25bf4c 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/_ArraysSetterImplBase.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.ObjectImpl
@@ -67,7 +67,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
 
     switch (__method.intValue ())
     {
-       case 0:  // Tester/ArraysSetter/setBoolean
+       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;
@@ -77,7 +77,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 1:  // Tester/ArraysSetter/setChar
+       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;
@@ -87,7 +87,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 2:  // Tester/ArraysSetter/setWchar
+       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;
@@ -97,7 +97,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 3:  // Tester/ArraysSetter/setOctet
+       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;
@@ -107,7 +107,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 4:  // Tester/ArraysSetter/setShort
+       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;
@@ -117,7 +117,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 5:  // Tester/ArraysSetter/setUnsignedShort
+       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;
@@ -127,7 +127,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 6:  // Tester/ArraysSetter/setLong
+       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;
@@ -137,7 +137,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 7:  // Tester/ArraysSetter/setUnsignedLong
+       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;
@@ -147,7 +147,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 8:  // Tester/ArraysSetter/setLongLong
+       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;
@@ -157,7 +157,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 9:  // Tester/ArraysSetter/setUnsignedLongLong
+       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;
@@ -167,7 +167,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 10:  // Tester/ArraysSetter/setFloat
+       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;
@@ -177,7 +177,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 11:  // Tester/ArraysSetter/setDouble
+       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;
@@ -187,7 +187,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 12:  // Tester/ArraysSetter/setString
+       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;
@@ -197,7 +197,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 13:  // Tester/ArraysSetter/setWstring
+       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;
@@ -207,7 +207,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
          break;
        }
 
-       case 14:  // Tester/ArraysSetter/setRemoteObject
+       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;
@@ -226,7 +226,7 @@ public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.Objec
 
   // Type-specific CORBA::Object operations
   private static String[] __ids = {
-    "IDL:Tester/ArraysSetter:1.0"};
+    "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0"};
 
   public String[] _ids ()
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
index 1605346ed8..1bdfb41d19 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/_ArraysSetterStub.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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
@@ -332,7 +332,7 @@ public class _ArraysSetterStub extends org.omg.CORBA.portable.ObjectImpl impleme
 
   // Type-specific CORBA::Object operations
   private static String[] __ids = {
-    "IDL:Tester/ArraysSetter:1.0"};
+    "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0"};
 
   public String[] _ids ()
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
index fd840095a5..8b6330bd48 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/_PrimitivesSetterImplBase.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.ObjectImpl
@@ -67,7 +67,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
 
     switch (__method.intValue ())
     {
-       case 0:  // Tester/PrimitivesSetter/setBoolean
+       case 0:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setBoolean
        {
          boolean arg = in.read_boolean ();
          boolean $result = false;
@@ -77,7 +77,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 1:  // Tester/PrimitivesSetter/setChar
+       case 1:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setChar
        {
          char arg = in.read_char ();
          char $result = (char)0;
@@ -87,7 +87,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 2:  // Tester/PrimitivesSetter/setWchar
+       case 2:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setWchar
        {
          char arg = in.read_wchar ();
          char $result = (char)0;
@@ -97,7 +97,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 3:  // Tester/PrimitivesSetter/setOctet
+       case 3:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setOctet
        {
          byte arg = in.read_octet ();
          byte $result = (byte)0;
@@ -107,7 +107,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 4:  // Tester/PrimitivesSetter/setShort
+       case 4:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setShort
        {
          short arg = in.read_short ();
          short $result = (short)0;
@@ -117,7 +117,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 5:  // Tester/PrimitivesSetter/setUnsignedShort
+       case 5:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedShort
        {
          short arg = in.read_ushort ();
          short $result = (short)0;
@@ -127,7 +127,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 6:  // Tester/PrimitivesSetter/setLong
+       case 6:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setLong
        {
          int arg = in.read_long ();
          int $result = (int)0;
@@ -137,7 +137,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 7:  // Tester/PrimitivesSetter/setUnsignedLong
+       case 7:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedLong
        {
          int arg = in.read_ulong ();
          int $result = (int)0;
@@ -147,7 +147,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 8:  // Tester/PrimitivesSetter/setLongLong
+       case 8:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setLongLong
        {
          long arg = in.read_longlong ();
          long $result = (long)0;
@@ -157,7 +157,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 9:  // Tester/PrimitivesSetter/setUnsignedLongLong
+       case 9:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedLongLong
        {
          long arg = in.read_ulonglong ();
          long $result = (long)0;
@@ -167,7 +167,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 10:  // Tester/PrimitivesSetter/setFloat
+       case 10:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setFloat
        {
          float arg = in.read_float ();
          float $result = (float)0;
@@ -177,7 +177,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 11:  // Tester/PrimitivesSetter/setDouble
+       case 11:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setDouble
        {
          double arg = in.read_double ();
          double $result = (double)0;
@@ -187,7 +187,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 12:  // Tester/PrimitivesSetter/setString
+       case 12:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setString
        {
          String arg = in.read_string ();
          String $result = null;
@@ -197,7 +197,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 13:  // Tester/PrimitivesSetter/setWstring
+       case 13:  // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setWstring
        {
          String arg = in.read_wstring ();
          String $result = null;
@@ -207,7 +207,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
          break;
        }
 
-       case 14:  // Tester/PrimitivesSetter/setRemoteObject
+       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;
@@ -226,7 +226,7 @@ public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.O
 
   // Type-specific CORBA::Object operations
   private static String[] __ids = {
-    "IDL:Tester/PrimitivesSetter:1.0"};
+    "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0"};
 
   public String[] _ids ()
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
index c7d3df6011..d61157a5bc 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/_PrimitivesSetterStub.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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
@@ -332,7 +332,7 @@ public class _PrimitivesSetterStub extends org.omg.CORBA.portable.ObjectImpl imp
 
   // Type-specific CORBA::Object operations
   private static String[] __ids = {
-    "IDL:Tester/PrimitivesSetter:1.0"};
+    "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0"};
 
   public String[] _ids ()
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
index bf54b1a3c1..2a577a20e3 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/_RemoteObjectImplBase.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public abstract class _RemoteObjectImplBase extends org.omg.CORBA.portable.ObjectImpl
@@ -55,7 +55,7 @@ public abstract class _RemoteObjectImplBase extends org.omg.CORBA.portable.Objec
 
   // Type-specific CORBA::Object operations
   private static String[] __ids = {
-    "IDL:Tester/RemoteObject:1.0"};
+    "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject:1.0"};
 
   public String[] _ids ()
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
index 4c1ef5fbbe..f01e4fdffa 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/_RemoteObjectStub.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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
@@ -32,7 +32,7 @@ public class _RemoteObjectStub extends org.omg.CORBA.portable.ObjectImpl impleme
 
   // Type-specific CORBA::Object operations
   private static String[] __ids = {
-    "IDL:Tester/RemoteObject:1.0"};
+    "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject:1.0"};
 
   public String[] _ids ()
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
index 69ae4e1d33..3f55d95c02 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/_TestObjectImplBase.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public abstract class _TestObjectImplBase extends org.omg.CORBA.portable.ObjectImpl
@@ -58,38 +58,30 @@ public abstract class _TestObjectImplBase extends org.omg.CORBA.portable.ObjectI
 
     switch (__method.intValue ())
     {
-       case 0:  // Tester/TestObject/pickStructFromArgs
+       case 0:  // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/pickStructFromArgs
        {
-         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg1 = new org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder ();
-         arg1.value = org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read (in);
-         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg2 = new org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder ();
-         arg2.value = org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read (in);
-         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg3 = new org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder ();
-         arg3.value = org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read (in);
+         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);
-         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write (out, arg1.value);
-         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write (out, arg2.value);
-         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write (out, arg3.value);
          break;
        }
 
-       case 1:  // Tester/TestObject/setStruct
+       case 1:  // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/setStruct
        {
-         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg = new org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder ();
-         arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read (in);
+         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);
-         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write (out, arg.value);
          break;
        }
 
-       case 2:  // Tester/TestObject/setSimpleStruct
+       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);
@@ -101,7 +93,7 @@ public abstract class _TestObjectImplBase extends org.omg.CORBA.portable.ObjectI
          break;
        }
 
-       case 3:  // Tester/TestObject/setLongSeq1
+       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);
@@ -113,7 +105,7 @@ public abstract class _TestObjectImplBase extends org.omg.CORBA.portable.ObjectI
          break;
        }
 
-       case 4:  // Tester/TestObject/setLongSeq2
+       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);
@@ -125,7 +117,7 @@ public abstract class _TestObjectImplBase extends org.omg.CORBA.portable.ObjectI
          break;
        }
 
-       case 5:  // Tester/TestObject/setLongSeq3
+       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);
@@ -146,7 +138,7 @@ public abstract class _TestObjectImplBase extends org.omg.CORBA.portable.ObjectI
 
   // Type-specific CORBA::Object operations
   private static String[] __ids = {
-    "IDL:Tester/TestObject:1.0"};
+    "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0"};
 
   public String[] _ids ()
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
index 60813f984f..a2e781795e 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
@@ -21,29 +21,26 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/_TestObjectStub.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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.SomeStructHolder arg1, org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg2, org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg3, int structNumber)
+  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.value);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write ($out, arg2.value);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write ($out, arg3.value);
+                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);
-                arg1.value = org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read ($in);
-                arg2.value = org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read ($in);
-                arg3.value = org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read ($in);
                 return $result;
             } catch (org.omg.CORBA.portable.ApplicationException $ex) {
                 $in = $ex.getInputStream ();
@@ -56,15 +53,14 @@ public class _TestObjectStub extends org.omg.CORBA.portable.ObjectImpl implement
             }
   } // pickStructFromArgs
 
-  public org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct setStruct (org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder arg)
+  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.value);
+                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);
-                arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read ($in);
                 return $result;
             } catch (org.omg.CORBA.portable.ApplicationException $ex) {
                 $in = $ex.getInputStream ();
@@ -163,7 +159,7 @@ public class _TestObjectStub extends org.omg.CORBA.portable.ObjectImpl implement
 
   // Type-specific CORBA::Object operations
   private static String[] __ids = {
-    "IDL:Tester/TestObject:1.0"};
+    "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0"};
 
   public String[] _ids ()
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
index b255ec191b..e1f13665d8 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/boolean_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 abstract public class boolean_listHelper
 {
-  private static String  _id = "IDL:Tester/boolean_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
index b1ae0ff24b..3ac1ffd697 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/boolean_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public final class boolean_listHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
index a31df9088b..65abc6c994 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/char_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 abstract public class char_listHelper
 {
-  private static String  _id = "IDL:Tester/char_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
index 76bbbc625e..17ff7d0016 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/char_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public final class char_listHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
index efa3d6d47f..c7f8133261 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/double_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 abstract public class double_listHelper
 {
-  private static String  _id = "IDL:Tester/double_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
index 72ef45a8a6..a5495f068a 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/double_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public final class double_listHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
index 5de19c6507..92de24dab0 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/float_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 abstract public class float_listHelper
 {
-  private static String  _id = "IDL:Tester/float_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
index 97713d14a8..dd00bdc28b 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/float_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public final class float_listHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
index bd8fb80e9f..e4caba864a 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/long_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 abstract public class long_listHelper
 {
-  private static String  _id = "IDL:Tester/long_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
index d45a339cb4..5df530e8b3 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/long_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public final class long_listHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
index d9e8fe14cb..bee5bd414b 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/long_long_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 abstract public class long_long_listHelper
 {
-  private static String  _id = "IDL:Tester/long_long_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
index 535cd2fd37..47f077a617 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/long_long_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 14:12:28 CEST
 */
 
 public final class long_long_listHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
index 3b8151f454..58c7903e15 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/long_seq1Helper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class long_seq1Helper
 {
-  private static String  _id = "IDL:Tester/long_seq1:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
index 23d5939811..56edf46e57 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/long_seq1Holder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class long_seq1Holder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
index 59dd5c39aa..9f486727a7 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/long_seq2Helper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class long_seq2Helper
 {
-  private static String  _id = "IDL:Tester/long_seq2:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
index 37c99438ee..691effb6b3 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/long_seq2Holder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class long_seq2Holder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
index f571cd0db5..963da418a5 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/long_seq3Helper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class long_seq3Helper
 {
-  private static String  _id = "IDL:Tester/long_seq3:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
index fdcd821a50..434d298430 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/long_seq3Holder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class long_seq3Holder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
index a9e32416b0..09d0f7d0ca 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/octet_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class octet_listHelper
 {
-  private static String  _id = "IDL:Tester/octet_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
index 07d85d1a1e..a9e4e9b295 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/octet_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class octet_listHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
index 3bbd68ffa0..4edee3aba0 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/remote_object_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class remote_object_listHelper
 {
-  private static String  _id = "IDL:Tester/remote_object_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
index 3e3ae28983..3b94159486 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/remote_object_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
index c013a0fbe0..c97a2e8fda 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/short_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class short_listHelper
 {
-  private static String  _id = "IDL:Tester/short_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
index b42302dbf4..e35a975abc 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/short_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class short_listHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
index b4543be986..aa59601dd4 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/string_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class string_listHelper
 {
-  private static String  _id = "IDL:Tester/string_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
index 468247a434..4feeb1155c 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/string_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class string_listHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
index 0010f8fad2..743bd459b0 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/unsigned_long_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class unsigned_long_listHelper
 {
-  private static String  _id = "IDL:Tester/unsigned_long_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
index ea74d32402..5bea8b9e20 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/unsigned_long_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
index 926cfd99aa..26d7954337 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/unsigned_long_long_listHelper.java .
+* 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 tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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:Tester/unsigned_long_long_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
index daa263f6ba..2c6b652812 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/unsigned_long_long_listHolder.java .
+* 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 tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
index 7fade26a5a..c16b9c617f 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/unsigned_short_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class unsigned_short_listHelper
 {
-  private static String  _id = "IDL:Tester/unsigned_short_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
index a0054282b2..1ce8cdecd5 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/unsigned_short_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* 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
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
index 90bb98c6c5..eeaec560dc 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/wchar_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class wchar_listHelper
 {
-  private static String  _id = "IDL:Tester/wchar_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
index ce9fa139d5..76d32fb999 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/wchar_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class wchar_listHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
index c912a1e0d6..517cdc236b 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
@@ -21,15 +21,15 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/wstring_listHelper.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 abstract public class wstring_listHelper
 {
-  private static String  _id = "IDL:Tester/wstring_list:1.0";
+  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)
   {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
index 56435ea38b..3197cc0564 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.binding.corba.testing.generated;
 
 
 /**
-* Tester/wstring_listHolder.java .
+* org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java .
 * Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from tester.idl
-* piątek, 30 maj 2008 17:04:42 CEST
+* from general_tests.idl
+* monday, 23 june 2008 2008 14:12:28 CEST
 */
 
 public final class wstring_listHolder implements org.omg.CORBA.portable.Streamable
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
new file mode 100644
index 0000000000..031b0549a2
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
@@ -0,0 +1,28 @@
+/*
+ * 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.hierarchy;
+
+public class NonCorbaException extends Exception {
+
+	private static final long serialVersionUID = 1L;
+
+	public String someField;
+	
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
new file mode 100644
index 0000000000..b7fbb69627
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
@@ -0,0 +1,24 @@
+/*
+ * 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.servants;
+
+public class InvalidTestObjectServant {
+
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
new file mode 100644
index 0000000000..b6a025e4db
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
@@ -0,0 +1,36 @@
+/*
+ * 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.servants;
+
+import org.apache.tuscany.sca.binding.corba.testing.hierarchy.NonCorbaException;
+
+public class NonCorbaServant {
+
+	public String setString(String arg) {
+		return arg;
+	}
+
+	public void throwException() throws NonCorbaException {
+		NonCorbaException e = new NonCorbaException();
+		e.someField = "test";
+		throw e;
+	}
+
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
index 39cef3f093..0b16ddd27e 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
@@ -22,7 +22,6 @@ package org.apache.tuscany.sca.binding.corba.testing.servants;
 import org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct;
 import org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHolder;
 import org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct;
-import org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHolder;
 import org.apache.tuscany.sca.binding.corba.testing.generated._TestObjectImplBase;
 import org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Holder;
 import org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Holder;
@@ -52,21 +51,21 @@ public class TestObjectServant extends _TestObjectImplBase {
 		return arg.value;
 	}
 
-	public SomeStruct setStruct(SomeStructHolder arg) {
-		return arg.value;
+	public SomeStruct setStruct(SomeStruct arg) {
+		return arg;
 	}
 
-	public SomeStruct pickStructFromArgs(SomeStructHolder arg1,
-			SomeStructHolder arg2, SomeStructHolder arg3, int structNumber) {
+	public SomeStruct pickStructFromArgs(SomeStruct arg1,
+			SomeStruct arg2, SomeStruct arg3, int structNumber) {
 		switch (structNumber) {
 		case 1:
-			return arg1.value;
+			return arg1;
 		case 2:
-			return arg2.value;
+			return arg2;
 		case 3:
-			return arg3.value;
+			return arg3;
 		default:
-			return arg1.value;
+			return arg1;
 		}
 	}
 
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
new file mode 100644
index 0000000000..14e16de864
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
@@ -0,0 +1,87 @@
+/*
+ * 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.service.mocks;
+
+import java.lang.reflect.Type;
+
+import org.apache.tuscany.sca.interfacedef.DataType;
+
+/**
+ * Mock DataType implementation. Only few methods needs to be implemented.
+ */
+public class TestDataType<L> implements DataType<L> {
+
+	public Class<?> typeClass;
+	public L logical;
+
+	public TestDataType(Class<?> typeClass) {
+		this.typeClass = typeClass;
+	}
+
+	public TestDataType(Class<?> typeClass, L logical) {
+		this.typeClass = typeClass;
+		this.logical = logical;
+	}
+
+	public String getDataBinding() {
+		return null;
+	}
+
+	public Type getGenericType() {
+		return null;
+	}
+
+	public L getLogical() {
+		return logical;
+	}
+
+	public <T> T getMetaData(Class<T> arg0) {
+		return null;
+	}
+
+	public Class<?> getPhysical() {
+		return typeClass;
+	}
+
+	public void setDataBinding(String arg0) {
+
+	}
+
+	public void setGenericType(Type arg0) {
+
+	}
+
+	public void setLogical(L arg0) {
+
+	}
+
+	public <T> void setMetaData(Class<T> arg0, T arg1) {
+
+	}
+
+	public void setPhysical(Class<?> arg0) {
+
+	}
+
+	public Object clone() {
+		return null;
+	}
+
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
new file mode 100644
index 0000000000..8eb0ab24ef
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
@@ -0,0 +1,97 @@
+/*
+ * 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.service.mocks;
+
+import java.util.List;
+
+import org.apache.tuscany.sca.interfacedef.Interface;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.PolicySet;
+
+/**
+ * Mock TestInterface implementation. Only few methods needs to be implemented.
+ */
+public class TestInterface implements Interface {
+
+	private List<Operation> operations;
+
+	public TestInterface(List<Operation> opearations) {
+		this.operations = opearations;
+	}
+
+	public List<Operation> getOperations() {
+		return operations;
+	}
+
+	public boolean isConversational() {
+		return false;
+	}
+
+	public boolean isDynamic() {
+		return false;
+	}
+
+	public boolean isRemotable() {
+		return false;
+	}
+
+	public void resetDataBinding(String dataBinding) {
+
+	}
+
+	public void setConversational(boolean conversational) {
+
+	}
+
+	public void setDefaultDataBinding(String dataBinding) {
+
+	}
+
+	public void setRemotable(boolean remotable) {
+
+	}
+
+	public List<PolicySet> getApplicablePolicySets() {
+		return null;
+	}
+
+	public List<PolicySet> getPolicySets() {
+		return null;
+	}
+
+	public List<Intent> getRequiredIntents() {
+		return null;
+	}
+
+	public IntentAttachPointType getType() {
+		return null;
+	}
+
+	public void setType(IntentAttachPointType type) {
+
+	}
+
+	public Object clone() {
+		return null;
+	}
+
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
new file mode 100644
index 0000000000..35fd4731d6
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
@@ -0,0 +1,57 @@
+/*
+ * 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.service.mocks;
+
+import org.apache.tuscany.sca.interfacedef.Interface;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+
+/**
+ * Mock InterfaceContract implementation. Only few methods needs to be
+ * implemented.
+ */
+public class TestInterfaceContract implements InterfaceContract {
+
+	private Interface iface;
+
+	public Interface getCallbackInterface() {
+		return null;
+	}
+
+	public Interface getInterface() {
+		return iface;
+	}
+
+	public InterfaceContract makeUnidirectional(boolean isCallback) {
+		return null;
+	}
+
+	public void setCallbackInterface(Interface callbackInterface) {
+
+	}
+
+	public void setInterface(Interface callInterface) {
+		this.iface = callInterface;
+	}
+
+	public Object clone() {
+		return null;
+	}
+
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
new file mode 100644
index 0000000000..f7d65a0b51
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
@@ -0,0 +1,173 @@
+/*
+ * 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.service.mocks;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.interfacedef.ConversationSequence;
+import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Interface;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
+import org.apache.tuscany.sca.interfacedef.util.XMLType;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.PolicySet;
+
+/**
+ * Mock Operation implementation. Only few methods needs to be implemented.
+ */
+public class TestOperation implements Operation {
+
+	private DataType<List<DataType>> inputType;
+	private DataType outputType;
+	private String name;
+
+	public ConversationSequence getConversationSequence() {
+		return null;
+	}
+
+	public String getDataBinding() {
+		return null;
+	}
+
+	public Map<QName, List<DataType<XMLType>>> getFaultBeans() {
+		return null;
+	}
+
+	public List<DataType> getFaultTypes() {
+		return null;
+	}
+
+	public DataType<List<DataType>> getInputType() {
+		return inputType;
+	}
+
+	public Interface getInterface() {
+		return null;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public DataType getOutputType() {
+		return outputType;
+	}
+
+	public WrapperInfo getWrapper() {
+		return null;
+	}
+
+	public boolean isDynamic() {
+		return false;
+	}
+
+	public boolean isNonBlocking() {
+		return false;
+	}
+
+	public boolean isUnresolved() {
+		return false;
+	}
+
+	public boolean isWrapperStyle() {
+		return false;
+	}
+
+	public void setConversationSequence(ConversationSequence sequence) {
+
+	}
+
+	public void setDataBinding(String dataBinding) {
+
+	}
+
+	public void setDynamic(boolean b) {
+
+	}
+
+	public void setFaultBeans(Map<QName, List<DataType<XMLType>>> faultBeans) {
+
+	}
+
+	public void setFaultTypes(List<DataType> faultTypes) {
+
+	}
+
+	public void setInputType(DataType<List<DataType>> inputType) {
+		this.inputType = inputType;
+	}
+
+	public void setInterface(Interface interfaze) {
+
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public void setNonBlocking(boolean nonBlocking) {
+
+	}
+
+	public void setOutputType(DataType outputType) {
+		this.outputType = outputType;
+	}
+
+	public void setUnresolved(boolean unresolved) {
+
+	}
+
+	public void setWrapper(WrapperInfo wrapperInfo) {
+
+	}
+
+	public void setWrapperStyle(boolean wrapperStyle) {
+
+	}
+
+	public List<PolicySet> getApplicablePolicySets() {
+		return null;
+	}
+
+	public List<PolicySet> getPolicySets() {
+		return null;
+	}
+
+	public Object clone() {
+		return null;
+	}
+
+	public List<Intent> getRequiredIntents() {
+		return null;
+	}
+
+	public IntentAttachPointType getType() {
+		return null;
+	}
+
+	public void setType(IntentAttachPointType type) {
+	}
+
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
new file mode 100644
index 0000000000..698114a2d0
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
@@ -0,0 +1,235 @@
+/*
+ * 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.service.mocks;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.Callback;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.ConfiguredOperation;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.InvocationChain;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.provider.PolicyProvider;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.runtime.RuntimeWire;
+
+/**
+ * Mock RuntimeComponentService implementation. Only few methods needs to be
+ * implemented.
+ */
+public class TestRuntimeComponentService implements RuntimeComponentService {
+
+	private InterfaceContract interfaceContract;
+	private RuntimeWire runtimeWire;
+
+	public TestRuntimeComponentService(Object invocationTarget) {
+		runtimeWire = new TestRuntimeWire(invocationTarget);
+		List<Operation> operations = new ArrayList<Operation>();
+		Method[] methods = invocationTarget.getClass().getMethods();
+		for (int i = 0; i < methods.length; i++) {
+			int mod = methods[i].getModifiers();
+			if (Modifier.isPublic(mod)) {
+				Operation operation = new TestOperation();
+				DataType returnType = new TestDataType(methods[i]
+						.getReturnType());
+				operation.setOutputType(returnType);
+				Class<?>[] argTypes = methods[i].getParameterTypes();
+				List<DataType> argDataTypes = new ArrayList<DataType>();
+				for (int j = 0; j < argTypes.length; j++) {
+					argDataTypes.add(new TestDataType(argTypes[j]));
+				}
+				TestDataType<List<DataType>> inputDataType = new TestDataType<List<DataType>>(
+						null, argDataTypes);
+				operation.setInputType(inputDataType);
+				operations.add(operation);
+				operation.setName(methods[i].getName());
+			}
+		}
+		TestInterface iface = new TestInterface(operations);
+		interfaceContract = new TestInterfaceContract();
+		interfaceContract.setInterface(iface);
+	}
+
+	public void addPolicyProvider(Binding binding, PolicyProvider policyProvider) {
+
+	}
+
+	public ServiceBindingProvider getBindingProvider(Binding binding) {
+		return null;
+	}
+
+	public List<RuntimeWire> getCallbackWires() {
+		return null;
+	}
+
+	public InvocationChain getInvocationChain(Binding binding,
+			Operation operation) {
+		return null;
+	}
+
+	public InvocationChain getInvocationChain(Binding binding,
+			InterfaceContract interfaceContract, Operation operation) {
+		return null;
+	}
+
+	public Invoker getInvoker(Binding binding, Operation operation) {
+		return null;
+	}
+
+	public Invoker getInvoker(Binding binding,
+			InterfaceContract interfaceContract, Operation operation) {
+		return null;
+	}
+
+	public List<PolicyProvider> getPolicyProviders(Binding binding) {
+		return null;
+	}
+
+	public RuntimeWire getRuntimeWire(Binding binding) {
+		return runtimeWire;
+	}
+
+	public RuntimeWire getRuntimeWire(Binding binding,
+			InterfaceContract interfaceContract) {
+		return null;
+	}
+
+	public List<RuntimeWire> getRuntimeWires() {
+		return null;
+	}
+
+	public void setBindingProvider(Binding binding,
+			ServiceBindingProvider bindingProvider) {
+
+	}
+
+	public ComponentReference getCallbackReference() {
+		return null;
+	}
+
+	public Service getService() {
+		return null;
+	}
+
+	public void setCallbackReference(ComponentReference callbackReference) {
+
+	}
+
+	public void setService(Service service) {
+
+	}
+
+	public InterfaceContract getInterfaceContract() {
+		return interfaceContract;
+	}
+
+	public String getName() {
+		return null;
+	}
+
+	public boolean isCallback() {
+		return false;
+	}
+
+	public void setInterfaceContract(InterfaceContract interfaceContract) {
+		this.interfaceContract = interfaceContract;
+	}
+
+	public void setIsCallback(boolean isCallback) {
+
+	}
+
+	public void setName(String name) {
+
+	}
+
+	public boolean isUnresolved() {
+		return false;
+	}
+
+	public void setUnresolved(boolean unresolved) {
+
+	}
+
+	public List<Object> getExtensions() {
+		return null;
+	}
+
+	public List<Intent> getRequiredIntents() {
+		return null;
+	}
+
+	public IntentAttachPointType getType() {
+		return null;
+	}
+
+	public void setType(IntentAttachPointType type) {
+
+	}
+
+	public List<ConfiguredOperation> getConfiguredOperations() {
+		return null;
+	}
+
+	public <B> B getBinding(Class<B> bindingClass) {
+		return null;
+	}
+
+	public List<Binding> getBindings() {
+		return null;
+	}
+
+	public Callback getCallback() {
+		return null;
+	}
+
+	public <B> B getCallbackBinding(Class<B> bindingClass) {
+		return null;
+	}
+
+	public void setCallback(Callback callback) {
+
+	}
+
+	public List<PolicySet> getApplicablePolicySets() {
+		return null;
+	}
+
+	public List<PolicySet> getPolicySets() {
+		return null;
+	}
+
+	public Object clone() {
+		return null;
+	}
+
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
new file mode 100644
index 0000000000..a5b478b868
--- /dev/null
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
@@ -0,0 +1,101 @@
+/*
+ * 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.service.mocks;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.InvocationChain;
+import org.apache.tuscany.sca.invocation.Message;
+import org.apache.tuscany.sca.runtime.EndpointReference;
+import org.apache.tuscany.sca.runtime.RuntimeWire;
+
+/**
+ * Mock RuntimeWire implementation. Only few methods needs to be implemented.
+ */
+public class TestRuntimeWire implements RuntimeWire {
+
+	private Object invocationTarget;
+
+	public TestRuntimeWire(Object invocationTarget) {
+		this.invocationTarget = invocationTarget;
+	}
+
+	public InvocationChain getInvocationChain(Operation arg0) {
+		return null;
+	}
+
+	public List<InvocationChain> getInvocationChains() {
+		return null;
+	}
+
+	public EndpointReference getSource() {
+		return null;
+	}
+
+	public EndpointReference getTarget() {
+		return null;
+	}
+
+	public Object invoke(Operation operation, Object[] args)
+			throws InvocationTargetException {
+		Class<?>[] types = new Class<?>[args.length];
+		for (int i = 0; i < args.length; i++) {
+			types[i] = args[i].getClass();
+		}
+		Object result = null;
+		try {
+			Method[] methods = invocationTarget.getClass().getMethods();
+			for (int i = 0; i < methods.length; i++) {
+				if (methods[i].getName().equals(operation.getName())) {
+					result = methods[i].invoke(invocationTarget, args);
+					break;
+				}
+			}
+		} catch (InvocationTargetException e) {
+			throw e;
+		} catch (IllegalAccessException e) {
+			e.printStackTrace();
+		}
+
+		return result;
+	}
+
+	public Object invoke(Operation operation, Message arg1)
+			throws InvocationTargetException {
+
+		return null;
+	}
+
+	public void rebuild() {
+
+	}
+
+	public void setTarget(EndpointReference arg0) {
+
+	}
+
+	public Object clone() {
+		return null;
+	}
+
+}
diff --git a/java/sca/modules/binding-corba-runtime/src/test/resources/general_tests.idl b/java/sca/modules/binding-corba-runtime/src/test/resources/general_tests.idl
index abae96c40b..db253338c3 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/resources/general_tests.idl
+++ b/java/sca/modules/binding-corba-runtime/src/test/resources/general_tests.idl
@@ -29,7 +29,6 @@ module org {
 				module binding {

 					module corba {

 						module testing {

-							module references {

 								module generated {

 

 									interface RemoteObject {

@@ -107,8 +106,8 @@ module org {
 									};

 								

 									interface TestObject {

-										SomeStruct pickStructFromArgs(inout SomeStruct arg1, inout SomeStruct arg2, inout SomeStruct arg3, in long structNumber);

-										SomeStruct setStruct(inout SomeStruct arg);

+										SomeStruct pickStructFromArgs(in SomeStruct arg1, in SomeStruct arg2, in SomeStruct arg3, in long structNumber);

+										SomeStruct setStruct(in SomeStruct arg);

 										SimpleStruct setSimpleStruct(inout SimpleStruct arg);

 										long_seq1 setLongSeq1(inout long_seq1 arg);

 										long_seq2 setLongSeq2(inout long_seq2 arg);

@@ -116,7 +115,6 @@ module org {
 									};

 								

 								};

-							};

 						};

 					};

 				};