You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2009/01/29 22:50:47 UTC

svn commit: r739033 [5/6] - in /incubator/etch/trunk: binding-csharp/runtime/src/main/csharp/Etch/Util/ compiler/src/test/etch/comments/ compiler/src/test/etch/constants/ tests/src/main/csharp/etch.tests/ tests/src/main/etch/ tests/src/main/java/etch/t...

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestRemoteTest1DotJava.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestRemoteTest1DotJava.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestRemoteTest1DotJava.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestRemoteTest1DotJava.java Thu Jan 29 21:50:44 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.tests;
+package org.apache.etch.tests;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -31,14 +31,17 @@
 import org.apache.etch.bindings.java.support.DeliveryService;
 import org.apache.etch.bindings.java.support.Mailbox;
 import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.tests.RemoteTest1;
+import org.apache.etch.tests.Test1;
+import org.apache.etch.tests.ValueFactoryTest1;
+import org.apache.etch.tests.Test1.E1;
+import org.apache.etch.tests.Test1.Excp1;
+import org.apache.etch.tests.Test1.Excp3;
+import org.apache.etch.tests.Test1.Excp4;
+import org.apache.etch.tests.Test1.S1;
+import org.apache.etch.tests.Test1.S2;
 import org.apache.etch.util.core.Who;
 
-import etch.tests.Test1.E1;
-import etch.tests.Test1.Excp1;
-import etch.tests.Test1.Excp3;
-import etch.tests.Test1.Excp4;
-import etch.tests.Test1.S1;
-import etch.tests.Test1.S2;
 
 /** Test of RemoteTest1 */
 public class TestRemoteTest1DotJava
@@ -49,11 +52,11 @@
 	{
 		test.nothing();
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_nothing,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_nothing,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_nothing,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_nothing.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_nothing,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_nothing.getTimeout() );
 	}
 
 	/** @throws Exception */
@@ -63,11 +66,11 @@
 		svc.xresult = 2;
 		assertEquals( 2, test.incr( 1 ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_incr,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_incr,
 			new Field[] { ValueFactoryTest1._mf_x },
 			new Object[] { 1 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_incr,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_incr.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_incr,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_incr.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -77,11 +80,11 @@
 		svc.xresult = 3;
 		assertEquals( 3, test.incr( 2 ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_incr,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_incr,
 			new Field[] { ValueFactoryTest1._mf_x },
 			new Object[] { 2 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_incr,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_incr.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_incr,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_incr.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -91,11 +94,11 @@
 		svc.xresult = -1;
 		assertEquals( -1, test.incr( -2 ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_incr,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_incr,
 			new Field[] { ValueFactoryTest1._mf_x },
 			new Object[] { -2 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_incr,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_incr.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_incr,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_incr.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -105,11 +108,11 @@
 		svc.xresult = 5;
 		assertEquals( 5, test.sub( 7, 2 ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_sub,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_sub,
 			new Field[] { ValueFactoryTest1._mf_x, ValueFactoryTest1._mf_y },
 			new Object[] { 7, 2 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_sub,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_sub.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sub,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sub.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -119,11 +122,11 @@
 		svc.xresult = 8;
 		assertEquals( 8, test.sub( 23, 15 ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_sub,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_sub,
 			new Field[] { ValueFactoryTest1._mf_x, ValueFactoryTest1._mf_y },
 			new Object[] { 23, 15 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_sub,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_sub.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sub,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sub.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -133,11 +136,11 @@
 		svc.xresult = -5;
 		assertEquals( -5, test.sub( 2, 7 ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_sub,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_sub,
 			new Field[] { ValueFactoryTest1._mf_x, ValueFactoryTest1._mf_y },
 			new Object[] { 2, 7 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_sub,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_sub.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sub,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sub.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -148,11 +151,11 @@
 		int[] arg = { 1, 2, 3, 7, 11 };
 		assertEquals( 24, test.sum( arg ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_sum,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_sum,
 			new Field[] { ValueFactoryTest1._mf_x },
 			new Object[] { arg },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_sum,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_sum.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sum,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sum.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -162,11 +165,11 @@
 		svc.xresult = 2;
 		assertEquals( 2, test.trans( E1.A, 5 ) ); // divide by 2
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_trans,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_trans,
 			new Field[] { ValueFactoryTest1._mf_e, ValueFactoryTest1._mf_x },
 			new Object[] { E1.A, 5 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_trans,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_trans.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_trans,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_trans.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -176,11 +179,11 @@
 		svc.xresult = 10;
 		assertEquals( 10, test.trans( E1.B, 5 ) ); // mul by 2
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_trans,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_trans,
 			new Field[] { ValueFactoryTest1._mf_e, ValueFactoryTest1._mf_x },
 			new Object[] { E1.B, 5 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_trans,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_trans.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_trans,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_trans.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -190,11 +193,11 @@
 		svc.xresult = 12;
 		assertEquals( 12, test.trans( E1.C, 5 ) ); // add 7
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_trans,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_trans,
 			new Field[] { ValueFactoryTest1._mf_e, ValueFactoryTest1._mf_x },
 			new Object[] { E1.C, 5 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_trans,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_trans.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_trans,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_trans.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -206,11 +209,11 @@
 		S1 arg2 = new S1( 0, 0, 0 );
 		assertEquals( Math.sqrt( 3 ), test.dist( arg1, arg2 ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_dist,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_dist,
 			new Field[] { ValueFactoryTest1._mf_a, ValueFactoryTest1._mf_b },
 			new Object[] { arg1, arg2 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_dist,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_dist.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_dist,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_dist.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -222,11 +225,11 @@
 		S1 arg2 = new S1( 6, 5, 4 );
 		assertEquals( Math.sqrt( 35 ), test.dist( arg1, arg2 ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_dist,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_dist,
 			new Field[] { ValueFactoryTest1._mf_a, ValueFactoryTest1._mf_b },
 			new Object[] { arg1, arg2 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_dist,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_dist.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_dist,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_dist.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -238,11 +241,11 @@
 		S1 arg2 = new S1( -1, -2, -3 );
 		assertEquals( Math.sqrt( 56 ), test.dist( arg1, arg2 ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_dist,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_dist,
 			new Field[] { ValueFactoryTest1._mf_a, ValueFactoryTest1._mf_b },
 			new Object[] { arg1, arg2 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_dist,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_dist.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_dist,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_dist.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -255,11 +258,11 @@
 		for (int i: x)
 			assertEquals( 1, i );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_fill,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_fill,
 			new Field[] { ValueFactoryTest1._mf_n, ValueFactoryTest1._mf_x },
 			new Object[] { 0, 1 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_fill,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_fill.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_fill,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_fill.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -272,11 +275,11 @@
 		for (int i: x)
 			assertEquals( 2, i );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_fill,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_fill,
 			new Field[] { ValueFactoryTest1._mf_n, ValueFactoryTest1._mf_x },
 			new Object[] { 1, 2 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_fill,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_fill.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_fill,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_fill.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -289,11 +292,11 @@
 		for (int i: x)
 			assertEquals( 3, i );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_fill,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_fill,
 			new Field[] { ValueFactoryTest1._mf_n, ValueFactoryTest1._mf_x },
 			new Object[] { 2, 3 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_fill,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_fill.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_fill,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_fill.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -312,11 +315,11 @@
 			assertEquals( 2, e.code );
 		}
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_blow,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_blow,
 			new Field[] { ValueFactoryTest1._mf_msg, ValueFactoryTest1._mf_code },
 			new Object[] { "foo", 2 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_blow,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_blow.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_blow,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_blow.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -335,11 +338,11 @@
 			assertEquals( 3, e.code );
 		}
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_blow,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_blow,
 			new Field[] { ValueFactoryTest1._mf_msg, ValueFactoryTest1._mf_code },
 			new Object[] { "bar", 3 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_blow,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_blow.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_blow,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_blow.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -349,11 +352,11 @@
 		svc.xresult = 5;
 		assertEquals( 5, test.beets( E1.A ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_beets,
 			new Field[] { ValueFactoryTest1._mf_e },
 			new Object[] { E1.A },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_beets,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_beets.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -371,11 +374,11 @@
 			assertTrue( true );
 		}
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_beets,
 			new Field[] { ValueFactoryTest1._mf_e },
 			new Object[] { E1.B },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_beets,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_beets.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -393,11 +396,11 @@
 			assertTrue( true );
 		}
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_beets,
 			new Field[] { ValueFactoryTest1._mf_e },
 			new Object[] { E1.C },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_beets,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_beets.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -407,11 +410,11 @@
 		svc.xresult = null;
 		assertNull( test.beets( null ) );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_beets,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_beets,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_beets.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets.getTimeout() );
 	}
 
 	/////////////
@@ -427,11 +430,11 @@
 		Boolean r = test.p_boolean( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_boolean,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_boolean,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_boolean,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_boolean.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_boolean,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_boolean.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -443,11 +446,11 @@
 		Boolean r = test.p_boolean( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_boolean,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_boolean,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_boolean,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_boolean.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_boolean,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_boolean.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -459,11 +462,11 @@
 		boolean[] r = test.p_boolean_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_boolean_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_boolean_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_boolean_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_boolean_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_boolean_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_boolean_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -477,11 +480,11 @@
 		boolean[] r = test.p_boolean_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_boolean_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_boolean_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_boolean_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_boolean_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_boolean_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_boolean_array.getTimeout() );
 	}
 
 	//////////
@@ -497,11 +500,11 @@
 		Byte r = test.p_byte( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_byte,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_byte,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_byte,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_byte.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_byte,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_byte.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -513,11 +516,11 @@
 		Byte r = test.p_byte( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_byte,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_byte,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_byte,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_byte.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_byte,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_byte.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -529,11 +532,11 @@
 		byte[] r = test.p_byte_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_byte_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_byte_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_byte_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_byte_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_byte_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_byte_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -547,11 +550,11 @@
 		byte[] r = test.p_byte_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_byte_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_byte_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_byte_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_byte_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_byte_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_byte_array.getTimeout() );
 	}
 
 	///////////
@@ -567,11 +570,11 @@
 		Short r = test.p_short( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_short,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_short,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_short,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_short.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_short,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_short.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -583,11 +586,11 @@
 		Short r = test.p_short( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_short,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_short,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_short,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_short.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_short,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_short.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -599,11 +602,11 @@
 		short[] r = test.p_short_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_short_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_short_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_short_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_short_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_short_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_short_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -617,11 +620,11 @@
 		short[] r = test.p_short_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_short_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_short_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_short_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_short_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_short_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_short_array.getTimeout() );
 	}
 
 	/////////
@@ -637,11 +640,11 @@
 		Integer r = test.p_int( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_int,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_int,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_int,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_int.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_int,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_int.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -653,11 +656,11 @@
 		Integer r = test.p_int( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_int,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_int,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_int,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_int.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_int,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_int.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -669,11 +672,11 @@
 		int[] r = test.p_int_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_int_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_int_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_int_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_int_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_int_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_int_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -687,11 +690,11 @@
 		int[] r = test.p_int_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_int_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_int_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_int_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_int_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_int_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_int_array.getTimeout() );
 	}
 
 	//////////
@@ -707,11 +710,11 @@
 		Long r = test.p_long( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_long,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_long,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_long,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_long.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_long,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_long.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -723,11 +726,11 @@
 		Long r = test.p_long( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_long,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_long,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_long,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_long.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_long,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_long.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -739,11 +742,11 @@
 		long[] r = test.p_long_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_long_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_long_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_long_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_long_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_long_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_long_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -757,11 +760,11 @@
 		long[] r = test.p_long_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_long_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_long_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_long_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_long_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_long_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_long_array.getTimeout() );
 	}
 
 	///////////
@@ -777,11 +780,11 @@
 		Float r = test.p_float( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_float,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_float,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_float,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_float.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_float,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_float.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -793,11 +796,11 @@
 		Float r = test.p_float( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_float,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_float,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_float,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_float.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_float,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_float.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -809,11 +812,11 @@
 		float[] r = test.p_float_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_float_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_float_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_float_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_float_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_float_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_float_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -827,11 +830,11 @@
 		float[] r = test.p_float_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_float_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_float_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_float_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_float_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_float_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_float_array.getTimeout() );
 	}
 
 	////////////
@@ -847,11 +850,11 @@
 		Double r = test.p_double( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_double,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_double,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_double,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_double.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_double,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_double.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -863,11 +866,11 @@
 		Double r = test.p_double( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_double,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_double,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_double,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_double.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_double,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_double.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -879,11 +882,11 @@
 		double[] r = test.p_double_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_double_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_double_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_double_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_double_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_double_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_double_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -897,11 +900,11 @@
 		double[] r = test.p_double_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_double_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_double_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_double_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_double_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_double_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_double_array.getTimeout() );
 	}
 
 	////////////
@@ -917,11 +920,11 @@
 		String r = test.p_string( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_string,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_string,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_string,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_string.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -933,11 +936,11 @@
 		String r = test.p_string( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_string,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_string,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_string,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_string.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -949,11 +952,11 @@
 		String[] r = test.p_string_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_string_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_string_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_string_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_string_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -967,11 +970,11 @@
 		String[] r = test.p_string_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_string_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_string_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_string_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_string_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string_array.getTimeout() );
 	}
 	
 	////////////
@@ -987,11 +990,11 @@
 		Object r = test.p_object( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_object,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_object,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_object,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_object.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1003,11 +1006,11 @@
 		Object r = test.p_object( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_object,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_object,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_object,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_object.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1019,11 +1022,11 @@
 		Object r1 = test.p_object( a1 );
 		assertObjectEquals( a1, r1 );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_object,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_object,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a1 },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_object,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_object.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1035,11 +1038,11 @@
 		String[] r = test.p_string_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_string_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_string_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_string_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_string_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1053,11 +1056,11 @@
 		Object[] r = test.p_object_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_object_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_object_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_object_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_object_array.getTimeout() );		
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object_array.getTimeout() );		
 	}
 	
 	/** @throws Exception */
@@ -1071,11 +1074,11 @@
 		Object[] r = test.p_object_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_object_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_object_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_object_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_object_array.getTimeout() );		
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object_array.getTimeout() );		
 	}
 	
 	
@@ -1093,11 +1096,11 @@
 		E1 r = test.p_E1( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_E1,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_E1,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_E1,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_E1.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_E1,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_E1.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1109,11 +1112,11 @@
 		E1 r = test.p_E1( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_E1,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_E1,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_E1,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_E1.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_E1,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_E1.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1125,11 +1128,11 @@
 		E1[] r = test.p_E1_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_E1_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_E1_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_E1_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_E1_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_E1_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_E1_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1143,11 +1146,11 @@
 		E1[] r = test.p_E1_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_E1_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_E1_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_E1_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_E1_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_E1_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_E1_array.getTimeout() );
 	}
 
 	////////
@@ -1163,11 +1166,11 @@
 		S1 r = test.p_S1( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_S1,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S1,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S1,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S1.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S1,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S1.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1179,11 +1182,11 @@
 		S1 r = test.p_S1( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_S1,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S1,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S1,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S1.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S1,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S1.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1195,11 +1198,11 @@
 		S1[] r = test.p_S1_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_S1_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S1_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S1_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S1_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S1_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S1_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1213,11 +1216,11 @@
 		S1[] r = test.p_S1_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_S1_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S1_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S1_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S1_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S1_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S1_array.getTimeout() );
 	}
 
 	////////
@@ -1233,11 +1236,11 @@
 		S2 r = test.p_S2( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_S2,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S2,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S2,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S2.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S2,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S2.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1249,11 +1252,11 @@
 		S2 r = test.p_S2( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_S2,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S2,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S2,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S2.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S2,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S2.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1265,11 +1268,11 @@
 		S2[] r = test.p_S2_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_S2_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S2_array,
 			new Field[] {},
 			new Object[] {},
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S2_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S2_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S2_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S2_array.getTimeout() );
 	}
 	
 	/** @throws Exception */
@@ -1283,11 +1286,11 @@
 		S2[] r = test.p_S2_array( a );
 		assertObjectEquals( a, r );
 		check( What.CALL,
-			ValueFactoryTest1._mt_etch_tests_Test1_p_S2_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S2_array,
 			new Field[] { ValueFactoryTest1._mf_a },
 			new Object[] { a },
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S2_array,
-			ValueFactoryTest1._mt_etch_tests_Test1__result_p_S2_array.getTimeout() );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S2_array,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S2_array.getTimeout() );
 	}
 
 	///////////////////

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestStubTest1DotJava.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestStubTest1DotJava.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestStubTest1DotJava.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestStubTest1DotJava.java Thu Jan 29 21:50:44 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.tests;
+package org.apache.etch.tests;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -29,6 +29,9 @@
 import org.apache.etch.bindings.java.support.Pool;
 import org.apache.etch.bindings.java.support._Etch_AuthException;
 import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.tests.StubTest1;
+import org.apache.etch.tests.Test1;
+import org.apache.etch.tests.ValueFactoryTest1;
 import org.apache.etch.util.core.Who;
 
 
@@ -40,12 +43,12 @@
 	public void method_nothing() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_nothing,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_nothing,
 			vf );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_nothing );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_nothing );
 		assertEquals( 0, src.xreply.size() );
 	}
 
@@ -54,12 +57,12 @@
 	public void method_incr1() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_incr, vf );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_incr, vf );
 		msg.put( ValueFactoryTest1._mf_x, 3 );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_incr );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_incr );
 		assertEquals( 1, src.xreply.size() );
 		assertEquals( 4, src.xreply.get( ValueFactoryTest1._mf_result ) );
 	}
@@ -69,12 +72,12 @@
 	public void method_incr2() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_incr, vf );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_incr, vf );
 		// msg.put( ValueFactoryTest1._mf_x, 3 ); -- cause an exception
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_incr );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_incr );
 		assertEquals( 1, src.xreply.size() );
 		Object o = src.xreply.get( ValueFactoryTest1._mf_result );
 		assertTrue( o instanceof RuntimeException ); // because incr is not
@@ -87,13 +90,13 @@
 	public void method_sub() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_sub, vf );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_sub, vf );
 		msg.put( ValueFactoryTest1._mf_x, 7 );
 		msg.put( ValueFactoryTest1._mf_y, 3 );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_sub );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sub );
 		assertEquals( 1, src.xreply.size() );
 		assertEquals( 4, src.xreply.get( ValueFactoryTest1._mf_result ) );
 	}
@@ -103,7 +106,7 @@
 	public void method_sum() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_sum, vf );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_sum, vf );
 		msg.put( ValueFactoryTest1._mf_x, new int[]
 		{
 			1, 2, 3, 7, 11
@@ -111,7 +114,7 @@
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_sum );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sum );
 		assertEquals( 1, src.xreply.size() );
 		assertEquals( 24, src.xreply.get( ValueFactoryTest1._mf_result ) );
 	}
@@ -121,14 +124,14 @@
 	public void method_trans1() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_trans,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_trans,
 			vf );
 		msg.put( ValueFactoryTest1._mf_e, Test1.E1.A );
 		msg.put( ValueFactoryTest1._mf_x, 5 );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_trans );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_trans );
 		assertEquals( 1, src.xreply.size() );
 		assertEquals( 2, src.xreply.get( ValueFactoryTest1._mf_result ) );
 	}
@@ -138,14 +141,14 @@
 	public void method_trans2() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_trans,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_trans,
 			vf );
 		msg.put( ValueFactoryTest1._mf_e, Test1.E1.B );
 		msg.put( ValueFactoryTest1._mf_x, 5 );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_trans );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_trans );
 		assertEquals( 1, src.xreply.size() );
 		assertEquals( 10, src.xreply.get( ValueFactoryTest1._mf_result ) );
 	}
@@ -155,14 +158,14 @@
 	public void method_trans3() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_trans,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_trans,
 			vf );
 		msg.put( ValueFactoryTest1._mf_e, Test1.E1.C );
 		msg.put( ValueFactoryTest1._mf_x, 5 );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_trans );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_trans );
 		assertEquals( 1, src.xreply.size() );
 		assertEquals( 12, src.xreply.get( ValueFactoryTest1._mf_result ) );
 	}
@@ -172,13 +175,13 @@
 	public void method_dist1() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_dist, vf );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_dist, vf );
 		msg.put( ValueFactoryTest1._mf_a, new Test1.S1( 1, 1, 1 ) );
 		msg.put( ValueFactoryTest1._mf_b, new Test1.S1( 0, 0, 0 ) );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_dist );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_dist );
 		assertEquals( 1, src.xreply.size() );
 		assertEquals( Math.sqrt( 3 ), src.xreply
 			.get( ValueFactoryTest1._mf_result ) );
@@ -189,13 +192,13 @@
 	public void method_dist2() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_dist, vf );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_dist, vf );
 		msg.put( ValueFactoryTest1._mf_a, new Test1.S1( 1, 2, 3 ) );
 		msg.put( ValueFactoryTest1._mf_b, new Test1.S1( 6, 5, 4 ) );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_dist );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_dist );
 		assertEquals( 1, src.xreply.size() );
 		assertEquals( Math.sqrt( 35 ), src.xreply
 			.get( ValueFactoryTest1._mf_result ) );
@@ -206,13 +209,13 @@
 	public void method_fill() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_fill, vf );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_fill, vf );
 		msg.put( ValueFactoryTest1._mf_n, 4 );
 		msg.put( ValueFactoryTest1._mf_x, 3 );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_fill );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_fill );
 		assertEquals( 1, src.xreply.size() );
 		int[] x = (int[]) src.xreply.get( ValueFactoryTest1._mf_result );
 		assertNotNull( x );
@@ -226,13 +229,13 @@
 	public void method_blow() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_blow, vf );
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_blow, vf );
 		msg.put( ValueFactoryTest1._mf_msg, "foo" );
 		msg.put( ValueFactoryTest1._mf_code, 23 );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_blow );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_blow );
 		assertEquals( 1, src.xreply.size() );
 		Test1.Excp1 e = (Test1.Excp1) src.xreply
 			.get( ValueFactoryTest1._mf_result );
@@ -246,13 +249,13 @@
 	public void method_beets1() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_beets,
 			vf );
 		msg.put( ValueFactoryTest1._mf_e, Test1.E1.A );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_beets );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets );
 		assertEquals( 1, src.xreply.size() );
 		Object o = src.xreply.get( ValueFactoryTest1._mf_result );
 		assertEquals( 5, o );
@@ -263,13 +266,13 @@
 	public void method_beets2() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_beets,
 			vf );
 		msg.put( ValueFactoryTest1._mf_e, Test1.E1.B );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_beets );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets );
 		assertEquals( 1, src.xreply.size() );
 		Object o = src.xreply.get( ValueFactoryTest1._mf_result );
 		assertEquals( Test1.Excp3.class, o.getClass() );
@@ -280,13 +283,13 @@
 	public void method_beets3() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_beets,
 			vf );
 		msg.put( ValueFactoryTest1._mf_e, Test1.E1.C );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_beets );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets );
 		assertEquals( 1, src.xreply.size() );
 		Object o = src.xreply.get( ValueFactoryTest1._mf_result );
 		assertEquals( Test1.Excp4.class, o.getClass() );
@@ -297,13 +300,13 @@
 	public void method_beets4() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_beets,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_beets,
 			vf );
 		msg.put( ValueFactoryTest1._mf_e, null );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_beets );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets );
 		assertEquals( 0, src.xreply.size() );
 		Object o = src.xreply.get( ValueFactoryTest1._mf_result );
 		assertNull( o );
@@ -314,12 +317,12 @@
 	public void method_isTrue() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_isTrue,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_isTrue,
 			vf );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_isTrue );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_isTrue );
 		assertEquals( 1, src.xreply.size() );
 		Object o = src.xreply.get( ValueFactoryTest1._mf_result );
 		assertEquals( true, o );
@@ -330,12 +333,12 @@
 	public void method_isFalse() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_isFalse,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_isFalse,
 			vf );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_isFalse );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_isFalse );
 		assertEquals( 1, src.xreply.size() );
 		Object o = src.xreply.get( ValueFactoryTest1._mf_result );
 		assertEquals( false, o );
@@ -346,12 +349,12 @@
 	public void method_alwaysWorks() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_alwaysWorks,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_alwaysWorks,
 			vf );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_alwaysWorks );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_alwaysWorks );
 		assertEquals( 1, src.xreply.size() );
 		Object o = src.xreply.get( ValueFactoryTest1._mf_result );
 		assertEquals( 23, o );
@@ -362,12 +365,12 @@
 	public void method_alwaysFails() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_alwaysFails,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_alwaysFails,
 			vf );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_alwaysFails );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_alwaysFails );
 		assertEquals( 1, src.xreply.size() );
 		Object o = src.xreply.get( ValueFactoryTest1._mf_result );
 		assertTrue( o instanceof _Etch_AuthException );
@@ -381,14 +384,14 @@
 	public void method_fillObjectInt() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_fillObject,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_fillObject,
 			vf );
 		msg.put( ValueFactoryTest1._mf_n, 3 );
 		msg.put( ValueFactoryTest1._mf_o, 9 );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_fillObject );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_fillObject );
 		assertEquals( 1, src.xreply.size() );
 		Object[] o = (Object[]) src.xreply.get( ValueFactoryTest1._mf_result );
 		assertNotNull( o );
@@ -402,14 +405,14 @@
 	public void method_fillObjectStr() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_fillObject,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_fillObject,
 			vf );
 		msg.put( ValueFactoryTest1._mf_n, 3 );
 		msg.put( ValueFactoryTest1._mf_o, "raw" );
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_fillObject );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_fillObject );
 		assertEquals( 1, src.xreply.size() );
 		Object[] o = (Object[]) src.xreply.get( ValueFactoryTest1._mf_result );
 		assertNotNull( o );
@@ -423,7 +426,7 @@
 	public void method_throwExcp5() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_throwExcp5,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_throwExcp5,
 			vf );
 		msg.put(ValueFactoryTest1._mf_msg,"raw");
 		msg.put(ValueFactoryTest1._mf_code,9);
@@ -431,7 +434,7 @@
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_throwExcp5 );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_throwExcp5 );
 		assertEquals( 1, src.xreply.size() );
 		Object o = src.xreply.get( ValueFactoryTest1._mf_result );
 		assertTrue( o instanceof Test1.Excp5 );
@@ -447,7 +450,7 @@
 	public void method_throwExcp6() throws Exception
 	{
 		Message msg = new Message(
-			ValueFactoryTest1._mt_etch_tests_Test1_throwExcp6,
+			ValueFactoryTest1._mt_org_apache_etch_tests_Test1_throwExcp6,
 			vf );
 		msg.put(ValueFactoryTest1._mf_msg,"raw");
 		msg.put(ValueFactoryTest1._mf_code,99);
@@ -455,7 +458,7 @@
 		stub.sessionMessage( null, msg );
 		// check the result.
 		src.xreply
-			.checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_throwExcp6 );
+			.checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_throwExcp6 );
 		assertEquals( 1, src.xreply.size() );
 		Object o = src.xreply.get( ValueFactoryTest1._mf_result );
 		assertTrue( o instanceof Test1.Excp6 );

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1DotJava.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1DotJava.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1DotJava.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1DotJava.java Thu Jan 29 21:50:44 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.tests;
+package org.apache.etch.tests;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,6 +25,8 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import org.apache.etch.tests.Test1;
+
 /** Test of Test1 */
 public class TestTest1DotJava
 {

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1Helper.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1Helper.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1Helper.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1Helper.java Thu Jan 29 21:50:44 2009
@@ -15,11 +15,15 @@
  * under the License.
  */
 
-package etch.tests;
+package org.apache.etch.tests;
 
 import org.apache.etch.bindings.java.support.ServerFactory;
 import org.apache.etch.bindings.java.support.TransportFactory;
 import org.apache.etch.bindings.java.transport.TcpTransportFactory;
+import org.apache.etch.tests.MainTest1Client;
+import org.apache.etch.tests.MainTest1Listener;
+import org.apache.etch.tests.RemoteTest1Server;
+import org.apache.etch.tests.Test1Helper;
 import org.apache.etch.util.core.io.Transport;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;