[jboss-svn-commits] JBL Code SVN: r13730 - in labs/jbossesb/trunk: product and 20 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 23 13:51:23 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-07-23 13:51:23 -0400 (Mon, 23 Jul 2007)
New Revision: 13730
Added:
labs/jbossesb/trunk/product/esb-config.xml
labs/jbossesb/trunk/product/ftpd.properties
labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/jboss-esb-unfiltered.xml
labs/jbossesb/trunk/qa/junit/resources/server/jca/META-INF/deployment.xml
Removed:
labs/jbossesb/trunk/product/lib/ext/jboss-test.jar
labs/jbossesb/trunk/product/rosetta/tests/resources/etc/ftpd.properties
labs/jbossesb/trunk/qa/junit/resources/ftpd.properties
labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/jboss-esb.xml
Modified:
labs/jbossesb/trunk/integration-build.xml
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/product.properties
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/listeners/ListenerManagerFTPIntegrationTest.java
labs/jbossesb/trunk/product/skip.properties-example
labs/jbossesb/trunk/qa/build.xml
labs/jbossesb/trunk/qa/junit/build.xml
labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/deployment.xml
labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbm-service.xml
labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbmq-service.xml
labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbm-service.xml
labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbmq-service.xml
labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/META-INF/deployment.xml
labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbm-service.xml
labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbmq-service.xml
labs/jbossesb/trunk/qa/junit/resources/server/simple/META-INF/deployment.xml
labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbm-service.xml
labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbmq-service.xml
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTest.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTest.java
labs/jbossesb/trunk/qa/test.properties
Log:
Updated build for JBESB-737 and JBESB-572
Modified: labs/jbossesb/trunk/integration-build.xml
===================================================================
--- labs/jbossesb/trunk/integration-build.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/integration-build.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,12 +1,8 @@
<project name="JBESB-QA" default="integration" basedir=".">
<property name="clean.jms.dest" location="clean.jms"/>
- <target name="integration" description="Run Continuous Integration." depends="clean-jms, clean">
- <ant dir="product">
- <target name="integration"/>
- <target name="artifacts"/>
- <target name="instr-report"/>
- </ant>
+ <target name="integration" description="Run Continuous Integration." depends="clean">
+ <ant dir="product" target="ci-integration"/>
<ant dir="qa" target="ci-test"/>
</target>
@@ -15,10 +11,4 @@
<ant dir="qa" target="clean"/>
<ant dir="product" target="clean"/>
</target>
-
- <target name="clean-jms" description="Clean the JMS queues">
- <get src="http://localhost:8080/jmx-console/HtmlAdaptor?action=invokeOpByName&name=jboss.mq.destination:service=Queue,name=A&methodName=removeAllMessages" dest="${clean.jms.dest}"/>
- <get src="http://localhost:8080/jmx-console/HtmlAdaptor?action=invokeOpByName&name=jboss.mq.destination:service=Queue,name=B&methodName=removeAllMessages" dest="${clean.jms.dest}"/>
- <get src="http://localhost:8080/jmx-console/HtmlAdaptor?action=invokeOpByName&name=jboss.mq.destination:service=Queue,name=C&methodName=removeAllMessages" dest="${clean.jms.dest}"/>
- </target>
</project>
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/product/build.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -4,16 +4,21 @@
JBoss ESB Project
</description>
+ <condition property="JDK_VERSION_OK">
+ <equals arg1="${java.specification.version}" arg2="1.5"/>
+ </condition>
+ <fail unless="JDK_VERSION_OK"
+ message="JBoss ESB requires jdk1.5 to build."/>
+
+ <import file="esb-config.xml"/>
+
<!-- Set default properties filename -->
<property name="org.jboss.esb.properties" location="product.properties"/>
<property file="skip.properties"/>
- <property name="org.jboss.esb.deployment.properties" location="install/deployment.properties"/>
-
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.properties}"/>
- <property file="${org.jboss.esb.deployment.properties}"/>
<!-- class path behaviour -->
<property name="build.sysclasspath" value="ignore"/>
@@ -84,10 +89,13 @@
<property name="junit.jar" location="lib/ext/junit-4.1.jar"/>
<macrodef name="runant">
<attribute name="target"/>
+ <attribute name="failonerror" default="true"/>
+ <attribute name="resultproperty" default="product.java.resultproperty"/>
<sequential>
<java classname="org.apache.tools.ant.launch.Launcher"
classpath="${ant.library.dir}/ant-launcher.jar"
- fork="true" failonerror="true">
+ fork="true" failonerror="@{failonerror}"
+ resultproperty="@{resultproperty}">
<sysproperty key="ant.home" value="${ant.home}"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
@@ -110,7 +118,7 @@
</target>
<!-- Initialisation -->
- <target name="org.jboss.esb.internal.init">
+ <target name="org.jboss.esb.internal.init" depends="esb.init">
<!-- Define default build properties -->
<tstamp>
<format property="org.jboss.esb.date" pattern="yyyy/mm/dd hh:mm aa"/>
@@ -161,12 +169,8 @@
<fail message="Sorry, you must run the 'dist' target before running the 'test' target." />
</target>
- <target name="ftp-server" unless="skip.ftp.server">
- <ant antfile="build.xml" dir="ftp"/>
- </target>
-
<!-- Integration test targets -->
- <target name="org.jboss.esb.integration.test" depends="ftp-server,org.jboss.esb.compile">
+ <target name="org.jboss.esb.integration.test" depends="org.jboss.esb.compile">
<echo message="Testing of modules, using unit, functional and integration tests"/>
<ant dir="rosetta">
<target name="org.jboss.esb.rosetta.integration.test"/>
@@ -446,7 +450,7 @@
<runant target="org.jboss.esb.dist"/>
</target>
- <target name="artifacts" depends="dist" description="Create disitribution artifacts for JBoss ESB">
+ <target name="artifacts" depends="dist" description="Create distribution artifacts for JBoss ESB">
<zip zipfile="${org.jboss.esb.internal.dest}/jbossesb.zip" basedir="${org.jboss.esb.internal.dest}/jbossesb"/>
<zip zipfile="${org.jboss.esb.internal.dest}/${esb.server.name}.zip" basedir="${org.jboss.esb.internal.dest}/${esb.server.name}"/>
</target>
@@ -464,7 +468,22 @@
</target>
<target name="integration" description="run integration tests">
- <runant target="org.jboss.esb.integration.test"/>
+ <antcall target="start-server"/>
+ <runant target="org.jboss.esb.integration.test"
+ failonerror="false" resultproperty="integration.product.resultproperty"/>
+ <antcall target="stop-server"/>
+
+ <condition property="integration.product.tests.failed">
+ <not>
+ <equals arg1="0" arg2="${integration.product.resultproperty}"/>
+ </not>
+ </condition>
+ <fail if="integration.product.tests.failed" message="Product Unit Test failure"/>
+ </target>
+
+ <target name="ci-integration" depends="integration">
+ <antcall target="artifacts"/>
+ <antcall target="instr-report"/>
</target>
<target name="jar" description="will generate all jar files">
@@ -486,6 +505,18 @@
<target name="deploy" depends="dist" description="deploys the ESB .sar to an application server">
<ant dir="install" target="deploy"/>
</target>
+
+ <target name="start-server" depends="esb.setup-server">
+ <start-server serverHome="${org.jboss.esb.server.home}"
+ serverConfig="${org.jboss.esb.test.server.config}"/>
+ <wait-on-server/>
+ </target>
+
+ <target name="stop-server" depends="esb.init">
+ <stop-server serverHome="${org.jboss.esb.server.home}"/>
+ <wait-on-shutdown serverHome="${org.jboss.esb.server.home}"
+ serverConfig="${org.jboss.esb.test.server.config}"/>
+ </target>
<target name="instr-report">
<property name="coverage.dir" location="build/tests/coverage"/>
Added: labs/jbossesb/trunk/product/esb-config.xml
===================================================================
--- labs/jbossesb/trunk/product/esb-config.xml (rev 0)
+++ labs/jbossesb/trunk/product/esb-config.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -0,0 +1,173 @@
+<!--
+ ESB config and start/stop macros
+-->
+<project name="esb-config">
+ <dirname property="esb.config.location" file="${ant.file.esb-config}"/>
+ <property name="esb.install.location" location="${esb.config.location}/install"/>
+ <property name="esb.server.zip.location" location="${esb.install.location}/standalone/jbossesb-server-base.zip"/>
+ <property name="esb.ftp.location" location="${esb.config.location}/ftp"/>
+ <property name="esb.ftp.server.location" location="${esb.ftp.location}/build"/>
+ <property name="esb.ftp.server.name" value="ftp-server.sar"/>
+
+ <property name="agent.jvmarg" value=""/>
+ <property name="org.jboss.esb.server.config" value="default"/>
+
+ <condition property="esb.ftp.config.all">
+ <and>
+ <isset property="org.jboss.esb.test.ftp.hostname"/>
+ <isset property="org.jboss.esb.test.ftp.user"/>
+ <isset property="org.jboss.esb.test.ftp.pwd"/>
+ <isset property="org.jboss.esb.test.ftp.dir"/>
+ </and>
+ </condition>
+
+ <condition property="esb.ftp.config.any">
+ <or>
+ <isset property="org.jboss.esb.test.ftp.hostname"/>
+ <isset property="org.jboss.esb.test.ftp.user"/>
+ <isset property="org.jboss.esb.test.ftp.pwd"/>
+ <isset property="org.jboss.esb.test.ftp.dir"/>
+ </or>
+ </condition>
+
+ <condition property="esb.ftp.config.fail">
+ <and>
+ <isset property="esb.ftp.config.any"/>
+ <not>
+ <isset property="esb.ftp.config.all"/>
+ </not>
+ </and>
+ </condition>
+
+ <fail if="esb.ftp.config.fail" message="All FTP configuration parameters must be set"/>
+
+ <macrodef name="start-server">
+ <attribute name="serverHome"/>
+ <attribute name="serverConfig"/>
+ <sequential>
+ <echo message="Starting local ESB server"/>
+ <java classname="org.jboss.Main" fork="true" spawn="true"
+ dir="@{serverHome}/bin">
+ <classpath refid="server.classpath"/>
+ <jvmarg line="${agent.jvmarg}"/>
+ <arg value="-c"/>
+ <arg value="@{serverConfig}"/>
+ </java>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="stop-server">
+ <attribute name="serverHome"/>
+ <sequential>
+ <echo message="Stopping local ESB server"/>
+ <java classname="org.jboss.Shutdown" fork="true"
+ dir="@{serverHome}/bin">
+ <classpath>
+ <pathelement location="@{serverHome}/bin/shutdown.jar"/>
+ <pathelement location="@{serverHome}/client/jbossall-client.jar"/>
+ </classpath>
+ <arg value="--server"/>
+ <arg value="jnp://localhost:1099"/>
+ <arg value="--shutdown"/>
+ </java>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="wait-on-server">
+ <attribute name="seconds" default="120"/>
+ <sequential>
+ <echo message="Waiting for ESB server to start..."/>
+ <waitfor maxwait="@{seconds}" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
+ <http url="http://localhost:8080/"/>
+ </waitfor>
+ <fail message="Timeout waiting for ESB server to start" if="startup.timeout"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="wait-on-shutdown">
+ <attribute name="serverHome"/>
+ <attribute name="serverConfig"/>
+ <attribute name="seconds" default="120"/>
+ <sequential>
+ <echo message="Waiting for ESB server to stop..."/>
+ <waitfor maxwait="@{seconds}" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="shutdown.timeout">
+ <available file="server.log">
+ <filepath>
+ <fileset dir="@{serverHome}/server/@{serverConfig}/log/" includes="server.log">
+ <contains text="[org.jboss.system.server.Server] Shutdown complete"/>
+ </fileset>
+ </filepath>
+ </available>
+ </waitfor>
+ <fail message="Timeout waiting for ESB server to shutdown." if="shutdown.timeout"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Configuring an app server installation -->
+ <target name="esb.init-app-server" if="org.jboss.esb.server.home">
+ <property name="org.jboss.esb.test.server.config" value="test-esb"/>
+ <property name="org.jboss.esb.server.config.appserver" value="true"/>
+ </target>
+
+ <target name="esb.configure-app-server" if="org.jboss.esb.server.config.appserver">
+ <property name="esb.target-dir" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}"/>
+ <delete dir="${esb.target.dir}" quiet="true"/>
+
+ <copy todir="${esb.target-dir}">
+ <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+ </copy>
+ </target>
+
+ <!-- Configuring an esb server installation -->
+ <target name="esb.init-esb-server" unless="org.jboss.esb.server.home">
+ <property name="esb.server-home" location="build/jbossesb-test"/>
+ <property name="org.jboss.esb.server.home" location="${esb.server-home}/jbossesb-server"/>
+ <property name="org.jboss.esb.test.server.config" value="default"/>
+ <property name="org.jboss.soa.esb.qa.jmsprovider" value="jbm"/>
+ </target>
+
+ <target name="esb.configure-esb-server" unless="org.jboss.esb.server.config.appserver">
+ <delete dir="${esb.server-home}" quiet="true"/>
+
+ <unzip dest="${esb.server-home}" src="${esb.server.zip.location}"/>
+ </target>
+
+ <!-- configuring the FTP server installation -->
+ <target name="esb.init-ftp-server" unless="org.jboss.esb.test.ftp.hostname">
+ <property name="org.jboss.esb.test.ftp.hostname" value="localhost:10021"/>
+ <property name="org.jboss.esb.test.ftp.user" value="esb"/>
+ <property name="org.jboss.esb.test.ftp.pwd" value="esb"/>
+ <property name="org.jboss.esb.test.ftp.dir" value="/"/>
+ <property name="org.jboss.esb.server.config.ftpserver" value="true"/>
+ </target>
+
+ <target name="esb.configure-ftp-server" if="org.jboss.esb.server.config.ftpserver">
+ <ant antfile="build.xml" dir="${esb.ftp.location}"/>
+ <property name="esb.deploy-dir" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}/deploy"/>
+ <copy todir="${esb.deploy-dir}">
+ <fileset dir="${esb.ftp.server.location}" includes="${esb.ftp.server.name}/**"/>
+ </copy>
+ <copy todir="${esb.deploy-dir}/${esb.ftp.server.name}/res/conf"
+ file="${esb.config.location}/ftpd.properties" overwrite="true"/>
+ </target>
+
+ <target name="esb.init" depends="esb.init-app-server, esb.init-esb-server, esb.init-ftp-server"
+ description="target for initialising properties">
+ <path id="server.classpath">
+ <pathelement location="${java.home}/lib/tools.jar"/>
+ <pathelement location="${org.jboss.esb.server.home}/bin/run.jar"/>
+ </path>
+ </target>
+
+ <target name="esb.configure" depends="esb.init, esb.configure-app-server, esb.configure-esb-server, esb.configure-ftp-server"/>
+
+ <target name="esb.setup-esb" depends="esb.configure" description="target for configuring a clean esb">
+ <ant antfile="build.xml" dir="${esb.install.location}" target="deploy"
+ inheritall="false">
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.test.server.config}"/>
+ </ant>
+ </target>
+
+ <target name="esb.setup-server" depends="esb.configure" description="target for configuring a clean app server profile"/>
+</project>
Property changes on: labs/jbossesb/trunk/product/esb-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Copied: labs/jbossesb/trunk/product/ftpd.properties (from rev 13698, labs/jbossesb/trunk/product/rosetta/tests/resources/etc/ftpd.properties)
===================================================================
--- labs/jbossesb/trunk/product/ftpd.properties (rev 0)
+++ labs/jbossesb/trunk/product/ftpd.properties 2007-07-23 17:51:23 UTC (rev 13730)
@@ -0,0 +1,162 @@
+# 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
+##-----------------------------------------------------------------------------
+#temporary until leak can be sorted out
+config.connection-manager.max-connection=400
+config.connection-manager.max-login=200
+#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
Deleted: labs/jbossesb/trunk/product/lib/ext/jboss-test.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/product.properties
===================================================================
--- labs/jbossesb/trunk/product/product.properties 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/product/product.properties 2007-07-23 17:51:23 UTC (rev 13730)
@@ -10,7 +10,8 @@
org.jboss.esb.alltests.build=yes
org.jboss.esb.jboss.home=.
-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
+# Uncomment all the ftp properties if you wish to override the ftp server
+#org.jboss.esb.test.ftp.hostname=<hostname:port>
+#org.jboss.esb.test.ftp.user=<username>
+#org.jboss.esb.test.ftp.pwd=<password>
+#org.jboss.esb.test.ftp.dir=<base directory>
Modified: labs/jbossesb/trunk/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/build.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/product/rosetta/tests/build.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -2,8 +2,6 @@
<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"/>
@@ -41,23 +39,17 @@
</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}"/>
-
</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">
@@ -165,15 +157,6 @@
<!-- INTEGRATION T E S T -->
<!-- ====================================================================== -->
<target name="org.jboss.esb.rosetta.internal.integration.test">
- <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>
-
<!-- Instrument the code for code coverage - using emma... -->
<delete dir="${org.jboss.esb.module.tests.coverage.dir}" />
<mkdir dir="${org.jboss.esb.module.classes.instr.dir}" />
@@ -233,13 +216,7 @@
</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}"/>
@@ -261,5 +238,4 @@
<report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
</junitreport>
</target>
-
</project>
Deleted: labs/jbossesb/trunk/product/rosetta/tests/resources/etc/ftpd.properties
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/resources/etc/ftpd.properties 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/product/rosetta/tests/resources/etc/ftpd.properties 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,161 +0,0 @@
-# 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
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-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java 2007-07-23 17:51:23 UTC (rev 13730)
@@ -27,8 +27,6 @@
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;
@@ -121,9 +119,4 @@
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-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java 2007-07-23 17:51:23 UTC (rev 13730)
@@ -25,6 +25,8 @@
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;
@@ -40,14 +42,14 @@
*/
public class FtpFileHandlerIntegrationTest extends BaseTest
{
- public static junit.framework.Test suite() throws Exception
+ public static junit.framework.Test suite()
{
System.err.println("<------------------------------------------>");
System.err.println("<- FTPFileHandlerIntegrationTest requires ->");
System.err.println("<- an available FTP server to work. ->");
System.err.println("<------------------------------------------>");
- return getDeploySetup(FtpFileHandlerIntegrationTest.class, "ftp-server.sar");
+ return new JUnit4TestAdapter(FtpFileHandlerIntegrationTest.class);
}
@Test
@@ -274,5 +276,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-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprIntegrationTest.java 2007-07-23 17:51:23 UTC (rev 13730)
@@ -21,6 +21,8 @@
*/
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;
@@ -46,9 +48,9 @@
private static Class thisClass = DefaultFtpReplyToEprIntegrationTest.class;
static Logger _logger = Logger.getLogger(thisClass);
- public static junit.framework.Test suite() throws Exception
+ public static junit.framework.Test suite()
{
- return getDeploySetup(DefaultFtpReplyToEprIntegrationTest.class, "ftp-server.sar");
+ return new JUnit4TestAdapter(thisClass);
}
@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-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2007-07-23 17:51:23 UTC (rev 13730)
@@ -26,10 +26,11 @@
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.
@@ -42,7 +43,7 @@
* This should probably use its own property file.
*/
-public class BaseTest extends JBossTestCase
+public class BaseTest extends TestCase
{
/** The Database driver used for unit tests */
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-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java 2007-07-23 17:51:23 UTC (rev 13730)
@@ -123,10 +123,5 @@
_logger.debug("back from stop");
}
}
-
- public static junit.framework.Test suite() throws Exception
- {
- return getDeploySetup(ListenerManagerFTPIntegrationTest.class, "ftp-server.sar");
- }
}
Modified: labs/jbossesb/trunk/product/skip.properties-example
===================================================================
--- labs/jbossesb/trunk/product/skip.properties-example 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/product/skip.properties-example 2007-07-23 17:51:23 UTC (rev 13730)
@@ -11,6 +11,5 @@
#skip.javadoc=true
#skip.server.esb=true
-#skip.ftp.server=true
#skip.docs=true
#skip.samples=true
Modified: labs/jbossesb/trunk/qa/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/build.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/build.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -2,16 +2,31 @@
<property name="build.sysclasspath" value="ignore"/>
+ <condition property="JDK_VERSION_OK">
+ <equals arg1="${java.specification.version}" arg2="1.5"/>
+ </condition>
+ <fail unless="JDK_VERSION_OK"
+ message="JBoss ESB requires jdk1.5 to build."/>
+
+ <property name="product.dir" location="../product"/>
+
+ <import file="${product.dir}/esb-config.xml"/>
+
+ <property name="org.jboss.esb.properties" location="${product.dir}/product.properties"/>
+ <property file="${org.jboss.esb.properties}"/>
+
<property file="test.properties" />
- <property file="${basedir}../product/install/deployment.properties" />
<property name="junit.jar" location="lib/ext/junit-4.1.jar"/>
<macrodef name="runant">
<attribute name="target"/>
+ <attribute name="failonerror" default="true"/>
+ <attribute name="resultproperty" default="qa.java.resultproperty"/>
<sequential>
<java classname="org.apache.tools.ant.launch.Launcher"
classpath="${ant.library.dir}/ant-launcher.jar"
- fork="true" failonerror="true">
+ fork="true" failonerror="@{failonerror}"
+ resultproperty="@{resultproperty}">
<sysproperty key="ant.home" value="${ant.home}"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
<sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
@@ -27,14 +42,24 @@
<target name="test" description="Run all QA tests." depends="test.junit"/>
<target name="ci-test" description="Run all QA tests.">
- <runant target="ci-test.junit"/>
+ <antcall target="start-server"/>
+ <runant target="ci-test.junit"
+ failonerror="false" resultproperty="integration.qa.resultproperty"/>
+ <antcall target="stop-server"/>
+
+ <condition property="integration.qa.tests.failed">
+ <not>
+ <equals arg1="0" arg2="${integration.qa.resultproperty}"/>
+ </not>
+ </condition>
+ <fail if="integration.qa.tests.failed" message="QA Unit Test failure"/>
</target>
- <target name="test.junit" description="Run JUnit based QA tests.">
+ <target name="test.junit" depends="esb.init" description="Run JUnit based QA tests.">
<ant dir="junit" target="test" />
</target>
- <target name="ci-test.junit" description="Run JUnit based QA tests.">
+ <target name="ci-test.junit" depends="esb.init" description="Run JUnit based QA tests.">
<ant dir="junit" target="ci-test" />
</target>
@@ -48,6 +73,18 @@
<!-- hardcoded in at least one test -->
<delete dir="${basedir}/product" />
</target>
+
+ <target name="start-server" depends="esb.setup-esb">
+ <start-server serverHome="${org.jboss.esb.server.home}"
+ serverConfig="${org.jboss.esb.test.server.config}"/>
+ <wait-on-server/>
+ </target>
+
+ <target name="stop-server" depends="esb.init">
+ <stop-server serverHome="${org.jboss.esb.server.home}"/>
+ <wait-on-shutdown serverHome="${org.jboss.esb.server.home}"
+ serverConfig="${org.jboss.esb.test.server.config}"/>
+ </target>
<target name="ant">
<property name="junit.jar" location="lib/ext/junit-4.1.jar"/>
Modified: labs/jbossesb/trunk/qa/junit/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/build.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/build.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -10,6 +10,7 @@
<property name="qa.build.testlog" location="../build/log"/>
<property name="qa.lib" location="../lib"/>
<property name="qa.build.stylesheets" location="${qa.build}/stylesheets"/>
+ <property name="qa.build.ftp" location="${qa.build}/ftp"/>
<property name="qa.source.stylesheets" location="../stylesheets"/>
<property name="qa.junit.src" location="src"/>
<property name="qa.junit.versioned.src" location="versioned-scoped-src"/>
@@ -20,10 +21,6 @@
<property name="qa.junit.memory" value="128m"/>
<property file="${org.jboss.esb.properties}"/>
- <property name="org.jboss.esb.test.ftp.hostname" value="ftp.ncl.ac.uk"/>
- <property name="org.jboss.esb.test.ftp.user" value="anonymous"/>
- <property name="org.jboss.esb.test.ftp.pwd" value=""/>
- <property name="org.jboss.esb.test.ftp.dir" value="/pub/DNS"/>
<path id="base.cp">
<fileset dir="${product.lib}/ext"
@@ -42,24 +39,9 @@
<fileset dir="${coverage}/all" includes="jbossesb-instr-all.jar"/>
<path refid="base.cp"/>
</path>
-
- <target name="init" >
- <copy todir="${qa.build.lib}/jbossesb.sar">
- <fileset dir="../../product/build/jbossesb.sar/"/>
- </copy>
- <copy todir="${qa.build.lib}/ftp-server.sar">
- <fileset dir="../../product/ftp/build/ftp-server.sar/"/>
- </copy>
- <copy todir="${qa.build.lib}/ftp-server.sar/res/conf" overwrite="true">
- <fileset dir="resources">
- <include name="ftpd.properties" />
- </fileset>
- </copy>
- </target>
-
- <target name="test" depends="init, compile, jars, prompt, execute"/>
- <target name="ci-test" depends="init, compile, jars, execute"/>
+ <target name="test" depends="jars, prompt, execute"/>
+ <target name="ci-test" depends="jars, execute"/>
<target name="compile">
<echo message="Running JUnit based QA tests..."/>
@@ -85,6 +67,15 @@
<target name="jars" depends="compile, compile-versioned">
<mkdir dir="${qa.build.lib}"/>
+ <mkdir dir="${qa.build.ftp}/META-INF"/>
+ <copy file="${qa.junit.resources}/server/ftp/META-INF/jboss-esb-unfiltered.xml" tofile="${qa.build.ftp}/META-INF/jboss-esb.xml">
+ <filterset>
+ <filter token="FTP_HOSTNAME" value="${org.jboss.esb.test.ftp.hostname}"/>
+ <filter token="FTP_USERNAME" value="${org.jboss.esb.test.ftp.user}"/>
+ <filter token="FTP_PASSWORD" value="${org.jboss.esb.test.ftp.pwd}"/>
+ <filter token="FTP_DIRECTORY" value="${org.jboss.esb.test.ftp.dir}"/>
+ </filterset>
+ </copy>
<jar jarfile="${qa.build.lib}/simple.esb">
<fileset dir="${qa.junit.classes}">
@@ -115,7 +106,9 @@
<fileset dir="${qa.junit.resources}/server/ftp">
<include name="esb-${org.jboss.soa.esb.qa.jmsprovider}-service.xml"/>
<include name="META-INF/*.xml"/>
+ <exclude name="META-INF/jboss-esb-unfiltered.xml"/>
</fileset>
+ <fileset dir="${qa.build.ftp}" includes="META-INF/*.xml"/>
</jar>
<jar jarfile="${qa.build.lib}/jca-test.esb">
<fileset dir="${qa.junit.classes}">
@@ -151,6 +144,11 @@
<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.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
+ <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}"/>
<classpath>
<pathelement location="${qa.junit.classes}"/>
@@ -227,7 +225,6 @@
<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.soa.esb.qa.deployjbossesb" value="${org.jboss.soa.esb.qa.deployjbossesb}"/>
<!-- Listener Sys Props... -->
<sysproperty key="org.jboss.soa.esb.paramsRepository.file.root"
Deleted: labs/jbossesb/trunk/qa/junit/resources/ftpd.properties
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/ftpd.properties 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/ftpd.properties 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,161 +0,0 @@
-# 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
Modified: labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/deployment.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/deployment.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,3 +1,4 @@
-<jbossesb-deployment>
- <depends>jboss.esb:test=server</depends>
-</jbossesb-deployment>
\ No newline at end of file
+<jbossesb-deployment>
+ <depends>jboss.esb:test=server</depends>
+ <depends>jboss.esb.qa.junit.destination:service=Queue,name=ftptest</depends>
+</jbossesb-deployment>
Copied: labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/jboss-esb-unfiltered.xml (from rev 13698, labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/jboss-esb.xml)
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/jboss-esb-unfiltered.xml (rev 0)
+++ labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/jboss-esb-unfiltered.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -0,0 +1,65 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+
+ <providers>
+ <ftp-provider name="FTPprovider" hostname="@FTP_HOSTNAME@" >
+ <ftp-bus busid="helloFTPChannel" >
+ <ftp-message-filter
+ username="@FTP_USERNAME@"
+ password="@FTP_PASSWORD@"
+ passive="false"
+ directory="@FTP_DIRECTORY@"
+ input-suffix=".dat"
+ work-suffix=".esbWorking"
+ post-delete="false"
+ post-suffix=".COMPLETE"
+ error-delete="false"
+ error-suffix=".HAS_ERROR"
+ />
+ </ftp-bus>
+ </ftp-provider>
+
+ <jms-provider name="JBossMQ"
+ connection-factory="ConnectionFactory"
+ jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
+ jndi-URL="localhost" >
+
+ <jms-bus busid="quickstartEsbChannel">
+ <jms-message-filter
+ dest-type="QUEUE"
+ dest-name="queue/ftptest"
+ />
+ </jms-bus>
+
+ </jms-provider>
+
+ </providers>
+
+ <services>
+ <service
+ category="myCategory"
+ name="myFileListener"
+ description="Hello World File Action (esb listener)" >
+ <listeners>
+ <ftp-listener name="FtpGateway"
+ busidref="helloFTPChannel"
+ maxThreads="1"
+ is-gateway="true"
+ >
+ <property name="pollLatencySeconds" value="5"/>
+ </ftp-listener>
+ <jms-listener name="helloWorldFileAction"
+ busidref="quickstartEsbChannel"
+ maxThreads="1"
+ />
+ </listeners>
+ <actions>
+ <action name="displayAction"
+ class="org.jboss.soa.esb.server.MyAction"
+ process="process">
+ </action>
+ </actions>
+ </service>
+ </services>
+
+</jbossesb>
Deleted: labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/jboss-esb.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/jboss-esb.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,65 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
-
- <providers>
- <ftp-provider name="FTPprovider" hostname="localhost:10021" >
- <ftp-bus busid="helloFTPChannel" >
- <ftp-message-filter
- username="esb"
- password="esb"
- passive="false"
- directory="/"
- input-suffix=".dat"
- work-suffix=".esbWorking"
- post-delete="false"
- post-suffix=".COMPLETE"
- error-delete="false"
- error-suffix=".HAS_ERROR"
- />
- </ftp-bus>
- </ftp-provider>
-
- <jms-provider name="JBossMQ"
- connection-factory="ConnectionFactory"
- jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
- jndi-URL="localhost" >
-
- <jms-bus busid="quickstartEsbChannel">
- <jms-message-filter
- dest-type="QUEUE"
- dest-name="queue/ftptest"
- />
- </jms-bus>
-
- </jms-provider>
-
- </providers>
-
- <services>
- <service
- category="myCategory"
- name="myFileListener"
- description="Hello World File Action (esb listener)" >
- <listeners>
- <ftp-listener name="FtpGateway"
- busidref="helloFTPChannel"
- maxThreads="1"
- is-gateway="true"
- >
- <property name="pollLatencySeconds" value="5"/>
- </ftp-listener>
- <jms-listener name="helloWorldFileAction"
- busidref="quickstartEsbChannel"
- maxThreads="1"
- />
- </listeners>
- <actions>
- <action name="displayAction"
- class="org.jboss.soa.esb.server.MyAction"
- process="process">
- </action>
- </actions>
- </service>
- </services>
-
-</jbossesb>
Modified: labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbm-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbm-service.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbm-service.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=ftptest"
+ name="jboss.esb.qa.junit.destination:service=Queue,name=ftptest"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
Modified: labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbmq-service.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbmq-service.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.quickstart.destination:service=Queue,name=ftptest">
+ name="jboss.esb.qa.junit.destination:service=Queue,name=ftptest">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
Added: labs/jbossesb/trunk/qa/junit/resources/server/jca/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/jca/META-INF/deployment.xml (rev 0)
+++ labs/jbossesb/trunk/qa/junit/resources/server/jca/META-INF/deployment.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+ <depends>jboss.esb.qa.junit.destination:service=Queue,name=esb_gateway_channel</depends>
+ <depends>jboss.esb.qa.junit.destination:service=Queue,name=esb_channel</depends>
+</jbossesb-deployment>
Property changes on: labs/jbossesb/trunk/qa/junit/resources/server/jca/META-INF/deployment.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbm-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbm-service.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbm-service.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=esb_gateway_channel"
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_gateway_channel"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=esb_channel"
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_channel"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
Modified: labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbmq-service.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbmq-service.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.quickstart.destination:service=Queue,name=esb_gateway_channel">
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_gateway_channel">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.quickstart.destination:service=Queue,name=esb_channel">
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_channel">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
Modified: labs/jbossesb/trunk/qa/junit/resources/server/simple/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple/META-INF/deployment.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple/META-INF/deployment.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,3 +1,5 @@
<jbossesb-deployment>
<depends>jboss.esb:test=server</depends>
-</jbossesb-deployment>
\ No newline at end of file
+ <depends>jboss.esb.qa.junit.destination:service=Queue,name=esb_gateway_channel</depends>
+ <depends>jboss.esb.qa.junit.destination:service=Queue,name=esb_channel</depends>
+</jbossesb-deployment>
Modified: labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbm-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbm-service.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbm-service.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=esb_gateway_channel"
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_gateway_channel"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=esb_channel"
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_channel"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
Modified: labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbmq-service.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbmq-service.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.quickstart.destination:service=Queue,name=esb_gateway_channel">
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_gateway_channel">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.quickstart.destination:service=Queue,name=esb_channel">
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_channel">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
</depends>
Modified: labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/META-INF/deployment.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/META-INF/deployment.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,9 +1,11 @@
<jbossesb-deployment>
<depends>jboss.esb:test=server</depends>
+ <depends>jboss.esb.qa.junit.destination:service=Queue,name=esb_gateway_channel_versioned</depends>
+ <depends>jboss.esb.qa.junit.destination:service=Queue,name=esb_channel_versioned</depends>
<loader-repository>
org.jboss.soa.esb:loader=simple-scoped
<loader-repository-config>
java2ParentDelegaton=false
</loader-repository-config>
</loader-repository>
-</jbossesb-deployment>
\ No newline at end of file
+</jbossesb-deployment>
Modified: labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbm-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbm-service.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbm-service.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=esb_channel_versioned"
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_channel_versioned"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=esb_gateway_channel_versioned"
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_gateway_channel_versioned"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
Modified: labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbmq-service.xml 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbmq-service.xml 2007-07-23 17:51:23 UTC (rev 13730)
@@ -3,11 +3,11 @@
<!-- jboss mq version -->
<server>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=esb_gateway_channel_versioned">
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_gateway_channel_versioned">
<depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=esb_channel_versioned">
+ name="jboss.esb.qa.junit.destination:service=Queue,name=esb_channel_versioned">
<depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
</mbean>
</server>
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTest.java 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTest.java 2007-07-23 17:51:23 UTC (rev 13730)
@@ -92,12 +92,7 @@
}
public static Test suite() throws Exception
{
- String deployESBStr = System.getProperty("org.jboss.soa.esb.qa.deployjbossesb");
- if ("true".equalsIgnoreCase(deployESBStr)) {
- return getDeploySetup(SimpleDeployUnitTest.class, "jbossesb.sar,simple.esb,simple-scoped.esb");
- } else {
- return getDeploySetup(SimpleDeployUnitTest.class, "simple.esb,simple-scoped.esb");
- }
+ return getDeploySetup(SimpleDeployUnitTest.class, "simple.esb,simple-scoped.esb");
}
}
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTest.java 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTest.java 2007-07-23 17:51:23 UTC (rev 13730)
@@ -31,6 +31,7 @@
import junit.framework.Test;
+import org.jboss.soa.esb.common.tests.BaseTest;
import org.jboss.soa.esb.server.StatsMBean;
import org.jboss.test.JBossTestCase;
@@ -61,27 +62,45 @@
public void sendFtp() throws Exception
{
- final String hostname = "localhost:10021";
- final String username = "esb";
- final String password = "esb";
+ final String hostname = System.getProperty(BaseTest.FTP_HOSTNAME, "localhost:10021");
+ final String username = System.getProperty(BaseTest.FTP_USER, "esb");
+ final String password = System.getProperty(BaseTest.FTP_PWD, "esb");
+ final String dir = System.getProperty(BaseTest.FTP_DIR, "/") ;
+
final String filename = "FtpUnitTestCase-" + new Date().getTime() + ".dat";
final String contents = "Hello World from FTP";
final URL url;
+ final String dirVal;
final String filenameVal;
- if (filename.charAt(0) == '/')
-
+
+ if (dir.length() > 0)
{
- filenameVal = (filename.length() > 1 ? "%2F" + filename.substring(1) : "%2F");
+ if (dir.charAt(0) == '/')
+ {
+ dirVal = (dir.length() > 1 ? "%2F" + dir.substring(1) : "%2F");
+ }
+ else
+ {
+ dirVal = dir;
+ }
+
+ if (dir.charAt(dir.length()-1) == '/')
+ {
+ filenameVal = filename;
+ }
+ else
+ {
+ filenameVal = '/' + filename;
+ }
}
-
else
-
{
- filenameVal = filename;
+ dirVal = dir ;
+ filenameVal = filename ;
}
-
- url = new URL("ftp://" + username + ":" + password + "@" + hostname + "/" + filenameVal);
+
+ url = new URL("ftp://" + username + ":" + password + "@" + hostname + "/" + dirVal + filenameVal);
System.out.println("FTP URL=" + url);
final URLConnection connection;
@@ -104,12 +123,7 @@
public static Test suite() throws Exception
{
- String deployESBStr = System.getProperty("org.jboss.soa.esb.qa.deployjbossesb");
- if ("true".equalsIgnoreCase(deployESBStr)) {
- return getDeploySetup(FtpUnitTest.class, "jbossesb.sar,ftp-server.sar,ftp-test.esb");
- } else {
- return getDeploySetup(FtpUnitTest.class, "ftp-server.sar,ftp-test.esb");
- }
+ return getDeploySetup(FtpUnitTest.class, "ftp-test.esb");
}
}
Modified: labs/jbossesb/trunk/qa/test.properties
===================================================================
--- labs/jbossesb/trunk/qa/test.properties 2007-07-23 15:38:46 UTC (rev 13729)
+++ labs/jbossesb/trunk/qa/test.properties 2007-07-23 17:51:23 UTC (rev 13730)
@@ -6,7 +6,3 @@
org.jboss.soa.esb.jndi.server.type=jboss
org.jboss.soa.esb.jndi.server.url=localhost
-# which queue definition should be deployed, the one for jbm or jbmq?
-org.jboss.soa.esb.qa.jmsprovider=jbmq
-# should the jbossesb.sar get deployed?
-org.jboss.soa.esb.qa.deployjbossesb=true
\ No newline at end of file
More information about the jboss-svn-commits
mailing list