camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r950858 - in /camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/ main/java/org/apache/camel/component/cxf/interceptors/ test/java/org/apache/camel/component/cxf/
Date Thu, 03 Jun 2010 03:05:27 GMT
Author: ningjiang
Date: Thu Jun  3 03:05:27 2010
New Revision: 950858

URL: http://svn.apache.org/viewvc?rev=950858&view=rev
Log:
CAMEL-2780 Changed the operationName to defaultOperationName and operationNamespace to defaultOperationNamespace

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=950858&r1=950857&r2=950858&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Thu Jun  3 03:05:27 2010
@@ -80,8 +80,8 @@ public class CxfEndpoint extends Default
     private String serviceClass;
     private String portName;
     private String serviceName;
-    private String operationName;
-    private String operationNamespace;
+    private String defaultOperationName;
+    private String defaultOperationNamespace;
     private DataFormat dataFormat = DataFormat.POJO;
     private boolean isWrapped;
     private boolean inOut = true;
@@ -415,20 +415,20 @@ public class CxfEndpoint extends Default
         portName = port;
     }
     
-    public String getOperationName() {
-        return operationName;
+    public String getDefaultOperationName() {
+        return defaultOperationName;
     }
     
-    public void setOperationName(String name) {
-        operationName = name;
+    public void setDefaultOperationName(String name) {
+        defaultOperationName = name;
     }
     
-    public String getOperationNamespace() {
-        return operationNamespace;
+    public String getDefaultOperationNamespace() {
+        return defaultOperationNamespace;
     }
     
-    public void setOperationNamespace(String namespace) {
-        operationNamespace = namespace;
+    public void setDefaultOperationNamespace(String namespace) {
+        defaultOperationNamespace = namespace;
     }
 
     public boolean isInOut() {

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=950858&r1=950857&r2=950858&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
(original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
Thu Jun  3 03:05:27 2010
@@ -263,7 +263,7 @@ public class CxfProducer extends Default
         BindingOperationInfo answer = null;
         String lp = ex.getIn().getHeader(CxfConstants.OPERATION_NAME, String.class);
         if (lp == null) {
-            lp = endpoint.getOperationName();
+            lp = endpoint.getDefaultOperationName();
         }
         if (lp == null) {
             if (LOG.isDebugEnabled()) {
@@ -281,7 +281,7 @@ public class CxfProducer extends Default
         } else {
             String ns = ex.getIn().getHeader(CxfConstants.OPERATION_NAMESPACE, String.class);
             if (ns == null) {
-                ns = endpoint.getOperationNamespace();
+                ns = endpoint.getDefaultOperationNamespace();
             }
             if (ns == null) {
                 ns = client.getEndpoint().getService().getName().getNamespaceURI();

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java?rev=950858&r1=950857&r2=950858&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
(original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
Thu Jun  3 03:05:27 2010
@@ -21,7 +21,6 @@ import java.io.OutputStream;
 import java.util.List;
 
 import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
@@ -53,8 +52,8 @@ public class RawMessageContentRedirectIn
         } catch (Exception e) {
             throw new Fault(e);
         } finally {
-            ObjectHelper.close(is, "input stream", null);
-            ObjectHelper.close(os, "output stream", null);
+            IOHelper.close(is, "input stream", null);
+            IOHelper.close(os, "output stream", null);
         }
     }
 }

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java?rev=950858&r1=950857&r2=950858&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
Thu Jun  3 03:05:27 2010
@@ -49,14 +49,14 @@ public class CxfProducerOperationTest ex
     protected String getSimpleEndpointUri() {
         return "cxf://" + SIMPLE_SERVER_ADDRESS
             + "?serviceClass=org.apache.camel.component.cxf.HelloService" 
-            + "&" + CxfConstants.OPERATION_NAME + "=" + ECHO_OPERATION;
+            + "&defaultOperationName=" + ECHO_OPERATION;
     }
 
     protected String getJaxwsEndpointUri() {
         return "cxf://" + JAXWS_SERVER_ADDRESS
             + "?serviceClass=org.apache.hello_world_soap_http.Greeter"
-            + "&" + CxfConstants.OPERATION_NAME + "=" + GREET_ME_OPERATION
-            + "&" + CxfConstants.OPERATION_NAMESPACE + "=" + NAMESPACE;
+            + "&defaultOperationName=" + GREET_ME_OPERATION
+            + "&defaultOperationNamespace=" + NAMESPACE;
     }
 
     protected Exchange sendSimpleMessage() {



Mime
View raw message