You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/11/28 05:27:41 UTC
svn commit: r721336 - in /activemq/camel/branches/camel-1.x: ./
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/
Author: ningjiang
Date: Thu Nov 27 20:27:40 2008
New Revision: 721336
URL: http://svn.apache.org/viewvc?rev=721336&view=rev
Log:
Merged revisions 721333-721334 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r721333 | ningjiang | 2008-11-28 12:16:31 +0800 (Fri, 28 Nov 2008) | 1 line
CAMEL-1124 added the wiki snippet comments
........
r721334 | ningjiang | 2008-11-28 12:19:27 +0800 (Fri, 28 Nov 2008) | 1 line
CAMEL-1124 mini updated the wiki snippet comments
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageStreamExceptionTest.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 27 20:27:40 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java?rev=721336&r1=721335&r2=721336&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java Thu Nov 27 20:27:40 2008
@@ -54,14 +54,16 @@
private static final SoapFault SOAP_FAULT;
private Bus bus;
-
+
static {
+ // START SNIPPET: FaultDefine
SOAP_FAULT = new SoapFault(EXCEPTION_MESSAGE, SoapFault.FAULT_CODE_CLIENT);
Element detail = SOAP_FAULT.getOrCreateDetail();
Document doc = detail.getOwnerDocument();
Text tn = doc.createTextNode(DETAIL_TEXT);
detail.appendChild(tn);
- }
+ // END SNIPPET: FaultDefine
+ }
@Override
protected void setUp() throws Exception {
@@ -78,14 +80,17 @@
//bus.shutdown(true);
BusFactory.setDefaultBus(null);
}
-
+
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
+ // START SNIPPET: ThrowFault
from(routerEndpointURI).throwFault(SOAP_FAULT);
+ // END SNIPPET: ThrowFault
}
};
}
+
protected CamelContext createCamelContext() throws Exception {
return new DefaultCamelContext();
Modified: activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageStreamExceptionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageStreamExceptionTest.java?rev=721336&r1=721335&r2=721336&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageStreamExceptionTest.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageStreamExceptionTest.java Thu Nov 27 20:27:40 2008
@@ -26,16 +26,19 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
+ // START SNIPPET: MessageStreamFault
from(routerEndpointURI).process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message out = exchange.getOut();
+ // Set the message body with the
out.setBody(this.getClass().getResourceAsStream("SoapFaultMessage.xml"));
- // set the response code here
+ // Set the response code here
out.setHeader(org.apache.cxf.message.Message.RESPONSE_CODE, new Integer(500));
}
});
+ // END SNIPPET: MessageStreamFault
}
};
}