cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r831635 - in /cxf/branches/2.2.x-fixes: ./ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ systests/databinding/src/test/resources/
Date Sun, 01 Nov 2009 03:17:22 GMT
Author: dkulp
Date: Sun Nov  1 03:17:20 2009
New Revision: 831635

URL: http://svn.apache.org/viewvc?rev=831635&view=rev
Log:
Merged revisions 831611 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r831611 | bimargulies | 2009-10-31 18:53:15 -0400 (Sat, 31 Oct 2009) | 1 line
  
  CXF-1706. Don't require explicit MTOM permission to accept MTOM in the one place that was
checking.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
    cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
    cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ByteArrayType.java
    cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java?rev=831635&r1=831634&r2=831635&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
Sun Nov  1 03:17:20 2009
@@ -57,7 +57,6 @@
     
     @Override
     public Object readObject(MessageReader mreader, Context context) throws DatabindingException
{
-        boolean mtomEnabled = context.isMtomEnabled();
         XMLStreamReader reader = mreader.getXMLStreamReader();
 
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -69,11 +68,7 @@
             }
             
             if (reader.isStartElement() && reader.getName().equals(AbstractXOPType.XOP_INCLUDE))
{
-                if (mtomEnabled) {
-                    return optimizedType.readMtoM(mreader, context);
-                } else {
-                    throw new DatabindingException("Unexpected element: " + reader.getName());
-                }
+                return optimizedType.readMtoM(mreader, context);
             }
 
             if (reader.isEndElement()) {

Modified: cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java?rev=831635&r1=831634&r2=831635&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
Sun Nov  1 03:17:20 2009
@@ -44,7 +44,6 @@
 
 /**
  * Base class for MtoM types.
- * @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
  */
 public abstract class AbstractXOPType extends Type {
     public static final String XOP_NS = "http://www.w3.org/2004/08/xop/include";

Modified: cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ByteArrayType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ByteArrayType.java?rev=831635&r1=831634&r2=831635&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ByteArrayType.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ByteArrayType.java
Sun Nov  1 03:17:20 2009
@@ -31,7 +31,7 @@
 import org.apache.cxf.message.Attachment;
 
 /**
- * @author Dan Diephouse
+ * Byte arrays. Also handles MTOM.
  */
 public class ByteArrayType extends AbstractXOPType {
     public ByteArrayType(boolean useXmimeBinaryType, String expectedContentTypes) {
@@ -50,16 +50,6 @@
         copy(is, out);
         is.close();
         return out.toByteArray();
-        // }
-        // finally
-        // {
-        // DataSource dataSource = handler.getDataSource();
-        // if (dataSource instanceof AttachmentDataSource)
-        // {
-        // File attFile = ((AttachmentDataSource) dataSource).getFile();
-        // if (attFile != null) attFile.delete();
-        // }
-        // }
     }
 
     public static void copy(InputStream input, OutputStream output) throws IOException {

Modified: cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml?rev=831635&r1=831634&r2=831635&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml Sun
Nov  1 03:17:20 2009
@@ -50,9 +50,7 @@
 		serviceClass="org.apache.cxf.systest.aegis.mtom.fortest.MtomTest">
 		<simple:dataBinding>
 			<bean
-				class="org.apache.cxf.aegis.databinding.AegisDatabinding">
-				<property name="mtomEnabled" value="true" />
-			</bean>
+				class="org.apache.cxf.aegis.databinding.AegisDatabinding"/>
 		</simple:dataBinding>
 		<simple:serviceBean>
 			<ref bean="mtomImpl" />



Mime
View raw message