incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r512947 - in /incubator/yoko/trunk: ./ bindings/ bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/ bindings/src/test/java/org/apache/yoko/bindings/corba/interceptors/ tools/
Date Wed, 28 Feb 2007 20:22:44 GMT
Author: bravi
Date: Wed Feb 28 12:22:43 2007
New Revision: 512947

URL: http://svn.apache.org/viewvc?view=rev&rev=512947
Log:
Fixing the binding test failure & also update of the woodstox dependency.

Modified:
    incubator/yoko/trunk/bindings/pom.xml
    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/CorbaOutInterceptorTest.java
    incubator/yoko/trunk/pom.xml
    incubator/yoko/trunk/tools/pom.xml

Modified: incubator/yoko/trunk/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/pom.xml?view=diff&rev=512947&r1=512946&r2=512947
==============================================================================
--- incubator/yoko/trunk/bindings/pom.xml (original)
+++ incubator/yoko/trunk/bindings/pom.xml Wed Feb 28 12:22:43 2007
@@ -245,9 +245,9 @@
                         <version>${version}</version>
                     </dependency>
                     <dependency>
-                        <groupId>woodstox</groupId> 
+                        <groupId>org.codehaus.woodstox</groupId> 
                         <artifactId>wstx-asl</artifactId> 
-                        <version>3.0.2</version> 
+                        <version>3.2.0</version> 
                     </dependency>
                 </dependencies>
                 <executions>

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=512947&r1=512946&r2=512947
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java
(original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaOutInterceptor.java
Wed Feb 28 12:22:43 2007
@@ -54,6 +54,7 @@
 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;
@@ -172,10 +173,11 @@
             ByteArrayOutputStream outStream = new ByteArrayOutputStream();
             XMLEventWriter evtWriter = outputFactory.createXMLEventWriter(outStream);
             for (int i = 0; i < args.size(); i++) {
-                MessagePartInfo part = getInputMessagePartInfo(opInfo, i);     
+                MessagePartInfo part = getInputMessagePartInfo(opInfo, i);
                 Object partValue = args.get(i);
                 writer.write(partValue, part, evtWriter);
             }
+            evtWriter.flush();
             ByteArrayInputStream inStream = new ByteArrayInputStream(outStream.toByteArray());
             XMLEventReader evtReader = inputFactory.createXMLEventReader(inStream);
 
@@ -230,6 +232,7 @@
                 Object partValue = args.get(i);
                 writer.write(partValue, part, evtWriter);
             }
+            evtWriter.flush();
             ByteArrayInputStream inStream = new ByteArrayInputStream(outStream.toByteArray());
             XMLEventReader evtReader = inputFactory.createXMLEventReader(inStream);
 
@@ -311,13 +314,9 @@
 
         DataWriter<XMLEventWriter> dataWriter = 
             serviceModel.getDataBinding().createWriter(XMLEventWriter.class);
-
         if (dataWriter == null) {
-            //throw a fault
-            //throw new Fault(new org.apache.cxf.common.i18n.Message("NO_DATAWRITER", BUNDLE,
service
-            //    .getName()));
+            throw new CorbaBindingException("Couldn't create data writer for outgoing message");
         }
-
         return dataWriter;
     }
     

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=512947&r1=512946&r2=512947
==============================================================================
--- 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
Wed Feb 28 12:22:43 2007
@@ -291,8 +291,10 @@
         CorbaMessage message = control.createMock(CorbaMessage.class);
         Exchange exchange = control.createMock(Exchange.class);
         Service service = control.createMock(Service.class);
+        DataWriter writer = control.createMock(DataWriter.class);
         DataBinding databinding = control.createMock(DataBinding.class);        
         
+        EasyMock.expect(databinding.createWriter(XMLEventWriter.class)).andReturn(writer);
         EasyMock.expect(message.getExchange()).andReturn(exchange);
         EasyMock.expect(ServiceModelUtil.getService(exchange)).andReturn(service);
         EasyMock.expect(service.getDataBinding()).andReturn(databinding);

Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/pom.xml?view=diff&rev=512947&r1=512946&r2=512947
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Wed Feb 28 12:22:43 2007
@@ -129,9 +129,9 @@
              </dependency>
              <!--  External dependencies --> 
              <dependency>
-                <groupId>woodstox</groupId> 
+                <groupId>org.codehaus.woodstox</groupId> 
                 <artifactId>wstx-asl</artifactId> 
-                <version>3.0.2</version>  
+                <version>3.2.0</version>  
              </dependency>
              <dependency>
                 <groupId>javax.xml.bind</groupId>

Modified: incubator/yoko/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/pom.xml?view=diff&rev=512947&r1=512946&r2=512947
==============================================================================
--- incubator/yoko/trunk/tools/pom.xml (original)
+++ incubator/yoko/trunk/tools/pom.xml Wed Feb 28 12:22:43 2007
@@ -62,9 +62,9 @@
             <artifactId>XmlSchema</artifactId>
         </dependency>
         <dependency>
-            <groupId>woodstox</groupId> 
+            <groupId>org.codehaus.woodstox</groupId> 
             <artifactId>wstx-asl</artifactId> 
-            <version>2.9.3</version> 
+            <version>3.2.0</version> 
         </dependency>
         <dependency>
             <groupId>wsdl4j</groupId>



Mime
View raw message