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 [4/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/csharp/etch.tests/TestValueFactoryTest1DotCsharp.cs
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/csharp/etch.tests/TestValueFactoryTest1DotCsharp.cs?rev=739033&r1=739032&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/csharp/etch.tests/TestValueFactoryTest1DotCsharp.cs (original)
+++ incubator/etch/trunk/tests/src/test/csharp/etch.tests/TestValueFactoryTest1DotCsharp.cs Thu Jan 29 21:50:44 2009
@@ -22,8 +22,8 @@
 using Etch.Msg;
 using Etch.Support;
 using Etch.Transport;
-
-using etch.tests.types.Test1;
+using org.apache.etch.tests;
+using org.apache.etch.tests.types.Test1;
 
 
 namespace etch.tests
@@ -45,7 +45,7 @@
 	    {
 		    // type //
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_E1,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_E1,
                        
 		            ValueFactoryTest1._mf_A,
 		   ValueFactoryTest1._mf_B,
@@ -56,15 +56,15 @@
 	    public void test_E1_export()
 	    {
             testEnumExport( E1.A,
-			    ValueFactoryTest1._mt_etch_tests_Test1_E1,
+			    ValueFactoryTest1._mt_org_apache_etch_tests_Test1_E1,
 			    ValueFactoryTest1._mf_A );
 
             testEnumExport( E1.B,
-			    ValueFactoryTest1._mt_etch_tests_Test1_E1,
+			    ValueFactoryTest1._mt_org_apache_etch_tests_Test1_E1,
 			    ValueFactoryTest1._mf_B );
 
             testEnumExport( E1.C,
-			    ValueFactoryTest1._mt_etch_tests_Test1_E1,
+			    ValueFactoryTest1._mt_org_apache_etch_tests_Test1_E1,
 			    ValueFactoryTest1._mf_C );
 	    }
     	
@@ -72,15 +72,15 @@
 	    public void test_E1_import()
 	    {
             testEnumImport( E1.A,
-			    ValueFactoryTest1._mt_etch_tests_Test1_E1,
+			    ValueFactoryTest1._mt_org_apache_etch_tests_Test1_E1,
 			    ValueFactoryTest1._mf_A );
 
             testEnumImport( E1.B,
-			    ValueFactoryTest1._mt_etch_tests_Test1_E1,
+			    ValueFactoryTest1._mt_org_apache_etch_tests_Test1_E1,
 			    ValueFactoryTest1._mf_B );
 
             testEnumImport( E1.C,
-			    ValueFactoryTest1._mt_etch_tests_Test1_E1,
+			    ValueFactoryTest1._mt_org_apache_etch_tests_Test1_E1,
 			    ValueFactoryTest1._mf_C );
 	    }
 
@@ -89,7 +89,7 @@
 	    {
 		    // type //
 
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_S1, 
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S1, 
     		
 		    // fields //
     		
@@ -102,7 +102,7 @@
 	    public void test_S1_export()
 	    {
             StructValue sv = vf.ExportCustomValue( new S1( 19, 23, 29 ) );
-		    sv.CheckType( ValueFactoryTest1._mt_etch_tests_Test1_S1 );
+		    sv.CheckType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S1 );
 		    Assert.AreEqual( 3, sv.Count );
 		    Assert.AreEqual( 19, sv.Get( ValueFactoryTest1._mf_x ) );
 		    Assert.AreEqual( 23, sv.Get( ValueFactoryTest1._mf_y ) );
@@ -112,7 +112,7 @@
 	    [Test]
 	    public void test_S1_import()
 	    {
-            StructValue sv = new StructValue(ValueFactoryTest1._mt_etch_tests_Test1_S1, vf);
+            StructValue sv = new StructValue(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S1, vf);
 		    sv.Add( ValueFactoryTest1._mf_x, 101 );
 		    sv.Add( ValueFactoryTest1._mf_y, 103 );
 		    sv.Add( ValueFactoryTest1._mf_z, 107 );
@@ -127,7 +127,7 @@
 	    {
 		    // type //
 
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_S2,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S2,
    
 		    ValueFactoryTest1._mf_a,
 		    ValueFactoryTest1._mf_b,
@@ -142,7 +142,7 @@
             E1 c = E1.A;
 
             StructValue sv = vf.ExportCustomValue( new S2( a, b, c ) );
-		    sv.CheckType( ValueFactoryTest1._mt_etch_tests_Test1_S2 );
+		    sv.CheckType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S2 );
 		    Assert.AreEqual( 3, sv.Count );
     		
 		    Assert.AreEqual( a, sv.Get( ValueFactoryTest1._mf_a ) );
@@ -153,7 +153,7 @@
 	    [Test]
 	    public void test_S2_import()
 	    {
-            StructValue sv = new StructValue(ValueFactoryTest1._mt_etch_tests_Test1_S2, vf);
+            StructValue sv = new StructValue(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S2, vf);
 
             sv.Add( ValueFactoryTest1._mf_a, new S1( 21, 22, 23 ) );
             sv.Add( ValueFactoryTest1._mf_b, new S1( 31, 32, 33 ) );
@@ -174,7 +174,7 @@
 	    {
 		    // type //
 
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_S3,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S3,
     		
 		    // fields //
 	//	    ValueFactoryTest1._mf_type1,
@@ -213,7 +213,7 @@
 	    {
 		    // type //
 
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_S4,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S4,
     		
 		    // fields //
 		     ValueFactoryTest1._mf_tipe,
@@ -269,12 +269,12 @@
 	    {
 		    // type //
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_Excp1, ValueFactoryTest1._mf_msg, ValueFactoryTest1._mf_code ); 
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_Excp2 );
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_Excp3 );
-            checkType( ValueFactoryTest1._mt_etch_tests_Test1_Excp4 );
-            checkType( ValueFactoryTest1._mt_etch_tests_Test1_Excp5, ValueFactoryTest1._mf_msg,ValueFactoryTest1._mf_code, ValueFactoryTest1._mf_x );
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1_Excp6, ValueFactoryTest1._mf_msg, ValueFactoryTest1._mf_code, ValueFactoryTest1._mf_x);
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp1, ValueFactoryTest1._mf_msg, ValueFactoryTest1._mf_code ); 
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp2 );
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp3 );
+            checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp4 );
+            checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp5, ValueFactoryTest1._mf_msg,ValueFactoryTest1._mf_code, ValueFactoryTest1._mf_x );
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp6, ValueFactoryTest1._mf_msg, ValueFactoryTest1._mf_code, ValueFactoryTest1._mf_x);
     		
 		    // fields //
     		
@@ -299,21 +299,21 @@
             int code = 500;
 
 		    StructValue sv = vf.ExportCustomValue( new Excp1( "abc", 23 ) );
-		    sv.CheckType( ValueFactoryTest1._mt_etch_tests_Test1_Excp1 );
+		    sv.CheckType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp1 );
 		    Assert.AreEqual( 2, sv.Count );
 		    Assert.AreEqual( "abc", sv.Get( ValueFactoryTest1._mf_msg ) );
 		    Assert.AreEqual( 23, sv.Get( ValueFactoryTest1._mf_code ) );
 
             sv = vf.ExportCustomValue( new Excp2() );
-		    sv.CheckType( ValueFactoryTest1._mt_etch_tests_Test1_Excp2 );
+		    sv.CheckType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp2 );
 		    Assert.AreEqual( 0, sv.Count );
 
             sv = vf.ExportCustomValue( new Excp3() );
-		    sv.CheckType( ValueFactoryTest1._mt_etch_tests_Test1_Excp3 );
+		    sv.CheckType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp3 );
 		    Assert.AreEqual( 0, sv.Count );
 
             sv = vf.ExportCustomValue( new Excp4() );
-		    sv.CheckType( ValueFactoryTest1._mt_etch_tests_Test1_Excp4 );
+		    sv.CheckType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp4 );
 		    Assert.AreEqual( 0, sv.Count );
 
             // Import exception with object as param
@@ -353,7 +353,7 @@
             String msg = "Exception";
             int code = 500;
 
-            StructValue sv = new StructValue(ValueFactoryTest1._mt_etch_tests_Test1_Excp1, vf);
+            StructValue sv = new StructValue(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp1, vf);
 		    sv.Add( ValueFactoryTest1._mf_msg, "def" );
 		    sv.Add( ValueFactoryTest1._mf_code, 29 );
             Excp1 e1 = ( Excp1 ) vf.ImportCustomValue( sv );
@@ -361,17 +361,17 @@
 		    Assert.AreEqual( 29, e1.code );
 		    e1 = null;
 
-            sv = new StructValue(ValueFactoryTest1._mt_etch_tests_Test1_Excp2, vf);
+            sv = new StructValue(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp2, vf);
             Excp2 e2 = ( Excp2 ) vf.ImportCustomValue( sv );
 		    Assert.IsNotNull( e2 );
 		    e2 = null;
 
-            sv = new StructValue(ValueFactoryTest1._mt_etch_tests_Test1_Excp3, vf);
+            sv = new StructValue(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp3, vf);
             Excp3 e3 = ( Excp3 ) vf.ImportCustomValue( sv );
 		    Assert.IsNotNull( e3 );
 		    e3 = null;
 
-            sv = new StructValue(ValueFactoryTest1._mt_etch_tests_Test1_Excp4, vf);
+            sv = new StructValue(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp4, vf);
             Excp4 e4 = ( Excp4 ) vf.ImportCustomValue( sv );
 		    Assert.IsNotNull( e4 );
 		    e4 = null;
@@ -400,9 +400,9 @@
 	    [Test]
 	    public void test_method_nothing()
 	    {
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1_nothing, ValueFactoryTest1._mf__messageId);
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_nothing, ValueFactoryTest1._mf__messageId);
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_nothing, 
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_nothing, 
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 			ValueFactoryTest1._mf_result );
@@ -412,11 +412,11 @@
 	    [Test]
 	    public void test_method_incr()
 	    {
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1_incr, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_incr, ValueFactoryTest1._mf__messageId,
         ValueFactoryTest1._mf_x);
 
 
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1__result_incr, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_incr, ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
 		    
@@ -425,11 +425,11 @@
 	    [Test]
 	    public void test_method_sub()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_sub, ValueFactoryTest1._mf__messageId,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_sub, ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_x, ValueFactoryTest1._mf_y );
 
 
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1__result_sub, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sub, ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo, ValueFactoryTest1._mf_result);
 		
 	    }
@@ -437,11 +437,11 @@
 	    [Test]
 	    public void test_method_sum()
 	    {
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1_sum, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_sum, ValueFactoryTest1._mf__messageId,
         ValueFactoryTest1._mf_x);
 
 
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1__result_sum, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_sum, ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
 		 
@@ -450,12 +450,12 @@
 	    [Test]
 	    public void test_method_trans()
 	    {
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1_trans, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_trans, ValueFactoryTest1._mf__messageId,
         ValueFactoryTest1._mf_e,
         ValueFactoryTest1._mf_x);
 
 
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1__result_trans, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_trans, ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
 		
@@ -464,12 +464,12 @@
 	    [Test]
 	    public void test_method_dist()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_dist,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_dist,
                 ValueFactoryTest1._mf__messageId,
 		    ValueFactoryTest1._mf_a,
 		    ValueFactoryTest1._mf_b );
 
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1__result_dist, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_dist, ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
 		
@@ -478,10 +478,10 @@
 	    [Test]
 	    public void test_method_fill()
 	    {
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1_fill, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_fill, ValueFactoryTest1._mf__messageId,
 		    ValueFactoryTest1._mf_n, ValueFactoryTest1._mf_x );
 
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1__result_fill, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_fill, ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
 		   
@@ -490,10 +490,10 @@
         [Test]
 	    public void test_method_fillObject()
 	    {
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1_fillObject, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_fillObject, ValueFactoryTest1._mf__messageId,
 		    ValueFactoryTest1._mf_n, ValueFactoryTest1._mf_o );
 
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1__result_fillObject, ValueFactoryTest1._mf__messageId,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_fillObject, ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
 		   
@@ -503,11 +503,11 @@
 	    [Test]
 	    public void test_method_blow()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_blow , ValueFactoryTest1._mf__messageId,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_blow , ValueFactoryTest1._mf__messageId,
 		    ValueFactoryTest1._mf_msg,
 		    ValueFactoryTest1._mf_code );
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_blow, ValueFactoryTest1._mf__messageId,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_blow, ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
 		  
@@ -516,9 +516,9 @@
 	    [Test]
 	    public void test_method_beets()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_beets, ValueFactoryTest1._mf__messageId,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_beets, ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_e );   		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_beets, ValueFactoryTest1._mf__messageId,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_beets, ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
 		    
@@ -527,13 +527,13 @@
         [Test]
 	    public void test_method_throwExcp5()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_throwExcp5,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_throwExcp5,
                 ValueFactoryTest1._mf__messageId,
                 ValueFactoryTest1._mf_msg,
                  ValueFactoryTest1._mf_code,
                  ValueFactoryTest1._mf_value);
 		
-            checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_throwExcp5,
+            checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_throwExcp5,
                 ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
@@ -544,14 +544,14 @@
 	    [Test]
 	    public void test_method_throwExcp6()
 	    {
-            checkType( ValueFactoryTest1._mt_etch_tests_Test1_throwExcp5,
+            checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_throwExcp5,
                 ValueFactoryTest1._mf__messageId,
         ValueFactoryTest1._mf_msg,
         ValueFactoryTest1._mf_code,
         ValueFactoryTest1._mf_value);
 
 		    
-            checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_throwExcp6,
+            checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_throwExcp6,
                 ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
@@ -561,13 +561,13 @@
 	    [Test]
 	    public void test_method_p_boolean()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_boolean,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_boolean,
                 ValueFactoryTest1._mf__messageId,
         ValueFactoryTest1._mf_a);
 
 		  
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_boolean,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_boolean,
                 ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
@@ -577,11 +577,11 @@
 	    [Test]
 	    public void test_method_p_boolean_array()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_boolean_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_boolean_array,
                 ValueFactoryTest1._mf__messageId,
         ValueFactoryTest1._mf_a);
 	
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_boolean_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_boolean_array,
                 ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
@@ -591,11 +591,11 @@
 	    [Test]
 	    public void test_method_p_byte()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_byte,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_byte,
                 ValueFactoryTest1._mf__messageId,
         ValueFactoryTest1._mf_a);
 	
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_byte,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_byte,
                 ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
@@ -606,11 +606,11 @@
 	    [Test]
 	    public void test_method_p_byte_array()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_byte_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_byte_array,
                 ValueFactoryTest1._mf__messageId,
         ValueFactoryTest1._mf_a);
 
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_byte_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_byte_array,
                 ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
@@ -621,12 +621,12 @@
 	    [Test]
 	    public void test_method_p_short()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_short,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_short,
                 ValueFactoryTest1._mf__messageId,
         ValueFactoryTest1._mf_a);
 		    
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_short,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_short,
                 ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
@@ -636,11 +636,11 @@
 	    [Test]
 	    public void test_method_p_short_array()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_short_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_short_array,
                ValueFactoryTest1._mf__messageId,
         ValueFactoryTest1._mf_a);
 	
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_short_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_short_array,
             ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -652,12 +652,12 @@
 	    [Test]
 	    public void test_method_p_int()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_int,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_int,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 		
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_int,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_int,
                 ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
@@ -668,12 +668,12 @@
 	    [Test]
 	    public void test_method_p_int_array()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_int_array ,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_int_array ,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_int_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_int_array,
                 ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
@@ -682,11 +682,11 @@
 	    [Test]
 	    public void test_method_p_long()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_long,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_long,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_long,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_long,
                 ValueFactoryTest1._mf__messageId,
             ValueFactoryTest1._mf__inReplyTo,
         ValueFactoryTest1._mf_result);
@@ -698,12 +698,12 @@
 	    [Test]
 	    public void test_method_p_long_array()
 	    {
-	        checkType(ValueFactoryTest1._mt_etch_tests_Test1_p_long_array,
+	        checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_long_array,
 	                  ValueFactoryTest1._mf__messageId,
 	                  ValueFactoryTest1._mf_a);
 
 
-	        checkType(ValueFactoryTest1._mt_etch_tests_Test1__result_p_long_array,
+	        checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_long_array,
 	                  ValueFactoryTest1._mf__messageId,
 	                  ValueFactoryTest1._mf__inReplyTo,
 	                  ValueFactoryTest1._mf_result);
@@ -712,12 +712,12 @@
         [Test]
 	    public void test_method_p_float()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_float,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_float,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 		   
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_float,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_float,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -727,12 +727,12 @@
 	    [Test]
 	    public void test_method_p_float_array()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_float_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_float_array,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_float_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_float_array,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -743,12 +743,12 @@
 	    [Test]
 	    public void test_method_p_double()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_double,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_double,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_double,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_double,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -759,12 +759,12 @@
 	    [Test]
 	    public void test_method_p_double_array()
 	    {
-	        checkType(ValueFactoryTest1._mt_etch_tests_Test1_p_double_array,
+	        checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_double_array,
 	                  ValueFactoryTest1._mf__messageId,
 	                  ValueFactoryTest1._mf_a);
 		   
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_double_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_double_array,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -775,13 +775,13 @@
 	    [Test]
 	    public void test_method_p_string()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_string,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_string,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 
 		   
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_string,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -792,12 +792,12 @@
         [Test]
         public void test_method_p_string_array()
         {
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1_p_string_array,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_string_array,
                       ValueFactoryTest1._mf__messageId,
                       ValueFactoryTest1._mf_a);
 
 
-            checkType(ValueFactoryTest1._mt_etch_tests_Test1__result_p_string_array,
+            checkType(ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_string_array,
                       ValueFactoryTest1._mf__messageId,
                       ValueFactoryTest1._mf__inReplyTo,
                       ValueFactoryTest1._mf_result);
@@ -806,12 +806,12 @@
         [Test]
 	    public void test_method_p_E1()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_E1,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_E1,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 
 		    
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_E1,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_E1,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -822,13 +822,13 @@
 	    [Test]
 	    public void test_method_p_E1_array()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_E1_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_E1_array,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 
 
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_E1_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_E1_array,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -838,12 +838,12 @@
 	    [Test]
 	    public void test_method_p_S1()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_S1,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S1,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 		
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_S1,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S1,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -853,11 +853,11 @@
 	    [Test]
 	    public void test_method_p_S1_array()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_S1_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S1_array,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_S1_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S1_array,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -867,11 +867,11 @@
 	    [Test]
 	    public void test_method_p_S2()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_S2,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S2,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_S2,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S2,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -881,11 +881,11 @@
 	    [Test]
 	    public void test_method_p_S2_array()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_S2_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_S2_array,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_S2_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_S2_array,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -895,11 +895,11 @@
 	    [Test]
 	    public void test_method_p_Blob()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_Blob,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_Blob,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_Blob,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_Blob,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -909,12 +909,12 @@
 	    [Test]
 	    public void test_method_p_Blob_array()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_Blob_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_Blob_array,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_Blob_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_Blob_array,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -924,12 +924,12 @@
         [Test]
 	    public void test_method_p_object()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_object,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_object,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 		   
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_object,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -939,12 +939,12 @@
 	    [Test]
 	    public void test_method_p_object_array()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_object_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_object_array,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 		   
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_object_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object_array,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -954,12 +954,12 @@
 	    [Test]
 	    public void test_method_p_object_struct()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_object_struct,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_object_struct,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 		   
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_object_struct,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object_struct,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -969,12 +969,12 @@
 	    [Test]
 	    public void test_method_p_object_struct_array()
 	    {
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1_p_object_struct_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_p_object_struct_array,
                 ValueFactoryTest1._mf__messageId,
 		ValueFactoryTest1._mf_a );
 		    
     		
-		    checkType( ValueFactoryTest1._mt_etch_tests_Test1__result_p_object_struct_array,
+		    checkType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1__result_p_object_struct_array,
                 ValueFactoryTest1._mf__messageId,
 			ValueFactoryTest1._mf__inReplyTo,
 		ValueFactoryTest1._mf_result );
@@ -1032,7 +1032,7 @@
         private void testS3Export( String s, Object value )
         {
             StructValue sv = vf.ExportCustomValue( new S3( s, value ) );
-            sv.CheckType( ValueFactoryTest1._mt_etch_tests_Test1_S3 );
+            sv.CheckType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S3 );
             Assert.AreEqual( 2, sv.Count );
             Assert.AreEqual( s, sv[ ValueFactoryTest1._mf_tipe ] );
             Assert.AreEqual( value, sv[ ValueFactoryTest1._mf_x ] );
@@ -1040,7 +1040,7 @@
 
         private void testS3Import( String s, Object value )
         {
-            StructValue sv = new StructValue(ValueFactoryTest1._mt_etch_tests_Test1_S3, vf);
+            StructValue sv = new StructValue(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S3, vf);
             sv.Add(ValueFactoryTest1._mf_tipe, s);
             sv.Add( ValueFactoryTest1._mf_x, value );
             S3 myS3 = ( S3 ) vf.ImportCustomValue( sv );
@@ -1051,7 +1051,7 @@
         private void testS4Export( String s, Object[] value )
         {
             StructValue sv = vf.ExportCustomValue( new S4( s, value ) );
-            sv.CheckType( ValueFactoryTest1._mt_etch_tests_Test1_S4 );
+            sv.CheckType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S4 );
             Assert.AreEqual( 2, sv.Count );
             Assert.AreEqual(s, sv[ValueFactoryTest1._mf_tipe]);
             Assert.AreEqual( value, sv[ ValueFactoryTest1._mf_x ] );
@@ -1059,7 +1059,7 @@
 
         private void testS4Import( String s, Object[] value )
         {
-            StructValue sv = new StructValue(ValueFactoryTest1._mt_etch_tests_Test1_S4, vf);
+            StructValue sv = new StructValue(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_S4, vf);
             sv.Add(ValueFactoryTest1._mf_tipe, s);
             sv.Add( ValueFactoryTest1._mf_x, value );
             S4 myS4 = ( S4 ) vf.ImportCustomValue( sv );
@@ -1070,7 +1070,7 @@
         private void testExcp5Export( String msg, int code, Object value )
         {
             StructValue sv = vf.ExportCustomValue( new Excp5( msg, code, value ) );
-            sv.CheckType( ValueFactoryTest1._mt_etch_tests_Test1_Excp5 );
+            sv.CheckType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp5 );
             Assert.AreEqual( 3, sv.Count );
             Assert.AreEqual( msg, sv[ValueFactoryTest1._mf_msg] );
             Assert.AreEqual( code, sv[ ValueFactoryTest1._mf_code] );
@@ -1079,7 +1079,7 @@
 
         private void testExcp5Import( String msg, int code, Object value )
         {
-            StructValue sv = new StructValue(ValueFactoryTest1._mt_etch_tests_Test1_Excp5, vf);
+            StructValue sv = new StructValue(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp5, vf);
             sv.Add( ValueFactoryTest1._mf_msg, msg );
             sv.Add( ValueFactoryTest1._mf_code, code );
             sv.Add( ValueFactoryTest1._mf_x, value );
@@ -1092,7 +1092,7 @@
         private void testExcp6Export( String msg, int code, Object[] value )
         {
             StructValue sv = vf.ExportCustomValue( new Excp6( msg, code, value ) );
-            sv.CheckType( ValueFactoryTest1._mt_etch_tests_Test1_Excp6 );
+            sv.CheckType( ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp6 );
             Assert.AreEqual( 3, sv.Count );
             Assert.AreEqual( msg, sv[ ValueFactoryTest1._mf_msg ] );
             Assert.AreEqual( code, sv[ ValueFactoryTest1._mf_code]  );
@@ -1101,7 +1101,7 @@
 
         private void testExcp6Import( String msg, int code, Object[] value )
         {
-            StructValue sv = new StructValue(ValueFactoryTest1._mt_etch_tests_Test1_Excp6, vf);
+            StructValue sv = new StructValue(ValueFactoryTest1._mt_org_apache_etch_tests_Test1_Excp6, vf);
             sv.Add( ValueFactoryTest1._mf_msg, msg );
             sv.Add( ValueFactoryTest1._mf_code, code );
             sv.Add( ValueFactoryTest1._mf_x, value );

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/FakeTest1.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/FakeTest1.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/FakeTest1.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/FakeTest1.java Thu Jan 29 21:50:44 2009
@@ -15,9 +15,10 @@
  * under the License.
  */
 
-package etch.tests;
+package org.apache.etch.tests;
 
 import org.apache.etch.bindings.java.util.StrIntHashMap;
+import org.apache.etch.tests.Test1;
 
 /**
  * Silly implementation of Test used for testing.

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestAsyncClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestAsyncClient.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestAsyncClient.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestAsyncClient.java Thu Jan 29 21:50:44 2009
@@ -15,10 +15,15 @@
  * under the License.
  */
 
-package etch.tests;
+package org.apache.etch.tests;
 
 import static org.junit.Assert.assertEquals;
 
+import org.apache.etch.tests.AsyncClient;
+import org.apache.etch.tests.AsyncHelper;
+import org.apache.etch.tests.ImplAsyncClient;
+import org.apache.etch.tests.MainAsyncListener;
+import org.apache.etch.tests.RemoteAsyncServer;
 import org.apache.etch.util.Log;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestImplIncludes.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestImplIncludes.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestImplIncludes.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestImplIncludes.java Thu Jan 29 21:50:44 2009
@@ -15,8 +15,12 @@
  * under the License.
  */
 
-package etch.tests;
+package org.apache.etch.tests;
 
+import org.apache.etch.tests.ImplTestIncludesClient;
+import org.apache.etch.tests.ImplTestIncludesServer;
+import org.apache.etch.tests.RemoteTestIncludesClient;
+import org.apache.etch.tests.RemoteTestIncludesServer;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestImplTest1.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestImplTest1.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestImplTest1.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestImplTest1.java Thu Jan 29 21:50:44 2009
@@ -15,17 +15,21 @@
  * under the License.
  */
 
-package etch.tests;
+package org.apache.etch.tests;
 
 import org.apache.etch.bindings.java.util.StrIntHashMap;
+import org.apache.etch.tests.ImplTest1Client;
+import org.apache.etch.tests.ImplTest1Server;
+import org.apache.etch.tests.RemoteTest1Client;
+import org.apache.etch.tests.RemoteTest1Server;
+import org.apache.etch.tests.Test1.E1;
+import org.apache.etch.tests.Test1.S1;
+import org.apache.etch.tests.Test1.S2;
+import org.apache.etch.tests.Test1.S3;
+import org.apache.etch.tests.Test1.S4;
 import org.junit.Before;
 import org.junit.Test;
 
-import etch.tests.Test1.E1;
-import etch.tests.Test1.S1;
-import etch.tests.Test1.S2;
-import etch.tests.Test1.S3;
-import etch.tests.Test1.S4;
 
 /**
  * Simple tests to ensure that ImplTestClient and ImplTestServer are generated

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritance.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritance.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritance.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritance.java Thu Jan 29 21:50:44 2009
@@ -15,20 +15,25 @@
  * under the License.
  */
 
-package etch.tests;
+package org.apache.etch.tests;
 
 import static org.junit.Assert.assertEquals;
 
+import org.apache.etch.tests.ImplInheritanceClient;
+import org.apache.etch.tests.InheritanceClient;
+import org.apache.etch.tests.InheritanceHelper;
+import org.apache.etch.tests.MainInheritanceListener;
+import org.apache.etch.tests.RemoteInheritanceServer;
+import org.apache.etch.tests.Inheritance.E1;
+import org.apache.etch.tests.Inheritance.E2;
+import org.apache.etch.tests.Inheritance.E3;
+import org.apache.etch.tests.Inheritance.S1;
+import org.apache.etch.tests.Inheritance.S2;
+import org.apache.etch.tests.Inheritance.S3;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import etch.tests.Inheritance.E1;
-import etch.tests.Inheritance.E2;
-import etch.tests.Inheritance.E3;
-import etch.tests.Inheritance.S1;
-import etch.tests.Inheritance.S2;
-import etch.tests.Inheritance.S3;
 
 /**
  * Main implementation for InheritanceClient.
@@ -257,15 +262,15 @@
 			new S3( 1, 2, 3, 4, 5, 6 ).toString() );
 		
 		assertEquals(
-			"etch.tests.Inheritance$E1: a=1; b=2",
+			"org.apache.etch.tests.Inheritance$E1: a=1; b=2",
 			new E1( 1, 2 ).toString() );
 		
 		assertEquals(
-			"etch.tests.Inheritance$E2: a=1; b=2; c=3; d=4",
+			"org.apache.etch.tests.Inheritance$E2: a=1; b=2; c=3; d=4",
 			new E2( 1, 2, 3, 4 ).toString() );
 		
 		assertEquals(
-			"etch.tests.Inheritance$E3: a=1; b=2; c=3; d=4; e=5; f=6",
+			"org.apache.etch.tests.Inheritance$E3: a=1; b=2; c=3; d=4; e=5; f=6",
 			new E3( 1, 2, 3, 4, 5, 6 ).toString() );
 	}
 

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritanceXml.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritanceXml.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritanceXml.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritanceXml.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 junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
@@ -49,7 +49,7 @@
 		//String userDir = System.getProperty("user.dir");
 		try
 		{
-			File f = new File("tests/target/generated-sources/main/etch/xml/etch/tests/Inheritance.xml");
+			File f = new File("tests/target/generated-sources/main/etch/xml/org/apache/etch/tests/Inheritance.xml");
 			document = builder.parse(f);
 		}
 		catch(Exception e)
@@ -77,7 +77,7 @@
 		assertEquals(list.getLength(), 1);
 		
 		String moduleName = list.item(0).getAttributes().getNamedItem("name").getNodeValue();
-		assertEquals(moduleName, "etch.tests");
+		assertEquals(moduleName, "org.apache.etch.tests");
 		
 		// verify that no unknown attr exist
 		assertTrue(onlyAttrsOfName(list.item(0), new String[] {"name"}));
@@ -156,22 +156,22 @@
 		
 		Node structNode = list.item(nodeCount++);
 		
-		checkStructProperties(structNode, "S1", "162907748", "etch.tests.Inheritance.S1", 
+		checkStructProperties(structNode, "S1", "-1054787880", "org.apache.etch.tests.Inheritance.S1", 
 				"null", "S1 descr.");
 		checkStructValueProperties(structNode, "a", "352988316", "a", "int", "true", "false", null, "blah about a.");
 		checkStructValueProperties(structNode, "b", "352988317", "b", "int", "true", "false", null, "blah about b.");
 		
 		structNode = list.item(nodeCount++);
 		
-		checkStructProperties(structNode, "S2", "162907749", "etch.tests.Inheritance.S2", 
-				"etch.tests.Inheritance.S1", "S2 descr.");
+		checkStructProperties(structNode, "S2", "-1054787879", "org.apache.etch.tests.Inheritance.S2", 
+			"org.apache.etch.tests.Inheritance.S1", "S2 descr.");
 		checkStructValueProperties(structNode, "c", "352988318", "c", "int", "true", "false", null, "blah about c.");
 		checkStructValueProperties(structNode, "d", "352988319", "d", "int", "true", "false", null, "blah about d.");
 		
 		structNode = list.item(nodeCount++);
 		
-		checkStructProperties(structNode, "S3", "162907750", "etch.tests.Inheritance.S3", 
-				"etch.tests.Inheritance.S2", "S3 descr.");
+		checkStructProperties(structNode, "S3", "-1054787878", "org.apache.etch.tests.Inheritance.S3", 
+			"org.apache.etch.tests.Inheritance.S2", "S3 descr.");
 		checkStructValueProperties(structNode, "e", "352988320", "e", "int", "true", "false", null, "blah about e.");
 		checkStructValueProperties(structNode, "f", "352988321", "f", "int", "true", "false", null, "blah about f.");
 		
@@ -206,22 +206,22 @@
 		
 		Node exceptionNode = list.get(nodeCount++);
 		
-		checkExceptionProperties(exceptionNode, "E1", "false", "161989362", "etch.tests.Inheritance.E1", 
+		checkExceptionProperties(exceptionNode, "E1", "false", "-1055706266", "org.apache.etch.tests.Inheritance.E1", 
 				"null", "E1 descr.");
 		checkExceptionValueProperties(exceptionNode, "a", "352988316", "a", "int", "false", null, "blah about a.");
 		checkExceptionValueProperties(exceptionNode, "b", "352988317", "b", "int", "false", null, "blah about b.");
 		
 		exceptionNode = list.get(nodeCount++);
 		
-		checkExceptionProperties(exceptionNode, "E2", "false", "161989363", "etch.tests.Inheritance.E2", 
-				"etch.tests.Inheritance.E1", "E2 descr.");
+		checkExceptionProperties(exceptionNode, "E2", "false", "-1055706265", "org.apache.etch.tests.Inheritance.E2", 
+			"org.apache.etch.tests.Inheritance.E1", "E2 descr.");
 		checkExceptionValueProperties(exceptionNode, "c", "352988318", "c", "int", "false", null, "blah about c.");
 		checkExceptionValueProperties(exceptionNode, "d", "352988319", "d", "int", "false", null, "blah about d.");
 		
 		exceptionNode = list.get(nodeCount++);
 		
-		checkExceptionProperties(exceptionNode, "E3", "false", "161989364", "etch.tests.Inheritance.E3", 
-				"etch.tests.Inheritance.E2", "E3 descr.");
+		checkExceptionProperties(exceptionNode, "E3", "false", "-1055706264", "org.apache.etch.tests.Inheritance.E3", 
+			"org.apache.etch.tests.Inheritance.E2", "E3 descr.");
 		checkExceptionValueProperties(exceptionNode, "e", "352988320", "e", "int", "false", null, "blah about e.");
 		checkExceptionValueProperties(exceptionNode, "f", "352988321", "f", "int", "false", null, "blah about f.");
 		
@@ -242,16 +242,16 @@
 		
 		Node methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "f1", "164154129", "etch.tests.Inheritance.f1", 
+		checkMethodProperties(methodNode, "f1", "-1053541499", "org.apache.etch.tests.Inheritance.f1", 
 				"none", "false", "server", null, "Blah about f1.", null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "object", "true", "false", null, "a value.");
-		checkResult(methodNode, "1104909012", "etch.tests.Inheritance._result_f1", 
+		checkResult(methodNode, "1309743944", "org.apache.etch.tests.Inheritance._result_f1", 
 				"object", "true", "false", null, "the same value.");
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_f1", "1104909012", "etch.tests.Inheritance._result_f1", 
+		checkMethodProperties(methodNode, "_result_f1", "1309743944", "org.apache.etch.tests.Inheritance._result_f1", 
 				"none", "true", "client", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result", 
@@ -259,70 +259,70 @@
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "f2", "164154130", "etch.tests.Inheritance.f2", 
+		checkMethodProperties(methodNode, "f2", "-1053541498", "org.apache.etch.tests.Inheritance.f2", 
 				"none", "false", "server", null, "Blah about f2.", null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "v", "352988337", "v", 
-				"etch.tests.Inheritance.S1", "false", "false", null, "a value.");
-		checkResult(methodNode, "1104909013", "etch.tests.Inheritance._result_f2", 
-				"etch.tests.Inheritance.S1", "false", "false", null, "the same value.");
+			"org.apache.etch.tests.Inheritance.S1", "false", "false", null, "a value.");
+		checkResult(methodNode, "1309743945", "org.apache.etch.tests.Inheritance._result_f2", 
+			"org.apache.etch.tests.Inheritance.S1", "false", "false", null, "the same value.");
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_f2", "1104909013", "etch.tests.Inheritance._result_f2", 
+		checkMethodProperties(methodNode, "_result_f2", "1309743945", "org.apache.etch.tests.Inheritance._result_f2", 
 				"none", "true", "client", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result", 
-				"etch.tests.Inheritance.S1", "false", "false", null, null);
+			"org.apache.etch.tests.Inheritance.S1", "false", "false", null, null);
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "f3", "164154131", "etch.tests.Inheritance.f3", 
+		checkMethodProperties(methodNode, "f3", "-1053541497", "org.apache.etch.tests.Inheritance.f3", 
 				"none", "false", "server", null, "Blah about f3.", null);
 		checkAuthorize(methodNode, null);
-		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "etch.tests.Inheritance.S2", 
+		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "org.apache.etch.tests.Inheritance.S2", 
 				"false", "false", null, "a value.");
-		checkResult(methodNode, "1104909014", "etch.tests.Inheritance._result_f3", 
-				"etch.tests.Inheritance.S2", "false", "false", null, "the same value.");
+		checkResult(methodNode, "1309743946", "org.apache.etch.tests.Inheritance._result_f3", 
+			"org.apache.etch.tests.Inheritance.S2", "false", "false", null, "the same value.");
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_f3", "1104909014", "etch.tests.Inheritance._result_f3", 
+		checkMethodProperties(methodNode, "_result_f3", "1309743946", "org.apache.etch.tests.Inheritance._result_f3", 
 				"none", "true", "client", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result", 
-				"etch.tests.Inheritance.S2", "false", "false", null, null);
+			"org.apache.etch.tests.Inheritance.S2", "false", "false", null, null);
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "f4", "164154132", "etch.tests.Inheritance.f4", 
+		checkMethodProperties(methodNode, "f4", "-1053541496", "org.apache.etch.tests.Inheritance.f4", 
 				"none", "false", "server", null, "Blah about f4.", null);
 		checkAuthorize(methodNode, null);
-		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "etch.tests.Inheritance.S3", 
+		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "org.apache.etch.tests.Inheritance.S3", 
 				"false", "false", null, "a value.");
-		checkResult(methodNode, "1104909015", "etch.tests.Inheritance._result_f4", 
-				"etch.tests.Inheritance.S3", "false",  "false", null, "the same value.");
+		checkResult(methodNode, "1309743947", "org.apache.etch.tests.Inheritance._result_f4", 
+			"org.apache.etch.tests.Inheritance.S3", "false",  "false", null, "the same value.");
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_f4", "1104909015", "etch.tests.Inheritance._result_f4", 
+		checkMethodProperties(methodNode, "_result_f4", "1309743947", "org.apache.etch.tests.Inheritance._result_f4", 
 				"none", "true", "client", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result", 
-				"etch.tests.Inheritance.S3", "false", "false", null, null);
+			"org.apache.etch.tests.Inheritance.S3", "false", "false", null, null);
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "f5", "164154133", "etch.tests.Inheritance.f5", 
+		checkMethodProperties(methodNode, "f5", "-1053541495", "org.apache.etch.tests.Inheritance.f5", 
 				"none", "false", "server", null, "Blah about f5.", null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "object", "true", "true", "1", "a value.");
-		checkResult(methodNode, "1104909016", "etch.tests.Inheritance._result_f5", 
+		checkResult(methodNode, "1309743948", "org.apache.etch.tests.Inheritance._result_f5", 
 				"object", "true", "true", "1", "the same value.");
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_f5", "1104909016", "etch.tests.Inheritance._result_f5", 
+		checkMethodProperties(methodNode, "_result_f5", "1309743948", "org.apache.etch.tests.Inheritance._result_f5", 
 				"none", "true", "client", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result", 
@@ -330,58 +330,58 @@
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "f6", "164154134", "etch.tests.Inheritance.f6", 
+		checkMethodProperties(methodNode, "f6", "-1053541494", "org.apache.etch.tests.Inheritance.f6", 
 				"none", "false", "server", null, "Blah about f6.", null);
 		checkAuthorize(methodNode, null);
-		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "etch.tests.Inheritance.S1", 
+		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "org.apache.etch.tests.Inheritance.S1", 
 				"false", "true", "1", "a value.");
-		checkResult(methodNode, "1104909017", "etch.tests.Inheritance._result_f6", 
-				"etch.tests.Inheritance.S1", "false",  "true", "1", "the same value.");
+		checkResult(methodNode, "1309743949", "org.apache.etch.tests.Inheritance._result_f6", 
+			"org.apache.etch.tests.Inheritance.S1", "false",  "true", "1", "the same value.");
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_f6", "1104909017", "etch.tests.Inheritance._result_f6", 
+		checkMethodProperties(methodNode, "_result_f6", "1309743949", "org.apache.etch.tests.Inheritance._result_f6", 
 				"none", "true", "client", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result", 
-				"etch.tests.Inheritance.S1", "false", "true", "1", null);
+			"org.apache.etch.tests.Inheritance.S1", "false", "true", "1", null);
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "f7", "164154135", "etch.tests.Inheritance.f7", 
+		checkMethodProperties(methodNode, "f7", "-1053541493", "org.apache.etch.tests.Inheritance.f7", 
 				"none", "false", "server", null, "Blah about f7.", null);
 		checkAuthorize(methodNode, null);
-		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "etch.tests.Inheritance.S2", 
+		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "org.apache.etch.tests.Inheritance.S2", 
 				"false", "true", "1", "a value.");
-		checkResult(methodNode, "1104909018", "etch.tests.Inheritance._result_f7", 
-				"etch.tests.Inheritance.S2", "false",  "true", "1", "the same value.");
+		checkResult(methodNode, "1309743950", "org.apache.etch.tests.Inheritance._result_f7", 
+			"org.apache.etch.tests.Inheritance.S2", "false",  "true", "1", "the same value.");
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_f7", "1104909018", "etch.tests.Inheritance._result_f7", 
+		checkMethodProperties(methodNode, "_result_f7", "1309743950", "org.apache.etch.tests.Inheritance._result_f7", 
 				"none", "true", "client", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result", 
-				"etch.tests.Inheritance.S2", "false", "true", "1", null);
+			"org.apache.etch.tests.Inheritance.S2", "false", "true", "1", null);
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "f8", "164154136", "etch.tests.Inheritance.f8", 
+		checkMethodProperties(methodNode, "f8", "-1053541492", "org.apache.etch.tests.Inheritance.f8", 
 				"none", "false", "server", null, "Blah about f8.", null);
 		checkAuthorize(methodNode, null);
-		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "etch.tests.Inheritance.S3", 
+		checkMethodFieldProperties(methodNode, "v", "352988337", "v", "org.apache.etch.tests.Inheritance.S3", 
 				"false", "true", "1", "a value.");
-		checkResult(methodNode, "1104909019", "etch.tests.Inheritance._result_f8", 
-				"etch.tests.Inheritance.S3", "false",  "true", "1", "the same value.");
+		checkResult(methodNode, "1309743951", "org.apache.etch.tests.Inheritance._result_f8", 
+			"org.apache.etch.tests.Inheritance.S3", "false",  "true", "1", "the same value.");
 		
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_f8", "1104909019", "etch.tests.Inheritance._result_f8", 
+		checkMethodProperties(methodNode, "_result_f8", "1309743951", "org.apache.etch.tests.Inheritance._result_f8", 
 				"none", "true", "client", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result", 
-				"etch.tests.Inheritance.S3", "false", "true", "1", null); 
+			"org.apache.etch.tests.Inheritance.S3", "false", "true", "1", null); 
 		
 		
 	}

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java Thu Jan 29 21:50:44 2009
@@ -15,13 +15,17 @@
  * under the License.
  */
 
-package etch.tests;
+package org.apache.etch.tests;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.Semaphore;
 
 import org.apache.etch.bindings.java.util.StrIntHashMap;
+import org.apache.etch.tests.BaseTest1Client;
+import org.apache.etch.tests.ImplTest1Client;
+import org.apache.etch.tests.MainTest1Client;
+import org.apache.etch.tests.MainTest1Listener;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -50,11 +54,11 @@
 	private Object			myObj;
 	private String			myString;
 	private StrIntHashMap	myMap;
-	private etch.tests.Test1.E1 myE1;
-	private etch.tests.Test1.S1 myS1;
-	private etch.tests.Test1.S2 myS2;
-	private etch.tests.Test1.S3 myS3;
-	private etch.tests.Test1.S4 myS4;
+	private org.apache.etch.tests.Test1.E1 myE1;
+	private org.apache.etch.tests.Test1.S1 myS1;
+	private org.apache.etch.tests.Test1.S2 myS2;
+	private org.apache.etch.tests.Test1.S3 myS3;
+	private org.apache.etch.tests.Test1.S4 myS4;
 	private boolean[]		myBools;
 	private byte[]			myBytes;
 	private short[]			myShorts;
@@ -65,9 +69,9 @@
 	private Object[]		myObjs;
 	private String[]		myStrings;
 	private StrIntHashMap[]	myMaps;
-	private etch.tests.Test1.E1[] myE1s;
-	private etch.tests.Test1.S1[] myS1s;
-	private etch.tests.Test1.S2[] myS2s;
+	private org.apache.etch.tests.Test1.E1[] myE1s;
+	private org.apache.etch.tests.Test1.S1[] myS1s;
+	private org.apache.etch.tests.Test1.S2[] myS2s;
 
 
 	// Maintenance

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Listener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Listener.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Listener.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Listener.java Thu Jan 29 21:50:44 2009
@@ -15,11 +15,14 @@
  * under the License.
  */
 
-package etch.tests;
+package org.apache.etch.tests;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.etch.tests.BaseTest1Server;
+import org.apache.etch.tests.ImplTest1Server;
+import org.apache.etch.tests.MainTest1Listener;
 import org.junit.Test;
 
 /**

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixin.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixin.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixin.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixin.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.assertSame;
@@ -26,11 +26,23 @@
 import org.apache.etch.bindings.java.msg.Type;
 import org.apache.etch.bindings.java.msg.ValueFactory;
 import org.apache.etch.bindings.java.support.DefaultValueFactory;
+import org.apache.etch.tests.Bar;
+import org.apache.etch.tests.BarClient;
+import org.apache.etch.tests.BarServer;
+import org.apache.etch.tests.Baz;
+import org.apache.etch.tests.BazClient;
+import org.apache.etch.tests.BazServer;
+import org.apache.etch.tests.Foo;
+import org.apache.etch.tests.FooClient;
+import org.apache.etch.tests.FooServer;
+import org.apache.etch.tests.ValueFactoryBar;
+import org.apache.etch.tests.ValueFactoryBaz;
+import org.apache.etch.tests.ValueFactoryFoo;
+import org.apache.etch.tests.Bar.BarData;
+import org.apache.etch.tests.Baz.BazData;
+import org.apache.etch.tests.Foo.FooData;
 import org.junit.Test;
 
-import etch.tests.Bar.BarData;
-import etch.tests.Baz.BazData;
-import etch.tests.Foo.FooData;
 
 /** Test of mixin */
 @SuppressWarnings("unused")
@@ -229,14 +241,14 @@
 		etypes.add( vf.get_mt__Etch_AuthException() );
 		etypes.add( vf.get_mt__exception() );
 		
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_BazTable );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_BazData );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_baz1 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz__result_baz1 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_baz2 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz__result_baz2 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_baz3 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz__result_baz3 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_BazTable );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_BazData );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_baz1 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz__result_baz1 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_baz2 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz__result_baz2 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_baz3 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz__result_baz3 );
 		
 		assertEquals( etypes, atypes );
 		for (Type type: etypes )
@@ -265,23 +277,23 @@
 		etypes.add( vf.get_mt__Etch_AuthException() );
 		etypes.add( vf.get_mt__exception() );
 		
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_BazTable );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_BazData );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_baz1 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz__result_baz1 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_baz2 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz__result_baz2 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_baz3 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz__result_baz3 );
-		
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar_BarTable );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar_BarData );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar_bar1 );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar__result_bar1 );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar_bar2 );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar__result_bar2 );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar_bar3 );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar__result_bar3 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_BazTable );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_BazData );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_baz1 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz__result_baz1 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_baz2 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz__result_baz2 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_baz3 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz__result_baz3 );
+		
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar_BarTable );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar_BarData );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar_bar1 );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar__result_bar1 );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar_bar2 );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar__result_bar2 );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar_bar3 );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar__result_bar3 );
 		
 		assertEquals( etypes, atypes );
 		for (Type type: etypes )
@@ -304,32 +316,32 @@
 		etypes.add( vf.get_mt__Etch_AuthException() );
 		etypes.add( vf.get_mt__exception() );
 
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_BazTable );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_BazData );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_baz1 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz__result_baz1 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_baz2 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz__result_baz2 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz_baz3 );
-		etypes.add( ValueFactoryBaz._mt_etch_tests_Baz__result_baz3 );
-
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar_BarTable );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar_BarData );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar_bar1 );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar__result_bar1 );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar_bar2 );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar__result_bar2 );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar_bar3 );
-		etypes.add( ValueFactoryBar._mt_etch_tests_Bar__result_bar3 );
-
-		etypes.add( ValueFactoryFoo._mt_etch_tests_Foo_FooTable );
-		etypes.add( ValueFactoryFoo._mt_etch_tests_Foo_FooData );
-		etypes.add( ValueFactoryFoo._mt_etch_tests_Foo_foo1 );
-		etypes.add( ValueFactoryFoo._mt_etch_tests_Foo__result_foo1 );
-		etypes.add( ValueFactoryFoo._mt_etch_tests_Foo_foo2 );
-		etypes.add( ValueFactoryFoo._mt_etch_tests_Foo__result_foo2 );
-		etypes.add( ValueFactoryFoo._mt_etch_tests_Foo_foo3 );
-		etypes.add( ValueFactoryFoo._mt_etch_tests_Foo__result_foo3 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_BazTable );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_BazData );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_baz1 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz__result_baz1 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_baz2 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz__result_baz2 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz_baz3 );
+		etypes.add( ValueFactoryBaz._mt_org_apache_etch_tests_Baz__result_baz3 );
+
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar_BarTable );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar_BarData );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar_bar1 );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar__result_bar1 );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar_bar2 );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar__result_bar2 );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar_bar3 );
+		etypes.add( ValueFactoryBar._mt_org_apache_etch_tests_Bar__result_bar3 );
+
+		etypes.add( ValueFactoryFoo._mt_org_apache_etch_tests_Foo_FooTable );
+		etypes.add( ValueFactoryFoo._mt_org_apache_etch_tests_Foo_FooData );
+		etypes.add( ValueFactoryFoo._mt_org_apache_etch_tests_Foo_foo1 );
+		etypes.add( ValueFactoryFoo._mt_org_apache_etch_tests_Foo__result_foo1 );
+		etypes.add( ValueFactoryFoo._mt_org_apache_etch_tests_Foo_foo2 );
+		etypes.add( ValueFactoryFoo._mt_org_apache_etch_tests_Foo__result_foo2 );
+		etypes.add( ValueFactoryFoo._mt_org_apache_etch_tests_Foo_foo3 );
+		etypes.add( ValueFactoryFoo._mt_org_apache_etch_tests_Foo__result_foo3 );
 		
 		assertEquals( etypes, atypes );
 		for (Type type: etypes )

Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixinXml.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixinXml.java?rev=739033&r1=738969&r2=739033&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixinXml.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixinXml.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 junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
@@ -50,7 +50,7 @@
 		//String userDir = System.getProperty("user.dir");
 		try
 		{
-			File f = new File("tests/target/generated-sources/main/etch/xml/etch/tests/Foo.xml");
+			File f = new File("tests/target/generated-sources/main/etch/xml/org/apache/etch/tests/Foo.xml");
 			
 			document = builder.parse(f);
 		}
@@ -79,7 +79,7 @@
 		assertEquals(list.getLength(), 1);
 		
 		String moduleName = list.item(0).getAttributes().getNamedItem("name").getNodeValue();
-		assertEquals(moduleName, "etch.tests");
+		assertEquals(moduleName, "org.apache.etch.tests");
 		
 		// verify that no unknown attr exist
 		assertTrue(onlyAttrsOfName(list.item(0), new String[] {"name"}));
@@ -136,15 +136,15 @@
 		
 		Node externNode = list.item(nodeCount++);
 		
-		checkExternProperties(externNode, "FooTable", "1071837490", "etch.tests.Foo.FooTable");
+		checkExternProperties(externNode, "FooTable", "-1404806234", "org.apache.etch.tests.Foo.FooTable");
 		checkExternMapProperties(externNode, "java", "org.apache.etch.bindings.java.util.StrStrHashMap", "", "org.apache.etch.bindings.java.util.StrStrHashMapSerializer",  "");
 		
 		externNode = list.item( nodeCount++ );
-		checkExternProperties(externNode, "BazTable", "-1088676472", "etch.tests.Baz.BazTable");
+		checkExternProperties(externNode, "BazTable", "729647100", "org.apache.etch.tests.Baz.BazTable");
 		checkExternMapProperties(externNode, "java", "org.apache.etch.bindings.java.util.StrStrHashMap", "", "org.apache.etch.bindings.java.util.StrStrHashMapSerializer",  "");
 		
 		externNode = list.item( nodeCount++ );
-		checkExternProperties(externNode, "BarTable", "-2096954984", "etch.tests.Bar.BarTable");
+		checkExternProperties(externNode, "BarTable", "-278631412", "org.apache.etch.tests.Bar.BarTable");
 		checkExternMapProperties(externNode, "java", "org.apache.etch.bindings.java.util.StrStrHashMap", "", "org.apache.etch.bindings.java.util.StrStrHashMapSerializer",  "");
 	}
 		
@@ -171,26 +171,26 @@
 		
 		Node structNode = list.item(nodeCount++);
 		
-		checkStructProperties(structNode, "FooData", "410518630", "etch.tests.Foo.FooData", "null", null);
+		checkStructProperties(structNode, "FooData", "-86983438", "org.apache.etch.tests.Foo.FooData", "null", null);
 		checkStructValueProperties(structNode, "code", "-325551150", "code", "int", "true", "false", null, null);
-		checkStructValueProperties(structNode, "fooTable", "-900628371", "fooTable", "etch.tests.Foo.FooTable", "false", "false", null, null);
-		checkStructValueProperties(structNode, "barData", "-780728328", "barData", "etch.tests.Bar.BarData", "false", "false", null, null);
-		checkStructValueProperties(structNode, "bazData", "-254148608", "bazData", "etch.tests.Baz.BazData", "false", "false", null, null);
+		checkStructValueProperties(structNode, "fooTable", "-900628371", "fooTable", "org.apache.etch.tests.Foo.FooTable", "false", "false", null, null);
+		checkStructValueProperties(structNode, "barData", "-780728328", "barData", "org.apache.etch.tests.Bar.BarData", "false", "false", null, null);
+		checkStructValueProperties(structNode, "bazData", "-254148608", "bazData", "org.apache.etch.tests.Baz.BazData", "false", "false", null, null);
 		
 		
 		
 		structNode = list.item(nodeCount++);
 		
-		checkStructProperties(structNode, "BazData", "964715152", "etch.tests.Baz.BazData", "null", null);
+		checkStructProperties(structNode, "BazData", "467213084", "org.apache.etch.tests.Baz.BazData", "null", null);
 		checkStructValueProperties(structNode, "code", "-325551150", "code", "int", "false", "false", null, null);
-		checkStructValueProperties(structNode, "bazTable", "2073680920", "bazTable", "etch.tests.Baz.BazTable", "false", "false", null, null);
+		checkStructValueProperties(structNode, "bazTable", "2073680920", "bazTable", "org.apache.etch.tests.Baz.BazTable", "false", "false", null, null);
 		
 		structNode = list.item(nodeCount++);
 		
-		checkStructProperties(structNode, "BarData", "-2125497728", "etch.tests.Bar.BarData", "null", null);
+		checkStructProperties(structNode, "BarData", "1671967500", "org.apache.etch.tests.Bar.BarData", "null", null);
 		checkStructValueProperties(structNode, "code", "-325551150", "code", "int", "false", "false", null, null);
-		checkStructValueProperties(structNode, "barTable", "-902376928", "barTable", "etch.tests.Bar.BarTable", "false", "false", null, null);
-		checkStructValueProperties(structNode, "bazData", "-254148608", "bazData", "etch.tests.Baz.BazData", "false", "false", null, null);
+		checkStructValueProperties(structNode, "barTable", "-902376928", "barTable", "org.apache.etch.tests.Bar.BarTable", "false", "false", null, null);
+		checkStructValueProperties(structNode, "bazData", "-254148608", "bazData", "org.apache.etch.tests.Baz.BazData", "false", "false", null, null);
 		
 		
 		
@@ -237,15 +237,15 @@
 		Node methodNode = list.item(nodeCount++);
 		
 		
-		checkMethodProperties(methodNode, "foo1", "-1087152587", "etch.tests.Foo.foo1", "none", "false", "both", null, null, null);
+		checkMethodProperties(methodNode, "foo1", "2107096233", "org.apache.etch.tests.Foo.foo1", "none", "false", "both", null, null, null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "fooData", "-1798637973", "fooData", 
-				"etch.tests.Foo.FooData", "false", "false", null, null);
-		checkResult(methodNode, "-76960648", "etch.tests.Foo._result_foo1", "boolean", "true", "false", null, null);
+				"org.apache.etch.tests.Foo.FooData", "false", "false", null, null);
+		checkResult(methodNode, "222044908", "org.apache.etch.tests.Foo._result_foo1", "boolean", "true", "false", null, null);
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_foo1", "-76960648", "etch.tests.Foo._result_foo1", 
+		checkMethodProperties(methodNode, "_result_foo1", "222044908", "org.apache.etch.tests.Foo._result_foo1", 
 				"none", "true", "both", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result",
@@ -253,16 +253,16 @@
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "foo2", "-1087152586", "etch.tests.Foo.foo2", "none", "false", "server", null, 
+		checkMethodProperties(methodNode, "foo2", "2107096234", "org.apache.etch.tests.Foo.foo2", "none", "false", "server", null, 
 				null, null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "fooData", "-1798637973", "fooData", 
-				"etch.tests.Foo.FooData", "false", "false", null, null);
-		checkResult(methodNode, "-76960647", "etch.tests.Foo._result_foo2", "boolean", "true",  "false", null, null);
+				"org.apache.etch.tests.Foo.FooData", "false", "false", null, null);
+		checkResult(methodNode, "222044909", "org.apache.etch.tests.Foo._result_foo2", "boolean", "true",  "false", null, null);
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_foo2", "-76960647", "etch.tests.Foo._result_foo2", 
+		checkMethodProperties(methodNode, "_result_foo2", "222044909", "org.apache.etch.tests.Foo._result_foo2", 
 				"none", "true", "client", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result",
@@ -270,15 +270,15 @@
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "foo3", "-1087152585", "etch.tests.Foo.foo3", "none", "false", "client", null, null, null);
+		checkMethodProperties(methodNode, "foo3", "2107096235", "org.apache.etch.tests.Foo.foo3", "none", "false", "client", null, null, null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "fooData", "-1798637973", "fooData", 
-				"etch.tests.Foo.FooData", "false", "false", null, null);
-		checkResult(methodNode, "-76960646", "etch.tests.Foo._result_foo3", "boolean",  "true", "false", null, null);
+				"org.apache.etch.tests.Foo.FooData", "false", "false", null, null);
+		checkResult(methodNode, "222044910", "org.apache.etch.tests.Foo._result_foo3", "boolean",  "true", "false", null, null);
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_foo3", "-76960646", "etch.tests.Foo._result_foo3", 
+		checkMethodProperties(methodNode, "_result_foo3", "222044910", "org.apache.etch.tests.Foo._result_foo3", 
 				"none", "true", "server", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result",
@@ -286,15 +286,15 @@
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "baz1", "-1350131573", "etch.tests.Baz.baz1", "none", "false", "both", null, "Method Baz1 *", null);
+		checkMethodProperties(methodNode, "baz1", "1844117247", "org.apache.etch.tests.Baz.baz1", "none", "false", "both", null, "Method Baz1 *", null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "bazData", "-254148608", "bazData", 
-				"etch.tests.Baz.BazData", "false", "false", null, null);
-		checkResult(methodNode, "-2072454962", "etch.tests.Baz._result_baz1", "boolean",  "true", "false", null, null);
+				"org.apache.etch.tests.Baz.BazData", "false", "false", null, null);
+		checkResult(methodNode, "-1773449406", "org.apache.etch.tests.Baz._result_baz1", "boolean",  "true", "false", null, null);
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_baz1", "-2072454962", "etch.tests.Baz._result_baz1", 
+		checkMethodProperties(methodNode, "_result_baz1", "-1773449406", "org.apache.etch.tests.Baz._result_baz1", 
 				"none", "true", "both", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result",
@@ -302,15 +302,15 @@
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "baz2", "-1350131572", "etch.tests.Baz.baz2", "none", "false", "server", null, "Method Baz2 *", null);
+		checkMethodProperties(methodNode, "baz2", "1844117248", "org.apache.etch.tests.Baz.baz2", "none", "false", "server", null, "Method Baz2 *", null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "bazData", "-254148608", "bazData", 
-				"etch.tests.Baz.BazData", "false", "false", null, null);
-		checkResult(methodNode, "-2072454961", "etch.tests.Baz._result_baz2", "boolean",  "true", "false", null, null);
+				"org.apache.etch.tests.Baz.BazData", "false", "false", null, null);
+		checkResult(methodNode, "-1773449405", "org.apache.etch.tests.Baz._result_baz2", "boolean",  "true", "false", null, null);
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_baz2", "-2072454961", "etch.tests.Baz._result_baz2", 
+		checkMethodProperties(methodNode, "_result_baz2", "-1773449405", "org.apache.etch.tests.Baz._result_baz2", 
 				"none", "true", "client", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result",
@@ -318,15 +318,15 @@
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "baz3", "-1350131571", "etch.tests.Baz.baz3", "none", "false", "client", null, "Method Baz3 *", null);
+		checkMethodProperties(methodNode, "baz3", "1844117249", "org.apache.etch.tests.Baz.baz3", "none", "false", "client", null, "Method Baz3 *", null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "bazData", "-254148608", "bazData", 
-				"etch.tests.Baz.BazData", "false", "false", null, null);
-		checkResult(methodNode, "-2072454960", "etch.tests.Baz._result_baz3", "boolean",  "true", "false", null, null);
+				"org.apache.etch.tests.Baz.BazData", "false", "false", null, null);
+		checkResult(methodNode, "-1773449404", "org.apache.etch.tests.Baz._result_baz3", "boolean",  "true", "false", null, null);
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_baz3", "-2072454960", "etch.tests.Baz._result_baz3", 
+		checkMethodProperties(methodNode, "_result_baz3", "-1773449404", "org.apache.etch.tests.Baz._result_baz3", 
 				"none", "true", "server", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result",
@@ -338,15 +338,15 @@
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "bar1", "-31746917", "etch.tests.Bar.bar1", "none", "false", "both", null, "Method Bar1 *", null);
+		checkMethodProperties(methodNode, "bar1", "-1132465393", "org.apache.etch.tests.Bar.bar1", "none", "false", "both", null, "Method Bar1 *", null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "barData", "-780728328", "barData", 
-				"etch.tests.Bar.BarData", "false", "false", null, null);
-		checkResult(methodNode, "-261112610", "etch.tests.Bar._result_bar1", "boolean",  "true", "false", null, null);
+				"org.apache.etch.tests.Bar.BarData", "false", "false", null, null);
+		checkResult(methodNode, "37892946", "org.apache.etch.tests.Bar._result_bar1", "boolean",  "true", "false", null, null);
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_bar1", "-261112610", "etch.tests.Bar._result_bar1", 
+		checkMethodProperties(methodNode, "_result_bar1", "37892946", "org.apache.etch.tests.Bar._result_bar1", 
 				"none", "true", "both", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result",
@@ -354,15 +354,15 @@
 		
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "bar2", "-31746916", "etch.tests.Bar.bar2", "none", "false", "server", null, "Method Bar2 *", null);
+		checkMethodProperties(methodNode, "bar2", "-1132465392", "org.apache.etch.tests.Bar.bar2", "none", "false", "server", null, "Method Bar2 *", null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "barData", "-780728328", "barData", 
-				"etch.tests.Bar.BarData", "false", "false", null, null);
-		checkResult(methodNode, "-261112609", "etch.tests.Bar._result_bar2", "boolean",  "true", "false", null, null);
+				"org.apache.etch.tests.Bar.BarData", "false", "false", null, null);
+		checkResult(methodNode, "37892947", "org.apache.etch.tests.Bar._result_bar2", "boolean",  "true", "false", null, null);
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_bar2", "-261112609", "etch.tests.Bar._result_bar2", 
+		checkMethodProperties(methodNode, "_result_bar2", "37892947", "org.apache.etch.tests.Bar._result_bar2", 
 				"none", "true", "client", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result",
@@ -370,15 +370,15 @@
 		
 		methodNode = list.item(nodeCount++);
 
-		checkMethodProperties(methodNode, "bar3", "-31746915", "etch.tests.Bar.bar3", "none", "false", "client", null, "Method Bar3 *", null);
+		checkMethodProperties(methodNode, "bar3", "-1132465391", "org.apache.etch.tests.Bar.bar3", "none", "false", "client", null, "Method Bar3 *", null);
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "barData", "-780728328", "barData", 
-				"etch.tests.Bar.BarData", "false", "false", null, null);
-		checkResult(methodNode, "-261112608", "etch.tests.Bar._result_bar3", "boolean",  "true", "false", null, null);
+				"org.apache.etch.tests.Bar.BarData", "false", "false", null, null);
+		checkResult(methodNode, "37892948", "org.apache.etch.tests.Bar._result_bar3", "boolean",  "true", "false", null, null);
 
 		methodNode = list.item(nodeCount++);
 		
-		checkMethodProperties(methodNode, "_result_bar3", "-261112608", "etch.tests.Bar._result_bar3", 
+		checkMethodProperties(methodNode, "_result_bar3", "37892948", "org.apache.etch.tests.Bar._result_bar3", 
 				"none", "true", "server", "0", null, "result");
 		checkAuthorize(methodNode, null);
 		checkMethodFieldProperties(methodNode, "result", "-2130379326", "result",