Author: veithen
Date: Sun Jun 14 16:55:09 2009
New Revision: 784584
URL: http://svn.apache.org/viewvc?rev=784584&view=rev
Log:
Solved a FIXME.
Modified:
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
Modified:
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java?rev=784584&r1=784583&r2=784584&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java
(original)
+++
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java
Sun Jun 14 16:55:09 2009
@@ -39,6 +39,8 @@
/** File or Directory to scan */
private String fileURI;
+ /** The URI to send replies to. May be null. */
+ private String replyFileURI;
/** file name pattern for a directory or compressed file entry */
private String fileNamePattern;
/** Content-Type to use for the message */
@@ -74,6 +76,10 @@
return fileURI;
}
+ public String getReplyFileURI() {
+ return replyFileURI;
+ }
+
public String getFileNamePattern() {
return fileNamePattern;
}
@@ -163,6 +169,7 @@
if (fileURI.startsWith(VFSConstants.VFS_PREFIX)) {
fileURI = fileURI.substring(VFSConstants.VFS_PREFIX.length());
}
+ replyFileURI = ParamUtils.getOptionalParam(params,
VFSConstants.REPLY_FILE_URI);
fileNamePattern = ParamUtils.getOptionalParam(params,
VFSConstants.TRANSPORT_FILE_FILE_NAME_PATTERN);
contentType = ParamUtils.getRequiredParam(params,
Modified:
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java?rev=784584&r1=784583&r2=784584&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
(original)
+++
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
Sun Jun 14 16:55:09 2009
@@ -30,7 +30,6 @@
import org.apache.axis2.transport.base.BaseUtils;
import org.apache.axis2.transport.base.AbstractPollingTransportListener;
import org.apache.axis2.transport.base.ManagementSupport;
-import org.apache.axis2.transport.base.ParamUtils;
import org.apache.axis2.builder.Builder;
import org.apache.axis2.builder.BuilderUtil;
import org.apache.axis2.builder.SOAPBuilder;
@@ -41,13 +40,10 @@
import javax.mail.internet.ContentType;
import javax.mail.internet.ParseException;
-import javax.xml.namespace.QName;
import java.util.*;
import java.io.IOException;
import java.io.InputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
/**
* The "vfs" transport is a polling based transport - i.e. it gets kicked off
at
@@ -395,17 +391,11 @@
}
}
- AxisService service = entry.getService();
-
// does the service specify a default reply file URI ?
- // FIXME: we should look for the parameter in createPollTableEntry
- // and store the value in PollTableEntry as we do for the
- // other parameters
- Parameter param =
service.getParameter(VFSConstants.REPLY_FILE_URI);
- if (param != null && param.getValue() != null) {
- msgContext.setProperty(
- Constants.OUT_TRANSPORT_INFO,
- new VFSOutTransportInfo((String) param.getValue()));
+ String replyFileURI = entry.getReplyFileURI();
+ if (replyFileURI != null) {
+ msgContext.setProperty(Constants.OUT_TRANSPORT_INFO,
+ new VFSOutTransportInfo(replyFileURI));
}
// Determine the message builder to use
