incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r503810 - 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/ test/java/org/apache/yoko/bindings/corba/interceptor...
Date Mon, 05 Feb 2007 18:49:28 GMT
Author: bravi
Date: Mon Feb  5 10:49:27 2007
New Revision: 503810

URL: http://svn.apache.org/viewvc?view=rev&rev=503810
Log:
Fixing the bindings module build issue because of changes to the apache cxf api's.

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/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/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingTest.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/CorbaDSIServantTest.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/CorbaStaxObjectTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.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

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=503810&r1=503809&r2=503810
==============================================================================
--- 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
Mon Feb  5 10:49:27 2007
@@ -162,7 +162,7 @@
         List<CorbaTypeMap> typeMaps = new ArrayList<CorbaTypeMap>();
 
         ServiceInfo service = message.getExchange().get(ServiceInfo.class);
-        List<TypeMappingType> corbaTypes = service.getExtensors(TypeMappingType.class);
+        List<TypeMappingType> corbaTypes = service.getDescription().getExtensors(TypeMappingType.class);
         if (corbaTypes != null) {
             CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
         }

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=503810&r1=503809&r2=503810
==============================================================================
--- 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
Mon Feb  5 10:49:27 2007
@@ -88,7 +88,8 @@
                 List<CorbaTypeMap> typeMaps = new ArrayList<CorbaTypeMap>();
 
                 ServiceInfo service = message.getExchange().get(ServiceInfo.class);
-                List<TypeMappingType> corbaTypes = service.getExtensors(TypeMappingType.class);
+                List<TypeMappingType> corbaTypes =
+                    service.getDescription().getExtensors(TypeMappingType.class);
                 if (corbaTypes != null) {
                     corbaStaxObject.setTypeMaps(typeMaps);
                 }

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=503810&r1=503809&r2=503810
==============================================================================
--- 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
Mon Feb  5 10:49:27 2007
@@ -92,7 +92,7 @@
 
             List<CorbaTypeMap> typeMaps = new ArrayList<CorbaTypeMap>();    
           
             ServiceInfo service = destination.getBindingInfo().getService();        
-            List<TypeMappingType> corbaTypes = service.getExtensors(TypeMappingType.class);
+            List<TypeMappingType> corbaTypes = service.getDescription().getExtensors(TypeMappingType.class);
             if (corbaTypes != null) {
                 CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
                 corbaStaxObject.setTypeMaps(typeMaps);

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=503810&r1=503809&r2=503810
==============================================================================
--- 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
Mon Feb  5 10:49:27 2007
@@ -104,7 +104,7 @@
         
             typeMaps = new ArrayList<CorbaTypeMap>();                
             service = destination.getBindingInfo().getService();
-            List<TypeMappingType> corbaTypes = service.getExtensors(TypeMappingType.class);
+            List<TypeMappingType> corbaTypes = service.getDescription().getExtensors(TypeMappingType.class);
             if (corbaTypes != null) {
                 CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
                 corbaStaxObject.setTypeMaps(typeMaps);

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=503810&r1=503809&r2=503810
==============================================================================
--- 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
Mon Feb  5 10:49:27 2007
@@ -95,7 +95,7 @@
             typeMaps = new ArrayList<CorbaTypeMap>();
 
             service = exchange.get(ServiceInfo.class);
-            List<TypeMappingType> corbaTypes = service.getExtensors(TypeMappingType.class);
+            List<TypeMappingType> corbaTypes = service.getDescription().getExtensors(TypeMappingType.class);
             if (corbaTypes != null) {
                 CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
                 corbaStaxObject.setTypeMaps(typeMaps);

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java?view=diff&rev=503810&r1=503809&r2=503810
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java
(original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java
Mon Feb  5 10:49:27 2007
@@ -29,7 +29,7 @@
 import junit.framework.TestCase;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.binding.BindingFactoryManagerImpl;
@@ -68,7 +68,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         System.setProperty("cxf.config.file", "cxf-extension-corba.xml");
-        bus = BusFactoryHelper.newInstance().getDefaultBus();       
+        bus = BusFactory.newInstance().getDefaultBus();       
         BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);      
 
         factory = (CorbaBindingFactory)bfm.getBindingFactory("http://schemas.apache.org/yoko/bindings/corba");
         bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);              


Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingTest.java?view=diff&rev=503810&r1=503809&r2=503810
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingTest.java
(original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingTest.java
Mon Feb  5 10:49:27 2007
@@ -29,7 +29,7 @@
 import junit.framework.TestCase;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.binding.BindingFactoryManagerImpl;

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=503810&r1=503809&r2=503810
==============================================================================
--- 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
Mon Feb  5 10:49:27 2007
@@ -29,7 +29,7 @@
 import junit.framework.TestCase;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointImpl;
 import org.apache.cxf.message.Exchange;
@@ -86,7 +86,7 @@
     public void setUp() throws Exception {
      control = EasyMock.createNiceControl();
      
-     bus = BusFactoryHelper.newInstance().getDefaultBus(); 
+     bus = BusFactory.newInstance().getDefaultBus(); 
      
      java.util.Properties props = System.getProperties();
      props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
@@ -231,7 +231,7 @@
                                  list);
         EasyMock.expectLastCall().andReturn(null);
         
-	conduit.getRequest(message, "Hello", null, null, null);
+        conduit.getRequest(message, "Hello", null, null, null);
         EasyMock.expectLastCall();
     }
     
@@ -307,7 +307,8 @@
         BindingOperationInfo bInfo = destination.getBindingInfo().getOperation(name);
         OperationType opType = bInfo.getExtensor(OperationType.class);
         
-        List<TypeMappingType> corbaTypes = endpointInfo.getService().getExtensors(TypeMappingType.class);
       
+        List<TypeMappingType> corbaTypes =
+            endpointInfo.getService().getDescription().getExtensors(TypeMappingType.class);
       
         if (corbaTypes != null) {
             CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
         }

Modified: 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/CorbaDSIServantTest.java?view=diff&rev=503810&r1=503809&r2=503810
==============================================================================
--- 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/CorbaDSIServantTest.java
Mon Feb  5 10:49:27 2007
@@ -21,7 +21,7 @@
 import junit.framework.TestCase;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointImpl;
 import org.apache.cxf.message.Message;
@@ -54,7 +54,7 @@
     
     protected void setUp() throws Exception {        
         super.setUp();
-        bus = BusFactoryHelper.newInstance().getDefaultBus();
+        bus = BusFactory.newInstance().getDefaultBus();
         java.util.Properties props = System.getProperties();
         props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
         props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");

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=503810&r1=503809&r2=503810
==============================================================================
--- 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
Mon Feb  5 10:49:27 2007
@@ -23,7 +23,7 @@
 import junit.framework.TestCase;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointImpl;
 import org.apache.cxf.message.Message;
@@ -83,7 +83,7 @@
        String addr = destination.getAddressType().getLocation();
        assertEquals(addr, "corbaloc::localhost:40000/Simple");  
        
-       Bus bus = BusFactoryHelper.newInstance().getDefaultBus();
+       Bus bus = BusFactory.newInstance().getDefaultBus();
        Service service = new ServiceImpl();
        Endpoint endpoint = new EndpointImpl(bus, service, endpointInfo);       
        MessageObserver observer = new ChainInitiationObserver(endpoint, bus);       

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=503810&r1=503809&r2=503810
==============================================================================
--- 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
Mon Feb  5 10:49:27 2007
@@ -25,7 +25,7 @@
 import junit.framework.TestCase;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
@@ -68,7 +68,7 @@
     public void setUp() throws Exception {
      control = EasyMock.createNiceControl();
      
-     bus = BusFactoryHelper.newInstance().getDefaultBus(); 
+     bus = BusFactory.newInstance().getDefaultBus(); 
      
      java.util.Properties props = System.getProperties();
      props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");

Modified: 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/CorbaStaxObjectTest.java?view=diff&rev=503810&r1=503809&r2=503810
==============================================================================
--- 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/CorbaStaxObjectTest.java
Mon Feb  5 10:49:27 2007
@@ -106,7 +106,7 @@
         
         CorbaDestination destination = testUtils.getStaxTypesTestDestination();
         ServiceInfo service = destination.getBindingInfo().getService();        
-        List<TypeMappingType> corbaTypes = service.getExtensors(TypeMappingType.class);
+        List<TypeMappingType> corbaTypes = service.getDescription().getExtensors(TypeMappingType.class);
         if (corbaTypes != null) {
             CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
             staxObject.setTypeMaps(typeMaps);

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java?view=diff&rev=503810&r1=503809&r2=503810
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java
(original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java
Mon Feb  5 10:49:27 2007
@@ -22,7 +22,7 @@
 import javax.xml.namespace.QName;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -36,7 +36,7 @@
     protected EndpointInfo endpointInfo;
     
     public TestUtils() {     
-        bus = BusFactoryHelper.newInstance().getDefaultBus();
+        bus = BusFactory.newInstance().getDefaultBus();
         BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
         try {
             factory = (CorbaBindingFactory)bfm.getBindingFactory("http://schemas.apache.org/yoko/bindings/corba");

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=503810&r1=503809&r2=503810
==============================================================================
--- 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
Mon Feb  5 10:49:27 2007
@@ -39,7 +39,7 @@
 import junit.framework.TestCase;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.databinding.DataBinding;
@@ -54,6 +54,7 @@
 import org.apache.cxf.service.ServiceImpl;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.service.model.DescriptionInfo;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.InterfaceInfo;
 import org.apache.cxf.service.model.MessageInfo;
@@ -142,11 +143,13 @@
         CorbaMessage msg = control.createMock(CorbaMessage.class);
         CorbaDestination destination = control.createMock(CorbaDestination.class);
         BindingInfo bInfo = control.createMock(BindingInfo.class);
-        ServiceInfo sInfo = control.createMock(ServiceInfo.class);    
+        ServiceInfo sInfo = control.createMock(ServiceInfo.class);
+        DescriptionInfo dInfo = control.createMock(DescriptionInfo.class);  
         EasyMock.expect(msg.getDestination()).andReturn(destination).times(2);        
         EasyMock.expect(destination.getBindingInfo()).andReturn(bInfo);
         EasyMock.expect(bInfo.getService()).andReturn(sInfo);
-        EasyMock.expect(sInfo.getExtensors(TypeMappingType.class)).andReturn(null);
+        EasyMock.expect(dInfo.getExtensors(TypeMappingType.class)).andReturn(null);
+        EasyMock.expect(sInfo.getDescription()).andReturn(dInfo);
         
         inInterceptor.handleNotRequestMessage(msg, destination);
         EasyMock.expectLastCall();
@@ -164,11 +167,13 @@
         CorbaMessage msg = control.createMock(CorbaMessage.class);
         CorbaDestination destination = control.createMock(CorbaDestination.class);
         BindingInfo bInfo = control.createMock(BindingInfo.class);
-        ServiceInfo sInfo = control.createMock(ServiceInfo.class);        
+        ServiceInfo sInfo = control.createMock(ServiceInfo.class);
+        DescriptionInfo dInfo = control.createMock(DescriptionInfo.class);   
         EasyMock.expect(msg.getDestination()).andReturn(destination).times(2);        
         EasyMock.expect(destination.getBindingInfo()).andReturn(bInfo);
         EasyMock.expect(bInfo.getService()).andReturn(sInfo);
-        EasyMock.expect(sInfo.getExtensors(TypeMappingType.class)).andReturn(null);
+        EasyMock.expect(dInfo.getExtensors(TypeMappingType.class)).andReturn(null);
+        EasyMock.expect(sInfo.getDescription()).andReturn(dInfo);
         EasyMock.expect(msg.containsKey(Message.REQUESTOR_ROLE)).andReturn(true);
         
         inInterceptor.handleRequestMessage(msg, destination);
@@ -188,13 +193,15 @@
         CorbaDestination destination = control.createMock(CorbaDestination.class);
         BindingInfo bInfo = control.createMock(BindingInfo.class);
         ServiceInfo sInfo = control.createMock(ServiceInfo.class);
+        DescriptionInfo dInfo = control.createMock(DescriptionInfo.class);  
         EasyMock.expect(msg.getDestination()).andReturn(null);
         Exchange exchange = control.createMock(Exchange.class);
         EasyMock.expect(msg.getExchange()).andReturn(exchange);
         EasyMock.expect(exchange.getDestination()).andReturn(destination);        
         EasyMock.expect(destination.getBindingInfo()).andReturn(bInfo);
         EasyMock.expect(bInfo.getService()).andReturn(sInfo);
-        EasyMock.expect(sInfo.getExtensors(TypeMappingType.class)).andReturn(null);
+        EasyMock.expect(dInfo.getExtensors(TypeMappingType.class)).andReturn(null);
+        EasyMock.expect(sInfo.getDescription()).andReturn(dInfo);
         EasyMock.expect(msg.containsKey(Message.REQUESTOR_ROLE)).andReturn(true);
         
         inInterceptor.handleRequestMessage(msg, destination);
@@ -351,7 +358,7 @@
         List<CorbaTypeMap> typeMaps = new ArrayList<CorbaTypeMap>();
         CorbaDestination destination = testUtils.getExceptionTypesTestDestination();
         ServiceInfo service = destination.getBindingInfo().getService();        
-        List<TypeMappingType> corbaTypes = service.getExtensors(TypeMappingType.class);
+        List<TypeMappingType> corbaTypes = service.getDescription().getExtensors(TypeMappingType.class);
         if (corbaTypes != null) {
             CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
             corbaStaxObject.setTypeMaps(typeMaps);

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=503810&r1=503809&r2=503810
==============================================================================
--- 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
Mon Feb  5 10:49:27 2007
@@ -30,7 +30,7 @@
 import junit.framework.TestCase;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.databinding.DataBinding;
@@ -107,7 +107,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         control = EasyMock.createNiceControl();
-        bus = BusFactoryHelper.newInstance().getDefaultBus();       
+        bus = BusFactory.newInstance().getDefaultBus();       
         BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);      
 
         factory = (BindingFactory)bfm.getBindingFactory("http://schemas.apache.org/yoko/bindings/corba");
         bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);

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=503810&r1=503809&r2=503810
==============================================================================
--- 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
Mon Feb  5 10:49:27 2007
@@ -15,7 +15,7 @@
 import org.apache.yoko.wsdl.CorbaConstants;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.interceptor.Interceptor;
@@ -54,7 +54,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
-        bus = BusFactoryHelper.newInstance().getDefaultBus();              
+        bus = BusFactory.newInstance().getDefaultBus();              
         BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);      
 
         factory = (BindingFactory)bfm.getBindingFactory("http://schemas.apache.org/yoko/bindings/corba");
         bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);        
@@ -70,7 +70,7 @@
         //CorbaDestination destination = (CorbaDestination)getDestination();
         CorbaDestination destination = testUtils.getComplexTypesTestDestination();
         service = destination.getBindingInfo().getService();
-        List<TypeMappingType> corbaTypes = service.getExtensors(TypeMappingType.class);
       
+        List<TypeMappingType> corbaTypes = service.getDescription().getExtensors(TypeMappingType.class);
       
         CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
     }
     



Mime
View raw message