You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/03/31 19:52:23 UTC
svn commit: r1307863 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterLoader.java
camel-core/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
Author: hadrian
Date: Sat Mar 31 17:52:22 2012
New Revision: 1307863
URL: http://svn.apache.org/viewvc?rev=1307863&view=rev
Log:
Merged revisions 1242700 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1242700 | ningjiang | 2012-02-10 03:15:47 -0500 (Fri, 10 Feb 2012) | 1 line
Added some comments on the camel-core type converter.
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterLoader.java
camel/branches/camel-2.9.x/camel-core/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterLoader.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterLoader.java?rev=1307863&r1=1307862&r2=1307863&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterLoader.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterLoader.java Sat Mar 31 17:52:22 2012
@@ -32,6 +32,7 @@ public class CoreTypeConverterLoader ext
@Override
protected String[] findPackageNames() throws IOException {
+ // this method doesn't change the behavior of the CorePackageScanClassResolver
return new String[]{"org.apache.camel.converter", "org.apache.camel.component.bean", "org.apache.camel.component.file"};
}
Modified: camel/branches/camel-2.9.x/camel-core/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/resources/META-INF/services/org/apache/camel/TypeConverter?rev=1307863&r1=1307862&r2=1307863&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/resources/META-INF/services/org/apache/camel/TypeConverter (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/resources/META-INF/services/org/apache/camel/TypeConverter Sat Mar 31 17:52:22 2012
@@ -16,8 +16,11 @@
#
# keep at least one package in camel-core so the annotation type converter
-# should at least be able to discover one package to scan
-# notice that there are no @Converter classes in util. As all camel-core
+# should at least be able to discover one package to scan notice that there
+# are no @Converter classes in org.apache.camel.core. As all camel-core
# type converters have been pre-loaded without package scanning, as that is
-# faster
+# faster.
+# If you adding a new converter class in camel-core, please added the class
+# into CorePackageScanClassResolver
+
org.apache.camel.core