svn commit: r1185272 - in /camel/branches/camel-2.8.x: ./ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java

[dkulp]

Author: dkulp
Date: Mon Oct 17 16:07:13 2011
New Revision: 1185272

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

........
  r1185193 | dkulp | 2011-10-17 10:22:02 -0400 (Mon, 17 Oct 2011) | 1 line
  
  [CAMEL-4548] Allow controlling the allowStreaming from CxfComponent
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
    
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 17 16:07:13 2011
@@ -1 +1 @@
-/camel/trunk:1183621,1184812-1184814,1184983-1184987
+/camel/trunk:1183621,1184812-1184814,1184983-1184987,1185193

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java?rev=1185272&r1=1185271&r2=1185272&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
 Mon Oct 17 16:07:13 2011
@@ -30,13 +30,21 @@ import org.apache.cxf.message.Message;
  * Defines the <a href="http://camel.apache.org/cxf.html";>CXF Component</a>
  */
 public class CxfComponent extends HeaderFilterStrategyComponent {
-
+    Boolean allowStreaming;
+    
     public CxfComponent() {
     }
 
     public CxfComponent(CamelContext context) {
         super(context);
     }
+    
+    public void setAllowStreaming(Boolean b) {
+        allowStreaming = b;
+    }
+    public Boolean getAllowStreaming() {
+        return allowStreaming;
+    }
 
     /**
      * Create a {@link CxfEndpoint} which, can be a Spring bean endpoint having
@@ -47,6 +55,10 @@ public class CxfComponent extends Header
     protected Endpoint createEndpoint(String uri, String remaining, 
Map<String, Object> parameters) throws Exception {
 
         CxfEndpoint result = null;
+        
+        if (allowStreaming != null && 
!parameters.containsKey("allowStreaming")) {
+            parameters.put("allowStreaming", Boolean.toString(allowStreaming));
+        }
 
         if (remaining.startsWith(CxfConstants.SPRING_CONTEXT_ENDPOINT)) {
             // Get the bean from the Spring context

Modified: 
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java?rev=1185272&r1=1185271&r2=1185272&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
 Mon Oct 17 16:07:13 2011
@@ -54,7 +54,7 @@ public class CxfMixedModeRouterTest exte
     protected static final String SERVICE_ADDRESS = "http://localhost:"; + 
port2 + "/helloworld";
     protected static final String SERVICE_CLASS = 
"serviceClass=org.apache.camel.component.cxf.HelloService";
 
-    private String routerEndpointURI = "cxf://" + ROUTER_ADDRESS + "?" + 
SERVICE_CLASS + "&dataFormat=PAYLOAD";
+    private String routerEndpointURI = "cxf://" + ROUTER_ADDRESS + "?" + 
SERVICE_CLASS + "&dataFormat=PAYLOAD&allowStreaming=false";
     private String serviceEndpointURI = "cxf://" + SERVICE_ADDRESS + "?" + 
SERVICE_CLASS + "&dataFormat=POJO";
     
     @BeforeClass