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/23 11:52:54 UTC

svn commit: r521685 - in /incubator/yoko/trunk: ./ bindings/src/main/java/org/apache/yoko/bindings/corba/ bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/ bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/ bindings/src/ma...

Author: bravi
Date: Fri Mar 23 04:52:52 2007
New Revision: 521685

URL: http://svn.apache.org/viewvc?view=rev&rev=521685
Log:
[YOKO-315] - Changing the packaging of some classes. Also, upgraded to the latest release version of the maven-remote-resources plugin.

Added:
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServant.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDSIServant.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReader.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectReader.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriter.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectWriter.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaStaxObject.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableImpl.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaStreamableImpl.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/Messages.properties
      - copied unchanged from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/Messages.properties
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/ContextUtils.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/ContextUtils.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaBindingHelper.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingHelper.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaObjectReferenceHelper.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceHelper.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaUtils.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaUtils.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/Messages.properties
      - copied unchanged from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/Messages.properties
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/OrbConfig.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/OrbConfig.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServantTest.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDSIServantTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReaderTest.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriterTest.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObjectTest.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStaxObjectTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableTest.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/utils/
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/utils/ContextUtilsTest.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/ContextUtilsTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/utils/CorbaUtilsTest.java
      - copied, changed from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java
Removed:
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/ContextUtils.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingHelper.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDSIServant.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectReader.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceHelper.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectWriter.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaStaxObject.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaUtils.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/OrbConfig.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaStreamableImpl.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/ContextUtilsTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDSIServantTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStaxObjectTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java
Modified:
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java
    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/CorbaDestination.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/CorbaServerConduit.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaFaultInInterceptor.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/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.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/CorbaDestinationTest.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/interceptors/CorbaInInterceptorTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptorTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
    incubator/yoko/trunk/pom.xml

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java?view=diff&rev=521685&r1=521684&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java Fri Mar 23 04:52:52 2007
@@ -53,6 +53,8 @@
 import org.apache.yoko.bindings.corba.interceptors.CorbaInInterceptor;
 import org.apache.yoko.bindings.corba.interceptors.CorbaOutInterceptor;
 
+import org.apache.yoko.bindings.corba.utils.OrbConfig;
+
 public class CorbaBindingFactory extends AbstractBindingFactory
     implements ConduitInitiator, DestinationFactory {
 

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=521685&r1=521684&r2=521685
==============================================================================
--- 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 Fri Mar 23 04:52:52 2007
@@ -50,6 +50,11 @@
 import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
 import org.apache.yoko.bindings.corba.types.CorbaHandlerUtils;
 import org.apache.yoko.bindings.corba.types.CorbaObjectHandler;
+import org.apache.yoko.bindings.corba.utils.ContextUtils;
+import org.apache.yoko.bindings.corba.utils.CorbaBindingHelper;
+import org.apache.yoko.bindings.corba.utils.CorbaObjectReferenceHelper;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
+import org.apache.yoko.bindings.corba.utils.OrbConfig;
 import org.apache.yoko.wsdl.CorbaConstants;
 
 import org.omg.CORBA.Any;

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDestination.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDestination.java?view=diff&rev=521685&r1=521684&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDestination.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDestination.java Fri Mar 23 04:52:52 2007
@@ -36,6 +36,12 @@
 
 import org.apache.schemas.yoko.bindings.corba.AddressType;
 
+import org.apache.yoko.bindings.corba.runtime.CorbaDSIServant;
+import org.apache.yoko.bindings.corba.utils.CorbaBindingHelper;
+import org.apache.yoko.bindings.corba.utils.CorbaObjectReferenceHelper;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
+import org.apache.yoko.bindings.corba.utils.OrbConfig;
+
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Policy;
 import org.omg.PortableServer.POA;

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=521685&r1=521684&r2=521685
==============================================================================
--- 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 Fri Mar 23 04:52:52 2007
@@ -29,8 +29,8 @@
 import org.apache.cxf.message.AbstractWrappedMessage;
 import org.apache.cxf.message.Message;
 
+import org.apache.yoko.bindings.corba.runtime.CorbaStreamableImpl;
 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;
 

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java?view=diff&rev=521685&r1=521684&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java Fri Mar 23 04:52:52 2007
@@ -36,6 +36,9 @@
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.schemas.yoko.bindings.corba.AddressType;
+import org.apache.yoko.bindings.corba.utils.CorbaBindingHelper;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
+import org.apache.yoko.bindings.corba.utils.OrbConfig;
 import org.apache.yoko.wsdl.CorbaConstants;
 
 import org.omg.CORBA.Any;

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaFaultInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaFaultInInterceptor.java?view=diff&rev=521685&r1=521684&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaFaultInInterceptor.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaFaultInInterceptor.java Fri Mar 23 04:52:52 2007
@@ -50,12 +50,12 @@
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
 
-import org.apache.yoko.bindings.corba.ContextUtils;
 import org.apache.yoko.bindings.corba.CorbaBindingException;
 import org.apache.yoko.bindings.corba.CorbaMessage;
-import org.apache.yoko.bindings.corba.CorbaStaxObject;
 import org.apache.yoko.bindings.corba.CorbaStreamable;
 import org.apache.yoko.bindings.corba.CorbaTypeMap;
+import org.apache.yoko.bindings.corba.runtime.CorbaStaxObject;
+import org.apache.yoko.bindings.corba.utils.ContextUtils;
 import org.apache.yoko.wsdl.CorbaConstants;
 
 import org.omg.CORBA.SystemException;

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=521685&r1=521684&r2=521685
==============================================================================
--- 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 Fri Mar 23 04:52:52 2007
@@ -57,11 +57,11 @@
 import org.apache.yoko.bindings.corba.CorbaBindingException;
 import org.apache.yoko.bindings.corba.CorbaDestination;
 import org.apache.yoko.bindings.corba.CorbaMessage;
-import org.apache.yoko.bindings.corba.CorbaStaxObject;
 import org.apache.yoko.bindings.corba.CorbaStreamable;
 import org.apache.yoko.bindings.corba.CorbaTypeMap;
-import org.apache.yoko.bindings.corba.CorbaUtils;
+import org.apache.yoko.bindings.corba.runtime.CorbaStaxObject;
 import org.apache.yoko.bindings.corba.types.CorbaObjectHandler;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
 import org.apache.yoko.wsdl.CorbaConstants;
 
 public class CorbaFaultOutInterceptor extends AbstractPhaseInterceptor<Message> {

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=521685&r1=521684&r2=521685
==============================================================================
--- 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 Fri Mar 23 04:52:52 2007
@@ -57,15 +57,15 @@
 import org.apache.schemas.yoko.bindings.corba.OperationType;
 import org.apache.schemas.yoko.bindings.corba.ParamType;
 import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
-import org.apache.yoko.bindings.corba.ContextUtils;
 import org.apache.yoko.bindings.corba.CorbaDestination;
 import org.apache.yoko.bindings.corba.CorbaMessage;
-import org.apache.yoko.bindings.corba.CorbaStaxObject;
 import org.apache.yoko.bindings.corba.CorbaStreamable;
 import org.apache.yoko.bindings.corba.CorbaTypeMap;
-import org.apache.yoko.bindings.corba.CorbaUtils;
+import org.apache.yoko.bindings.corba.runtime.CorbaStaxObject;
 import org.apache.yoko.bindings.corba.types.CorbaHandlerUtils;
 import org.apache.yoko.bindings.corba.types.CorbaObjectHandler;
+import org.apache.yoko.bindings.corba.utils.ContextUtils;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
 import org.apache.yoko.wsdl.CorbaConstants;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.NVList;

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=521685&r1=521684&r2=521685
==============================================================================
--- 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 Fri Mar 23 04:52:52 2007
@@ -53,15 +53,15 @@
 import org.apache.schemas.yoko.bindings.corba.OperationType;
 import org.apache.schemas.yoko.bindings.corba.ParamType;
 import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
-import org.apache.yoko.bindings.corba.ContextUtils;
 import org.apache.yoko.bindings.corba.CorbaBindingException;
 import org.apache.yoko.bindings.corba.CorbaMessage;
-import org.apache.yoko.bindings.corba.CorbaStaxObject;
 import org.apache.yoko.bindings.corba.CorbaStreamable;
 import org.apache.yoko.bindings.corba.CorbaTypeMap;
-import org.apache.yoko.bindings.corba.CorbaUtils;
+import org.apache.yoko.bindings.corba.runtime.CorbaStaxObject;
 import org.apache.yoko.bindings.corba.types.CorbaHandlerUtils;
 import org.apache.yoko.bindings.corba.types.CorbaObjectHandler;
+import org.apache.yoko.bindings.corba.utils.ContextUtils;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
 import org.apache.yoko.wsdl.CorbaConstants;
 import org.omg.CORBA.ORB;
 

Copied: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServant.java (from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDSIServant.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServant.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDSIServant.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServant.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDSIServant.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServant.java Fri Mar 23 04:52:52 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.runtime;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -31,6 +31,8 @@
 import org.apache.cxf.transport.MessageObserver;
 
 import org.apache.schemas.yoko.bindings.corba.BindingType;
+import org.apache.yoko.bindings.corba.CorbaBindingException;
+import org.apache.yoko.bindings.corba.CorbaDestination;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.ServerRequest;
 import org.omg.PortableServer.DynamicImplementation;

Copied: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReader.java (from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectReader.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReader.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectReader.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReader.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectReader.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReader.java Fri Mar 23 04:52:52 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.runtime;
 
 import java.lang.reflect.Constructor;
 import java.math.BigInteger;
@@ -35,6 +35,8 @@
 import org.apache.schemas.yoko.bindings.corba.Sequence;
 import org.apache.schemas.yoko.bindings.corba.Union;
 import org.apache.schemas.yoko.bindings.corba.Unionbranch;
+
+import org.apache.yoko.bindings.corba.CorbaBindingException;
 import org.apache.yoko.bindings.corba.types.CorbaAnyHandler;
 import org.apache.yoko.bindings.corba.types.CorbaArrayHandler;
 import org.apache.yoko.bindings.corba.types.CorbaEnumHandler;

Copied: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriter.java (from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectWriter.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriter.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectWriter.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriter.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectWriter.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriter.java Fri Mar 23 04:52:52 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.runtime;
 
 import java.math.BigInteger;
 import java.util.List;
@@ -26,6 +26,7 @@
 import org.apache.schemas.yoko.bindings.corba.Exception;
 import org.apache.schemas.yoko.bindings.corba.Union;
 import org.apache.schemas.yoko.bindings.corba.Unionbranch;
+import org.apache.yoko.bindings.corba.CorbaBindingException;
 import org.apache.yoko.bindings.corba.types.CorbaAnyHandler;
 import org.apache.yoko.bindings.corba.types.CorbaArrayHandler;
 import org.apache.yoko.bindings.corba.types.CorbaEnumHandler;

Copied: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java (from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaStaxObject.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaStaxObject.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaStaxObject.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java Fri Mar 23 04:52:52 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.runtime;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -65,6 +65,9 @@
 import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
 import org.apache.ws.commons.schema.XmlSchemaType;
 
+import org.apache.yoko.bindings.corba.CorbaBindingException;
+import org.apache.yoko.bindings.corba.CorbaTypeMap;
+
 import org.apache.yoko.bindings.corba.interceptors.CorbaOutInterceptor;
 import org.apache.yoko.bindings.corba.types.CorbaAnyHandler;
 import org.apache.yoko.bindings.corba.types.CorbaArrayHandler;
@@ -78,6 +81,10 @@
 import org.apache.yoko.bindings.corba.types.CorbaSequenceHandler;
 import org.apache.yoko.bindings.corba.types.CorbaStructHandler;
 import org.apache.yoko.bindings.corba.types.CorbaUnionHandler;
+import org.apache.yoko.bindings.corba.utils.CorbaBindingHelper;
+import org.apache.yoko.bindings.corba.utils.CorbaObjectReferenceHelper;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
+import org.apache.yoko.bindings.corba.utils.OrbConfig;
 import org.apache.yoko.wsdl.CorbaConstants;
 import org.apache.yoko.wsdl.CorbaTypeImpl;
 import org.apache.yoko.wsdl.W3CConstants;
@@ -924,7 +931,7 @@
             } else if (readElement) {
                 elName = reader.nextEvent().asStartElement().getName();
             } else {
-                elName = CorbaUtils.EMPTY_QNAME;
+                elName = CorbaUtils.getEmptyQName();
             }
             obj = new CorbaStructHandler(elName, idlType, tc, structType);
             List<MemberType> structMembers = structType.getMember();

Copied: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableImpl.java (from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaStreamableImpl.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableImpl.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaStreamableImpl.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableImpl.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaStreamableImpl.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableImpl.java Fri Mar 23 04:52:52 2007
@@ -16,14 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.bindings.corba.types;
+package org.apache.yoko.bindings.corba.runtime;
 
 import javax.xml.namespace.QName;
 
 import org.apache.yoko.bindings.corba.CorbaBindingException;
-import org.apache.yoko.bindings.corba.CorbaObjectReader;
-import org.apache.yoko.bindings.corba.CorbaObjectWriter;
 import org.apache.yoko.bindings.corba.CorbaStreamable;
+import org.apache.yoko.bindings.corba.types.CorbaObjectHandler;
 
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java?view=diff&rev=521685&r1=521684&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java Fri Mar 23 04:52:52 2007
@@ -45,7 +45,7 @@
 import org.apache.ws.commons.schema.XmlSchemaType;
 
 import org.apache.yoko.bindings.corba.CorbaTypeMap;
-import org.apache.yoko.bindings.corba.CorbaUtils;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
 import org.apache.yoko.wsdl.CorbaTypeImpl;
 import org.apache.yoko.wsdl.W3CConstants;
 

Copied: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/ContextUtils.java (from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/ContextUtils.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/ContextUtils.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/ContextUtils.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/ContextUtils.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/ContextUtils.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/ContextUtils.java Fri Mar 23 04:52:52 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.utils;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLEventWriter;
@@ -29,6 +29,8 @@
 import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.ServiceModelUtil;
+
+import org.apache.yoko.bindings.corba.CorbaMessage;
 
 
 /**

Copied: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaBindingHelper.java (from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingHelper.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaBindingHelper.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingHelper.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaBindingHelper.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingHelper.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaBindingHelper.java Fri Mar 23 04:52:52 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.utils;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -28,6 +28,7 @@
 import java.util.logging.Logger;
 
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.yoko.bindings.corba.CorbaBindingException;
 import org.omg.CORBA.ORB;
 
 public class CorbaBindingHelper {

Copied: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaObjectReferenceHelper.java (from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceHelper.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaObjectReferenceHelper.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceHelper.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaObjectReferenceHelper.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceHelper.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaObjectReferenceHelper.java Fri Mar 23 04:52:52 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.utils;
 
 import java.util.Collection;
 import java.util.HashMap;

Copied: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaUtils.java (from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaUtils.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaUtils.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaUtils.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaUtils.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaUtils.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaUtils.java Fri Mar 23 04:52:52 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.utils;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -61,6 +61,9 @@
 import org.apache.ws.commons.schema.XmlSchemaForm;
 import org.apache.ws.commons.schema.XmlSchemaType;
 
+import org.apache.yoko.bindings.corba.CorbaBindingException;
+import org.apache.yoko.bindings.corba.CorbaTypeMap;
+
 import org.apache.yoko.wsdl.CorbaConstants;
 import org.apache.yoko.wsdl.CorbaTypeImpl;
 
@@ -72,11 +75,15 @@
 
 public class CorbaUtils {
 
-    static Map<QName, TCKind> PRIMITIVE_TYPECODES = new HashMap<QName, TCKind>();
     static QName EMPTY_QNAME = new QName("", "");
+    static Map<QName, TCKind> PRIMITIVE_TYPECODES = new HashMap<QName, TCKind>();
 
     private static final Logger LOG = LogUtils.getL7dLogger(CorbaUtils.class);
     
+    public static QName getEmptyQName() {
+        return EMPTY_QNAME;
+    }
+
     public static TypeCode getTypeCode(ORB orb, QName type, List<CorbaTypeMap> typeMaps) {
         return getTypeCode(orb, type, null, typeMaps);
     }

Copied: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/OrbConfig.java (from r521283, incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/OrbConfig.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/OrbConfig.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/OrbConfig.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/OrbConfig.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/OrbConfig.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/utils/OrbConfig.java Fri Mar 23 04:52:52 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.utils;
 
 import java.util.ArrayList;
 import java.util.List;

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=521685&r1=521684&r2=521685
==============================================================================
--- 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 Fri Mar 23 04:52:52 2007
@@ -60,6 +60,8 @@
 import org.apache.schemas.yoko.bindings.corba.RaisesType;
 import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
 import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
+import org.apache.yoko.bindings.corba.utils.OrbConfig;
 import org.apache.yoko.orb.CORBA.NVList;
 import org.apache.yoko.wsdl.CorbaConstants;
 

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java?view=diff&rev=521685&r1=521684&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java Fri Mar 23 04:52:52 2007
@@ -36,6 +36,8 @@
 import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 
+import org.apache.yoko.bindings.corba.utils.OrbConfig;
+
 public class CorbaDestinationTest extends TestCase {    
     
     protected static TestUtils testUtils;

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=521685&r1=521684&r2=521685
==============================================================================
--- 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 Fri Mar 23 04:52:52 2007
@@ -41,8 +41,9 @@
 import org.omg.CORBA.ServerRequest;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
+import org.apache.yoko.bindings.corba.runtime.CorbaStreamableImpl;
 import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
-import org.apache.yoko.bindings.corba.types.CorbaStreamableImpl;
+import org.apache.yoko.bindings.corba.utils.OrbConfig;
 import org.apache.yoko.orb.CORBA.NVList;
 import org.apache.yoko.wsdl.CorbaConstants;
 

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptorTest.java?view=diff&rev=521685&r1=521684&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptorTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptorTest.java Fri Mar 23 04:52:52 2007
@@ -74,18 +74,18 @@
 import org.apache.schemas.yoko.bindings.corba.OperationType;
 import org.apache.schemas.yoko.bindings.corba.ParamType;
 import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
-import org.apache.yoko.bindings.corba.ContextUtils;
 import org.apache.yoko.bindings.corba.CorbaBindingFactory;
 import org.apache.yoko.bindings.corba.CorbaDestination;
 import org.apache.yoko.bindings.corba.CorbaMessage;
-import org.apache.yoko.bindings.corba.CorbaStaxObject;
 import org.apache.yoko.bindings.corba.CorbaStreamable;
 import org.apache.yoko.bindings.corba.CorbaTypeMap;
-import org.apache.yoko.bindings.corba.CorbaUtils;
 import org.apache.yoko.bindings.corba.TestUtils;
+import org.apache.yoko.bindings.corba.runtime.CorbaStaxObject;
 import org.apache.yoko.bindings.corba.types.CorbaHandlerUtils;
 import org.apache.yoko.bindings.corba.types.CorbaObjectHandler;
 import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
+import org.apache.yoko.bindings.corba.utils.ContextUtils;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
 import org.apache.yoko.bindings.corba.CorbaBinding;
 import org.apache.yoko.orb.CORBA.ServerRequest;
 import org.apache.yoko.wsdl.CorbaConstants;

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptorTest.java?view=diff&rev=521685&r1=521684&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptorTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptorTest.java Fri Mar 23 04:52:52 2007
@@ -65,19 +65,19 @@
 import org.apache.schemas.yoko.bindings.corba.OperationType;
 import org.apache.schemas.yoko.bindings.corba.ParamType;
 import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
-import org.apache.yoko.bindings.corba.ContextUtils;
 import org.apache.yoko.bindings.corba.CorbaBindingFactory;
 import org.apache.yoko.bindings.corba.CorbaConduit;
 import org.apache.yoko.bindings.corba.CorbaDestination;
 import org.apache.yoko.bindings.corba.CorbaMessage;
-import org.apache.yoko.bindings.corba.CorbaStaxObject;
 import org.apache.yoko.bindings.corba.CorbaStreamable;
 import org.apache.yoko.bindings.corba.CorbaTypeMap;
-import org.apache.yoko.bindings.corba.CorbaUtils;
 import org.apache.yoko.bindings.corba.TestUtils;
+import org.apache.yoko.bindings.corba.runtime.CorbaStaxObject;
 import org.apache.yoko.bindings.corba.types.CorbaHandlerUtils;
 import org.apache.yoko.bindings.corba.types.CorbaObjectHandler;
 import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
+import org.apache.yoko.bindings.corba.utils.ContextUtils;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
 import org.apache.yoko.bindings.corba.CorbaBinding;
 import org.apache.yoko.wsdl.CorbaConstants;
 import org.easymock.classextension.EasyMock;

Copied: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServantTest.java (from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDSIServantTest.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServantTest.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDSIServantTest.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServantTest.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDSIServantTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServantTest.java Fri Mar 23 04:52:52 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.runtime;
 
 import junit.framework.TestCase;
 
@@ -34,6 +34,8 @@
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.ServerRequest;
 import org.omg.PortableServer.POA;
+
+import org.apache.yoko.bindings.corba.TestUtils;
 
 public class CorbaDSIServantTest extends TestCase {
     protected static ORB orb;

Copied: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReaderTest.java (from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReaderTest.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReaderTest.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReaderTest.java Fri Mar 23 04:52:52 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.runtime;
 
 import java.math.BigInteger;
 import java.net.URL;

Copied: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriterTest.java (from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriterTest.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriterTest.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriterTest.java Fri Mar 23 04:52:52 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.runtime;
 
 import java.math.BigInteger;
 import java.net.URL;

Copied: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObjectTest.java (from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStaxObjectTest.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObjectTest.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStaxObjectTest.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObjectTest.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStaxObjectTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObjectTest.java Fri Mar 23 04:52:52 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.runtime;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -53,6 +53,10 @@
 import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
 import org.apache.schemas.yoko.bindings.corba.Union;
 import org.apache.yoko.wsdl.CorbaConstants;
+import org.apache.yoko.bindings.corba.CorbaBindingFactory;
+import org.apache.yoko.bindings.corba.CorbaDestination;
+import org.apache.yoko.bindings.corba.CorbaTypeMap;
+import org.apache.yoko.bindings.corba.TestUtils;
 import org.apache.yoko.bindings.corba.types.CorbaArrayHandler;
 import org.apache.yoko.bindings.corba.types.CorbaEnumHandler;
 import org.apache.yoko.bindings.corba.types.CorbaFixedHandler;
@@ -61,6 +65,7 @@
 import org.apache.yoko.bindings.corba.types.CorbaSequenceHandler;
 import org.apache.yoko.bindings.corba.types.CorbaStructHandler;
 import org.apache.yoko.bindings.corba.types.CorbaUnionHandler;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
 import org.apache.yoko.wsdl.CorbaTypeImpl;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;

Copied: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableTest.java (from r521283, 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/runtime/CorbaStreamableTest.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableTest.java&r2=521685
==============================================================================
--- 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/runtime/CorbaStreamableTest.java Fri Mar 23 04:52:52 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.runtime;
 
 import javax.xml.namespace.QName;
 
@@ -27,8 +27,8 @@
 
 import junit.framework.TestCase;
 
+import org.apache.yoko.bindings.corba.CorbaStreamable;
 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;

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java?view=diff&rev=521685&r1=521684&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java Fri Mar 23 04:52:52 2007
@@ -27,9 +27,9 @@
 import org.apache.yoko.bindings.corba.CorbaBindingFactory;
 import org.apache.yoko.bindings.corba.CorbaBinding;
 import org.apache.yoko.bindings.corba.CorbaDestination;
-import org.apache.yoko.bindings.corba.CorbaUtils;
 import org.apache.yoko.bindings.corba.CorbaTypeMap;
 import org.apache.yoko.bindings.corba.TestUtils;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
 import org.apache.yoko.wsdl.CorbaConstants;
 
 import org.apache.cxf.Bus;

Copied: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/utils/ContextUtilsTest.java (from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/ContextUtilsTest.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/utils/ContextUtilsTest.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/ContextUtilsTest.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/utils/ContextUtilsTest.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/ContextUtilsTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/utils/ContextUtilsTest.java Fri Mar 23 04:52:52 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.utils;
 
 import junit.framework.TestCase;
 
@@ -64,4 +64,4 @@
     }
 
 }
-    
\ No newline at end of file
+    

Copied: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/utils/CorbaUtilsTest.java (from r521283, incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java)
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/utils/CorbaUtilsTest.java?view=diff&rev=521685&p1=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java&r1=521283&p2=incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/utils/CorbaUtilsTest.java&r2=521685
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/utils/CorbaUtilsTest.java Fri Mar 23 04:52:52 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.bindings.corba;
+package org.apache.yoko.bindings.corba.utils;
 
 import javax.xml.namespace.QName;
 import junit.framework.TestCase;

Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/pom.xml?view=diff&rev=521685&r1=521684&r2=521685
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Fri Mar 23 04:52:52 2007
@@ -389,10 +389,9 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- REVISIT to change the version once the 1.0-alpha-4 version is release -->
             <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.0-alpha-4-SNAPSHOT</version>
+                <version>1.0-alpha-4</version>
                 <executions>
                     <execution>
                         <goals>