cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1512384 - in /cxf/trunk: rt/bindings/soap/ rt/core/ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ rt/databinding/jaxb/ rt/frontend/jaxrs/ rt/frontend/jaxws/ systests/databinding/src/test/java/org/apache/cxf/systest/aeg...
Date Fri, 09 Aug 2013 16:34:46 GMT
Author: dkulp
Date: Fri Aug  9 16:34:46 2013
New Revision: 1512384

URL: http://svn.apache.org/r1512384
Log:
Remove mail implementation out of default classpath

Modified:
    cxf/trunk/rt/bindings/soap/pom.xml
    cxf/trunk/rt/core/pom.xml
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/DataHandlerType.java
    cxf/trunk/rt/databinding/jaxb/pom.xml
    cxf/trunk/rt/frontend/jaxrs/pom.xml
    cxf/trunk/rt/frontend/jaxws/pom.xml
    cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
    cxf/trunk/systests/transport-jms/pom.xml
    cxf/trunk/systests/uncategorized/pom.xml

Modified: cxf/trunk/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/pom.xml?rev=1512384&r1=1512383&r2=1512384&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ cxf/trunk/rt/bindings/soap/pom.xml Fri Aug  9 16:34:46 2013
@@ -87,6 +87,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.easymock</groupId>

Modified: cxf/trunk/rt/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/pom.xml?rev=1512384&r1=1512383&r2=1512384&view=diff
==============================================================================
--- cxf/trunk/rt/core/pom.xml (original)
+++ cxf/trunk/rt/core/pom.xml Fri Aug  9 16:34:46 2013
@@ -117,10 +117,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.4_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.sun.xml.fastinfoset</groupId>
             <artifactId>FastInfoset</artifactId>
             <optional>true</optional>

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/DataHandlerType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/DataHandlerType.java?rev=1512384&r1=1512383&r2=1512384&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/DataHandlerType.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/DataHandlerType.java
Fri Aug  9 16:34:46 2013
@@ -21,13 +21,11 @@ package org.apache.cxf.aegis.type.mtom;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 
 import javax.activation.DataHandler;
 
 import org.apache.cxf.aegis.Context;
 import org.apache.cxf.attachment.AttachmentImpl;
-import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.message.Attachment;
 
 /**
@@ -70,8 +68,7 @@ public class DataHandlerType extends Abs
         DataHandler handler = (DataHandler) object;
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         try {
-            InputStream stream = handler.getInputStream();
-            IOUtils.copy(stream, baos);
+            handler.writeTo(baos);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=1512384&r1=1512383&r2=1512384&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Fri Aug  9 16:34:46 2013
@@ -143,10 +143,6 @@
                      <artifactId>geronimo-jaxws_2.2_spec</artifactId>
                      <scope>test</scope>
                  </dependency>
-                 <dependency>
-                      <groupId>org.apache.geronimo.specs</groupId>
-                      <artifactId>geronimo-javamail_1.4_spec</artifactId>
-                  </dependency>
                   <dependency>
                       <groupId>org.apache.geronimo.specs</groupId>
                       <artifactId>geronimo-activation_1.1_spec</artifactId>

Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=1512384&r1=1512383&r2=1512384&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Fri Aug  9 16:34:46 2013
@@ -131,6 +131,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
             <scope>test</scope>

Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=1512384&r1=1512383&r2=1512384&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Fri Aug  9 16:34:46 2013
@@ -173,6 +173,11 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <scope>test</scope>
+        </dependency>        
     </dependencies>
 
     <build>

Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java?rev=1512384&r1=1512383&r2=1512384&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
(original)
+++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
Fri Aug  9 16:34:46 2013
@@ -120,7 +120,13 @@ public class MtomTest extends AbstractJU
         client.acceptDataHandler(dhBean);
         DataHandlerBean accepted = impl.getLastDhBean();
         Assert.assertNotNull(accepted);
-        String data = (String) accepted.getDataHandler().getContent();
+        Object o = accepted.getDataHandler().getContent();
+        String data = null;
+        if (o instanceof String) {
+            data = (String)o;
+        } else if (o instanceof InputStream) {
+            data = IOUtils.toString((InputStream)o);
+        }
         Assert.assertNotNull(data);
         Assert.assertEquals("This is the cereal shot from guns.", data);
     }

Modified: cxf/trunk/systests/transport-jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/pom.xml?rev=1512384&r1=1512383&r2=1512384&view=diff
==============================================================================
--- cxf/trunk/systests/transport-jms/pom.xml (original)
+++ cxf/trunk/systests/transport-jms/pom.xml Fri Aug  9 16:34:46 2013
@@ -228,7 +228,11 @@
             <scope>test</scope>
             <version>${cxf.spring.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>

Modified: cxf/trunk/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/pom.xml?rev=1512384&r1=1512383&r2=1512384&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/pom.xml (original)
+++ cxf/trunk/systests/uncategorized/pom.xml Fri Aug  9 16:34:46 2013
@@ -300,7 +300,11 @@
             <artifactId>spring-security-core</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.security</groupId>



Mime
View raw message