svn commit: r1159289 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/converter/ camel-core/src/main/java/org/apache/camel/impl/converter/ camel-core/src/test/java/org/apache/camel/converter/

[davsclaus]

Author: davsclaus
Date: Thu Aug 18 15:58:40 2011
New Revision: 1159289

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


Added:
    
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
      - copied unchanged from r1159174, 
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
    
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
      - copied unchanged from r1159174, 
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/CorePackageScanClassResolver.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 18 15:58:40 2011
@@ -1 +1 @@
-/camel/trunk:1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153
+/camel/trunk:1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159174

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

Modified: 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/CorePackageScanClassResolver.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/CorePackageScanClassResolver.java?rev=1159289&r1=1159288&r2=1159289&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/CorePackageScanClassResolver.java
 (original)
+++ 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/CorePackageScanClassResolver.java
 Thu Aug 18 15:58:40 2011
@@ -25,6 +25,7 @@ import org.apache.camel.component.bean.B
 import org.apache.camel.component.file.GenericFileConverter;
 import org.apache.camel.converter.CamelConverter;
 import org.apache.camel.converter.CollectionConverter;
+import org.apache.camel.converter.DateTimeConverter;
 import org.apache.camel.converter.IOConverter;
 import org.apache.camel.converter.NIOConverter;
 import org.apache.camel.converter.ObjectConverter;
@@ -57,6 +58,7 @@ public class CorePackageScanClassResolve
     public CorePackageScanClassResolver() {
         converters.add(ObjectConverter.class);
         converters.add(CollectionConverter.class);
+        converters.add(DateTimeConverter.class);
         converters.add(IOConverter.class);
         converters.add(NIOConverter.class);
         converters.add(StaxConverter.class);