camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r828294 - in /camel/branches/camel-1.x: ./ components/camel-velocity/src/main/java/org/apache/camel/component/velocity/ components/camel-velocity/src/test/java/org/apache/camel/component/velocity/ components/camel-velocity/src/test/resource...
Date Thu, 22 Oct 2009 03:53:31 GMT
Author: ningjiang
Date: Thu Oct 22 03:53:30 2009
New Revision: 828294

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

........
  r828288 | ningjiang | 2009-10-22 11:18:49 +0800 (Thu, 22 Oct 2009) | 1 line
  
  CAMEL-2092 fixed the bug of camel-velocity remembering the last called resource's URI
........

Added:
    camel/branches/camel-1.x/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterWithoutHeaderTest.java
      - copied unchanged from r828288, camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterWithoutHeaderTest.java
    camel/branches/camel-1.x/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/header.vm
      - copied unchanged from r828288, camel/trunk/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/header.vm
    camel/branches/camel-1.x/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letterWithoutHeader.vm
      - copied unchanged from r828288, camel/trunk/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letterWithoutHeader.vm
Modified:
    camel/branches/camel-1.x/   (props changed)
    camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 22 03:53:30 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,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819483,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765
+/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,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819483,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288

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

Modified: camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java?rev=828294&r1=828293&r2=828294&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
(original)
+++ camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
Thu Oct 22 03:53:30 2009
@@ -115,8 +115,7 @@
         // now lets output the results to the exchange
         Message out = exchange.getOut(true);
         out.setBody(buffer.toString());
-        out.setHeader("org.apache.camel.velocity.resource", resource);
-        Map<String, Object> headers = (Map<String, Object>)velocityContext.get("headers");
+        Map<String, Object> headers = (Map<String, Object>) velocityContext.get("headers");
         for (String key : headers.keySet()) {
             out.setHeader(key, headers.get(key));
         }



Mime
View raw message