camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1330685 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/component/file/ components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/
Date Thu, 26 Apr 2012 07:28:21 GMT
Author: davsclaus
Date: Thu Apr 26 07:28:20 2012
New Revision: 1330685

URL: http://svn.apache.org/viewvc?rev=1330685&view=rev
Log:
Deprecated API that was only applicable for Camel 1.x

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/Endpoint.java
    camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/Producer.java
    camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
    camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1330140

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/Endpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/Endpoint.java?rev=1330685&r1=1330684&r2=1330685&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/Endpoint.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/Endpoint.java Thu
Apr 26 07:28:20 2012
@@ -81,7 +81,9 @@ public interface Endpoint extends IsSing
      *
      * @param exchange given exchange to use for pre-populate
      * @return a new exchange
+     * @deprecated will be removed in Camel 3.0
      */
+    @Deprecated
     Exchange createExchange(Exchange exchange);
 
     /**

Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/Producer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/Producer.java?rev=1330685&r1=1330684&r2=1330685&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/Producer.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/Producer.java Thu
Apr 26 07:28:20 2012
@@ -52,6 +52,8 @@ public interface Producer extends Proces
      *
      * @param exchange the existing exchange
      * @return the created exchange
+     * @deprecated will be removed in Camel 3.0
      */
+    @Deprecated
     Exchange createExchange(Exchange exchange);
 }

Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java?rev=1330685&r1=1330684&r2=1330685&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
(original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
Thu Apr 26 07:28:20 2012
@@ -59,8 +59,7 @@ public class GenericFileProducer<T> exte
     }
 
     public void process(Exchange exchange) throws Exception {
-        Exchange fileExchange = endpoint.createExchange(exchange);
-        endpoint.configureExchange(fileExchange);
+        endpoint.configureExchange(exchange);
 
         String target = createFileName(exchange);
 
@@ -77,8 +76,7 @@ public class GenericFileProducer<T> exte
 
         lock.lock();
         try {
-            processExchange(fileExchange, target);
-            ExchangeHelper.copyResults(exchange, fileExchange);
+            processExchange(exchange, target);
         } finally {
             // do not remove as the locks cache has an upper bound
             // this ensure the locks is appropriate reused

Modified: camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java?rev=1330685&r1=1330684&r2=1330685&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
(original)
+++ camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
Thu Apr 26 07:28:20 2012
@@ -46,10 +46,8 @@ public class RemoteFileProducer<T> exten
     }
 
     public void process(Exchange exchange) throws Exception {
-        Exchange remoteExchange = getEndpoint().createExchange(exchange);
         String target = createFileName(exchange);
-        processExchange(remoteExchange, target);
-        ExchangeHelper.copyResults(exchange, remoteExchange);
+        processExchange(exchange, target);
     }
 
     protected RemoteFileOperations getOperations() {



Mime
View raw message