[jboss-svn-commits] JBL Code SVN: r10127 - in labs/jbossesb/trunk/product/core/listeners: src/org/jboss/soa/esb/listeners/message and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 12 07:01:19 EDT 2007
Author: estebanschifman
Date: 2007-03-12 07:01:19 -0400 (Mon, 12 Mar 2007)
New Revision: 10127
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/Invoker.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerIntegrationTest.java
Log:
Remove parameter from getFileList() in file gateways
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java 2007-03-12 05:58:35 UTC (rev 10126)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java 2007-03-12 11:01:19 UTC (rev 10127)
@@ -63,7 +63,7 @@
*/
public abstract class AbstractFileGateway extends AbstractThreadedManagedLifecycle
{
- abstract File[] getFileList(String suffix) throws GatewayException;
+ abstract File[] getFileList() throws GatewayException;
abstract byte[] getFileContents(File file) throws GatewayException;
@@ -119,7 +119,7 @@
File[] fileList;
try
{
- fileList = getFileList(_inputSuffix);
+ fileList = getFileList();
}
catch (GatewayException e)
{
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java 2007-03-12 05:58:35 UTC (rev 10126)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java 2007-03-12 11:01:19 UTC (rev 10127)
@@ -96,7 +96,7 @@
}
@Override
- File[] getFileList(String suffix) throws GatewayException
+ File[] getFileList() throws GatewayException
{
return _inputDirectory.listFiles(_fileFilter);
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java 2007-03-12 05:58:35 UTC (rev 10126)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java 2007-03-12 11:01:19 UTC (rev 10127)
@@ -150,7 +150,8 @@
}
}
- File[] getFileList(String suffix) throws GatewayException
+ @Override
+ File[] getFileList() throws GatewayException
{
RemoteFileSystem rfs = null;
try
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/Invoker.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/Invoker.java 2007-03-12 05:58:35 UTC (rev 10126)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/Invoker.java 2007-03-12 11:01:19 UTC (rev 10127)
@@ -92,38 +92,54 @@
{
Message outgoing = command.toCommandMessage();
Call call = outgoing.getHeader().getCall();
- URI uri = null;
- try { uri = new URI(UUID.randomUUID().toString()); }
- catch (URISyntaxException e)
+ Collection<EPR> eprs = RegistryUtil.getEprs(category, name);
+ EPR toEpr = (eprs.size()<1) ? null : eprs.iterator().next();
+ call.setTo(toEpr);
+ return invokeAndAwaitResponse(outgoing, maxWaitMillis);
+ }
+
+ /**
+ * Deliver an ESB Message and wait for a response Message.
+ *
+ * @param outgoing Message - should contain at least the toEPR
+ * @param maxWaitMillis int - Maximum time to wait for a response
+ * @return
+ * @throws CourierException
+ * @throws MalformedEPRException
+ * @throws CourierTimeoutException - If response was not received in specified time
+ */
+ public static Message invokeAndAwaitResponse(Message outgoing ,int maxWaitMillis)
+ throws CourierException, MalformedEPRException, CourierTimeoutException
+ {
+ Call call = outgoing.getHeader().getCall();
+ if (null==call.getMessageID())
{
- _logger.fatal("Failed to create URI: "+e);
-
- throw new CourierException(e);
+ URI uri = null;
+ try { uri = new URI(UUID.randomUUID().toString()); }
+ catch (URISyntaxException e)
+ {
+ _logger.fatal("Failed to create URI: "+e);
+ throw new CourierException(e);
+ }
+ call.setMessageID(uri);
}
- call.setMessageID(uri);
- Collection<EPR> eprs = RegistryUtil.getEprs(category, name);
- EPR toEpr = (eprs.size()<1) ? null : eprs.iterator().next();
- call.setTo(toEpr);
-
- Courier sender = CourierFactory.getCourier(toEpr);
+ Courier sender = CourierFactory.getCourier(call.getTo());
PickUpOnlyCourier receiver = null;
- EPR replyToEpr = null;
boolean waitForResponse = (maxWaitMillis > 0);
if (waitForResponse)
{
- replyToEpr = CourierUtil.getTemporaryReplyToEpr(toEpr);
- call.setReplyTo(replyToEpr);
- call.setFaultTo(replyToEpr);
- receiver = CourierFactory.getPickupCourier(replyToEpr);
+ if (null==call.getReplyTo())
+ call.setReplyTo(CourierUtil.getTemporaryReplyToEpr(call.getTo()));
+ receiver = CourierFactory.getPickupCourier(call.getReplyTo());
}
-
+
sender.deliver(outgoing);
return (waitForResponse)
- ? receiver.pickup(maxWaitMillis)
- : null
+ ? receiver.pickup(maxWaitMillis)
+ : null
;
- }
+ } //________________________________
private static Logger _logger = Logger.getLogger(Invoker.class);
}
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java 2007-03-12 05:58:35 UTC (rev 10126)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java 2007-03-12 11:01:19 UTC (rev 10127)
@@ -159,15 +159,13 @@
if (!gateway.deleteFile(testFile))
fail();
- testFile = File.createTempFile("foo", "testFile");
- anTestFile = File.createTempFile("bar", "testFile");
+ testFile = File.createTempFile("foo", "testFile",gateway._inputDirectory);
+ anTestFile = File.createTempFile("bar", "testFile",gateway._inputDirectory);
+
+ tree.setAttribute("inputSuffix", "testFile");
+ gateway = new FileGatewayListener(tree);
+ File[] files = gateway.getFileList();
- @SuppressWarnings("unused")
- File[] files = gateway.getFileList("testFile");
-
- // TODO check why getFileList ignores the parameter! Hence this test fails!
-
- /*
if (files.length != 2)
{
for (int i = 0; i < files.length; i++)
@@ -175,7 +173,6 @@
fail();
}
- */
try
{
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerIntegrationTest.java 2007-03-12 05:58:35 UTC (rev 10126)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerIntegrationTest.java 2007-03-12 11:01:19 UTC (rev 10127)
@@ -58,6 +58,7 @@
url = url + getFtpPwd()+"@";
tree.setAttribute(FTPEpr.URL_TAG, "ftp://"+url+getFtpHostname()+"/"+getFtpDir());
+// tree.setAttribute(FTPEpr.URL_TAG, "ftp://ftpuser:ftppassword@localhost/tmp");
RemoteGatewayListener gateway = new RemoteGatewayListener(tree);
boolean exception = false;
@@ -91,7 +92,7 @@
try
{
- gateway.getFileList("foobar");
+ gateway.getFileList();
}
catch (GatewayException ex)
{
More information about the jboss-svn-commits
mailing list