incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mvesc...@apache.org
Subject svn commit: r509536 - 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/interceptors/
Date Tue, 20 Feb 2007 12:45:09 GMT
Author: mvescovi
Date: Tue Feb 20 04:45:08 2007
New Revision: 509536

URL: http://svn.apache.org/viewvc?view=rev&rev=509536
Log:
[YOKO-295] Fixed build problem in bindings module caused by change in CXF

Modified:
    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/interceptors/CorbaOutInterceptor.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

Modified: 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/ContextUtils.java?view=diff&rev=509536&r1=509535&r2=509536
==============================================================================
--- 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/ContextUtils.java
Tue Feb 20 04:45:08 2007
@@ -24,9 +24,7 @@
 import javax.xml.stream.XMLEventWriter;
 
 import org.apache.cxf.databinding.DataReader;
-import org.apache.cxf.databinding.DataReaderFactory;
 import org.apache.cxf.databinding.DataWriter;
-import org.apache.cxf.databinding.DataWriterFactory;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
@@ -57,15 +55,8 @@
         
     public static DataWriter<XMLEventWriter> getDataWriter(CorbaMessage message) {
         Service service = ServiceModelUtil.getService(message.getExchange());
-        DataWriterFactory factory = service.getDataBinding().getDataWriterFactory();
 
-        DataWriter<XMLEventWriter> dataWriter = null;
-        for (Class<?> cls : factory.getSupportedFormats()) {
-            if (cls == XMLEventWriter.class) {
-                dataWriter = factory.createWriter(XMLEventWriter.class);
-                break;
-            }
-        }
+        DataWriter<XMLEventWriter> dataWriter = service.getDataBinding().createWriter(XMLEventWriter.class);
 
         if (dataWriter == null) {
             //throw a fault
@@ -78,17 +69,8 @@
 
     public static DataReader<XMLEventReader> getDataReader(CorbaMessage message) {
         Service service = ServiceModelUtil.getService(message.getExchange());
-        DataReaderFactory factory = service.getDataBinding().getDataReaderFactory();
 
-        DataReader<XMLEventReader> dataReader = null;
-        if (factory != null) {
-            for (Class<?> cls : factory.getSupportedFormats()) {
-                if (cls == XMLEventReader.class) {
-                    dataReader = factory.createReader(XMLEventReader.class);
-                    break;
-                }
-            }
-        }
+        DataReader<XMLEventReader> dataReader = service.getDataBinding().createReader(XMLEventReader.class);
 
         if (dataReader == null) {
             //throw a fault

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=509536&r1=509535&r2=509536
==============================================================================
--- 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
Tue Feb 20 04:45:08 2007
@@ -35,7 +35,6 @@
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.databinding.DataWriter;
-import org.apache.cxf.databinding.DataWriterFactory;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.jaxb.io.EventDataWriter;
 import org.apache.cxf.message.Exchange;
@@ -309,17 +308,9 @@
     
     protected DataWriter<XMLEventWriter> getDataWriter(CorbaMessage message) {
         Service serviceModel = ServiceModelUtil.getService(message.getExchange());
-        DataWriterFactory factory = serviceModel.getDataBinding().getDataWriterFactory();
 
-        DataWriter<XMLEventWriter> dataWriter = null;
-        if (factory != null) {
-            for (Class<?> cls : factory.getSupportedFormats()) {
-                if (cls == XMLEventWriter.class) {
-                    dataWriter = factory.createWriter(XMLEventWriter.class);
-                    break;
-                }
-            }
-        }
+        DataWriter<XMLEventWriter> dataWriter = 
+            serviceModel.getDataBinding().createWriter(XMLEventWriter.class);
 
         if (dataWriter == null) {
             //throw a fault

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=509536&r1=509535&r2=509536
==============================================================================
--- 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
Tue Feb 20 04:45:08 2007
@@ -44,7 +44,6 @@
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.databinding.DataBinding;
 import org.apache.cxf.databinding.DataReader;
-import org.apache.cxf.databinding.DataReaderFactory;
 import org.apache.cxf.jaxb.io.EventDataReader;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;

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=509536&r1=509535&r2=509536
==============================================================================
--- 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
Tue Feb 20 04:45:08 2007
@@ -35,7 +35,6 @@
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.databinding.DataBinding;
 import org.apache.cxf.databinding.DataWriter;
-import org.apache.cxf.databinding.DataWriterFactory;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointImpl;
 import org.apache.cxf.jaxb.io.EventDataReader;
@@ -297,7 +296,6 @@
         EasyMock.expect(message.getExchange()).andReturn(exchange);
         EasyMock.expect(ServiceModelUtil.getService(exchange)).andReturn(service);
         EasyMock.expect(service.getDataBinding()).andReturn(databinding);
-        EasyMock.expect(databinding.getDataWriterFactory()).andReturn(null);
         
         control.replay();
         outInterceptor.getDataWriter(message);



Mime
View raw message