svn commit: r788801 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean: CxfBeanHeaderNames.java DefaultCxfBeanBinding.java

[wtam]

Author: wtam
Date: Fri Jun 26 18:12:27 2009
New Revision: 788801

URL: http://svn.apache.org/viewvc?rev=788801&view=rev
Log:
clean up header constants

Modified:
    
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanHeaderNames.java
    
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanHeaderNames.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanHeaderNames.java?rev=788801&r1=788800&r2=788801&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanHeaderNames.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanHeaderNames.java
 Fri Jun 26 18:12:27 2009
@@ -16,17 +16,11 @@
  */
 package org.apache.camel.component.cxf.cxfbean;
 
-import org.apache.camel.Exchange;
-
 /**
  * @version $Revision$
  */
 public interface CxfBeanHeaderNames {
     
-    String VERB = Exchange.HTTP_METHOD;
-    String CONTENT_TYPE = Exchange.CONTENT_TYPE;
-    String CHARACTER_ENCODING = Exchange.HTTP_CHARACTER_ENCODING;
-    String PATH = Exchange.HTTP_PATH;
     String BASE_PATH = "CamelCxfBeanRequestBasePath";
 
 }

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java?rev=788801&r1=788800&r2=788801&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java
 Fri Jun 26 18:12:27 2009
@@ -79,7 +79,7 @@
     }
 
     protected String getPath(org.apache.camel.Message camelMessage) {
-        String answer = camelMessage.getHeader(CxfBeanHeaderNames.PATH, 
String.class);
+        String answer = camelMessage.getHeader(Exchange.HTTP_PATH, 
String.class);
         return answer;
     }
     
@@ -94,12 +94,12 @@
     }
 
     protected String getVerb(org.apache.camel.Message camelMessage) {
-        String answer = camelMessage.getHeader(CxfBeanHeaderNames.VERB, 
String.class);
+        String answer = camelMessage.getHeader(Exchange.HTTP_METHOD, 
String.class);
         return answer;
     }
 
     protected String getCharacterEncoding(org.apache.camel.Message 
camelMessage) {
-        String answer = 
camelMessage.getHeader(CxfBeanHeaderNames.CHARACTER_ENCODING, String.class);
+        String answer = 
camelMessage.getHeader(Exchange.HTTP_CHARACTER_ENCODING, String.class);
         if (answer == null) {
             answer = camelMessage.getHeader(Exchange.CHARSET_NAME, 
String.class);
         }
@@ -108,7 +108,7 @@
     }
 
     protected String getRequestContentType(org.apache.camel.Message 
camelMessage) {
-        String answer = 
camelMessage.getHeader(CxfBeanHeaderNames.CONTENT_TYPE, String.class);
+        String answer = camelMessage.getHeader(Exchange.CONTENT_TYPE, 
String.class);
         if (answer != null) {
             return answer;
         }