You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by di...@apache.org on 2009/03/12 01:25:56 UTC

svn commit: r752717 - in /incubator/etch/trunk/binding-python/runtime: ./ src/main/python/ src/main/python/etch/binding/ src/main/python/etch/binding/support/ src/main/python/etch/binding/transport/ src/main/python/etch/binding/transport/fmt/binary/ sr...

Author: dixson
Date: Thu Mar 12 00:25:55 2009
New Revision: 752717

URL: http://svn.apache.org/viewvc?rev=752717&view=rev
Log:
first cut at build integration

Modified:
    incubator/etch/trunk/binding-python/runtime/build.xml
    incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/__init__.py
    incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubBase.py
    incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubHelper.py
    incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubIntf.py
    incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/FormatFactory.py
    incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/PlainMailboxManager.py
    incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/TcpTransportFactory.py
    incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/UnwantedMessage.py
    incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedData.py
    incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedDataInput.py
    incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedDataOutput.py
    incubator/etch/trunk/binding-python/runtime/src/main/python/setup.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/__init__.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestField.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestIdName.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestMessage.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestStructValue.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestType.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/__init__.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestComboValidator.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestDefaultValueFactory.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestIdNameMap.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestRemoteBase.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestStubBase.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestTypeValidator.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_boolean.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_byte.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_double.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_float.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_int.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_long.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_short.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidators.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/__init__.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/TestArrayValue.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/__init__.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/__init__.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/binary/TestBinaryTaggedDataInOut.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/binary/__init__.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/xml/__init__.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/TestFlexBuffer.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/TestTypes.py
    incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/__init__.py

Modified: incubator/etch/trunk/binding-python/runtime/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/build.xml?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/build.xml (original)
+++ incubator/etch/trunk/binding-python/runtime/build.xml Thu Mar 12 00:25:55 2009
@@ -10,6 +10,16 @@
     <property name="src"                  location="${proj}/src" />
     <property name="testResultsDirectory" location="${target}/test-results"  />
 
+    <taskdef resource="pyAntTasks.properties" classpath="/Users/dixson/Downloads/pyAntTasks-1.2.jar" />
+
+    <macrodef name="do-python">
+        <attribute name="python" default="/opt/local/bin/python2.6" />
+        <sequential>
+
+        </sequential>
+    </macrodef>
+
+
     <!-- INIT TARGET -->
     <!-- Modify this target to define project specific properties that can only be set at runtime -->
     <target name="do-init">
@@ -28,30 +38,52 @@
 
     <target name="generate-sources" >
         <!-- Generate version info -->
-        <!-- <update-tokens filename="${src}/main/python/etch/version.py.tmpl" /> -->
+        <mkdir dir="${target}" />
+        <mkdir dir="${target}/" />
+        <mkdir dir="${target}/src" />
+        <mkdir dir="${target}/test" />
+        <copy todir="${target}/src" >
+            <fileset dir="${src}/main/python" >
+                <include name="etch/**" />
+            </fileset>
+        </copy>
+        <copy todir="${target}/src" >
+            <fileset dir="${src}/main/resources" >
+                <include name="*egg*/*" />
+            </fileset>
+            <filterset refid="Etch.buildTokens" />
+        </copy>
+        <copy todir="${target}/src" >
+            <fileset dir="${src}/test/python" >
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${target}" file="${src}/main/python/setup.py" >
+            <filterset refid="Etch.buildTokens" />
+        </copy>
+    
     </target>
 
     <target name="do-build" depends="generate-sources" >
+        <py-compile python="/opt/local/bin/python2.6" dir="${target}/src" pythonpath="${target}/src" />
 
-        <mkdir dir="${Etch.dist}/lib" />
-        <mkdir dir="${Etch.clover-dist}/lib" />
-
-        <copy todir="${Etch.clover-dist}/lib" >
-            <fileset dir="${target}" >
-                <include name="*.egg" />
-            </fileset>
-        </copy>
-
-        <copy todir="${Etch.dist}/lib" >
-            <fileset dir="${target}">
-                <include name="*.egg" />
+        <mkdir dir="${target}/dist" />
+        <copy todir="${target}/dist" >
+            <fileset dir="${target}/src" >
+                <include name="etch/**" />
             </fileset>
         </copy>
+    
     </target>
 
     <!-- TEST TARGET -->
 
-    <target name="do-test" >        
+    <target name="do-test" >
+        <py-test python="/opt/local/bin/python2.6" pythonpath="${target}/dist" dir="${target}/src/tests" >
+            <fileset dir="${target}/src/tests" >
+                <include name="**/msg/Test*.py" />
+            </fileset>
+        </py-test>
     </target>
 
     <!-- POSTBUILD TARGET -->

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/__init__.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/__init__.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/__init__.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/__init__.py Thu Mar 12 00:25:55 2009
@@ -15,6 +15,6 @@
 from __future__ import absolute_import
 
 from . import msg
-from . import support
-from . import transport
-from . import util
+#from . import support
+#from . import transport
+#from . import util

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubBase.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubBase.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubBase.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubBase.py Thu Mar 12 00:25:55 2009
@@ -16,4 +16,4 @@
 # under the License.
 #
 """
-from __future__ import absolute_import
\ No newline at end of file
+from __future__ import absolute_import

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubHelper.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubHelper.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubHelper.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubHelper.py Thu Mar 12 00:25:55 2009
@@ -16,7 +16,7 @@
 # under the License.
 #
 """
-from __future__ import *
+from __future__ import absolute_import 
 from ...python.Exception import *
 
 class StubHelper(object):

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubIntf.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubIntf.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubIntf.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/support/StubIntf.py Thu Mar 12 00:25:55 2009
@@ -16,7 +16,7 @@
 # under the License.
 #
 """
-from __future__ import *
+from __future__ import absolute_import
 from .MessageHandler import *
 from ...util.core.io.Session import *
 
@@ -25,4 +25,4 @@
     Interface required by DeliveryService
     """
     pass
-    
\ No newline at end of file
+    

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/FormatFactory.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/FormatFactory.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/FormatFactory.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/FormatFactory.py Thu Mar 12 00:25:55 2009
@@ -77,7 +77,7 @@
         if isinstance(factoryInstance, FormatFactory):
             return factoryInstance
         else:
-            raise IllegalArgumentException "instance for format name %s(%s) does not implement FormatFactory" % (name, repr(factory))    
+            raise IllegalArgumentException, "instance for format name %s(%s) does not implement FormatFactory" % (name, repr(factory))    
 
 
     @classmethod
@@ -90,4 +90,4 @@
         of the FormatFactory to associate with the name.
         """
         cls.formatFactories[name] = factory
-        
\ No newline at end of file
+        

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/PlainMailboxManager.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/PlainMailboxManager.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/PlainMailboxManager.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/PlainMailboxManager.py Thu Mar 12 00:25:55 2009
@@ -153,7 +153,7 @@
     def redeliver(self, sender, msg):
         self.__session.sessionMessage(sender, msg)
     
-    def size(self)::
+    def size(self):
         """
         @return the number of mailboxes
         """
@@ -201,4 +201,4 @@
     
     
     
-    
\ No newline at end of file
+    

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/TcpTransportFactory.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/TcpTransportFactory.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/TcpTransportFactory.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/TcpTransportFactory.py Thu Mar 12 00:25:55 2009
@@ -44,7 +44,7 @@
     
         self.__src = None
         
-    def accepted(self, s)::
+    def accepted(self, s):
         r = Resources(self.__resources)
         r.put('SOCKET', s)
         
@@ -103,4 +103,4 @@
         return l
 
 
-        
\ No newline at end of file
+        

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/UnwantedMessage.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/UnwantedMessage.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/UnwantedMessage.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/UnwantedMessage.py Thu Mar 12 00:25:55 2009
@@ -37,5 +37,5 @@
         self.__msg    = msg
     
     def __repr__(self):
-        return "Unwanted message from %s: %s" % (repr(self.__sender), repr(self.__msg)
+        return "Unwanted message from %s: %s" % (repr(self.__sender), repr(self.__msg))
 

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedData.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedData.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedData.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedData.py Thu Mar 12 00:25:55 2009
@@ -16,9 +16,9 @@
 # under the License.
 #
 """
-import types
-
 from __future__ import absolute_import
+
+import types
 from .....python.Exceptions import *
 from .....python.Types import *
 from ..TypeCode import TypeCode

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedDataInput.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedDataInput.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedDataInput.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedDataInput.py Thu Mar 12 00:25:55 2009
@@ -27,7 +27,7 @@
 from ....msg.StructValue import *
 from ....msg.Message import *
 from .....util.Flexbuffer import *
-from ....support.Validator_int *
+from ....support.Validator_int import *
 
 class BinaryTaggedDataInput(BinaryTaggedData,TaggedDataInput):
     

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedDataOutput.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedDataOutput.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedDataOutput.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/etch/binding/transport/fmt/binary/BinaryTaggedDataOutput.py Thu Mar 12 00:25:55 2009
@@ -24,7 +24,7 @@
 from .BinaryTaggedData import *
 from ...TaggedDataOutput import *
 from .....util.Flexbuffer import *
-from ....support.Validator_int *
+from ....support.Validator_int import *
 from .Validator_none import *
 
 class BinaryTaggedDataOutput(BinaryTaggedData,TaggedDataOutput):

Modified: incubator/etch/trunk/binding-python/runtime/src/main/python/setup.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/main/python/setup.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/main/python/setup.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/main/python/setup.py Thu Mar 12 00:25:55 2009
@@ -19,8 +19,8 @@
 from setuptools import setup, find_packages
 
 setup(name='etch',
-      version='1.0.0',
-      author='Cisco Systems',
+      version='@EtchVersion@',
+      author='Apache Foundation',
       package_dir = {'':'src'},
       packages = find_packages('src', exclude=["*.tests","*.test.*","tests.*","tests"]),
       test_suite = "nose.collector"

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/__init__.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/__init__.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/__init__.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/__init__.py Thu Mar 12 00:25:55 2009
@@ -1,16 +1,8 @@
-"""
-# Copyright 2007-2008 Cisco Systems Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy
-# of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-"""
\ No newline at end of file
+from . import binding
+from . import support
+from . import transport
+from . import util
+
+#from . import util
+#from . import python
+#from . import compiler

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestField.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestField.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestField.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestField.py Thu Mar 12 00:25:55 2009
@@ -15,9 +15,9 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.Field import Field
-from etch.msg.IdName import IdName
+from etch.python.Types import *
+from etch.binding.msg.Field import Field
+from etch.binding.msg.IdName import IdName
 
 class Test_EtchMsgField(unittest.TestCase):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestIdName.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestIdName.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestIdName.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestIdName.py Thu Mar 12 00:25:55 2009
@@ -15,8 +15,8 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.IdName import IdName
+from etch.python.Types import *
+from etch.binding.msg.IdName import IdName
 
 class Test_EtchMsgIdName(unittest.TestCase):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestMessage.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestMessage.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestMessage.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestMessage.py Thu Mar 12 00:25:55 2009
@@ -15,13 +15,13 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.Message import Message
-from etch.msg.Type import Type
-from etch.msg.Field import Field
-from etch.msg.ValueFactory import ValueFactory
-from etch.support.Validator_int import Validator_int
-from etch.support.Validator_long import Validator_long
+from etch.python.Types import *
+from etch.binding.msg.Message import Message
+from etch.binding.msg.Type import Type
+from etch.binding.msg.Field import Field
+from etch.binding.msg.ValueFactory import ValueFactory
+from etch.binding.support.Validator_int import Validator_int
+from etch.binding.support.Validator_long import Validator_long
 
 
 class Test_EtchMsgMessage(unittest.TestCase):

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestStructValue.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestStructValue.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestStructValue.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestStructValue.py Thu Mar 12 00:25:55 2009
@@ -15,15 +15,15 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.StructValue import *
-from etch.msg.Type import Type
-from etch.msg.Field import Field
-from etch.msg.IdName import IdName
-#from etch.support.ComboValidator import ComboValidator
-from etch.support.Validator_int import Validator_int
-from etch.support.Validator_boolean import Validator_boolean
-from etch.support.Validator_string import Validator_string
+from etch.python.Types import *
+from etch.binding.msg.StructValue import *
+from etch.binding.msg.Type import Type
+from etch.binding.msg.Field import Field
+from etch.binding.msg.IdName import IdName
+#from etch.binding.support.ComboValidator import ComboValidator
+from etch.binding.support.Validator_int import Validator_int
+from etch.binding.support.Validator_boolean import Validator_boolean
+from etch.binding.support.Validator_string import Validator_string
 
 class Test_EtchMsgStructValue(unittest.TestCase):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestType.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestType.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestType.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/TestType.py Thu Mar 12 00:25:55 2009
@@ -15,12 +15,12 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.Type import Type
-from etch.msg.Field import Field
-from etch.msg.IdName import IdName
-from etch.support.ComboValidator import ComboValidator
-from etch.support.Validator_int import Validator_int
+from etch.python.Types import *
+from etch.binding.msg.Type import Type
+from etch.binding.msg.Field import Field
+from etch.binding.msg.IdName import IdName
+from etch.binding.support.ComboValidator import ComboValidator
+from etch.binding.support.Validator_int import Validator_int
 
 class Test_EtchMsgType(unittest.TestCase):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/__init__.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/__init__.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/__init__.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/msg/__init__.py Thu Mar 12 00:25:55 2009
@@ -1,16 +1,7 @@
-"""
-# Copyright 2007-2008 Cisco Systems Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy
-# of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-"""
\ No newline at end of file
+from __future__ import absolute_import
+from .TestField import *
+from .TestIdName import *
+from .TestMessage import *
+from .TestStructValue import *
+from .TestType import *
+

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestComboValidator.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestComboValidator.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestComboValidator.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestComboValidator.py Thu Mar 12 00:25:55 2009
@@ -15,11 +15,11 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.support.ComboValidator import *
-from etch.support.Validator_boolean import *
-from etch.support.Validator_int import *
-from etch.transport.fmt.TypeCode import *
+from etch.python.Types import *
+from etch.binding.support.ComboValidator import *
+from etch.binding.support.Validator_boolean import *
+from etch.binding.support.Validator_int import *
+from etch.binding.transport.fmt.TypeCode import *
 
 class Test_EtchSupportComboValidator(unittest.TestCase):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestDefaultValueFactory.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestDefaultValueFactory.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestDefaultValueFactory.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestDefaultValueFactory.py Thu Mar 12 00:25:55 2009
@@ -15,17 +15,17 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.Type import *
-from etch.msg.Field import *
-from etch.support.DefaultValueFactory import *
-from etch.support.TypeMap import *
-from etch.support.Class2TypeMap import *
-from etch.support._Etch_AuthException import *
-from etch.support._Etch_RuntimeException import *
-from etch.support.Validator_long import *
-from etch.msg.Message import *
-from etch.msg.StructValue import *
+from etch.python.Types import *
+from etch.binding.msg.Type import *
+from etch.binding.msg.Field import *
+from etch.binding.support.DefaultValueFactory import *
+from etch.binding.support.TypeMap import *
+from etch.binding.support.Class2TypeMap import *
+from etch.binding.support._Etch_AuthException import *
+from etch.binding.support._Etch_RuntimeException import *
+from etch.binding.support.Validator_long import *
+from etch.binding.msg.Message import *
+from etch.binding.msg.StructValue import *
 
 
 class MyValueFactory(DefaultValueFactory):

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestIdNameMap.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestIdNameMap.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestIdNameMap.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestIdNameMap.py Thu Mar 12 00:25:55 2009
@@ -15,9 +15,9 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.support.IdNameMap import *
-from etch.msg.IdName import *
+from etch.python.Types import *
+from etch.binding.support.IdNameMap import *
+from etch.binding.msg.IdName import *
 
 class IdNameMapTest(IdNameMap):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestRemoteBase.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestRemoteBase.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestRemoteBase.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestRemoteBase.py Thu Mar 12 00:25:55 2009
@@ -15,8 +15,8 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.support.RemoteBase import *
+from etch.python.Types import *
+from etch.binding.support.RemoteBase import *
 
 class What:
     SEND      = "SEND"

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestStubBase.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestStubBase.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestStubBase.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestStubBase.py Thu Mar 12 00:25:55 2009
@@ -15,8 +15,8 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.support.StubBase import *
+from etch.python.Types import *
+from etch.binding.support.StubBase import *
 
 class What:
     UNWANTED = 'UNWANTED'

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestTypeValidator.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestTypeValidator.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestTypeValidator.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestTypeValidator.py Thu Mar 12 00:25:55 2009
@@ -15,8 +15,8 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.support.TypeValidator import *
+from etch.python.Types import *
+from etch.binding.support.TypeValidator import *
 
 class MyTypeValidator(TypeValidator):
     pass

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_boolean.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_boolean.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_boolean.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_boolean.py Thu Mar 12 00:25:55 2009
@@ -16,10 +16,10 @@
 """
 import unittest
 import types
-from etch.util.Types import *
-from etch.support.Validator_boolean import *
-from etch.msg.Validator import *
-from etch.transport.fmt.TypeCode import *
+from etch.python.Types import *
+from etch.binding.support.Validator_boolean import *
+from etch.binding.msg.Validator import *
+from etch.binding.transport.fmt.TypeCode import *
 
 class Test_EtchSupportValidator_boolean(unittest.TestCase):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_byte.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_byte.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_byte.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_byte.py Thu Mar 12 00:25:55 2009
@@ -15,10 +15,10 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.Validator import *
-from etch.support.Validator_byte import *
-from etch.transport.fmt.TypeCode import *
+from etch.python.Types import *
+from etch.binding.msg.Validator import *
+from etch.binding.support.Validator_byte import *
+from etch.binding.transport.fmt.TypeCode import *
 
 class Test_EtchSupportValidator_byte(unittest.TestCase):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_double.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_double.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_double.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_double.py Thu Mar 12 00:25:55 2009
@@ -15,9 +15,9 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.support.Validator_double import *
-from etch.transport.fmt.TypeCode import *
+from etch.python.Types import *
+from etch.binding.support.Validator_double import *
+from etch.binding.transport.fmt.TypeCode import *
 
 class Test_EtchSupportValidator_double(unittest.TestCase):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_float.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_float.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_float.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_float.py Thu Mar 12 00:25:55 2009
@@ -15,9 +15,9 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.support.Validator_float import *
-from etch.transport.fmt.TypeCode import *
+from etch.python.Types import *
+from etch.binding.support.Validator_float import *
+from etch.binding.transport.fmt.TypeCode import *
 
 class Test_EtchSupportValidator_float(unittest.TestCase):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_int.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_int.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_int.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_int.py Thu Mar 12 00:25:55 2009
@@ -15,10 +15,10 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.Validator import *
-from etch.support.Validator_int import *
-from etch.transport.fmt.TypeCode import *
+from etch.python.Types import *
+from etch.binding.msg.Validator import *
+from etch.binding.support.Validator_int import *
+from etch.binding.transport.fmt.TypeCode import *
 
 class Test_EtchSupportValidator_int(unittest.TestCase):
         

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_long.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_long.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_long.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_long.py Thu Mar 12 00:25:55 2009
@@ -15,10 +15,10 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.Validator import *
-from etch.support.Validator_long import *
-from etch.transport.fmt.TypeCode import *
+from etch.python.Types import *
+from etch.binding.msg.Validator import *
+from etch.binding.support.Validator_long import *
+from etch.binding.transport.fmt.TypeCode import *
 
 class Test_EtchSupportValidator_long(unittest.TestCase):
         

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_short.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_short.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_short.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidator_short.py Thu Mar 12 00:25:55 2009
@@ -15,10 +15,10 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.Validator import *
-from etch.support.Validator_short import *
-from etch.transport.fmt.TypeCode import *
+from etch.python.Types import *
+from etch.binding.msg.Validator import *
+from etch.binding.support.Validator_short import *
+from etch.binding.transport.fmt.TypeCode import *
 
 class Test_EtchSupportValidator_short(unittest.TestCase):
         

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidators.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidators.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidators.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/TestValidators.py Thu Mar 12 00:25:55 2009
@@ -15,14 +15,14 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.Validator import *
-from etch.support.Validator_boolean import *
-from etch.support.Validator_int import *
-from etch.support.Validator_short import *
-from etch.support.Validator_byte import *
-from etch.support.Validator_string import *
-from etch.transport.fmt.TypeCode import *
+from etch.python.Types import *
+from etch.binding.msg.Validator import *
+from etch.binding.support.Validator_boolean import *
+from etch.binding.support.Validator_int import *
+from etch.binding.support.Validator_short import *
+from etch.binding.support.Validator_byte import *
+from etch.binding.support.Validator_string import *
+from etch.binding.transport.fmt.TypeCode import *
 
 class Test_EtchSupportValidators(unittest.TestCase):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/__init__.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/__init__.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/__init__.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/support/__init__.py Thu Mar 12 00:25:55 2009
@@ -1,16 +1,20 @@
-"""
-# Copyright 2007-2008 Cisco Systems Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy
-# of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-"""
\ No newline at end of file
+from __future__ import absolute_import
+
+from .TestComboValidator import *
+from .TestDefaultValueFactory import *
+from .TestIdNameMap import *
+from .TestRemoteBase import *
+from .TestStubBase import *
+from .TestTypeValidator import *
+from .TestValidator_boolean import *
+from .TestValidator_byte import *
+from .TestValidator_double import *
+from .TestValidator_float import *
+from .TestValidator_int import *
+from .TestValidator_long import *
+from .TestValidator_object import *
+from .TestValidator_short import *
+from .TestValidator_string import *
+from .TestValidator_void import *
+from .TestValidators import *
+

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/TestArrayValue.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/TestArrayValue.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/TestArrayValue.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/TestArrayValue.py Thu Mar 12 00:25:55 2009
@@ -15,8 +15,8 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.Type import *
+from etch.python.Types import *
+from etch.binding.msg.Type import *
 
 # TODO - finish this
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/__init__.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/__init__.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/__init__.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/__init__.py Thu Mar 12 00:25:55 2009
@@ -1,16 +1,7 @@
-"""
-# Copyright 2007-2008 Cisco Systems Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy
-# of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-"""
\ No newline at end of file
+from __future__ import absolute_import
+
+from .TestArrayValue import *
+from .TestMailboxManager import *
+from .TestMessagizer import *
+from .TestPlainMailbox import *
+from . import fmt

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/__init__.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/__init__.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/__init__.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/__init__.py Thu Mar 12 00:25:55 2009
@@ -1,16 +1,4 @@
-"""
-# Copyright 2007-2008 Cisco Systems Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy
-# of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-"""
\ No newline at end of file
+from __future__ import absolute_import
+
+from . import binary
+from . import xml

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/binary/TestBinaryTaggedDataInOut.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/binary/TestBinaryTaggedDataInOut.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/binary/TestBinaryTaggedDataInOut.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/binary/TestBinaryTaggedDataInOut.py Thu Mar 12 00:25:55 2009
@@ -19,12 +19,12 @@
 import unittest
 import time
 
-from etch.transport.fmt.binary.BinaryTaggedDataOutput import BinaryTaggedDataOutput
-from etch.support.DefaultValueFactory import DefaultValueFactory
-from etch.support.TypeMap import TypeMap
-from etch.support.Class2TypeMap import Class2TypeMap
-from etch.msg.Type import Type
-from etch.util.Types import *
+from etch.binding.transport.fmt.binary.BinaryTaggedDataOutput import BinaryTaggedDataOutput
+from etch.binding.support.DefaultValueFactory import DefaultValueFactory
+from etch.binding.support.TypeMap import TypeMap
+from etch.binding.support.Class2TypeMap import Class2TypeMap
+from etch.binding.msg.Type import Type
+from etch.pyhon.Types import *
 from etch.util.PacketSource import PacketSource
 
 class TestBinaryTaggedDataInOut(unittest.TestCase):

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/binary/__init__.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/binary/__init__.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/binary/__init__.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/binary/__init__.py Thu Mar 12 00:25:55 2009
@@ -1,16 +1,3 @@
-"""
-# Copyright 2007-2008 Cisco Systems Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy
-# of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-"""
\ No newline at end of file
+from __future__ import absolute_import
+
+from .TestBinaryTaggedDataInOut import *

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/xml/__init__.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/xml/__init__.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/xml/__init__.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/transport/fmt/xml/__init__.py Thu Mar 12 00:25:55 2009
@@ -1,16 +0,0 @@
-"""
-# Copyright 2007-2008 Cisco Systems Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy
-# of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-"""
\ No newline at end of file

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/TestFlexBuffer.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/TestFlexBuffer.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/TestFlexBuffer.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/TestFlexBuffer.py Thu Mar 12 00:25:55 2009
@@ -15,8 +15,8 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.util.Exceptions import *
+from etch.python.Types import *
+from etch.python.Exceptions import *
 from etch.util.FlexBuffer import *
 
 class Test_EtchUtilFlexBuffer(unittest.TestCase):

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/TestTypes.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/TestTypes.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/TestTypes.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/TestTypes.py Thu Mar 12 00:25:55 2009
@@ -15,8 +15,8 @@
 #
 """
 import unittest
-from etch.util.Types import *
-from etch.msg.IdName import IdName
+from etch.python.Types import *
+from etch.binding.msg.IdName import IdName
 
 class Test_EtchUtilTypes(unittest.TestCase):
 

Modified: incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/__init__.py
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/__init__.py?rev=752717&r1=752716&r2=752717&view=diff
==============================================================================
--- incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/__init__.py (original)
+++ incubator/etch/trunk/binding-python/runtime/src/test/python/tests/util/__init__.py Thu Mar 12 00:25:55 2009
@@ -1,16 +1,4 @@
-"""
-# Copyright 2007-2008 Cisco Systems Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy
-# of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-"""
\ No newline at end of file
+from __future__ import absolute_import
+
+from .TestFlexBuffer import *
+from .TestTypes import *