Author: ningjiang
Date: Thu Dec 15 13:58:31 2011
New Revision: 1214763
URL: http://svn.apache.org/viewvc?rev=1214763&view=rev
Log:
Merged revisions 1214743 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1214743 | ningjiang | 2011-12-15 21:21:38 +0800 (Thu, 15 Dec 2011) | 1 line
CAMEL-4784 Changed the ScalaTypeConveter to be object.
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaTypeConverter.scala
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 13:58:31 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132,1214639
+/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132,1214639,1214743
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaTypeConverter.scala
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaTypeConverter.scala?rev=1214763&r1=1214762&r2=1214763&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaTypeConverter.scala
(original)
+++
camel/branches/camel-2.8.x/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaTypeConverter.scala
Thu Dec 15 13:58:31 2011
@@ -29,10 +29,7 @@ import org.apache.camel.{Exchange, Conve
* Converter implementation for supporting some common Scala types within
Apache Camel
*/
@Converter
-class ScalaTypeConverter {
-
- // static classes in Scala don't work on linux with Camel type converter as
for some reason
- // camel-core cannot see the methods have static modifiers
+object ScalaTypeConverter {
@Converter
def convertToDocument(xml: Elem, exchange : Exchange) : Document = {
