camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r774195 - in /camel/branches/camel-1.x: ./ components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/ components/camel-stringtemplate/src/test/resources/org/apache/camel/component/stringtemplate/
Date Wed, 13 May 2009 04:51:27 GMT
Author: ningjiang
Date: Wed May 13 04:51:27 2009
New Revision: 774195

URL: http://svn.apache.org/viewvc?rev=774195&view=rev
Log:
Merged revisions 774192 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r774192 | ningjiang | 2009-05-13 12:34:29 +0800 (Wed, 13 May 2009) | 1 line
  
  Fixed the test error of camel-stringtemplate on Windows
........

Modified:
    camel/branches/camel-1.x/   (props changed)
    camel/branches/camel-1.x/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java
    camel/branches/camel-1.x/components/camel-stringtemplate/src/test/resources/org/apache/camel/component/stringtemplate/letter.tm

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 04:51:27 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
+/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

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-1.x/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java?rev=774195&r1=774194&r2=774195&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java
(original)
+++ camel/branches/camel-1.x/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java
Wed May 13 04:51:27 2009
@@ -41,7 +41,7 @@
     public void testVelocityLetter() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
-        mock.expectedBodiesReceived("Dear Ibsen, Claus\n\nThanks for the order of Camel in
Action.\n\nRegards Camel Riders Bookstore\nPS: Next beer is on me, James");
+        mock.expectedBodiesReceived("Dear Ibsen, Claus! Thanks for the order of Camel in
Action. Regards Camel Riders Bookstore PS: Next beer is on me, James");
 
         template.send("direct:a", createLetter());
 

Modified: camel/branches/camel-1.x/components/camel-stringtemplate/src/test/resources/org/apache/camel/component/stringtemplate/letter.tm
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-stringtemplate/src/test/resources/org/apache/camel/component/stringtemplate/letter.tm?rev=774195&r1=774194&r2=774195&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-stringtemplate/src/test/resources/org/apache/camel/component/stringtemplate/letter.tm
(original)
+++ camel/branches/camel-1.x/components/camel-stringtemplate/src/test/resources/org/apache/camel/component/stringtemplate/letter.tm
Wed May 13 04:51:27 2009
@@ -14,9 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ------------------------------------------------------------------------ !$
-Dear $headers.lastName$, $headers.firstName$
-
-Thanks for the order of $headers.item$.
-
-Regards Camel Riders Bookstore
-$body$
\ No newline at end of file
+Dear $headers.lastName$, $headers.firstName$! Thanks for the order of $headers.item$. Regards
Camel Riders Bookstore $body$
\ No newline at end of file



Mime
View raw message