[jboss-svn-commits] JBL Code SVN: r13602 - in labs/jbossesb/trunk/product/rosetta: src/org/jboss/internal/soa/esb/message/filter and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 18 07:49:27 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-07-18 07:49:27 -0400 (Wed, 18 Jul 2007)
New Revision: 13602
Modified:
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/Invoker.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprIntegrationTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java
Log:
Tidy up File/FTP/SFTP PostSuffix usage: JBESB-718
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java 2007-07-18 11:35:57 UTC (rev 13601)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java 2007-07-18 11:49:27 UTC (rev 13602)
@@ -99,25 +99,17 @@
*/
protected void checkEprParms() throws CourierException, MalformedEPRException
{
- _outputSuffix = null;
+ _inputSuffix = null;
try
{
- _outputSuffix = _epr.getPostSuffix();
- _logger.debug("output suffix set to "+_outputSuffix);
+ _inputSuffix = _epr.getInputSuffix();
+ _logger.debug("input suffix set to "+_inputSuffix);
}
catch (URISyntaxException e)
{
_logger.warn("Malformed EPR");
}
-
- if (Util.isNullString(_outputSuffix))
- {
- _outputSuffix = ".esbMessage";
- _logger
- .debug("No suffix for delivered messages - using default of <"
- + _outputSuffix + ">");
- }
// Certain things can only be checked in local filesystem
try
@@ -207,7 +199,7 @@
File dir = new File(_url.getFile());
String name = message.getHeader().getCall().getMessageID()
.toString();
- name += _outputSuffix;
+ name += _inputSuffix;
tmpFile = CourierUtil.messageToLocalFile(dir, message);
@@ -237,7 +229,7 @@
File dir = new File(sDir);
String name = message.getHeader().getCall().getMessageID().toString();
- name += _outputSuffix;
+ name += _inputSuffix;
tmpFile = CourierUtil.messageToLocalFile(dir, message);
@@ -498,7 +490,7 @@
protected static final String DEFAULT_TMP = System
.getProperty("java.io.tmpdir");
- protected String _outputSuffix;
+ protected String _inputSuffix;
protected URL _url;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java 2007-07-18 11:35:57 UTC (rev 13601)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java 2007-07-18 11:49:27 UTC (rev 13602)
@@ -94,7 +94,7 @@
+ File.separator
+ msg.getHeader().getCall().getMessageID()
.toString()
- + ((FileEpr) destination).getPostSuffix();
+ + ((FileEpr) destination).getInputSuffix();
}
catch (MalformedURLException ex)
{
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java 2007-07-18 11:35:57 UTC (rev 13601)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java 2007-07-18 11:49:27 UTC (rev 13602)
@@ -38,7 +38,6 @@
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.MalformedEPRException;
-import org.jboss.soa.esb.addressing.eprs.FileEpr;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.couriers.Courier;
import org.jboss.soa.esb.couriers.CourierException;
@@ -170,19 +169,6 @@
outMessage = FilterManager.getInstance().doOutputWork(outMessage, params);
for (EPR current : _targetEprs) {
- if (current instanceof FileEpr) {
- try {
- FileEpr fpr = (FileEpr) current;
- FileEpr newEpr = new FileEpr(fpr.getURL());
- newEpr.setPostDelete(false);
- newEpr.setPostDirectory(fpr.getURL().getFile());
- newEpr.setPostSuffix(fpr.getInputSuffix());
- current = newEpr;
- }
- catch (Exception e) {
- _logger.error("Problems with file EPR", e);
- }
- }
_courier = getCourier(current);
try {
replyEpr = null;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/Invoker.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/Invoker.java 2007-07-18 11:35:57 UTC (rev 13601)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/Invoker.java 2007-07-18 11:49:27 UTC (rev 13602)
@@ -21,7 +21,6 @@
*/
package org.jboss.soa.esb.listeners.message;
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
@@ -32,9 +31,6 @@
import org.jboss.soa.esb.addressing.Call;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.MalformedEPRException;
-import org.jboss.soa.esb.addressing.eprs.FTPEpr;
-import org.jboss.soa.esb.addressing.eprs.FileEpr;
-import org.jboss.soa.esb.addressing.eprs.SFTPEpr;
import org.jboss.soa.esb.couriers.Courier;
import org.jboss.soa.esb.couriers.CourierException;
import org.jboss.soa.esb.couriers.CourierFactory;
@@ -97,7 +93,7 @@
if (null==eprs || eprs.size()<1)
throw new RegistryException("No eprs found for <"+category+","+name+">");
EPR service = eprs.iterator().next();
- call.setTo(serviceDestination(service));
+ call.setTo(service);
return invokeAndAwaitResponse(message, maxWaitMillis);
}
@@ -149,43 +145,5 @@
}
} //________________________________
- public static EPR serviceDestination(EPR epr) throws MalformedEPRException
- {
- // For all file Epr's (local, FTP and sFTP - destination EPR
- // must be set to where the service expects the input
- // dest.setPostSuffix (source.getInputSuffix)
- try
- {
- if (epr instanceof SFTPEpr)
- {
- SFTPEpr source = (SFTPEpr)epr;
- SFTPEpr dest = new SFTPEpr(source.getURL());
- dest.setPostSuffix (source.getInputSuffix());
- dest.setPassive (source.getPassive());
- dest.setCertificateURL (source.getCertificateURL());
- return dest;
- }
- if (epr instanceof FTPEpr)
- {
- FTPEpr source = (FTPEpr)epr;
- FTPEpr dest = new FTPEpr(source.getURL());
- dest.setPostSuffix (source.getInputSuffix());
- dest.setPassive (source.getPassive());
- return dest;
- }
- if (epr instanceof FileEpr)
- {
- FileEpr source = (FileEpr)epr;
- FileEpr dest = new FileEpr(source.getURL());
- dest.setPostSuffix (source.getInputSuffix());
- return dest;
- }
- }
- catch (URISyntaxException e) {throw new MalformedEPRException(e); }
- catch (MalformedURLException e) {throw new MalformedEPRException(e); }
-
- return epr;
- }
-
private static Logger _logger = Logger.getLogger(Invoker.class);
}
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java 2007-07-18 11:35:57 UTC (rev 13601)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java 2007-07-18 11:49:27 UTC (rev 13602)
@@ -112,8 +112,7 @@
// toEpr for files must be a directory
FileEpr toEpr = new FileEpr(_tmpDir.toURL());
- // FileEpr uses the postSuffix as the extension for messages delivered (default = ".esbMessage")
- toEpr.setPostSuffix(TEST_SUFFIX);
+ toEpr.setInputSuffix(TEST_SUFFIX);
Message msg = MessageFactory.getInstance().getMessage();
msg.getBody().setByteArray(contents.getBytes());
@@ -162,8 +161,7 @@
// toEpr for files must be a directory
FileEpr toEpr = new FileEpr(_tmpDir.toURL());
- // FileEpr uses the postSuffix as the extension for messages delivered (default = ".esbMessage")
- toEpr.setPostSuffix(TEST_SUFFIX);
+ toEpr.setInputSuffix(TEST_SUFFIX);
Message msg = MessageFactory.getInstance().getMessage();
msg.getBody().setByteArray(contents.getBytes());
@@ -204,8 +202,7 @@
// toEpr for files must be a directory
FileEpr toEpr = new FileEpr(_tmpDir.toURL());
- // FileEpr uses the postSuffix as the extension for messages delivered (default = ".esbMessage")
- toEpr.setPostSuffix(TEST_SUFFIX);
+ toEpr.setInputSuffix(TEST_SUFFIX);
Message msg = MessageFactory.getInstance().getMessage();
msg.getBody().setByteArray(contents.getBytes());
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java 2007-07-18 11:35:57 UTC (rev 13601)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java 2007-07-18 11:49:27 UTC (rev 13602)
@@ -93,7 +93,6 @@
FileEpr toEpr = new FileEpr(WORKDIR.toURI().toString());
toEpr.setInputSuffix(initialSuffix);
toEpr.setPostDelete(true);
- toEpr.setPostSuffix(initialSuffix);
FileEpr replyToEpr = (FileEpr)CourierUtil.getDefaultReplyToEpr(toEpr);
String text_1 = "Outgoing";
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprIntegrationTest.java 2007-07-18 11:35:57 UTC (rev 13601)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprIntegrationTest.java 2007-07-18 11:49:27 UTC (rev 13602)
@@ -94,7 +94,6 @@
FTPEpr toEpr = new FTPEpr(ftpUrl);
toEpr.setInputSuffix(initialSuffix);
toEpr.setPostDelete(true);
- toEpr.setPostSuffix(initialSuffix);
FTPEpr replyToEpr = (FTPEpr)CourierUtil.getDefaultReplyToEpr(toEpr);
String text_1 = "Outgoing";
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java 2007-07-18 11:35:57 UTC (rev 13601)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java 2007-07-18 11:49:27 UTC (rev 13602)
@@ -69,10 +69,8 @@
if (toEPR instanceof FTPEpr)
{
- // take inputSuffix as outputSuffix for initial message sending
- eprElement.setAttribute(FileEpr.POST_SUFFIX_TAG, eprElement
+ eprElement.setAttribute(FileEpr.INPUT_SUFFIX_TAG, eprElement
.getAttribute(FileEpr.INPUT_SUFFIX_TAG));
- eprElement.setAttribute(FileEpr.INPUT_SUFFIX_TAG, null);
toEPR = ListenerUtil.assembleEpr(eprElement);
}
else
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java 2007-07-18 11:35:57 UTC (rev 13601)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java 2007-07-18 11:49:27 UTC (rev 13602)
@@ -101,10 +101,8 @@
if (toEPR instanceof FileEpr)
{
- // take inputSuffix as outputSuffix for initial message sending
- eprElement.setAttribute(FileEpr.POST_SUFFIX_TAG, eprElement
+ eprElement.setAttribute(FileEpr.INPUT_SUFFIX_TAG, eprElement
.getAttribute(FileEpr.INPUT_SUFFIX_TAG));
- eprElement.setAttribute(FileEpr.INPUT_SUFFIX_TAG, null);
toEPR = ListenerUtil.assembleEpr(eprElement);
}
else
More information about the jboss-svn-commits
mailing list