[jboss-svn-commits] JBL Code SVN: r13666 - in labs/jbossesb/workspace/mlittle/uri/product: core/listeners/src/org/jboss/soa/esb/listeners and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 20 05:19:22 EDT 2007
Author: b_georges
Date: 2007-07-20 05:19:22 -0400 (Fri, 20 Jul 2007)
New Revision: 13666
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/soa/esb/util/RemoteFileSystemFactory.java
labs/jbossesb/workspace/mlittle/uri/product/install/deployment.properties-example
labs/jbossesb/workspace/mlittle/uri/product/product.properties
labs/jbossesb/workspace/mlittle/uri/product/tools/configeditor/editor/dist/jbossesb-config-editor.war
Log:
Validating URI changes from Mark, adapated ListenerUtil to support sftp.
Modified: labs/jbossesb/workspace/mlittle/uri/product/build.xml
===================================================================
--- labs/jbossesb/workspace/mlittle/uri/product/build.xml 2007-07-20 05:25:05 UTC (rev 13665)
+++ labs/jbossesb/workspace/mlittle/uri/product/build.xml 2007-07-20 09:19:22 UTC (rev 13666)
@@ -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/configapp.war" todir="${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/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/workspace/mlittle/uri/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2007-07-20 05:25:05 UTC (rev 13665)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2007-07-20 09:19:22 UTC (rev 13666)
@@ -23,10 +23,8 @@
package org.jboss.soa.esb.listeners;
import java.io.File;
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import java.util.Collection;
import java.util.Properties;
import java.util.Set;
@@ -41,6 +39,7 @@
import org.jboss.soa.esb.addressing.eprs.FileEpr;
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.couriers.Courier;
import org.jboss.soa.esb.couriers.CourierException;
import org.jboss.soa.esb.couriers.CourierFactory;
@@ -103,6 +102,8 @@
return fileEprFromElement(tree);
if ("ftp".equals(protocol))
return fileEprFromElement(tree);
+ if ("sftp".equals(protocol))
+ return fileEprFromElement(tree);
if ("jdbc".equals(protocol))
return jdbcEprFromElement(tree);
}
@@ -167,7 +168,8 @@
{
URI url = new URI(tree.getRequiredAttribute(ListenerTagNames.URL_TAG));
String protocol = url.getScheme();
-
+ _logger.debug("uri : "+ url.toString());
+
if ("file".equals(protocol))
{
if (!new File(url.getPath()).isDirectory())
@@ -176,12 +178,26 @@
+ " must reference a directory");
}
- FileEpr epr = ("file".equals(protocol)) ? new FileEpr(url) : ("ftp"
- .equals(protocol)) ? new FTPEpr(url) : null;
- if (null == epr)
+ FileEpr epr = null;
+ if ("file".equals(protocol))
+ {
+ epr = new FileEpr(url);
+ }
+ else if ("ftp".equals(protocol))
+ {
+ epr = new FTPEpr(url);
+ }
+ else if ("sftp".equals(protocol))
+ {
+ epr = new SFTPEpr(url);
+ }
+ else
+ {
+ // (null == epr)
throw new ConfigurationException("Unsupported file protocol : "
+ protocol);
-
+ }
+
String inputSuffix = tree.getAttribute(FileEpr.INPUT_SUFFIX_TAG);
if (!Util.isNullString(inputSuffix))
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
===================================================================
--- labs/jbossesb/workspace/mlittle/uri/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java 2007-07-20 05:25:05 UTC (rev 13665)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java 2007-07-20 09:19:22 UTC (rev 13666)
@@ -27,10 +27,8 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
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;
import org.apache.log4j.Logger;
Modified: labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystemFactory.java
===================================================================
--- labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystemFactory.java 2007-07-20 05:25:05 UTC (rev 13665)
+++ labs/jbossesb/workspace/mlittle/uri/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystemFactory.java 2007-07-20 09:19:22 UTC (rev 13666)
@@ -22,11 +22,8 @@
package org.jboss.soa.esb.util;
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
-
import org.jboss.internal.soa.esb.util.EdtFtpImpl;
import org.jboss.internal.soa.esb.util.SecureFtpImpl;
import org.jboss.soa.esb.addressing.eprs.FTPEpr;
@@ -43,7 +40,7 @@
/**
* This method returns a RemoteFileSystem Implementation at runtime.
* The implementation depends on which protocol is specified in the
- * URL of the RemoteFileSystem.
+ * URI of the RemoteFileSystem.
* We currently support "ftp" and "sftp"
* Refactoring related to JIRA Tasks: JBESB-127 and JBESB-197
* @param p_oEpr
Modified: labs/jbossesb/workspace/mlittle/uri/product/install/deployment.properties-example
===================================================================
--- labs/jbossesb/workspace/mlittle/uri/product/install/deployment.properties-example 2007-07-20 05:25:05 UTC (rev 13665)
+++ labs/jbossesb/workspace/mlittle/uri/product/install/deployment.properties-example 2007-07-20 09:19:22 UTC (rev 13666)
@@ -21,7 +21,7 @@
######################################################################
# Server home directory
# (By default the 'ant install' task will create this directory.)
-org.jboss.esb.server.home=/jbossesb-server-4.2.MP1
+org.jboss.esb.server.home=/Applications/jboss-4.0.5.GA
# the instance of jboss you are running (default)
org.jboss.esb.appserver.config=default
######################################################################
Modified: labs/jbossesb/workspace/mlittle/uri/product/product.properties
===================================================================
--- labs/jbossesb/workspace/mlittle/uri/product/product.properties 2007-07-20 05:25:05 UTC (rev 13665)
+++ labs/jbossesb/workspace/mlittle/uri/product/product.properties 2007-07-20 09:19:22 UTC (rev 13666)
@@ -3,14 +3,14 @@
#
org.jboss.esb.build.deprecation=yes
org.jboss.esb.build.optimize=off
-org.jboss.esb.build.frominstall=no
+org.jboss.esb.build.frominstall=yes
org.jboss.esb.build.debug=yes
org.jboss.esb.build.tests=no
org.jboss.esb.alltests.build=yes
-org.jboss.esb.jboss.home=.
+org.jboss.esb.jboss.home=/Applications/jboss-4.2.0.CR1
-org.jboss.esb.test.ftp.hostname=ftp.ncl.jboss.com
-org.jboss.esb.test.ftp.user=kurt
-org.jboss.esb.test.ftp.pwd=password
-org.jboss.esb.test.ftp.dir=/home/kurt
\ No newline at end of file
+org.jboss.esb.test.ftp.hostname=localhost
+org.jboss.esb.test.ftp.user=esb
+org.jboss.esb.test.ftp.pwd=esb
+org.jboss.esb.test.ftp.dir=/Users/esb
Modified: labs/jbossesb/workspace/mlittle/uri/product/tools/configeditor/editor/dist/jbossesb-config-editor.war
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list