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/24 16:17:39 UTC
svn commit: r720208 - in /activemq/camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/model/dataformat/
camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/
components/camel-jaxb/src/test/java/org/apache/camel/jaxb/ ...
Author: ningjiang
Date: Mon Nov 24 07:17:37 2008
New Revision: 720208
URL: http://svn.apache.org/viewvc?rev=720208&view=rev
Log:
Merged revisions 720207 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r720207 | ningjiang | 2008-11-24 23:11:04 +0800 (Mon, 24 Nov 2008) | 1 line
CAMEL-1074 Added the Spring test of JAXB
........
Added:
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbSpringTest.java
- copied unchanged from r720207, activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbSpringTest.java
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/resources/org/apache/camel/jaxb/
- copied from r720207, activemq/camel/trunk/components/camel-jaxb/src/test/resources/org/apache/camel/jaxb/
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/resources/org/apache/camel/jaxb/CamelJaxbTest.xml
- copied unchanged from r720207, activemq/camel/trunk/components/camel-jaxb/src/test/resources/org/apache/camel/jaxb/CamelJaxbTest.xml
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java (props changed)
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java (props changed)
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 24 07:17:37 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,719864,719978-719979
+/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,719864,719978-719979,720207
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java?rev=720208&r1=720207&r2=720208&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java Mon Nov 24 07:17:37 2008
@@ -36,6 +36,8 @@
private String contextPath;
@XmlAttribute(required = false)
private Boolean prettyPrint;
+ @XmlAttribute(required = false)
+ private Boolean ignoreJAXBElement;
public JaxbDataFormat() {
super("org.apache.camel.converter.jaxb.JaxbDataFormat");
@@ -61,13 +63,29 @@
public void setPrettyPrint(Boolean prettyPrint) {
this.prettyPrint = prettyPrint;
}
-
+
+ public Boolean getIgnoreJAXBElement() {
+ return ignoreJAXBElement;
+ }
+
+ public void setIgnoreJAXBElement(Boolean ignoreJAXBElement) {
+ this.ignoreJAXBElement = ignoreJAXBElement;
+ }
+
@Override
protected void configureDataFormat(DataFormat dataFormat) {
Boolean answer = ObjectHelper.toBoolean(getPrettyPrint());
- if (answer != null && answer.booleanValue()) {
+ if (answer != null && !answer.booleanValue()) {
+ setProperty(dataFormat, "prettyPrint", Boolean.FALSE);
+ } else { // the default value is true
setProperty(dataFormat, "prettyPrint", Boolean.TRUE);
}
+ answer = ObjectHelper.toBoolean(getIgnoreJAXBElement());
+ if (answer != null && !answer.booleanValue()) {
+ setProperty(dataFormat, "ignoreJAXBElement", Boolean.FALSE);
+ } else { // the default value is true
+ setProperty(dataFormat, "ignoreJAXBElement", Boolean.TRUE);
+ }
setProperty(dataFormat, "contextPath", contextPath);
}
}
\ No newline at end of file
Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 24 07:17:37 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java:720207
Modified: activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java?rev=720208&r1=720207&r2=720208&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java Mon Nov 24 07:17:37 2008
@@ -16,8 +16,11 @@
*/
package org.apache.camel.jaxb;
+import javax.xml.bind.JAXBElement;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
+import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.TypeConverter;
import org.apache.camel.builder.RouteBuilder;
@@ -44,10 +47,14 @@
expected.setLastName("BAR");
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedBodiesReceived(expected);
-
- template.sendBody("direct:start", xml);
+ template.sendBody("direct:getJAXBElementValue", xml);
resultEndpoint.assertIsSatisfied();
+ resultEndpoint.reset();
+ resultEndpoint.expectedMessageCount(1);
+ template.sendBody("direct:getJAXBElement", xml);
+ resultEndpoint.assertIsSatisfied();
+ assertTrue("We should get the JAXBElement here", resultEndpoint.getExchanges().get(0).getIn().getBody() instanceof JAXBElement);
}
@Override
@@ -56,9 +63,13 @@
public void configure() throws Exception {
JaxbDataFormat dataFormat = new JaxbDataFormat("org.apache.camel.foo.bar");
- dataFormat.setIgnoreJAXBElement(true);
- from("direct:start")
- .unmarshal(dataFormat)
+ dataFormat.setIgnoreJAXBElement(false);
+ from("direct:getJAXBElementValue")
+ .unmarshal(new JaxbDataFormat("org.apache.camel.foo.bar"))
+ .to("mock:result");
+
+ from("direct:getJAXBElement")
+ .unmarshal(dataFormat)
.to("mock:result");
}
};
Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 24 07:17:37 2008
@@ -1 +1 @@
-/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java:719848,719864
+/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java:719848,719864,720207