[jboss-svn-commits] JBL Code SVN: r13644 - in labs/jbossesb/trunk/product: lib/ext and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 19 15:23:03 EDT 2007
Author: kurt.stam at jboss.com
Date: 2007-07-19 15:23:03 -0400 (Thu, 19 Jul 2007)
New Revision: 13644
Added:
labs/jbossesb/trunk/product/lib/ext/jboss-test.jar
labs/jbossesb/trunk/product/rosetta/tests/resources/etc/ftpd.properties
labs/jbossesb/trunk/product/rosetta/tests/resources/etc/jndi.properties
Modified:
labs/jbossesb/trunk/product/product.properties
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
labs/jbossesb/trunk/product/rosetta/tests/build.xml
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.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/common/tests/BaseTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java
labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/
Log:
JBESB-572, adding optional -per test- deployment of the ftp-server to a running jbossas, so the integration tests can run against it.
Added: labs/jbossesb/trunk/product/lib/ext/jboss-test.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/lib/ext/jboss-test.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/trunk/product/product.properties
===================================================================
--- labs/jbossesb/trunk/product/product.properties 2007-07-19 19:12:44 UTC (rev 13643)
+++ labs/jbossesb/trunk/product/product.properties 2007-07-19 19:23:03 UTC (rev 13644)
@@ -10,7 +10,7 @@
org.jboss.esb.alltests.build=yes
org.jboss.esb.jboss.home=.
-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:10021
+org.jboss.esb.test.ftp.user=esb
+org.jboss.esb.test.ftp.pwd=esb
+org.jboss.esb.test.ftp.dir=/
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2007-07-19 19:12:44 UTC (rev 13643)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2007-07-19 19:23:03 UTC (rev 13644)
@@ -151,7 +151,8 @@
{
try
{
- URL url = new URL(tree.getRequiredAttribute(ListenerTagNames.URL_TAG));
+ String urlString = tree.getRequiredAttribute(ListenerTagNames.URL_TAG);
+ URL url = new URL(urlString);
String protocol = url.getProtocol();
if ("file".equals(protocol))
Modified: labs/jbossesb/trunk/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/build.xml 2007-07-19 19:12:44 UTC (rev 13643)
+++ labs/jbossesb/trunk/product/rosetta/tests/build.xml 2007-07-19 19:23:03 UTC (rev 13644)
@@ -2,6 +2,8 @@
<project name="build.rosetta.tests" default="org.jboss.esb.rosetta.tests.compile" basedir=".">
<property name="org.jboss.esb.internal.dest" location="../../../build"/>
+ <property name="org.jboss.esb.deploy.dir" location="${org.jboss.esb.internal.dest}/deploy"/>
+ <property name="org.jboss.esb.test.log.dir" location="${org.jboss.esb.internal.dest}/log"/>
<property name="org.jboss.esb.module.src.dir" location="../src"/>
<property name="org.jboss.esb.module.classes.dir" location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
<property name="org.jboss.esb.module.tests.src.dir" location="src"/>
@@ -39,17 +41,30 @@
</path>
<target name="org.jboss.esb.tests.init">
+
<tstamp>
<format property="TODAY" pattern="dd-MM-yy"/>
</tstamp>
<mkdir dir="${org.jboss.esb.tests.classes.dir}"/>
<mkdir dir="${org.jboss.esb.tests.report.dir}"/>
+ <mkdir dir="${org.jboss.esb.deploy.dir}/ftp-server.sar"/>
+ <mkdir dir="${org.jboss.esb.test.log.dir}"/>
+ <copy todir="${org.jboss.esb.deploy.dir}/ftp-server.sar">
+ <fileset dir="../../ftp/build/ftp-server.sar/"/>
+ </copy>
+ <copy todir="${org.jboss.esb.deploy.dir}/ftp-server.sar/res/conf" overwrite="true">
+ <fileset dir="resources/etc/">
+ <include name="ftpd.properties" />
+ </fileset>
+ </copy>
</target>
<target name="clean">
<delete dir="${org.jboss.esb.tests.classes.dir}"/>
<delete file="TESTS-TestSuites.xml"/>
+ <delete dir="${org.jboss.esb.deploy.dir}"/>
+ <delete dir="${org.jboss.esb.test.log.dir}"/>
</target>
<target name="org.jboss.esb.rosetta.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
@@ -197,6 +212,8 @@
<batchtest todir="${org.jboss.esb.tests.report.dir}">
<fileset dir="${org.jboss.esb.module.tests.src.dir}">
<include name="**/**IntegrationTest.java"/>
+ <!-- Daniel, takes this back out when fixed -->
+ <exclude name="org/jboss/soa/esb/listeners/gateway/**/**IntegrationTest.java" />
<include name="**/**UnitTest.java"/>
<include name="**/**FuncTest.java"/>
</fileset>
@@ -214,7 +231,13 @@
</classpath>
<!-- emma jvm args -->
<jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
-
+
+ <sysproperty key="jbosstest.deploy.dir" value="${org.jboss.esb.deploy.dir}"/>
+ <sysproperty key="build.testlog" value="${org.jboss.esb.test.log.dir}"/>
+ <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
+ <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
+ <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+
<!--
<sysproperty key="org.jboss.esb.test.db.driver" value="${org.jboss.esb.test.db.driver}"/>
<sysproperty key="org.jboss.esb.test.db.url" value="${org.jboss.esb.test.db.url}"/>
@@ -225,7 +248,7 @@
<sysproperty key="org.jboss.esb.test.ftp.user" value="${org.jboss.esb.test.ftp.user}"/>
<sysproperty key="org.jboss.esb.test.ftp.pwd" value="${org.jboss.esb.test.ftp.pwd}"/>
<sysproperty key="org.jboss.esb.test.ftp.dir" value="${org.jboss.esb.test.ftp.dir}"/>
- <sysproperty key="org.jboss.esb.test.persistdb.dir" value="${org.jboss.esb.test.persistdb.dir}"/>
+ <sysproperty key="org.jboss.esb.test.persistdb.dir" value="${org.jboss.esb.test.persistdb.dir}"/>
<sysproperty key="log4j.configuration" value="log4j.xml"/>
</junit>
<junitreport>
@@ -236,4 +259,5 @@
<report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
</junitreport>
</target>
+
</project>
Added: labs/jbossesb/trunk/product/rosetta/tests/resources/etc/ftpd.properties
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/resources/etc/ftpd.properties (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/tests/resources/etc/ftpd.properties 2007-07-19 19:23:03 UTC (rev 13644)
@@ -0,0 +1,161 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+## Properties file based configuration
+
+##-----------------------------------------------------------------------------
+## This is the listener configuration. Additional listeners can be added if required.
+## If you want to support SSL connections, please specify ssl block
+##-----------------------------------------------------------------------------
+#config.listeners.default.class=org.apache.ftpserver.listener.mina.MinaListener
+#config.listeners.default.address=localhost
+config.listeners.default.port=10021
+#config.listeners.default.implicit-ssl=false
+#config.listeners.default.ssl.class=org.apache.ftpserver.ssl.DefaultSsl
+#config.listeners.default.ssl.keystore-file=./res/.keystore
+#config.listeners.default.ssl.keystore-password=password
+#config.listeners.default.ssl.keystore-type=JKS
+#config.listeners.default.ssl.keystore-algorithm=SunX509
+#config.listeners.default.ssl.ssl-protocol=TLS
+#config.listeners.default.ssl.client-authentication=false
+#config.listeners.default.ssl.key-password=password
+
+##------------------------------------------------------------------------------
+## Data connection configuration
+## If you want to use encrypted data connection, please use ssl block.
+##------------------------------------------------------------------------------
+#config.listeners.default.data-connection.class=org.apache.ftpserver.DefaultDataConnectionConfig
+#config.listeners.default.data-connection.idle-time=10
+#config.listeners.default.data-connection.active.enable=true
+#config.listeners.default.data-connection.active.local-address=localhost
+#config.listeners.default.data-connection.active.local-port=20
+#config.listeners.default.data-connection.active.ip-check=false
+#config.listeners.default.data-connection.passive.address=localhost
+#config.listeners.default.data-connection.passive.ports=0
+#config.listeners.default.data-connection.ssl.class=org.apache.ftpserver.ssl.DefaultSsl
+#config.listeners.default.data-connection.ssl.keystore-file=./res/.keystore
+#config.listeners.default.data-connection.ssl.keystore-password=password
+#config.listeners.default.data-connection.ssl.keystore-type=JKS
+#config.listeners.default.data-connection.ssl.keystore-algorithm=SunX509
+#config.listeners.default.data-connection.ssl.ssl-protocol=TLS
+#config.listeners.default.data-connection.ssl.client-authentication=false
+#config.listeners.default.data-connection.ssl.key-password=password
+
+
+##-----------------------------------------------------------------------------
+## Standard users admin and anonymous will be created by default.
+##-----------------------------------------------------------------------------
+#config.create-default-user=true
+
+
+##-----------------------------------------------------------------------------
+## Ftp message configuration block
+##-----------------------------------------------------------------------------
+#config.message.class=org.apache.ftpserver.message.MessageResourceImpl
+#config.message.custom-message-dir=./res
+#config.message.languages=en,zh-tw
+
+
+##-----------------------------------------------------------------------------
+## Connection manager configuration
+##-----------------------------------------------------------------------------
+#config.connection-manager.max-connection=20
+#config.connection-manager.max-login=10
+#config.connection-manager.anonymous-login-enabled=true
+#config.connection-manager.max-anonymous-login=10
+#config.connection-manager.default-idle-time=60
+#config.connection-manager.timeout-poll-inverval=60
+
+
+##-----------------------------------------------------------------------------
+## Command factory configuration
+##-----------------------------------------------------------------------------
+#config.command-factory.command.command-name=fully-qualified-command-class-name
+
+
+##-----------------------------------------------------------------------------
+## This is the IP restrictor configuration
+##-----------------------------------------------------------------------------
+#config.ip-restrictor.class=org.apache.ftpserver.iprestrictor.FileIpRestrictor
+#config.ip-restrictor.file=./res/ip.gen
+
+
+##-----------------------------------------------------------------------------
+## Properties based default user manager configuration.
+##-----------------------------------------------------------------------------
+#config.user-manager.class=org.apache.ftpserver.usermanager.PropertiesUserManager
+#config.user-manager.admin-name=admin
+#config.user-manager.prop-file=./res/user.gen
+#config.user-manager.encrypt-passwords=true
+
+
+##-----------------------------------------------------------------------------
+## Database based user manager configuration
+##-----------------------------------------------------------------------------
+#config.user-manager.class=org.apache.ftpserver.usermanager.DbUserManager
+#config.user-manager.admin-name=admin
+#config.user-manager.data-source.class=com.mysql.jdbc.jdbc2.optional.MysqlDataSource
+#config.user-manager.data-source.server-name=localhost
+#config.user-manager.data-source.database-name=ftpdb
+#config.user-manager.data-source.user=user
+#config.user-manager.data-source.password=password
+#config.user-manager.sql-user-insert=INSERT INTO FTP_USER (uid, userpassword, homedirectory, enableflag, writepermission, idletime, uploadrate, downloadrate) VALUES ('{uid}', '{userpassword}', '{homedirectory}', '{enableflag}', '{writepermission}', {idletime}, {uploadrate}, {downloadrate})
+#config.user-manager.sql-user-update=UPDATE FTP_USER SET userpassword\='{userpassword}',homedirectory\='{homedirectory}',enableflag\='{enableflag}',writepermission\='{writepermission}',idletime\={idletime},uploadrate\={uploadrate},downloadrate\={downloadrate} WHERE uid\='{uid}'
+#config.user-manager.sql-user-delete=DELETE FROM FTP_USER WHERE uid \= '{uid}'
+#config.user-manager.sql-user-select=SELECT uid, userpassword, homedirectory, enableflag, writepermission, idletime, uploadrate, downloadrate FROM FTP_USER WHERE uid \= '{uid}'
+#config.user-manager.sql-user-select-all=SELECT uid FROM FTP_USER ORDER BY uid
+#config.user-manager.sql-user-authenticate=SELECT uid FROM FTP_USER WHERE uid\='{uid}' AND userpassword\='{userpassword}'
+#config.user-manager.sql-user-admin=SELECT uid FROM FTP_USER WHERE uid\='{uid}' AND WHERE uid\='admin'
+
+
+##-----------------------------------------------------------------------------
+## LDAP based user manager configuration
+##-----------------------------------------------------------------------------
+#config.user-manager.class=org.apache.ftpserver.usermanager.LdapUserManager
+#config.user-manager.admin-name=admin
+#config.user-manager.ldap-url=ldap\://localhost\:389
+#config.user-manager.ldap-admin-dn=cn=Manager,dc=apache,dc=org
+#config.user-manager.ldap-admin-password=secret
+#config.user-manager.ldap-authentication=simple
+#config.user-manager.ldap-user-base-dn=dc\=apache,dc\=org
+
+
+##-----------------------------------------------------------------------------
+## File system manager configuration.
+##-----------------------------------------------------------------------------
+#config.file-system-manager.class=org.apache.ftpserver.filesystem.NativeFileSystemManager
+#config.file-system-manager.create-home=false
+
+
+##------------------------------------------------------------------------------
+## All ftplets
+##------------------------------------------------------------------------------
+#config.ftplets=f1,f2
+
+
+##------------------------------------------------------------------------------
+## Ftplet f1 configuration
+##------------------------------------------------------------------------------
+#config.ftplet.f1.class=org.apache.ftpserver.ftplet.Ftplet1
+#config.ftplet.f1.param=value1
+
+
+##------------------------------------------------------------------------------
+## Ftplet f2 configuration
+##------------------------------------------------------------------------------
+#config.ftplet.f2.class=org.apache.ftpserver.ftplet.Ftplet2
+#config.ftplet.f2.param=value2
Property changes on: labs/jbossesb/trunk/product/rosetta/tests/resources/etc/ftpd.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: labs/jbossesb/trunk/product/rosetta/tests/resources/etc/jndi.properties
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/resources/etc/jndi.properties (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/tests/resources/etc/jndi.properties 2007-07-19 19:23:03 UTC (rev 13644)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Property changes on: labs/jbossesb/trunk/product/rosetta/tests/resources/etc/jndi.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java 2007-07-19 19:12:44 UTC (rev 13643)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java 2007-07-19 19:23:03 UTC (rev 13644)
@@ -27,6 +27,8 @@
import java.net.URL;
import java.util.UUID;
+import junit.framework.Test;
+
import org.jboss.soa.esb.addressing.Call;
import org.jboss.soa.esb.addressing.eprs.FTPEpr;
import org.jboss.soa.esb.addressing.eprs.FileEpr;
@@ -119,4 +121,9 @@
courier.deliver(message);
}
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(CourierIntegrationTest.class, "ftp-server.sar");
+ }
}
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java 2007-07-19 19:12:44 UTC (rev 13643)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java 2007-07-19 19:23:03 UTC (rev 13644)
@@ -25,8 +25,6 @@
import java.io.File;
import junit.framework.Assert;
-import junit.framework.JUnit4TestAdapter;
-
import org.jboss.internal.soa.esb.couriers.helpers.FileHandlerFactory;
import org.jboss.internal.soa.esb.couriers.helpers.FtpFileHandler;
import org.jboss.soa.esb.addressing.eprs.FTPEpr;
@@ -42,14 +40,14 @@
*/
public class FtpFileHandlerIntegrationTest extends BaseTest
{
- public static junit.framework.Test suite()
+ public static junit.framework.Test suite() throws Exception
{
System.err.println("<------------------------------------------>");
System.err.println("<- FTPFileHandlerIntegrationTest requires ->");
System.err.println("<- an available FTP server to work. ->");
System.err.println("<------------------------------------------>");
- return new JUnit4TestAdapter(FtpFileHandlerIntegrationTest.class);
+ return getDeploySetup(FtpFileHandlerIntegrationTest.class, "ftp-server.sar");
}
@Test
@@ -276,5 +274,5 @@
Assert.fail();
}
}
-
+
}
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-19 19:12:44 UTC (rev 13643)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprIntegrationTest.java 2007-07-19 19:23:03 UTC (rev 13644)
@@ -21,8 +21,6 @@
*/
package org.jboss.soa.esb.addressing.eprs.tests;
-import junit.framework.JUnit4TestAdapter;
-
import org.apache.log4j.Logger;
import org.jboss.internal.soa.esb.couriers.PickUpOnlyCourier;
import org.jboss.soa.esb.addressing.eprs.FTPEpr;
@@ -48,9 +46,9 @@
private static Class thisClass = DefaultFtpReplyToEprIntegrationTest.class;
static Logger _logger = Logger.getLogger(thisClass);
- public static junit.framework.Test suite()
+ public static junit.framework.Test suite() throws Exception
{
- return new JUnit4TestAdapter(thisClass);
+ return getDeploySetup(DefaultFtpReplyToEprIntegrationTest.class, "ftp-server.sar");
}
@BeforeClass
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2007-07-19 19:12:44 UTC (rev 13643)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2007-07-19 19:23:03 UTC (rev 13644)
@@ -26,11 +26,10 @@
import java.sql.SQLException;
import java.util.HashMap;
-import junit.framework.TestCase;
-
import org.apache.log4j.Logger;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.common.ModulePropertyManager;
+import org.jboss.test.JBossTestCase;
/**
* Base test class for esb test classes, uses jboss logging.
@@ -43,7 +42,7 @@
* This should probably use its own property file.
*/
-public class BaseTest extends TestCase
+public class BaseTest extends JBossTestCase
{
/** The Database driver used for unit tests */
@@ -81,6 +80,7 @@
*/
public BaseTest()
{
+ super("DummyName");
SYSTEM_PARAMETERS = readSystemParameters();
}
@@ -114,7 +114,7 @@
String dbPassword = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE)
.getProperty(DB_PASSWORD, "");
String ftpHostname = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE)
- .getProperty(FTP_HOSTNAME, "ftp.ncl.ac.uk");
+ .getProperty(FTP_HOSTNAME, "localhost:10021");
String ftpUser = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE)
.getProperty(FTP_USER, "anonymous");
String ftpDir = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE)
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java 2007-07-19 19:12:44 UTC (rev 13643)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java 2007-07-19 19:23:03 UTC (rev 13644)
@@ -51,7 +51,7 @@
log.debug(props);
assertEquals("org.jnp.interfaces.NamingContextFactory", props.get(Context.INITIAL_CONTEXT_FACTORY));
assertEquals("http://localhost:1234", props.get(Context.PROVIDER_URL));
- assertEquals("", props.get("java.naming.factory.url.pkgs"));
+
ctx.close();
}
}
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java 2007-07-19 19:12:44 UTC (rev 13643)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java 2007-07-19 19:23:03 UTC (rev 13644)
@@ -58,9 +58,9 @@
String url = null;
if (getFtpPwd() == null)
- url = "ftp://"+getFtpUser()+"@"+getFtpHostname()+":"+getFtpDir();
+ url = "ftp://"+getFtpUser()+"@"+getFtpHostname()+getFtpDir();
else
- url = "ftp://"+getFtpUser()+":"+getFtpPwd()+"@"+getFtpHostname()+":"+getFtpDir();
+ url = "ftp://"+getFtpUser()+":"+getFtpPwd()+"@"+getFtpHostname()+getFtpDir();
ConfigTree eprElement = tree.getAllChildren()[0].getFirstChild("EPR");
eprElement.setAttribute(ListenerTagNames.URL_TAG, url);
@@ -123,5 +123,10 @@
_logger.debug("back from stop");
}
}
+
+ public static junit.framework.Test suite() throws Exception
+ {
+ return getDeploySetup(ListenerManagerFTPIntegrationTest.class, "ftp-server.sar");
+ }
}
Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy
___________________________________________________________________
Name: svn:ignore
+ build
More information about the jboss-svn-commits
mailing list