[jboss-svn-commits] JBL Code SVN: r10884 - in labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb: couriers and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Apr 11 06:42:49 EDT 2007
Author: estebanschifman
Date: 2007-04-11 06:42:49 -0400 (Wed, 11 Apr 2007)
New Revision: 10884
Added:
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java
Modified:
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
Log:
Fix default reply to for local/ftp and sftp file transport
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java 2007-04-11 09:12:28 UTC (rev 10883)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java 2007-04-11 10:42:49 UTC (rev 10884)
@@ -30,14 +30,18 @@
public DefaultFileReplyToEpr (FileEpr epr)
throws URISyntaxException, MalformedURLException
{
- super(epr);
- setPostSuffix(uniqueInputSuffix(epr));
+ super(epr.getURL());
+ String suffix = uniqueFileSuffix(epr);
+ setInputSuffix(suffix);
+ setPostSuffix(suffix);
+ setPostDelete(true);
}
- static String uniqueInputSuffix(FileEpr epr)
+ static String uniqueFileSuffix(FileEpr epr)
throws URISyntaxException
{
- return epr.getInputSuffix()+"."+FileEpr.DEFAULT_REPLY_TO_FILE_SUFFIX+UUID.randomUUID().toString();
+ String inputSuffix = epr.getInputSuffix();
+ return ((null==inputSuffix)?"":inputSuffix)+"."+FileEpr.DEFAULT_REPLY_TO_FILE_SUFFIX+UUID.randomUUID().toString();
}
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java 2007-04-11 09:12:28 UTC (rev 10883)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java 2007-04-11 10:42:49 UTC (rev 10884)
@@ -20,16 +20,22 @@
package org.jboss.soa.esb.addressing.eprs;
+import java.net.MalformedURLException;
import java.net.URISyntaxException;
public class DefaultFtpReplyToEpr extends FTPEpr
{
public DefaultFtpReplyToEpr(FTPEpr epr)
- throws URISyntaxException
+ throws URISyntaxException, MalformedURLException
{
- super(epr);
- setPostSuffix(DefaultFileReplyToEpr.uniqueInputSuffix(epr));
+ super(epr.getURL());
+ String suffix = DefaultFileReplyToEpr.uniqueFileSuffix(epr);
+ setInputSuffix(suffix);
+ setPostSuffix(suffix);
+ setPostDelete(true);
+
+ setPassive(epr.getPassive());
}
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java 2007-04-11 09:12:28 UTC (rev 10883)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java 2007-04-11 10:42:49 UTC (rev 10884)
@@ -20,21 +20,19 @@
package org.jboss.soa.esb.addressing.eprs;
+import java.net.URISyntaxException;
+
public class DefaultJdbcReplyToEpr extends JDBCEpr
{
- public DefaultJdbcReplyToEpr(JDBCEpr epr)
+ public DefaultJdbcReplyToEpr(JDBCEpr epr) throws URISyntaxException
{
super(epr);
- //TODO We need to add a 'selector' to the JDBCEpr also, so we can selectively pickup
-// if(toEpr instanceof JDBCEpr)
-// {
-// JDBCEpr fpr = (JDBCEpr)toEpr;
-// JDBCEpr temp = new JDBCEpr(fpr.getURL());
-//
-// String selector = getReplySelector();
-//
-// return temp;
-// }
+ setTableName(replyToTableName(epr));
}
+
+ public static String replyToTableName(JDBCEpr epr) throws URISyntaxException
+ {
+ return epr.getTableName()+JDBCEpr.DEFAULT_REPLY_TO_TABLE_SUFFIX;
+ }
}
Added: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java (rev 0)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java 2007-04-11 10:42:49 UTC (rev 10884)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ */
+
+package org.jboss.soa.esb.addressing.eprs;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+
+public class DefaultSftpReplyToEpr extends SFTPEpr
+{
+
+ public DefaultSftpReplyToEpr(SFTPEpr epr)
+ throws URISyntaxException, MalformedURLException
+ {
+ super(epr.getURL());
+ String suffix = DefaultFileReplyToEpr.uniqueFileSuffix(epr);
+ setInputSuffix(suffix);
+ setPostSuffix(suffix);
+ setPostDelete(true);
+
+ setPassive(epr.getPassive());
+ setCertificateURL(epr.getCertificateURL());
+ }
+
+}
Property changes on: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java 2007-04-11 09:12:28 UTC (rev 10883)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java 2007-04-11 10:42:49 UTC (rev 10884)
@@ -47,9 +47,11 @@
import org.jboss.soa.esb.addressing.eprs.DefaultFileReplyToEpr;
import org.jboss.soa.esb.addressing.eprs.DefaultFtpReplyToEpr;
import org.jboss.soa.esb.addressing.eprs.DefaultJmsReplyToEpr;
+import org.jboss.soa.esb.addressing.eprs.DefaultSftpReplyToEpr;
import org.jboss.soa.esb.addressing.eprs.FTPEpr;
import org.jboss.soa.esb.addressing.eprs.FileEpr;
import org.jboss.soa.esb.addressing.eprs.JMSEpr;
+import org.jboss.soa.esb.addressing.eprs.SFTPEpr;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.util.Util;
@@ -76,6 +78,9 @@
throw new IllegalArgumentException("toEpr must not be null");
if (toEpr instanceof JMSEpr)
return new DefaultJmsReplyToEpr((JMSEpr)toEpr);
+ // Check for SFTPEpr first, as it extends FTPEpr
+ if(toEpr instanceof SFTPEpr)
+ return new DefaultSftpReplyToEpr((SFTPEpr)toEpr);
// Check for FTPEpr first, as it extends FileEpr
if(toEpr instanceof FTPEpr)
return new DefaultFtpReplyToEpr((FTPEpr)toEpr);
More information about the jboss-svn-commits
mailing list