You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/03/21 13:35:59 UTC

svn commit: r520884 - in /incubator/yoko/trunk/bindings/src: main/java/org/apache/yoko/bindings/corba/ main/java/org/apache/yoko/bindings/corba/interceptors/ test/java/org/apache/yoko/bindings/corba/

Author: bravi
Date: Wed Mar 21 06:35:58 2007
New Revision: 520884

URL: http://svn.apache.org/viewvc?view=rev&rev=520884
Log:
[YOKO-313] - Separated the CorbaStreamable interface & implementation to provide more flexibility.

Modified:
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaMessage.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaStreamable.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaFaultOutInterceptor.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptor.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java?view=diff&rev=520884&r1=520883&r2=520884
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java Wed Mar 21 06:35:58 2007
@@ -199,7 +199,7 @@
                                                               typeMaps,
                                                               service);
                 
-                CorbaStreamable exStreamable = new CorbaStreamable(handler, elName);
+                CorbaStreamable exStreamable = message.createStreamableObject(handler, elName);
                 exStreamable._read(except.create_input_stream());
                 message.setStreamableException(exStreamable);
                 message.setContent(Exception.class, new Fault(userEx));

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaMessage.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaMessage.java?view=diff&rev=520884&r1=520883&r2=520884
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaMessage.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaMessage.java Wed Mar 21 06:35:58 2007
@@ -24,10 +24,13 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import org.apache.cxf.message.AbstractWrappedMessage;
 import org.apache.cxf.message.Message;
 
 import org.apache.yoko.bindings.corba.types.CorbaObjectHandler;
+import org.apache.yoko.bindings.corba.types.CorbaStreamableImpl;
 import org.omg.CORBA.NVList;
 import org.omg.CORBA.SystemException;
 
@@ -135,5 +138,9 @@
     public void setStreamableExceptionValue(CorbaObjectHandler exData) {
         // TODO: Handle case of the return parameter has not yet been initialized.
         except.setObject(exData);
+    }
+
+    public CorbaStreamable createStreamableObject(CorbaObjectHandler obj, QName elName) {
+        return new CorbaStreamableImpl(obj, elName);
     }
 }

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaStreamable.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaStreamable.java?view=diff&rev=520884&r1=520883&r2=520884
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaStreamable.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaStreamable.java Wed Mar 21 06:35:58 2007
@@ -18,69 +18,17 @@
  */
 package org.apache.yoko.bindings.corba;
 
-import javax.xml.namespace.QName;
-
 import org.apache.yoko.bindings.corba.types.CorbaObjectHandler;
 
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.Streamable;
 
-public class CorbaStreamable implements Streamable {
-
-    private CorbaObjectHandler value;
-    private QName name;
-    private int mode;
-    private TypeCode typecode;
-
-    public CorbaStreamable(CorbaObjectHandler obj, QName elName) {
-        value = obj;
-        name = elName;
-        typecode = obj.getTypeCode();
-
-        mode = org.omg.CORBA.ARG_OUT.value;
-    }
-
-    public void _read(InputStream istream) {
-        try {
-            CorbaObjectReader reader = new CorbaObjectReader(istream);
-            reader.read(value);
-        } catch (java.lang.Exception ex) {
-            throw new CorbaBindingException("Error reading streamable value", ex);
-        }
-    }
-
-    public void _write(OutputStream ostream) {
-        try {
-            CorbaObjectWriter writer = new CorbaObjectWriter(ostream);
-            writer.write(value);
-        } catch (java.lang.Exception ex) {
-            throw new CorbaBindingException("Error writing streamable value", ex);
-        }
-    }
-
-    public TypeCode _type() {
-        return typecode;
-    }
-
-    public CorbaObjectHandler getObject() {
-        return value;
-    }
-
-    public void setObject(CorbaObjectHandler obj) {
-        value = obj;
-    }
-
-    public int getMode() {
-        return mode;
-    }
-
-    public void setMode(int md) {
-        mode = md;
-    }
+public interface CorbaStreamable extends Streamable {
 
-    public String getName() {
-        return name.getLocalPart();
-    }
+    TypeCode _type();
+    CorbaObjectHandler getObject();
+    void setObject(CorbaObjectHandler obj);
+    int getMode();
+    void setMode(int md);
+    String getName();
 }

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaFaultOutInterceptor.java?view=diff&rev=520884&r1=520883&r2=520884
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaFaultOutInterceptor.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaFaultOutInterceptor.java Wed Mar 21 06:35:58 2007
@@ -193,7 +193,7 @@
         ByteArrayInputStream inStream = new ByteArrayInputStream(outStream.toByteArray());
         XMLEventReader evtReader = inputFactory.createXMLEventReader(inStream);
         CorbaObjectHandler obj = corbaStaxObject.readObjectFromStax(evtReader, exIdlType);
-        CorbaStreamable streamable = new CorbaStreamable(obj, elName);
+        CorbaStreamable streamable = message.createStreamableObject(obj, elName);
         message.setStreamableException(streamable);
     }
 

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptor.java?view=diff&rev=520884&r1=520883&r2=520884
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptor.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptor.java Wed Mar 21 06:35:58 2007
@@ -473,7 +473,7 @@
             CorbaObjectHandler obj = 
                 CorbaHandlerUtils.initializeObjectHandler(orb, paramName, paramIdlType, maps, service);
 
-            streamables[i] = new CorbaStreamable(obj, paramName);
+            streamables[i] = corbaMsg.createStreamableObject(obj, paramName);
             if (paramMode.value().equals("in")) {
                 streamables[i].setMode(org.omg.CORBA.ARG_IN.value);
             } else if (paramMode.value().equals("out")) {

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java?view=diff&rev=520884&r1=520883&r2=520884
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java Wed Mar 21 06:35:58 2007
@@ -139,7 +139,7 @@
             QName retName = new QName("", returnParam.getName());
             CorbaObjectHandler obj = CorbaHandlerUtils
                 .initializeObjectHandler(orb, retName, retIdlType, typeMaps, service);
-            CorbaStreamable streamable = new CorbaStreamable(obj, retName);
+            CorbaStreamable streamable = message.createStreamableObject(obj, retName);
             message.setStreamableReturn(streamable);
         }
     }
@@ -217,7 +217,7 @@
                 } else {
                     obj = corbaStaxObject.readObjectFromStax(evtReader, idlType);
                 }
-                CorbaStreamable streamable = new CorbaStreamable(obj, paramName);
+                CorbaStreamable streamable = message.createStreamableObject(obj, paramName);
                 ModeType paramMode = param.getMode();
                 if (paramMode.value().equals("in")) {
                     streamable.setMode(org.omg.CORBA.ARG_IN.value);
@@ -270,7 +270,7 @@
                 QName retName = new QName("", returnParam.getName());
                 QName retIdlType = returnParam.getIdltype();
                 CorbaObjectHandler obj = corbaStaxObject.readObjectFromStax(evtReader, retIdlType);
-                CorbaStreamable streamable = new CorbaStreamable(obj, retName);
+                CorbaStreamable streamable = message.createStreamableObject(obj, retName);
                 message.setStreamableReturn(streamable);
             }
 
@@ -297,7 +297,7 @@
                     obj = corbaStaxObject.readObjectFromStax(evtReader, idlType);
                 }
 
-                CorbaStreamable streamable = new CorbaStreamable(obj, paramName);
+                CorbaStreamable streamable = message.createStreamableObject(obj, paramName);
                 ModeType paramMode = param.getMode();
                 if (paramMode.value().equals("in")) {
                     streamable.setMode(org.omg.CORBA.ARG_IN.value);

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java?view=diff&rev=520884&r1=520883&r2=520884
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java Wed Mar 21 06:35:58 2007
@@ -239,19 +239,19 @@
         EasyMock.expectLastCall();
     }
     
-    public void testBuildArguments() throws Exception {       
+    public void testBuildArguments() throws Exception {
+        Message msg = new MessageImpl();
+        CorbaMessage message = new CorbaMessage(msg);
         CorbaStreamable[] arguments = new CorbaStreamable[1];
         QName objName = new QName("object");
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
         TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
         CorbaPrimitiveHandler obj1 = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
-        CorbaStreamable arg = new CorbaStreamable(obj1, objName);        
+        CorbaStreamable arg = message.createStreamableObject(obj1, objName);        
         arguments[0] = arg;
         arguments[0].setMode(org.omg.CORBA.ARG_OUT.value);
         
         CorbaConduit conduit = setupCorbaConduit(false);
-        Message msg = new MessageImpl();
-        CorbaMessage message = new CorbaMessage(msg);
         NVList list = (NVList)conduit.getArguments(message);
         assertNotNull("list should not be null", list != null);
         
@@ -265,15 +265,16 @@
     }
     
     public void testBuildReturn() throws Exception {
+        Message msg = new MessageImpl();
+        CorbaMessage message = new CorbaMessage(msg);
+
         QName objName = new QName("returnName");
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
         TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
         CorbaPrimitiveHandler obj1 = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
-        CorbaStreamable arg = new CorbaStreamable(obj1, objName);        
+        CorbaStreamable arg = message.createStreamableObject(obj1, objName);        
         
         CorbaConduit conduit = setupCorbaConduit(false);
-        Message msg = new MessageImpl();
-        CorbaMessage message = new CorbaMessage(msg);
         NamedValue ret = (NamedValue)conduit.getReturn(message);
         assertNotNull("Return should not be null", ret != null);
         assertEquals("name should be equal", ret.name(), "return");

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java?view=diff&rev=520884&r1=520883&r2=520884
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java Wed Mar 21 06:35:58 2007
@@ -72,13 +72,13 @@
         QName param1IdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
         TypeCode param1TypeCode = orb.get_primitive_tc(TCKind.tk_long);
         CorbaPrimitiveHandler param1 = new CorbaPrimitiveHandler(param1Name, param1IdlType, param1TypeCode, null);
-        CorbaStreamable p1 = new CorbaStreamable(param1, param1Name);
+        CorbaStreamable p1 = msg.createStreamableObject(param1, param1Name);
         
         QName param2Name = new QName("param2");
         QName param2IdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
         TypeCode param2TypeCode = orb.get_primitive_tc(TCKind.tk_string);
         CorbaPrimitiveHandler param2 = new CorbaPrimitiveHandler(param2Name, param2IdlType, param2TypeCode, null);
-        CorbaStreamable p2 = new CorbaStreamable(param2, param2Name);
+        CorbaStreamable p2 = msg.createStreamableObject(param2, param2Name);
         
         msg.addStreamableArgument(p1);
         msg.addStreamableArgument(p2);
@@ -92,13 +92,13 @@
         QName param3IdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
         TypeCode param3TypeCode = orb.get_primitive_tc(TCKind.tk_short);
         CorbaPrimitiveHandler param3 = new CorbaPrimitiveHandler(param3Name, param3IdlType, param3TypeCode, null);
-        CorbaStreamable p3 = new CorbaStreamable(param3, param3Name);
+        CorbaStreamable p3 = msg.createStreamableObject(param3, param3Name);
         
         QName param4Name = new QName("param4");
         QName param4IdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "float", CorbaConstants.NP_WSDL_CORBA);
         TypeCode param4TypeCode = orb.get_primitive_tc(TCKind.tk_float);
         CorbaPrimitiveHandler param4 = new CorbaPrimitiveHandler(param4Name, param4IdlType, param4TypeCode, null);
-        CorbaStreamable p4 = new CorbaStreamable(param4, param4Name);
+        CorbaStreamable p4 = msg.createStreamableObject(param4, param4Name);
         
         CorbaStreamable[] args = new CorbaStreamable[2];
         args[0] =  p3;
@@ -127,7 +127,7 @@
         QName returnIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
         TypeCode returnTypeCode = orb.get_primitive_tc(TCKind.tk_boolean);
         CorbaPrimitiveHandler returnValue = new CorbaPrimitiveHandler(returnName, returnIdlType, returnTypeCode, null);
-        CorbaStreamable ret = new CorbaStreamable(returnValue, returnName);
+        CorbaStreamable ret = msg.createStreamableObject(returnValue, returnName);
         
         msg.setStreamableReturn(ret);
         CorbaStreamable retVal = msg.getStreamableReturn();

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java?view=diff&rev=520884&r1=520883&r2=520884
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java Wed Mar 21 06:35:58 2007
@@ -42,6 +42,7 @@
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
+import org.apache.yoko.bindings.corba.types.CorbaStreamableImpl;
 import org.apache.yoko.orb.CORBA.NVList;
 import org.apache.yoko.wsdl.CorbaConstants;
 
@@ -210,7 +211,7 @@
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
         TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
         CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
-        CorbaStreamable exception = new CorbaStreamable(obj, objName);       
+        CorbaStreamable exception = new CorbaStreamableImpl(obj, objName);       
 
         EasyMock.expect(msg.getStreamableException()).andReturn(exception);
         EasyMock.expect(msg.getStreamableException()).andReturn(exception);
@@ -226,7 +227,7 @@
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
         TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
         CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
-        CorbaStreamable arg = new CorbaStreamable(obj, objName);        
+        CorbaStreamable arg = new CorbaStreamableImpl(obj, objName);        
         arguments[0] = arg;
         arguments[0].setMode(org.omg.CORBA.ARG_OUT.value);        
         

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java?view=diff&rev=520884&r1=520883&r2=520884
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java Wed Mar 21 06:35:58 2007
@@ -28,6 +28,7 @@
 import junit.framework.TestCase;
 
 import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
+import org.apache.yoko.bindings.corba.types.CorbaStreamableImpl;
 import org.apache.yoko.wsdl.CorbaConstants;
 import org.apache.yoko.orb.CORBA.OutputStream;
 import org.apache.yoko.orb.OCI.Buffer;
@@ -69,7 +70,7 @@
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
         TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
         CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
-        CorbaStreamable streamable = new CorbaStreamable(obj, objName);       
+        CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);       
 
         assertNotNull(streamable);
     }
@@ -79,7 +80,7 @@
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "float", CorbaConstants.NP_WSDL_CORBA);
         TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_float);
         CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
-        CorbaStreamable streamable = new CorbaStreamable(obj, objName);       
+        CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);       
 
         TypeCode type = streamable._type();
         assertTrue(type.kind().value() == objTypeCode.kind().value());
@@ -99,7 +100,7 @@
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
         TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_boolean);
         CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
-        CorbaStreamable streamable = new CorbaStreamable(obj, objName);       
+        CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);       
 
         streamable.setMode(org.omg.CORBA.ARG_IN.value);
         int mode = streamable.getMode();
@@ -111,7 +112,7 @@
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "char", CorbaConstants.NP_WSDL_CORBA);
         TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_char);
         CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
-        CorbaStreamable streamable = new CorbaStreamable(obj, objName); 
+        CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName); 
         
         Buffer buf = new Buffer();
         OutputStream oStream = new OutputStream(buf);
@@ -133,7 +134,7 @@
         TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_wstring);
         CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
         obj.setValueFromData("TestWString");
-        CorbaStreamable streamable = new CorbaStreamable(obj, objName);
+        CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
         
         Buffer buf = new Buffer();
         OutputStream oStream = new OutputStream(buf);