camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dval...@apache.org
Subject svn commit: r1177403 - in /camel/branches/camel-2.7.x: ./ camel-core/src/main/java/org/apache/camel/component/file/ camel-core/src/test/java/org/apache/camel/component/file/ camel-core/src/test/java/org/apache/camel/processor/
Date Thu, 29 Sep 2011 19:11:34 GMT
Author: dvaleri
Date: Thu Sep 29 19:11:34 2011
New Revision: 1177403

URL: http://svn.apache.org/viewvc?rev=1177403&view=rev
Log:
Merged revisions 1177397 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x

................
  r1177397 | dvaleri | 2011-09-29 14:54:27 -0400 (Thu, 29 Sep 2011) | 8 lines
  
  Merged revisions 1177394 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1177394 | dvaleri | 2011-09-29 14:42:53 -0400 (Thu, 29 Sep 2011) | 1 line
    
    [CAMEL-4504] Added unit test to cover bean expressions that throw excetpions fix from
2.4.0.
  ........
................

Added:
    camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionWithExceptionTest.java
      - copied unchanged from r1177397, camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionWithExceptionTest.java
Modified:
    camel/branches/camel-2.7.x/   (props changed)
    camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
  (props changed)
    camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java
  (props changed)

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 29 19:11:34 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x:1174571,1175323,1176329,1176787
-/camel/trunk:1146608,1146903,1147216,1174565,1175321,1176274,1176781-1176782
+/camel/branches/camel-2.8.x:1174571,1175323,1176329,1176787,1177397
+/camel/trunk:1146608,1146903,1147216,1174565,1175321,1176274,1176781-1176782,1177394

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 29 19:11:34 2011
@@ -1 +1 @@
-/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1174571,1175323,1176329,1176787
+/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1174571,1175323,1176329,1176787,1177397

Propchange: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 29 19:11:34 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java:1174571,1175323,1176787
+/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java:1174571,1175323,1176787,1177397
 /camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java:1124595

Propchange: camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 29 19:11:34 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java:1174571,1175323,1176787
+/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java:1174571,1175323,1176787,1177397
 /camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java:1124595



Mime
View raw message