[jboss-svn-commits] JBL Code SVN: r11001 - in labs/jbossesb/workspace/mlittle: uri and 16 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Apr 16 08:25:28 EDT 2007
Author: mark.little at jboss.com
Date: 2007-04-16 08:25:28 -0400 (Mon, 16 Apr 2007)
New Revision: 11001
Added:
labs/jbossesb/workspace/mlittle/uri/
labs/jbossesb/workspace/mlittle/uri/Developer.txt
labs/jbossesb/workspace/mlittle/uri/product/services/jbpm/build.properties
Removed:
labs/jbossesb/workspace/mlittle/uri/Developer.txt
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/ant.bat
labs/jbossesb/workspace/mlittle/uri/product/services/jbpm/build.properties
Modified:
labs/jbossesb/workspace/mlittle/uri/product/build.xml
labs/jbossesb/workspace/mlittle/uri/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java
labs/jbossesb/workspace/mlittle/uri/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystemFactory.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprUnitTest.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/helpers/tests/FTPUnitTest.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/helpers/tests/HTTPUnitTest.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java
labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java
labs/jbossesb/workspace/mlittle/uri/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java
Log:
Copied: labs/jbossesb/workspace/mlittle/uri (from rev 10953, labs/jbossesb/trunk)
Deleted: labs/jbossesb/workspace/mlittle/uri/Developer.txt
===================================================================
--- labs/jbossesb/trunk/Developer.txt 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/Developer.txt 2007-04-16 12:25:28 UTC (rev 11001)
@@ -1,11 +0,0 @@
-The structure of the distribution is as follows:
-
-product: contains the JBossESB product codebase, including unit tests.
-qa: contains the QA infrastructure for JBossESB.
-
-Eclipse developers, there is IDE/JBossIDE directory with the .classpath. Copy that onto the root;
-it assumes you have the entire project checked out.
-
-If you have svn commit rights, then try to do your work within the workspace area first, before
-committing it to the trunk. We have a continuous integration build process that runs against the
-trunk whenever it is updated.
Copied: labs/jbossesb/workspace/mlittle/uri/Developer.txt (from rev 10955, labs/jbossesb/trunk/Developer.txt)
===================================================================
--- labs/jbossesb/workspace/mlittle/uri/Developer.txt (rev 0)
+++ labs/jbossesb/workspace/mlittle/uri/Developer.txt 2007-04-16 12:25:28 UTC (rev 11001)
@@ -0,0 +1,13 @@
+The structure of the distribution is as follows:
+
+product: contains the JBossESB product codebase, including unit tests.
+qa: contains the QA infrastructure for JBossESB.
+
+Eclipse developers, there is IDE/JBossIDE directory with the .classpath. Copy that onto the root;
+it assumes you have the entire project checked out.
+
+If you have svn commit rights, then try to do your work within the workspace area first, before
+committing it to the trunk. We have a continuous integration build process that runs against the
+trunk whenever it is updated.
+
+NOTE: you must ensure that all source files have the standard JBoss copyright at the start.
Modified: labs/jbossesb/workspace/mlittle/uri/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/build.xml 2007-04-16 12:25:28 UTC (rev 11001)
@@ -120,14 +120,14 @@
</target>
<!-- Test targets -->
- <target name="org.jboss.esb.test" depends="org.jboss.esb.compile">
+ <target name="org.jboss.esb.test" depends="org.jboss.esb.core.jar">
<echo message="Testing of modules, using unit and functional tests"/>
<ant dir="core" target="org.jboss.esb.core.test"/>
<ant dir="services" target="test"/>
</target>
<!-- Integration test targets -->
- <target name="org.jboss.esb.integration.test" depends="org.jboss.esb.compile">
+ <target name="org.jboss.esb.integration.test" depends="org.jboss.esb.core.jar">
<echo message="Testing of modules, using unit, functional and integration tests"/>
<ant dir="core" target="org.jboss.esb.core.integration.test"/>
</target>
@@ -244,7 +244,7 @@
<mkdir dir="${org.jboss.esb.installationdirectory}/tools/configeditor/resources"/>
<mkdir dir="${org.jboss.esb.installationdirectory}/tools/configeditor/dist"/>
- <copy file="tools/configeditor/editor/dist/jbossesb-config-editor.war" todir="${org.jboss.esb.installationdirectory}/tools/configeditor/dist"/>
+ <copy file="tools/configeditor/editor/dist/configapp.war" todir="${org.jboss.esb.installationdirectory}/tools/configeditor/dist"/>
<copy file="tools/configeditor/editor/resources/action-templates.xml" todir="${org.jboss.esb.installationdirectory}/tools/configeditor/resources"/>
<copy file="tools/configeditor/editor/README.txt" todir="${org.jboss.esb.installationdirectory}/tools/configeditor"/>
</target>
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -24,6 +24,7 @@
import java.io.File;
import java.net.MalformedURLException;
+import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Collection;
@@ -164,12 +165,12 @@
{
try
{
- URL url = new URL(tree.getRequiredAttribute(ListenerTagNames.URL_TAG));
- String protocol = url.getProtocol();
+ URI url = new URI(tree.getRequiredAttribute(ListenerTagNames.URL_TAG));
+ String protocol = url.getScheme();
if ("file".equals(protocol))
{
- if (!new File(url.getFile()).isDirectory())
+ if (!new File(url.getPath()).isDirectory())
throw new ConfigurationException("Attribute "
+ ListenerTagNames.URL_TAG
+ " must reference a directory");
@@ -205,7 +206,7 @@
}
if (null == errorDir)
{
- errorDir = url.getFile();
+ errorDir = url.getPath();
warnDefault(FileEpr.ERROR_DIR_TAG, errorDir);
}
if (null == errorSuffix)
@@ -236,7 +237,7 @@
}
if (null == postDir)
{
- postDir = url.getFile();
+ postDir = url.getPath();
warnDefault(FileEpr.POST_DIR_TAG, postDir);
}
if (null == postSuffix)
@@ -260,10 +261,6 @@
{
throw new ConfigurationException(ex);
}
- catch (MalformedURLException ex)
- {
- throw new ConfigurationException(ex);
- }
} // ________________________________
public static JDBCEpr jdbcEprFromElement(ConfigTree tree) throws ConfigurationException
Modified: labs/jbossesb/workspace/mlittle/uri/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-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -29,6 +29,7 @@
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Collection;
@@ -165,9 +166,9 @@
try
{
FileEpr fpr = (FileEpr) current;
- FileEpr newEpr = new FileEpr(fpr.getURL());
+ FileEpr newEpr = new FileEpr(fpr.getURI());
newEpr.setPostDelete(false);
- newEpr.setPostDirectory(fpr.getURL().getFile());
+ newEpr.setPostDirectory(fpr.getURI().getPath());
newEpr.setPostSuffix(fpr.getInputSuffix());
current = newEpr;
}
@@ -362,7 +363,7 @@
{
// INPUT directory and suffix (used for FileFilter)
String url = _config.getAttribute(ListenerTagNames.URL_TAG);
- String sInpDir = (null != url) ? new URL(url).getFile() :
+ String sInpDir = (null != url) ? new URI(url).getPath() :
ListenerUtil.obtainAtt(_config, ListenerTagNames.FILE_INPUT_DIR_TAG, null);
_inputDirectory = fileFromString(sInpDir);
seeIfOkToWorkOnDir(_inputDirectory);
@@ -431,7 +432,7 @@
{
throw ex;
}
- catch (MalformedURLException ex)
+ catch (URISyntaxException ex)
{
throw new ConfigurationException(ex);
}
Deleted: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/ant.bat
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/ant.bat 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/ant.bat 2007-04-16 12:25:28 UTC (rev 11001)
@@ -1,12 +0,0 @@
- at echo off
-set ANT_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-:doneStart
-%ANT_HOME%\bin\ant %ANT_CMD_LINE_ARGS%
-
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -25,10 +25,8 @@
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import java.util.UUID;
import javax.xml.parsers.ParserConfigurationException;
@@ -121,13 +119,13 @@
// Certain things can only be checked in local filesystem
try
{
- _url = _epr.getURL();
+ _url = _epr.getURI();
FileHandler handler = FileHandlerFactory.getInstance()
.getFileHandler(_epr);
if (handler instanceof LocalFileHandler)
{
_localFhandler = (LocalFileHandler) handler;
- File file = new File(_url.getFile());
+ File file = new File(_url.getPath());
if ((!_receiverOnly) && (!file.isDirectory()))
throw new CourierException(
"File for deliver EPR must be a directory (file name will be MessageID)");
@@ -148,10 +146,6 @@
return;
}
}
- catch (MalformedURLException e)
- {
- throw new MalformedEPRException(e);
- }
catch (URISyntaxException e)
{
throw new MalformedEPRException(e);
@@ -203,7 +197,7 @@
{
try
{
- File dir = new File(_url.getFile());
+ File dir = new File(_url.getPath());
tmpFile = CourierUtil.messageToLocalFile(dir, message);
String name = message.getHeader().getCall().getMessageID()
@@ -496,7 +490,7 @@
protected String _outputSuffix;
- protected URL _url;
+ protected URI _url;
protected boolean _receiverOnly;
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -25,6 +25,7 @@
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
@@ -49,15 +50,11 @@
{
_epr = epr;
- URL url = null;
+ URI url = null;
try
{
- url = _epr.getURL();
+ url = _epr.getURI();
}
- catch (MalformedURLException e)
- {
- throw new CourierException(e);
- }
catch (URISyntaxException e)
{
throw new CourierException(e);
@@ -76,7 +73,7 @@
_user = (sa.length < 1) ? "" : sa[0];
_passwd = (sa.length < 2) ? "" : sa[1];
- _remoteDir = url.getFile();
+ _remoteDir = url.getPath();
final String tmpdir = System.getProperty("java.io.tmpdir") ;
if ((_remoteDir == null) || (_remoteDir.equals("")))
@@ -84,7 +81,7 @@
_port = url.getPort();
if (_port < 0)
- _port = url.getDefaultPort();
+ _port = 0;
_localDir = ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.FTP_LOCALDIR, tmpdir);
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -6,7 +6,6 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URISyntaxException;
import org.apache.log4j.Logger;
@@ -67,7 +66,7 @@
{
try
{
- File dir = new File(_epr.getURL().getFile());
+ File dir = new File(_epr.getURI().getPath());
if (!dir.isDirectory())
throw new CourierException(
"Can't get file list if URL is not a directory");
@@ -79,10 +78,6 @@
{
throw new CourierException(e);
}
- catch (MalformedURLException e)
- {
- throw new CourierException(e);
- }
// Just in case... (comment next line out to see if you're missing
// something)
catch (Exception e)
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -24,6 +24,7 @@
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.UnknownHostException;
@@ -112,15 +113,11 @@
{
m_oEpr = p_oP;
- URL url = null;
+ URI url = null;
try
{
- url = m_oEpr.getURL();
+ url = m_oEpr.getURI();
}
- catch (MalformedURLException e)
- {
- throw new ConfigurationException(e);
- }
catch (URISyntaxException e)
{
throw new ConfigurationException(e);
@@ -137,7 +134,7 @@
m_sUser = (sa.length < 1) ? "" : sa[0];
m_sPasswd = (sa.length < 2) ? "" : sa[1];
- m_sRemoteDir = url.getFile();
+ m_sRemoteDir = url.getPath();
final String tmpdir = System.getProperty("java.io.tmpdir");
if ((m_sRemoteDir == null) || (m_sRemoteDir.equals("")))
@@ -146,8 +143,20 @@
Environment.FTP_REMOTEDIR, tmpdir);
m_iPort = url.getPort();
- if (m_iPort < 0) m_iPort = url.getDefaultPort();
-
+
+ if (m_iPort < 0)
+ {
+ try
+ {
+ if (m_iPort < 0)
+ m_iPort = new URL("ftp://").getDefaultPort();
+ }
+ catch (MalformedURLException ex)
+ {
+ throw new ConfigurationException(ex);
+ }
+ }
+
m_sLocalDir = ModulePropertyManager.getPropertyManager(
ModulePropertyManager.TRANSPORTS_MODULE).getProperty(
Environment.FTP_LOCALDIR, tmpdir);
@@ -181,14 +190,14 @@
private void checkParms () throws ConfigurationException
{
String att = m_oParms.getAttribute(FileEpr.URL_TAG);
- URL url = null;
+ URI url = null;
try
{
if (att != null)
- url = new URL(att);
+ url = new URI(att);
}
- catch (MalformedURLException ex)
+ catch (URISyntaxException ex)
{
throw new ConfigurationException(ex);
}
@@ -207,7 +216,7 @@
if (null == m_sPasswd)
throw new ConfigurationException("No password specified for FTP");
- m_sRemoteDir = (null != url) ? url.getFile() : m_oParms
+ m_sRemoteDir = (null != url) ? url.getPath() : m_oParms
.getAttribute(PARMS_REMOTE_DIR);
if (null == m_sRemoteDir) m_sRemoteDir = "";
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -27,9 +27,8 @@
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
+import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
@@ -81,8 +80,8 @@
private ChannelSftp m_oSftpChannel = null;
- // TODO Add support for certificate. Not for GA though.
- private URL m_oCertificate = null;
+ // TODO Add support for certificate.
+ private URI m_oCertificate = null;
@SuppressWarnings("unused")
private boolean m_bConnected, m_bPassive;
@@ -124,11 +123,9 @@
m_oEpr = p_oP;
- URL url = null;
+ URI url = null;
try {
- url = m_oEpr.getURL();
- } catch (MalformedURLException e) {
- throw new RemoteFileSystemException(e);
+ url = m_oEpr.getURI();
} catch (URISyntaxException e) {
throw new RemoteFileSystemException(e);
}
@@ -146,7 +143,7 @@
m_sUser = (sa.length < 1) ? "" : sa[0];
m_sPasswd = (sa.length < 2) ? "" : sa[1];
- m_sRemoteDir = url.getFile();
+ m_sRemoteDir = url.getPath();
final String tmpdir = System.getProperty("java.io.tmpdir");
if ((m_sRemoteDir == null) || (m_sRemoteDir.equals("")))
@@ -155,8 +152,6 @@
Environment.FTP_REMOTEDIR, tmpdir);
m_iPort = url.getPort();
- if (m_iPort < 0)
- m_iPort = url.getDefaultPort();
m_sLocalDir = ModulePropertyManager.getPropertyManager(
ModulePropertyManager.TRANSPORTS_MODULE).getProperty(
@@ -174,20 +169,14 @@
try
{
- m_oCertificate = m_oEpr.getCertificateURL();
+ m_oCertificate = m_oEpr.getCertificateURI();
}
- catch (MalformedURLException ex)
+ catch (URISyntaxException ex)
{
_logger.error(ex);
throw new ConfigurationException(ex);
}
- catch (URISyntaxException e)
- {
- _logger.warn(e);
-
- throw new ConfigurationException(e);
- }
// TODO there is still a bit of space for improvements here.
configTreeFromEpr();
@@ -220,8 +209,11 @@
{
try
{
- session = m_oJSch.getSession(m_sUser, m_sFtpServer, m_iPort);
-
+ if (m_iPort < 0)
+ session = m_oJSch.getSession(m_sUser, m_sFtpServer);
+ else
+ session = m_oJSch.getSession(m_sUser, m_sFtpServer, m_iPort);
+
UserInfo ui = new SecureFtpUserInfo(m_sPasswd);
session.setUserInfo(ui);
@@ -304,9 +296,9 @@
{
try
{
- m_oCertificate = new URL(certificate);
+ m_oCertificate = new URI(certificate);
}
- catch (MalformedURLException ex)
+ catch (URISyntaxException ex)
{
throw new ConfigurationException(ex);
}
Modified: labs/jbossesb/workspace/mlittle/uri/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-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFileReplyToEpr.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -20,7 +20,6 @@
package org.jboss.soa.esb.addressing.eprs;
-import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.util.UUID;
@@ -28,9 +27,9 @@
{
public DefaultFileReplyToEpr (FileEpr epr)
- throws URISyntaxException, MalformedURLException
+ throws URISyntaxException
{
- super(epr.getURL());
+ super(epr.getURI());
String suffix = uniqueFileSuffix(epr);
setInputSuffix(suffix);
setPostSuffix(suffix);
Modified: labs/jbossesb/workspace/mlittle/uri/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-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultFtpReplyToEpr.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -20,16 +20,15 @@
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
+ throws URISyntaxException
{
- super(epr.getURL());
+ super(epr.getURI());
String suffix = DefaultFileReplyToEpr.uniqueFileSuffix(epr);
setInputSuffix(suffix);
setPostSuffix(suffix);
Modified: labs/jbossesb/workspace/mlittle/uri/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 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/DefaultSftpReplyToEpr.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -20,23 +20,22 @@
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
+ throws URISyntaxException
{
- super(epr.getURL());
+ super(epr.getURI());
String suffix = DefaultFileReplyToEpr.uniqueFileSuffix(epr);
setInputSuffix(suffix);
setPostSuffix(suffix);
setPostDelete(true);
setPassive(epr.getPassive());
- setCertificateURL(epr.getCertificateURL());
+ setCertificateURI(epr.getCertificateURI());
}
}
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -26,10 +26,8 @@
* This class represents the endpoint reference for services.
*/
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.PortReference;
@@ -99,9 +97,9 @@
}
}
- public FTPEpr (URL url) throws URISyntaxException
+ public FTPEpr (URI url) throws URISyntaxException
{
- super(new URI(url.toString()));
+ super(url);
}
public FTPEpr (String url) throws URISyntaxException
@@ -115,7 +113,7 @@
* @param url the address.
*/
- public final void setURL (URL url)
+ public final void setURI (URI url)
{
super.setAddr(new PortReference(url.toString()));
}
@@ -127,9 +125,9 @@
* @throws URISyntaxException thrown if the address is invalid.
*/
- public final URL getURL () throws MalformedURLException, URISyntaxException
+ public final URI getURI () throws URISyntaxException
{
- return new URL(super.getAddr().getAddress());
+ return new URI(super.getAddr().getAddress());
}
/**
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -26,10 +26,8 @@
* This class represents the endpoint reference for services.
*/
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.PortReference;
@@ -125,9 +123,9 @@
}
}
- public FileEpr (URL url) throws URISyntaxException
+ public FileEpr (URI url) throws URISyntaxException
{
- super(new URI(url.toString()));
+ super(url);
}
public FileEpr (String url) throws URISyntaxException
@@ -141,7 +139,7 @@
* @param url the address.
*/
- public void setURL (URL url)
+ public void setURI (URI url)
{
super.setAddr(new PortReference(url.toString()));
}
@@ -153,9 +151,9 @@
* @throws URISyntaxException thrown if the address is invalid.
*/
- public URL getURL () throws MalformedURLException, URISyntaxException
+ public URI getURI () throws URISyntaxException
{
- return new URL(super.getAddr().getAddress());
+ return new URI(super.getAddr().getAddress());
}
/**
@@ -397,11 +395,6 @@
{
return _type;
}
-
- protected FileEpr (URI uri)
- {
- super(uri);
- }
private boolean inputSet = false;
private boolean workSet = false;
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -29,7 +29,6 @@
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.PortReference;
@@ -55,7 +54,7 @@
copy(epr);
}
- public HTTPEpr (URL url) throws URISyntaxException
+ public HTTPEpr (URI url) throws URISyntaxException
{
super(new URI(url.toString()));
}
@@ -71,7 +70,7 @@
* @param url the address.
*/
- public final void setURL (URL url)
+ public final void setURI (URI url)
{
super.setAddr(new PortReference(url.toString()));
}
@@ -83,9 +82,9 @@
* @throws URISyntaxException thrown if the address is invalid.
*/
- public final URL getURL () throws MalformedURLException, URISyntaxException
+ public final URI getURI () throws MalformedURLException, URISyntaxException
{
- return new URL(super.getAddr().getAddress());
+ return new URI(super.getAddr().getAddress());
}
public static final URI type ()
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -25,10 +25,8 @@
* This class represents the endpoint reference for services.
*/
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.XMLUtil;
@@ -82,23 +80,23 @@
}
}
- public SFTPEpr(URL url) throws URISyntaxException
+ public SFTPEpr(URI url) throws URISyntaxException
{
super(url);
}
- public SFTPEpr(URL url, URL cert) throws URISyntaxException
+ public SFTPEpr(URI url, URI cert) throws URISyntaxException
{
super(url);
- setCertificateURL(cert);
+ setCertificateURI(cert);
}
- public SFTPEpr(String url, String cert) throws URISyntaxException, MalformedURLException
+ public SFTPEpr(String url, String cert) throws URISyntaxException
{
super(url);
- setCertificateURL(new URL(cert));
+ setCertificateURI(new URI(cert));
}
/**
@@ -110,7 +108,7 @@
* thrown if this EPR is malformed.
*/
- public final void setCertificateURL(URL cert) throws URISyntaxException
+ public final void setCertificateURI(URI cert) throws URISyntaxException
{
if (cert == null)
throw new IllegalArgumentException();
@@ -128,13 +126,12 @@
* thrown if this EPR is malformed.
*/
- public final URL getCertificateURL () throws URISyntaxException,
- MalformedURLException
+ public final URI getCertificateURI () throws URISyntaxException
{
String cert = getAddr().getExtensionValue(CERTIFICATE_TAG);
if (cert != null)
- return new URL(cert);
+ return new URI(cert);
else
return null;
}
Modified: labs/jbossesb/workspace/mlittle/uri/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-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -32,7 +32,6 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.io.StreamCorruptedException;
-import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.util.Properties;
@@ -70,7 +69,7 @@
* CourierException
*/
public static EPR getDefaultReplyToEpr(EPR toEpr)
- throws CourierException, MalformedEPRException
+ throws CourierException
{
try
{
@@ -89,13 +88,9 @@
// if(toEpr instanceof JDBCEpr)
// return new DefaultJdbcReplyToEpr((JDBCEpr)toEpr);
}
- catch (MalformedURLException ex)
- {
- throw new MalformedEPRException(ex);
- }
catch (URISyntaxException ex)
{
- throw new MalformedEPRException(ex);
+ throw new CourierException(ex);
}
throw new CourierException("Unsupported temporary reply to EPR "
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystemFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystemFactory.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystemFactory.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -23,6 +23,7 @@
package org.jboss.soa.esb.util;
import java.net.MalformedURLException;
+import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
@@ -53,21 +54,19 @@
public static RemoteFileSystem getRemoteFileSystem(FTPEpr p_oEpr,
boolean p_bConnect) throws RemoteFileSystemException
{
- URL url = null;
+ URI url = null;
try
{
- url = p_oEpr.getURL();
- if (url.getProtocol().equals(RemoteFileSystem.FTP_PROTOCOL))
+ url = p_oEpr.getURI();
+ if (url.getScheme().equals(RemoteFileSystem.FTP_PROTOCOL))
return new EdtFtpImpl((FTPEpr) p_oEpr, p_bConnect);
- else if (url.getProtocol().equals(RemoteFileSystem.SFTP_PROTOCOL))
+ else if (url.getScheme().equals(RemoteFileSystem.SFTP_PROTOCOL))
return new SecureFtpImpl((SFTPEpr) p_oEpr, p_bConnect);
- } catch (MalformedURLException e)
+ }
+ catch (URISyntaxException e)
{
throw new RemoteFileSystemException(e);
- } catch (URISyntaxException e)
- {
- throw new RemoteFileSystemException(e);
} catch (Exception e)
{
throw new RemoteFileSystemException(e);
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -106,7 +106,7 @@
String contents = "This is the text that travels in the Message body";
// toEpr for files must be a directory
- FileEpr toEpr = new FileEpr(_tmpDir.toURL());
+ FileEpr toEpr = new FileEpr(new URI(_tmpDir.toURL().toString()));
// FileEpr uses the postSuffix as the extension for messages delivered (default = ".esbMessage")
toEpr.setPostSuffix(TEST_SUFFIX);
@@ -123,7 +123,7 @@
Assert.assertTrue(theFile.exists());
_logger.info("Message file "+theFile.toString()+" successfully created");
- FileEpr fromEpr = new FileEpr(toEpr.getURL());
+ FileEpr fromEpr = new FileEpr(toEpr.getURI());
fromEpr.setInputSuffix(TEST_SUFFIX);
fromEpr.setPostSuffix(DONE_SUFFIX);
@@ -148,7 +148,7 @@
String contents = "This is the text that travels in the Message body";
// toEpr for files must be a directory
- FileEpr toEpr = new FileEpr(_tmpDir.toURL());
+ FileEpr toEpr = new FileEpr(new URI(_tmpDir.toURL().toString()));
// FileEpr uses the postSuffix as the extension for messages delivered (default = ".esbMessage")
toEpr.setPostSuffix(TEST_SUFFIX);
@@ -165,7 +165,7 @@
Assert.assertTrue(theFile.exists());
_logger.info("Message file "+theFile.toString()+" successfully created");
- FileEpr fromEpr = new FileEpr(toEpr.getURL());
+ FileEpr fromEpr = new FileEpr(toEpr.getURI());
fromEpr.setInputSuffix(TEST_SUFFIX);
// setting postdelete to true will delete input Message files, if they were picked up
fromEpr.setPostDelete(true);
@@ -200,7 +200,7 @@
Assert.assertTrue(theFile.exists());
_logger.info("Invalid Message file "+theFile.toString()+" successfully created");
- FileEpr fromEpr = new FileEpr(_tmpDir.toURL()) ;
+ FileEpr fromEpr = new FileEpr(new URI(_tmpDir.toURL().toString())) ;
fromEpr.setInputSuffix(TEST_SUFFIX);
fromEpr.setPostSuffix(DONE_SUFFIX);
fromEpr.setErrorSuffix(ERROR_SUFFIX);
@@ -229,7 +229,7 @@
Assert.assertTrue(theFile.exists());
_logger.info("Invalid Message file "+theFile.toString()+" successfully created");
- FileEpr fromEpr = new FileEpr(_tmpDir.toURL());
+ FileEpr fromEpr = new FileEpr(new URI(_tmpDir.toURL().toString()));
fromEpr.setInputSuffix(TEST_SUFFIX);
fromEpr.setPostSuffix(DONE_SUFFIX);
fromEpr.setErrorSuffix(ERROR_SUFFIX);
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -104,7 +104,7 @@
CourierUtil.deliverMessage(outgoingMsg);
// Mock a service that picks up the original message and replies
- FileEpr serviceEpr = new FileEpr(toEpr.getURL());
+ FileEpr serviceEpr = new FileEpr(toEpr.getURI());
serviceEpr.setInputSuffix(initialSuffix);
serviceEpr.setPostDelete(true);
PickUpOnlyCourier listener = CourierFactory.getPickupCourier(serviceEpr);
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprUnitTest.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprUnitTest.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -102,7 +102,7 @@
CourierUtil.deliverMessage(outgoingMsg);
// Mock a service that picks up the original message and replies
- FTPEpr serviceEpr = new FTPEpr(toEpr.getURL());
+ FTPEpr serviceEpr = new FTPEpr(toEpr.getURI());
serviceEpr.setInputSuffix(initialSuffix);
serviceEpr.setPostDelete(true);
PickUpOnlyCourier listener = CourierFactory.getPickupCourier(serviceEpr);
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/helpers/tests/FTPUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/helpers/tests/FTPUnitTest.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/helpers/tests/FTPUnitTest.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -53,9 +53,9 @@
{
FTPEpr ftp = new FTPEpr("ftp://foo.com");
- assertEquals(ftp.getURL().toString(), "ftp://foo.com");
- assertEquals(ftp.getURL().getHost(), "foo.com");
- assertEquals(ftp.getURL().getProtocol(), "ftp");
+ assertEquals(ftp.getURI().toString(), "ftp://foo.com");
+ assertEquals(ftp.getURI().getHost(), "foo.com");
+ assertEquals(ftp.getURI().getScheme(), "ftp");
ftp.setPassword("foobar");
assertEquals(ftp.getPassword(), "foobar");
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/helpers/tests/HTTPUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/helpers/tests/HTTPUnitTest.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/helpers/tests/HTTPUnitTest.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -22,7 +22,7 @@
package org.jboss.soa.esb.addressing.helpers.tests;
-import java.net.URL;
+import java.net.URI;
import junit.framework.TestCase;
@@ -57,12 +57,12 @@
String url1 = "http://www.local.bar:8080";
HTTPEpr epr = new HTTPEpr(url1);
- assertEquals(epr.getURL().toString(), url1);
+ assertEquals(epr.getURI().toString(), url1);
String url2 = "http://foo.com";
- epr.setURL(new URL(url2));
+ epr.setURI(new URI(url2));
- assertEquals(epr.getURL().toString(), url2);
+ assertEquals(epr.getURI().toString(), url2);
}
catch (Exception ex)
{
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -26,6 +26,7 @@
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.net.URI;
import java.net.URL;
import junit.framework.TestCase;
@@ -463,7 +464,7 @@
assertEquals(theEpr instanceof HTTPEpr, true);
- assertEquals(((HTTPEpr) theEpr).getURL().toString(), "http://www.foo.bar");
+ assertEquals(((HTTPEpr) theEpr).getURI().toString(), "http://www.foo.bar");
}
catch (Exception ex)
{
@@ -631,9 +632,9 @@
try
{
- SFTPEpr epr = new SFTPEpr(new URL("http://www.foo.bar"), new URL("http://www.bar.foo"));
+ SFTPEpr epr = new SFTPEpr(new URI("http://www.foo.bar"), new URI("http://www.bar.foo"));
- assertEquals(epr.getCertificateURL().toString(), "http://www.bar.foo");
+ assertEquals(epr.getCertificateURI().toString(), "http://www.bar.foo");
msg.getHeader().getCall().setTo(epr);
@@ -654,7 +655,7 @@
assertEquals(theEpr instanceof SFTPEpr, true);
- assertEquals(((SFTPEpr) theEpr).getCertificateURL().toString(), "http://www.bar.foo");
+ assertEquals(((SFTPEpr) theEpr).getCertificateURI().toString(), "http://www.bar.foo");
}
catch (Exception ex)
{
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -24,6 +24,7 @@
import java.io.StringReader;
import java.io.StringWriter;
+import java.net.URI;
import java.net.URL;
import javax.xml.parsers.DocumentBuilder;
@@ -397,7 +398,7 @@
assertEquals(theEpr instanceof HTTPEpr, true);
- assertEquals(((HTTPEpr) theEpr).getURL().toString(), "http://www.foo.bar");
+ assertEquals(((HTTPEpr) theEpr).getURI().toString(), "http://www.foo.bar");
}
catch (Exception ex)
{
@@ -523,9 +524,9 @@
try
{
- SFTPEpr epr = new SFTPEpr(new URL("http://www.foo.bar"), new URL("http://www.bar.foo"));
+ SFTPEpr epr = new SFTPEpr(new URI("http://www.foo.bar"), new URI("http://www.bar.foo"));
- assertEquals(epr.getCertificateURL().toString(), "http://www.bar.foo");
+ assertEquals(epr.getCertificateURI().toString(), "http://www.bar.foo");
msg.getHeader().getCall().setTo(epr);
@@ -538,7 +539,7 @@
assertEquals(theEpr instanceof SFTPEpr, true);
- assertEquals(((SFTPEpr) theEpr).getCertificateURL().toString(), "http://www.bar.foo");
+ assertEquals(((SFTPEpr) theEpr).getCertificateURI().toString(), "http://www.bar.foo");
}
catch (Exception ex)
{
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java 2007-04-16 12:25:28 UTC (rev 11001)
@@ -125,17 +125,14 @@
if (epr instanceof FileEpr) {
try {
FileEpr fileEpr = (FileEpr) epr;
- FileEpr newEpr = new FileEpr(fileEpr.getURL());
+ FileEpr newEpr = new FileEpr(fileEpr.getURI());
newEpr.setPostDelete(false);
- newEpr.setPostDirectory(fileEpr.getURL().getFile());
+ newEpr.setPostDirectory(fileEpr.getURI().getPath());
newEpr.setPostSuffix(fileEpr.getInputSuffix());
epr = newEpr;
} catch (URISyntaxException usex) {
logger.log(Priority.ERROR, "Malformed epr while setting :"
+ epr, usex);
- } catch (MalformedURLException muex) {
- logger.log(Priority.ERROR, "Malformed epr:"
- + epr, muex);
}
}
// Give the message to the courier
Deleted: labs/jbossesb/workspace/mlittle/uri/product/services/jbpm/build.properties
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/build.properties 2007-04-12 23:13:13 UTC (rev 10953)
+++ labs/jbossesb/workspace/mlittle/uri/product/services/jbpm/build.properties 2007-04-16 12:25:28 UTC (rev 11001)
@@ -1 +0,0 @@
-esb.product.lib.dir=../../../product/build/jbossesb/lib
\ No newline at end of file
Copied: labs/jbossesb/workspace/mlittle/uri/product/services/jbpm/build.properties (from rev 10954, labs/jbossesb/trunk/product/services/jbpm/build.properties)
===================================================================
--- labs/jbossesb/workspace/mlittle/uri/product/services/jbpm/build.properties (rev 0)
+++ labs/jbossesb/workspace/mlittle/uri/product/services/jbpm/build.properties 2007-04-16 12:25:28 UTC (rev 11001)
@@ -0,0 +1 @@
+esb.product.lib.dir=../../../product/build/jbossesb/lib
\ No newline at end of file
More information about the jboss-svn-commits
mailing list