Return-Path: 
 <camel-commits-return-4064-apmail-activemq-camel-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-camel-commits-archive@locus.apache.org
Received: (qmail 51161 invoked from network); 11 Nov 2008 12:58:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 Nov 2008 12:58:11 -0000
Received: (qmail 82593 invoked by uid 500); 11 Nov 2008 12:58:18 -0000
Delivered-To: apmail-activemq-camel-commits-archive@activemq.apache.org
Received: (qmail 82565 invoked by uid 500); 11 Nov 2008 12:58:18 -0000
Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:camel-commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:camel-commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:camel-commits@activemq.apache.org>
List-Id: <camel-commits.activemq.apache.org>
Reply-To: camel-dev@activemq.apache.org
Delivered-To: mailing list camel-commits@activemq.apache.org
Received: (qmail 82556 invoked by uid 99); 11 Nov 2008 12:58:18 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Nov 2008 04:58:18 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Nov 2008 12:57:07 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 99292238893B; Tue, 11 Nov 2008 04:57:20 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r713026 - in /activemq/camel/trunk/components/camel-cxf:
 pom.xml
 src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Date: Tue, 11 Nov 2008 12:57:20 -0000
To: camel-commits@activemq.apache.org
From: ningjiang@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081111125720.99292238893B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ningjiang
Date: Tue Nov 11 04:57:20 2008
New Revision: 713026

URL: http://svn.apache.org/viewvc?rev=713026&view=rev
Log:
Reenable the unit tests in camel-cxf

Modified:
    activemq/camel/trunk/components/camel-cxf/pom.xml
    activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

Modified: activemq/camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/pom.xml?rev=713026&r1=713025&r2=713026&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/pom.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/pom.xml Tue Nov 11 04:57:20 2008
@@ -254,12 +254,7 @@
           <useFile>true</useFile>
           <includes>
             <include>**/*Test.*</include>
-          </includes>
-          <excludes>
-            <exclude>**/CxfGreeterPayLoadRouterTest.*</exclude>
-            <exclude>**/CxfPayLoadMessageRouterTest.*</exclude>
-            <exclude>**/CxfWsdlFirstTest.*</exclude>
-          </excludes>
+          </includes>          
           <systemProperties>
                <property>
                     <name>java.util.logging.config.file</name>

Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=713026&r1=713025&r2=713026&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Tue Nov 11 04:57:20 2008
@@ -88,6 +88,17 @@
     public CxfExchange createExchange(Message inMessage) {
         return new CxfExchange(getCamelContext(), getExchangePattern(), inMessage);
     }
+    
+    /* Override the defaultEndpoint exchange create method */
+    public Exchange createExchange(Exchange exchange) {
+        if (exchange instanceof CxfExchange) {
+            return exchange;
+        } else {
+            Exchange answer = createExchange();
+            answer.copyFrom(exchange);
+            return answer;
+        }
+    }
 
     public String getDataFormat() {
         return dataFormat;