svn commit: r738913 - in /camel/branches/camel-1.x: ./ components/camel-mina/src/main/java/org/apache/camel/component/mina/ components/camel-restlet/src/test/java/org/apache/camel/component/restlet/ components/camel-sql/src/test/java/org/apache/camel/c...

[davsclaus]

Author: davsclaus
Date: Thu Jan 29 16:21:37 2009
New Revision: 738913

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

........
  r738911 | davsclaus | 2009-01-29 17:16:12 +0100 (Thu, 29 Jan 2009) | 1 line
  
  CAMEL-1305: Add missing DEFAULT textline delimiter to camel-mina and it 
should be used by default.
........

Modified:
    camel/branches/camel-1.x/   (props changed)
    
camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
    
camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java
    
camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
   (props changed)
    
camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
   (props changed)

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 29 16:21:37 2009
@@ -1,2 +1,2 @@
 
/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422,734727,734903,734932,735421,735427,735732
-/camel/trunk:735847,735888,736227,736562,736617-736620,736676,736953
+/camel/trunk:735847,735888,736227,736562,736617-736620,736676,736953,738911

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

Modified: 
camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java?rev=738913&r1=738912&r2=738913&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
 (original)
+++ 
camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
 Thu Jan 29 16:21:37 2009
@@ -346,10 +346,12 @@
 
     private LineDelimiter getLineDelimiterParameter() {
         if (textlineDelimiter == null) {
-            return LineDelimiter.AUTO;
+            return LineDelimiter.DEFAULT;
         }
 
         switch (textlineDelimiter) {
+        case DEFAULT:
+            return LineDelimiter.DEFAULT;
         case AUTO:
             return LineDelimiter.AUTO;
         case UNIX:

Modified: 
camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java?rev=738913&r1=738912&r2=738913&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java
 (original)
+++ 
camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java
 Thu Jan 29 16:21:37 2009
@@ -20,5 +20,5 @@
  * Possible text line delmiters to be used with the textline codec.
  */
 public enum TextLineDelimiter {
-    AUTO, UNIX, WINDOWS, MAC
+    DEFAULT, AUTO, UNIX, WINDOWS, MAC
 }

Propchange: 
camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 29 16:21:37 2009
@@ -1 +1 @@
-/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java:736676,736953
+/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java:736676,736953,738911

Propchange: 
camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 29 16:21:37 2009
@@ -0,0 +1 @@
+/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java:738911