svn commit: r766891 - in /servicemix/components/bindings/servicemix-ftp/trunk: pom.xml src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java

[lh...@apache.org]

Author: lhein
Date: Mon Apr 20 21:40:56 2009
New Revision: 766891

URL: http://svn.apache.org/viewvc?rev=766891&view=rev
Log:
applied patch (see SMXCOMP-55) for determining the temp file name

Modified:
    servicemix/components/bindings/servicemix-ftp/trunk/pom.xml
    servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java

Modified: servicemix/components/bindings/servicemix-ftp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-ftp/trunk/pom.xml?rev=766891&r1=766890&r2=766891&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-ftp/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-ftp/trunk/pom.xml Mon Apr 20 21:40:56 2009
@@ -41,7 +41,7 @@
   <properties>
     <previous.releases>3.1.2,3.2,3.2.1,3.2.2,3.2.3,2008.01</previous.releases>
     <servicemix-version>3.3</servicemix-version>
-    <servicemix-shared-version>2009.01</servicemix-shared-version>
+    <servicemix-shared-version>2009.02-SNAPSHOT</servicemix-shared-version>
 
     <servicemix.osgi.import>
         org.apache.servicemix.common,

Modified: servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java?rev=766891&r1=766890&r2=766891&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java Mon Apr 20 21:40:56 2009
@@ -45,7 +45,9 @@
     private String uniqueFileName = "ServiceMix";
     private boolean overwrite;
     private URI uri;
+    @Deprecated
     private String uploadPrefix;
+    @Deprecated
     private String uploadSuffix;
     private boolean checkDuplicates = true;
     private boolean autoCreateDirectory = true;
@@ -170,6 +172,7 @@
         this.overwrite = overwrite;
     }
 
+    @Deprecated
     public String getUploadPrefix() {
         return uploadPrefix;
     }
@@ -180,10 +183,12 @@
      * 
      * @param uploadPrefix
      */
+    @Deprecated
     public void setUploadPrefix(String uploadPrefix) {
         this.uploadPrefix = uploadPrefix;
     }
 
+    @Deprecated
     public String getUploadSuffix() {
         return uploadSuffix;
     }
@@ -194,6 +199,7 @@
      * 
      * @param uploadSuffix
      */
+    @Deprecated
     public void setUploadSuffix(String uploadSuffix) {
         this.uploadSuffix = uploadSuffix;
     }
@@ -248,7 +254,7 @@
                                 + " : file already exists and overwrite has not been enabled");
                     }
                 }
-                uploadName = getUploadName(name);
+                uploadName = marshaler.getTempOutputName(exchange, message) != null ? marshaler.getTempOutputName(exchange, message) : name;
                 out = client.storeFileStream(uploadName);
             }
             if (out == null) {
@@ -271,6 +277,7 @@
         }
     }
 
+    @Deprecated
     protected String getUploadName(String name) {
         String result = uploadPrefix == null ? name : uploadPrefix + name;
         result = uploadSuffix == null ? result : result + uploadSuffix;