svn commit: r830950 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfConstants.java CxfEndpoint.java DefaultCxfBinding.java

[wtam]

Author: wtam
Date: Thu Oct 29 13:58:31 2009
New Revision: 830950

URL: http://svn.apache.org/viewvc?rev=830950&view=rev
Log:
rename constants name to CAMEL_CXF_ATTACHMENTS

Modified:
    
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java
    
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/DefaultCxfBinding.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java?rev=830950&r1=830949&r2=830950&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java
 Thu Oct 29 13:58:31 2009
@@ -46,7 +46,7 @@
     String CAMEL_CXF_RS_VAR_VALUES = "CamelCxfRsVarValues";
     String CAMEL_CXF_RS_RESPONSE_CLASS = "CamelCxfRsResponseClass";
     String CAMEL_CXF_RS_OPERATION_RESOURCE_INFO_STACK = 
"CamelCxfRsOperationResourceInfoStack";
-    String ATTACHMENTS_PROP_KEY = "CamelAttachments";
+    String CAMEL_CXF_ATTACHMENTS = "CamelAttachments";
 }
 
 

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=830950&r1=830949&r2=830950&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 Oct 29 13:58:31 2009
@@ -469,10 +469,10 @@
         @Override
         protected void setParameters(Object[] params, Message message) {
             
-            Object attachements = 
message.get(CxfConstants.ATTACHMENTS_PROP_KEY);
+            Object attachements = 
message.get(CxfConstants.CAMEL_CXF_ATTACHMENTS);
             if (attachements != null) {
                 message.setAttachments((Collection<Attachment>)attachements);
-                message.remove(CxfConstants.ATTACHMENTS_PROP_KEY);
+                message.remove(CxfConstants.CAMEL_CXF_ATTACHMENTS);
             }
             
             if (DataFormat.PAYLOAD == message.get(DataFormat.class)) {

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=830950&r1=830949&r2=830950&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
 Thu Oct 29 13:58:31 2009
@@ -97,7 +97,7 @@
         }
         
         if (attachments != null) {
-            requestContext.put(CxfConstants.ATTACHMENTS_PROP_KEY, attachments);
+            requestContext.put(CxfConstants.CAMEL_CXF_ATTACHMENTS, 
attachments);
         }
     }