Author: davsclaus
Date: Tue May 19 06:43:54 2009
New Revision: 776202
URL: http://svn.apache.org/viewvc?rev=776202&view=rev
Log:
Merged revisions 776198 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r776198 | davsclaus | 2009-05-19 08:20:51 +0200 (Tue, 19 May 2009) | 1 line
CAMEL-1624: camel-xmpp. Subject and Language now set if provided in Camel
Message Header.
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
camel/branches/camel-1.x/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 19 06:43:54 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java?rev=776202&r1=776201&r2=776202&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
(original)
+++
camel/branches/camel-1.x/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
Tue May 19 06:43:54 2009
@@ -56,7 +56,18 @@
// BUG?
if (headerFilterStrategy != null
&& !headerFilterStrategy.applyFilterToCamelHeaders(name,
value)) {
- message.setProperty(name, value);
+
+ if ("subject".equalsIgnoreCase(name)) {
+ // special for subject
+ String subject =
exchange.getContext().getTypeConverter().convertTo(String.class, value);
+ message.setSubject(subject);
+ } else if ("language".equalsIgnoreCase(name)) {
+ // special for language
+ String language =
exchange.getContext().getTypeConverter().convertTo(String.class, value);
+ message.setLanguage(language);
+ } else {
+ message.setProperty(name, value);
+ }
}
}
String id = exchange.getExchangeId();
Modified:
camel/branches/camel-1.x/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java?rev=776202&r1=776201&r2=776202&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
Tue May 19 06:43:54 2009
@@ -28,6 +28,12 @@
result.assertIsSatisfied();
}
+ public void xtestSendToGTalkWithSubject() throws Exception {
+ MockEndpoint result = getMockEndpoint("mock:result");
+ template.sendBodyAndHeader("direct:start", "Hi!", "Subject", "From
Camel");
+ result.assertIsSatisfied();
+ }
+
// get around junit warning
public void testNothing() throws Exception {
}
