[jboss-svn-commits] JBL Code SVN: r13852 - in labs/jbossesb/trunk/product/rosetta: src/org/jboss/internal/soa/esb/addressing/eprs and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 30 11:29:28 EDT 2007
Author: mark.little at jboss.com
Date: 2007-07-30 11:29:28 -0400 (Mon, 30 Jul 2007)
New Revision: 13852
Added:
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java
Removed:
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java
Modified:
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ServiceInvoker.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/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/addressing/eprs/tests/DefaultJdbcReplyToEprUnitTest.java
Log:
http://jira.jboss.com/jira/browse/JBESB-745, http://jira.jboss.com/jira/browse/JBESB-744, http://jira.jboss.com/jira/browse/JBESB-680, http://jira.jboss.com/jira/browse/JBESB-743
Copied: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java (from rev 13648, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -0,0 +1,49 @@
+/* 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.internal.soa.esb.addressing.eprs;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.util.UUID;
+
+import org.jboss.soa.esb.addressing.eprs.FileEpr;
+
+public class DefaultFileReplyToEpr extends FileEpr
+{
+
+ public DefaultFileReplyToEpr (FileEpr epr)
+ throws URISyntaxException, MalformedURLException
+ {
+ super(epr.getURL());
+ String suffix = uniqueFileSuffix(epr);
+ setInputSuffix(suffix);
+ setPostSuffix(suffix);
+ setPostDelete(true);
+ }
+
+
+ static String uniqueFileSuffix(FileEpr epr)
+ throws URISyntaxException
+ {
+ String inputSuffix = epr.getInputSuffix();
+ return ((null==inputSuffix)?"":inputSuffix)+"."+FileEpr.DEFAULT_REPLY_TO_FILE_SUFFIX+UUID.randomUUID().toString();
+ }
+}
Property changes on: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java (from rev 13648, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -0,0 +1,43 @@
+/*
+ * 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.internal.soa.esb.addressing.eprs;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+
+import org.jboss.soa.esb.addressing.eprs.FTPEpr;
+
+public class DefaultFtpReplyToEpr extends FTPEpr
+{
+
+ public DefaultFtpReplyToEpr(FTPEpr epr)
+ throws URISyntaxException, MalformedURLException
+ {
+ super(epr.getURL());
+ String suffix = DefaultFileReplyToEpr.uniqueFileSuffix(epr);
+ setInputSuffix(suffix);
+ setPostSuffix(suffix);
+ setPostDelete(true);
+
+ setPassive(epr.getPassive());
+ }
+
+}
Property changes on: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java (from rev 13648, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.internal.soa.esb.addressing.eprs;
+
+import java.net.URISyntaxException;
+
+import org.jboss.soa.esb.addressing.eprs.HibernateEpr;
+
+public class DefaultHibernateReplyToEpr extends HibernateEpr
+{
+
+ public DefaultHibernateReplyToEpr(HibernateEpr epr) throws URISyntaxException
+ {
+ super(epr);
+ setClassName(replyToClassName(epr));
+ }
+
+ public static String replyToClassName(HibernateEpr epr) throws URISyntaxException
+ {
+ return epr.getClassName()+HibernateEpr.DEFAULT_REPLY_TO_CLASS_SUFFIX;
+ }
+}
\ No newline at end of file
Copied: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java (from rev 13648, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -0,0 +1,40 @@
+/*
+ * 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.internal.soa.esb.addressing.eprs;
+
+import java.net.URISyntaxException;
+
+import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
+
+public class DefaultJdbcReplyToEpr extends JDBCEpr
+{
+
+ public DefaultJdbcReplyToEpr(JDBCEpr epr) throws URISyntaxException
+ {
+ super(epr);
+ setTableName(replyToTableName(epr));
+ }
+
+ public static String replyToTableName(JDBCEpr epr) throws URISyntaxException
+ {
+ return epr.getTableName()+JDBCEpr.DEFAULT_REPLY_TO_TABLE_SUFFIX;
+ }
+}
Property changes on: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java (from rev 13648, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -0,0 +1,70 @@
+/*
+ * 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.internal.soa.esb.addressing.eprs;
+
+import java.net.URISyntaxException;
+import java.util.UUID;
+
+import org.jboss.soa.esb.addressing.eprs.JMSEpr;
+import org.jboss.soa.esb.util.Util;
+
+public class DefaultJmsReplyToEpr extends JMSEpr{
+
+ public static final String REPLY_UUID_TAG = "jbossESBresponseUUID";
+
+ public DefaultJmsReplyToEpr(JMSEpr epr)
+ throws URISyntaxException
+ {
+ super( epr.getDestinationType()
+ ,replyDestinationName(epr)
+ ,epr.getConnectionFactory()
+ ,epr.getJndiEnvironment()
+ ,replySelector(epr)
+ );
+ }
+ private static String replyDestinationName(JMSEpr toEpr)
+ throws URISyntaxException
+ {
+ return toEpr.getDestinationName()+JMSEpr.DEFAULT_REPLY_TO_DESTINATION_SUFFIX;
+ }
+
+ /**
+ * Unique reply message selector
+ *
+ * @return String - the generated unique reply selector.
+ */
+ @SuppressWarnings("unused")
+ private static String replySelector(JMSEpr epr)
+ throws URISyntaxException
+ {
+ StringBuilder sb = new StringBuilder();
+
+ String oldSelector = epr.getMessageSelector();
+ // If there was a message selector, use it
+ if (!Util.isNullString(oldSelector))
+ sb.append(oldSelector).append(" AND ");
+ // And add a unique reply UUID
+ sb.append(REPLY_UUID_TAG)
+ .append("='").append(UUID.randomUUID().toString()).append("'");
+ return sb.toString();
+ }
+
+}
Property changes on: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java (from rev 13648, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -0,0 +1,44 @@
+/*
+ * 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.internal.soa.esb.addressing.eprs;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+
+import org.jboss.soa.esb.addressing.eprs.SFTPEpr;
+
+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/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java 2007-07-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -1,47 +0,0 @@
-/* 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;
-import java.util.UUID;
-
-public class DefaultFileReplyToEpr extends FileEpr
-{
-
- public DefaultFileReplyToEpr (FileEpr epr)
- throws URISyntaxException, MalformedURLException
- {
- super(epr.getURL());
- String suffix = uniqueFileSuffix(epr);
- setInputSuffix(suffix);
- setPostSuffix(suffix);
- setPostDelete(true);
- }
-
-
- static String uniqueFileSuffix(FileEpr epr)
- throws URISyntaxException
- {
- String inputSuffix = epr.getInputSuffix();
- return ((null==inputSuffix)?"":inputSuffix)+"."+FileEpr.DEFAULT_REPLY_TO_FILE_SUFFIX+UUID.randomUUID().toString();
- }
-}
Deleted: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java 2007-07-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -1,41 +0,0 @@
-/*
- * 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 DefaultFtpReplyToEpr extends FTPEpr
-{
-
- public DefaultFtpReplyToEpr(FTPEpr epr)
- throws URISyntaxException, MalformedURLException
- {
- super(epr.getURL());
- String suffix = DefaultFileReplyToEpr.uniqueFileSuffix(epr);
- setInputSuffix(suffix);
- setPostSuffix(suffix);
- setPostDelete(true);
-
- setPassive(epr.getPassive());
- }
-
-}
Deleted: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java 2007-07-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.addressing.eprs;
-
-import java.net.URISyntaxException;
-
-public class DefaultHibernateReplyToEpr extends HibernateEpr
-{
-
- public DefaultHibernateReplyToEpr(HibernateEpr epr) throws URISyntaxException
- {
- super(epr);
- setClassName(replyToClassName(epr));
- }
-
- public static String replyToClassName(HibernateEpr epr) throws URISyntaxException
- {
- return epr.getClassName()+HibernateEpr.DEFAULT_REPLY_TO_CLASS_SUFFIX;
- }
-}
\ No newline at end of file
Deleted: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java 2007-07-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -1,38 +0,0 @@
-/*
- * 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.URISyntaxException;
-
-public class DefaultJdbcReplyToEpr extends JDBCEpr
-{
-
- public DefaultJdbcReplyToEpr(JDBCEpr epr) throws URISyntaxException
- {
- super(epr);
- setTableName(replyToTableName(epr));
- }
-
- public static String replyToTableName(JDBCEpr epr) throws URISyntaxException
- {
- return epr.getTableName()+JDBCEpr.DEFAULT_REPLY_TO_TABLE_SUFFIX;
- }
-}
Deleted: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java 2007-07-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -1,69 +0,0 @@
-/*
- * 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.URISyntaxException;
-import java.util.UUID;
-
-import org.jboss.soa.esb.util.Util;
-
-public class DefaultJmsReplyToEpr extends JMSEpr{
-
- public static final String REPLY_UUID_TAG = "jbossESBresponseUUID";
-
- public DefaultJmsReplyToEpr(JMSEpr epr)
- throws URISyntaxException
- {
- super( epr.getDestinationType()
- ,replyDestinationName(epr)
- ,epr.getConnectionFactory()
- ,epr.getJndiEnvironment()
- ,replySelector(epr)
- );
- }
- private static String replyDestinationName(JMSEpr toEpr)
- throws URISyntaxException
- {
- return toEpr.getDestinationName()+JMSEpr.DEFAULT_REPLY_TO_DESTINATION_SUFFIX;
- }
-
- /**
- * Unique reply message selector
- *
- * @return String - the generated unique reply selector.
- */
- @SuppressWarnings("unused")
- private static String replySelector(JMSEpr epr)
- throws URISyntaxException
- {
- StringBuilder sb = new StringBuilder();
-
- String oldSelector = epr.getMessageSelector();
- // If there was a message selector, use it
- if (!Util.isNullString(oldSelector))
- sb.append(oldSelector).append(" AND ");
- // And add a unique reply UUID
- sb.append(REPLY_UUID_TAG)
- .append("='").append(UUID.randomUUID().toString()).append("'");
- return sb.toString();
- }
-
-}
Deleted: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java 2007-07-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -1,42 +0,0 @@
-/*
- * 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());
- }
-
-}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java 2007-07-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -39,23 +39,24 @@
import javax.xml.parsers.ParserConfigurationException;
import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.addressing.eprs.DefaultFileReplyToEpr;
+import org.jboss.internal.soa.esb.addressing.eprs.DefaultFtpReplyToEpr;
+import org.jboss.internal.soa.esb.addressing.eprs.DefaultHibernateReplyToEpr;
+import org.jboss.internal.soa.esb.addressing.eprs.DefaultJdbcReplyToEpr;
+import org.jboss.internal.soa.esb.addressing.eprs.DefaultJmsReplyToEpr;
+import org.jboss.internal.soa.esb.addressing.eprs.DefaultSftpReplyToEpr;
import org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier;
import org.jboss.internal.soa.esb.couriers.PickUpOnlyCourier;
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.DefaultFileReplyToEpr;
-import org.jboss.soa.esb.addressing.eprs.DefaultFtpReplyToEpr;
-import org.jboss.soa.esb.addressing.eprs.DefaultHibernateReplyToEpr;
-import org.jboss.soa.esb.addressing.eprs.DefaultJdbcReplyToEpr;
-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.HibernateEpr;
import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
import org.jboss.soa.esb.addressing.eprs.JMSEpr;
import org.jboss.soa.esb.addressing.eprs.SFTPEpr;
+import org.jboss.soa.esb.addressing.util.DefaultReplyTo;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.util.Util;
@@ -68,6 +69,8 @@
/**
* Obtain a default replyToEPR (based on the toEpr) to which we can reply to.
*
+ * @deprecated Use DefaultReplyTo helper class instead.
+ *
* @param toEpr - the toEPR which will be used a basis to generate the replyToEPR.
* @return EPR - the EPR to which the pickup will be delivered.
* @throws URISyntaxException,
@@ -76,37 +79,7 @@
public static EPR getDefaultReplyToEpr(EPR toEpr)
throws CourierException, MalformedEPRException
{
- // TODO: Is this really a "Courier" utility? Looks more like an EPR/EPRFactory utility?
- try
- {
- if (null==toEpr)
- 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);
- if(toEpr instanceof FileEpr)
- return new DefaultFileReplyToEpr((FileEpr)toEpr);
- if(toEpr instanceof JDBCEpr)
- return new DefaultJdbcReplyToEpr((JDBCEpr)toEpr);
- if(toEpr instanceof HibernateEpr)
- return new DefaultHibernateReplyToEpr((HibernateEpr)toEpr);
- }
- catch (MalformedURLException ex)
- {
- throw new MalformedEPRException(ex);
- }
- catch (URISyntaxException ex)
- {
- throw new MalformedEPRException(ex);
- }
-
- throw new CourierException("Unsupported temporary reply to EPR "
- +toEpr.getClass().getSimpleName());
+ return DefaultReplyTo.getReplyTo(toEpr);
}
/**
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ServiceInvoker.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ServiceInvoker.java 2007-07-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ServiceInvoker.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -27,6 +27,7 @@
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.util.DefaultReplyTo;
import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.couriers.Courier;
import org.jboss.soa.esb.couriers.CourierException;
@@ -114,6 +115,40 @@
throw new MessageDeliverException( iae.getMessage(), iae);
}
}
+
+ public ServiceInvoker (String serviceCategory, String serviceName, long timeout) throws RegistryException, MessageDeliverException
+ {
+ this(serviceCategory, serviceName);
+
+ _timeout = timeout;
+ }
+
+ /**
+ * Deliver the message to the target service identified in the header (To field). If there is a
+ * ReplyTo field set, then the message will be delivered and a response is expected. Otherwise
+ * the message is sent as an asynchronous one-way and no response is returned. Responses to this
+ * invocation may be sent at a different time using correlated one-way invocations.
+ *
+ * @param message the message to be delivered.
+ * @return if synchronous request/response is used, then this will be a response message, otherwise null.
+ * @throws MessageDeliverException
+ * @throws RegistryException
+ */
+
+ public Message deliver (Message message) throws MessageDeliverException, RegistryException
+ {
+ if (message == null)
+ throw new IllegalArgumentException();
+
+ if (message.getHeader().getCall().getReplyTo() != null)
+ return deliverSync(message, _timeout);
+ else
+ {
+ deliverAsync(message);
+
+ return null;
+ }
+ }
/**
* Synchronously deliver the supplied message to the target service associated with this invoker instance.
@@ -126,7 +161,7 @@
*/
public Message deliverSync(Message message, long timeoutMillis) throws MessageDeliverException, RegistryException {
syncPickupDeliveryTimeout.set(timeoutMillis);
- return deliver(message, true);
+ return post(message, true);
}
/**
@@ -137,7 +172,7 @@
*/
public void deliverAsync(Message message) throws MessageDeliverException {
// Not interested in a reply
- deliver(message, false);
+ post(message, false);
}
/**
@@ -149,7 +184,7 @@
* without error, otherwise an exception is thrown.
* @throws MessageDeliverException Failed to deliver message, after trying all available EPRs.
*/
- private Message deliver(Message message, boolean synchronous) throws MessageDeliverException
+ private Message post(Message message, boolean synchronous) throws MessageDeliverException
{
int numberOfAttemps=0;
while (numberOfAttemps++ < 2) {
@@ -219,10 +254,12 @@
// Try delivering the message using the courier we just looked up....
if (courier != null) {
try {
- EPR replyToEPR = null;
+ EPR replyToEPR = message.getHeader().getCall().getReplyTo();
if (synchronous) {
- replyToEPR = getReplyToAddress(epr);
+ if (replyToEPR == null)
+ replyToEPR = getReplyToAddress(epr);
+
if(replyToEPR == null) {
logger.debug("Not using epr [" + epr + "] for Service [" + serviceCategory + ":" + serviceName + "]. No reply-to address available for synchronous response.");
return null;
@@ -263,7 +300,7 @@
protected EPR getReplyToAddress(EPR toEpr) throws ConfigurationException {
// This method just allows us to override Courier lookup during unit testing.
try {
- return CourierUtil.getDefaultReplyToEpr(toEpr);
+ return DefaultReplyTo.getReplyTo(toEpr);
} catch (CourierException e) {
throw new ConfigurationException("Bad configuration. Unable to support synchronous reply on 'to' address " + toEpr, e);
} catch (MalformedEPRException e) {
@@ -299,4 +336,6 @@
throw new MessageDeliverException(e.getMessage(), e);
}
}
+
+ private long _timeout;
}
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-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -38,6 +38,7 @@
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.util.DefaultReplyTo;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.couriers.Courier;
import org.jboss.soa.esb.couriers.CourierException;
@@ -174,8 +175,8 @@
replyEpr = null;
outMessage.getHeader().getCall().setTo(current);
if (_maxMillisForResponse > 0) {
- replyEpr = CourierUtil
- .getDefaultReplyToEpr(current);
+ replyEpr = DefaultReplyTo
+ .getReplyTo(current);
outMessage.getHeader().getCall().setReplyTo(
replyEpr);
}
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-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/Invoker.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -31,6 +31,7 @@
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.util.DefaultReplyTo;
import org.jboss.soa.esb.couriers.Courier;
import org.jboss.soa.esb.couriers.CourierException;
import org.jboss.soa.esb.couriers.CourierFactory;
@@ -131,7 +132,7 @@
if (waitForResponse)
{
if (null==call.getReplyTo())
- call.setReplyTo(CourierUtil.getDefaultReplyToEpr(call.getTo()));
+ call.setReplyTo(DefaultReplyTo.getReplyTo(call.getTo()));
receiver = CourierFactory.getPickupCourier(call.getReplyTo());
}
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-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -30,6 +30,7 @@
import org.apache.log4j.Logger;
import org.jboss.internal.soa.esb.couriers.PickUpOnlyCourier;
import org.jboss.soa.esb.addressing.eprs.FileEpr;
+import org.jboss.soa.esb.addressing.util.DefaultReplyTo;
import org.jboss.soa.esb.couriers.CourierFactory;
import org.jboss.soa.esb.couriers.CourierUtil;
import org.jboss.soa.esb.message.Message;
@@ -93,7 +94,7 @@
FileEpr toEpr = new FileEpr(WORKDIR.toURI().toString());
toEpr.setInputSuffix(initialSuffix);
toEpr.setPostDelete(true);
- FileEpr replyToEpr = (FileEpr)CourierUtil.getDefaultReplyToEpr(toEpr);
+ FileEpr replyToEpr = (FileEpr)DefaultReplyTo.getReplyTo(toEpr);
String text_1 = "Outgoing";
Message outgoingMsg = MessageFactory.getInstance().getMessage();
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-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprIntegrationTest.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -26,6 +26,7 @@
import org.apache.log4j.Logger;
import org.jboss.internal.soa.esb.couriers.PickUpOnlyCourier;
import org.jboss.soa.esb.addressing.eprs.FTPEpr;
+import org.jboss.soa.esb.addressing.util.DefaultReplyTo;
import org.jboss.soa.esb.common.tests.BaseTest;
import org.jboss.soa.esb.couriers.CourierFactory;
import org.jboss.soa.esb.couriers.CourierUtil;
@@ -94,7 +95,7 @@
FTPEpr toEpr = new FTPEpr(ftpUrl);
toEpr.setInputSuffix(initialSuffix);
toEpr.setPostDelete(true);
- FTPEpr replyToEpr = (FTPEpr)CourierUtil.getDefaultReplyToEpr(toEpr);
+ FTPEpr replyToEpr = (FTPEpr)DefaultReplyTo.getReplyTo(toEpr);
String text_1 = "Outgoing";
Message outgoingMsg = MessageFactory.getInstance().getMessage();
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultJdbcReplyToEprUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultJdbcReplyToEprUnitTest.java 2007-07-30 15:25:22 UTC (rev 13851)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultJdbcReplyToEprUnitTest.java 2007-07-30 15:29:28 UTC (rev 13852)
@@ -32,6 +32,7 @@
import org.apache.log4j.Logger;
import org.jboss.internal.soa.esb.couriers.PickUpOnlyCourier;
import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
+import org.jboss.soa.esb.addressing.util.DefaultReplyTo;
import org.jboss.soa.esb.couriers.CourierFactory;
import org.jboss.soa.esb.couriers.CourierUtil;
import org.jboss.soa.esb.helpers.persist.JdbcCleanConn;
@@ -124,7 +125,7 @@
{
// Send a Message that will be picked up by a listener, and specify replyTo
JDBCEpr toEpr = getEpr("foo");
- JDBCEpr replyToEpr = (JDBCEpr)CourierUtil.getDefaultReplyToEpr(toEpr);
+ JDBCEpr replyToEpr = (JDBCEpr)DefaultReplyTo.getReplyTo(toEpr);
String text_1 = "Outgoing";
Message outgoingMsg = MessageFactory.getInstance().getMessage();
More information about the jboss-svn-commits
mailing list