You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2009/04/20 23:40:22 UTC
svn commit: r766890 - in
/servicemix/components/bindings/servicemix-file/trunk: pom.xml
src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java
Author: lhein
Date: Mon Apr 20 21:40:22 2009
New Revision: 766890
URL: http://svn.apache.org/viewvc?rev=766890&view=rev
Log:
applied patch (see SMXCOMP-55) for determining the temp file name
Modified:
servicemix/components/bindings/servicemix-file/trunk/pom.xml
servicemix/components/bindings/servicemix-file/trunk/src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java
Modified: servicemix/components/bindings/servicemix-file/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-file/trunk/pom.xml?rev=766890&r1=766889&r2=766890&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-file/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-file/trunk/pom.xml Mon Apr 20 21:40:22 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-file/trunk/src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-file/trunk/src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java?rev=766890&r1=766889&r2=766890&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-file/trunk/src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-file/trunk/src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java Mon Apr 20 21:40:22 2009
@@ -45,7 +45,9 @@
private File directory;
private FileMarshaler marshaler = new DefaultFileMarshaler();
+ @Deprecated
private String tempFilePrefix = "servicemix-";
+ @Deprecated
private String tempFileSuffix = ".xml";
private boolean autoCreateDirectory = true;
private boolean append = true;
@@ -85,7 +87,7 @@
try {
name = marshaler.getOutputName(exchange, in);
if (name == null) {
- newFile = File.createTempFile(tempFilePrefix, tempFileSuffix, directory);
+ newFile = File.createTempFile("" + System.currentTimeMillis(), "tmp", directory);
} else {
newFile = new File(directory, name);
if (newFile.exists()) {
@@ -100,7 +102,7 @@
+ " : file already exists and overwrite has not been enabled");
}
}
- writeTempName = getTemporaryName(name);
+ writeTempName = marshaler.getTempOutputName(exchange, in) != null ? marshaler.getTempOutputName(exchange, in) : name;
newFile = new File(directory, writeTempName);
}
@@ -163,18 +165,6 @@
}
}
- /**
- * provides a temporary unique file name for writing
- *
- * @param name the original name
- * @return a temporary unique file name
- */
- protected String getTemporaryName(String name) {
- String result = tempFilePrefix == null ? name : tempFilePrefix + name;
- result = tempFileSuffix == null ? result : result + tempFileSuffix;
- return result;
- }
-
protected void processInOut(MessageExchange exchange, NormalizedMessage in, NormalizedMessage out)
throws Exception {
/** TODO list the files? */
@@ -220,10 +210,12 @@
*
* @param filePrefix a string to prefix to generated file names
*/
+ @Deprecated
public void setTempFilePrefix(String tempFilePrefix) {
this.tempFilePrefix = tempFilePrefix;
}
+ @Deprecated
public String getTempFilePrefix() {
return tempFilePrefix;
}
@@ -233,10 +225,12 @@
*
* @param fileSuffix a string to append to generated file names
*/
+ @Deprecated
public void setTempFileSuffix(String tempFileSuffix) {
this.tempFileSuffix = tempFileSuffix;
}
+ @Deprecated
public String getTempFileSuffix() {
return tempFileSuffix;
}