[jboss-svn-commits] JBL Code SVN: r13686 - in labs/jbossesb/trunk/qa: junit and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 20 17:16:16 EDT 2007
Author: kurt.stam at jboss.com
Date: 2007-07-20 17:16:15 -0400 (Fri, 20 Jul 2007)
New Revision: 13686
Added:
labs/jbossesb/trunk/qa/junit/resources/ftpd.properties
labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbmq-service.xml
labs/jbossesb/trunk/qa/junit/resources/server/ftp/test-service.xml
labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbmq-service.xml
labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbmq-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/junit/src/org/jboss/soa/esb/server/jca/JcaUnitTest.java
Removed:
labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-queues-service.xml
labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-queues-service.xml
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTestCase.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTestCase.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/jca/JcaUnitTestCase.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/unit/
Modified:
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/META-INF/jboss-esb.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/META-INF/deployment.xml
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/MyAction.java
labs/jbossesb/trunk/qa/test.properties
Log:
JBESB-613, qa now runs tests on .esb archives. Next we should start bringing over the QS tests.
Modified: labs/jbossesb/trunk/qa/junit/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/build.xml 2007-07-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/build.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -42,9 +42,24 @@
<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="compile, prompt, execute"/>
- <target name="ci-test" depends="compile, execute"/>
+ <target name="test" depends="init, compile, jars, prompt, execute"/>
+ <target name="ci-test" depends="init, compile, jars, execute"/>
<target name="compile">
<echo message="Running JUnit based QA tests..."/>
@@ -77,7 +92,7 @@
</fileset>
<fileset dir="${qa.junit.resources}/server/simple">
<include name="test-service.xml"/>
- <include name="esb-jbm-service.xml"/>
+ <include name="esb-${org.jboss.soa.esb.qa.jmsprovider}-service.xml"/>
<include name="META-INF/*.xml"/>
</fileset>
</jar>
@@ -86,7 +101,7 @@
<include name="org/jboss/soa/esb/server/*.class"/>
</fileset>
<fileset dir="${qa.junit.resources}/server/simple-scoped">
- <include name="esb-jbm-service.xml"/>
+ <include name="esb-${org.jboss.soa.esb.qa.jmsprovider}-service.xml"/>
<include name="META-INF/*.xml"/>
</fileset>
</jar>
@@ -98,7 +113,7 @@
<include name="test-service.xml"/>
</fileset>
<fileset dir="${qa.junit.resources}/server/ftp">
- <include name="esb-jbm-service.xml"/>
+ <include name="esb-${org.jboss.soa.esb.qa.jmsprovider}-service.xml"/>
<include name="META-INF/*.xml"/>
</fileset>
</jar>
@@ -113,13 +128,13 @@
<include name="test-service.xml"/>
</fileset>
<fileset dir="${qa.junit.resources}/server/jca">
- <include name="esb-jbm-service.xml"/>
+ <include name="esb-${org.jboss.soa.esb.qa.jmsprovider}-service.xml"/>
<include name="META-INF/*.xml"/>
</fileset>
</jar>
</target>
- <target name="one-test" if="test"
+ <target name="one-test" if="test" depends="jars"
description="Execute all tests in the given test directory.">
<mkdir dir="${qa.build.reports}"/>
<mkdir dir="${qa.build.testlog}"/>
@@ -203,9 +218,17 @@
<pathelement location="${qa.junit.classes}"/>
<path refid="qa.junit.cp"/>
<pathelement location="${qa.junit.src}"/>
+ <pathelement location="${qa.junit.resources}/server"/>
</classpath>
<jvmarg value="-Xmx${qa.junit.memory}"/>
+ <sysproperty key="jbosstest.deploy.dir" value="${qa.build.lib}"/>
+ <sysproperty key="build.testlog" value="${qa.build.testlog}"/>
+ <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"
value="${org.jboss.soa.esb.paramsRepository.file.root}"/>
Added: labs/jbossesb/trunk/qa/junit/resources/ftpd.properties
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/ftpd.properties (rev 0)
+++ labs/jbossesb/trunk/qa/junit/resources/ftpd.properties 2007-07-20 21:16:15 UTC (rev 13686)
@@ -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/qa/junit/resources/ftpd.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
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-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/deployment.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -1,4 +1,3 @@
<jbossesb-deployment>
<depends>jboss.esb:test=server</depends>
- <depends>jboss.messaging.destination:service=Queue,name=ftptest</depends>
</jbossesb-deployment>
\ No newline at end of file
Modified: 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-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/resources/server/ftp/META-INF/jboss-esb.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -2,7 +2,7 @@
<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" >
+ <ftp-provider name="FTPprovider" hostname="localhost:10021" >
<ftp-bus busid="helloFTPChannel" >
<ftp-message-filter
username="esb"
Added: labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbmq-service.xml (rev 0)
+++ labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbmq-service.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -0,0 +1,10 @@
+<?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">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+
+</server>
Property changes on: labs/jbossesb/trunk/qa/junit/resources/server/ftp/esb-jbmq-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: labs/jbossesb/trunk/qa/junit/resources/server/ftp/test-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/ftp/test-service.xml (rev 0)
+++ labs/jbossesb/trunk/qa/junit/resources/server/ftp/test-service.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <mbean name="jboss.esb:test=server" code="org.jboss.soa.esb.server.Stats"/>
+</server>
\ No newline at end of file
Property changes on: labs/jbossesb/trunk/qa/junit/resources/server/ftp/test-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbmq-service.xml (rev 0)
+++ labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbmq-service.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -0,0 +1,16 @@
+<?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">
+ <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">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+</server>
Property changes on: labs/jbossesb/trunk/qa/junit/resources/server/jca/esb-jbmq-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
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-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple/META-INF/deployment.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -1,5 +1,3 @@
<jbossesb-deployment>
<depends>jboss.esb:test=server</depends>
- <depends>jboss.messaging.destination:service=Queue,name=esb_gateway_channel</depends>
- <depends>jboss.messaging.destination:service=Queue,name=esb_channel</depends>
</jbossesb-deployment>
\ No newline at end of file
Added: labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbmq-service.xml (rev 0)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbmq-service.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -0,0 +1,16 @@
+<?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">
+ <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">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+</server>
Property changes on: labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbmq-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Deleted: labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-queues-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-queues-service.xml 2007-07-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-queues-service.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- jboss mq version -->
-<server>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.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.mq.destination:service=Queue,name=esb_channel">
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-</server>
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-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/META-INF/deployment.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -1,7 +1,5 @@
<jbossesb-deployment>
<depends>jboss.esb:test=server</depends>
- <depends>jboss.messaging.destination:service=Queue,name=esb_gateway_channel_versioned</depends>
- <depends>jboss.messaging.destination:service=Queue,name=esb_channel_versioned</depends>
<loader-repository>
org.jboss.soa.esb:loader=simple-scoped
<loader-repository-config>
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-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbm-service.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -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_versioned"
+ name="jboss.messaging.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_channel_versioned"
+ name="jboss.messaging.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>
Copied: labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbmq-service.xml (from rev 13672, labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-queues-service.xml)
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbmq-service.xml (rev 0)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-jbmq-service.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- jboss mq version -->
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.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">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+</server>
Deleted: labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-queues-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-queues-service.xml 2007-07-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple-scoped/esb-queues-service.xml 2007-07-20 21:16:15 UTC (rev 13686)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- jboss mq version -->
-<server>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.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">
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-</server>
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/MyAction.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/MyAction.java 2007-07-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/MyAction.java 2007-07-20 21:16:15 UTC (rev 13686)
@@ -30,6 +30,7 @@
import org.jboss.soa.esb.actions.ActionProcessingException;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.server.StatsMBean;
public class MyAction extends AbstractActionPipelineProcessor
{
Copied: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTest.java (from rev 13673, labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTestCase.java)
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTest.java (rev 0)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTest.java 2007-07-20 21:16:15 UTC (rev 13686)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.server;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z scott.stark at jboss.org $
+ */
+
+public class SimpleDeployUnitTest
+ extends JBossTestCase
+{
+ org.jboss.logging.Logger log = getLog();
+
+ static boolean deployed = false;
+ static int test = 0;
+
+ public SimpleDeployUnitTest(String name)
+ {
+ super(name);
+ }
+
+ public void sendAMessage(String msg, String destination) throws Exception
+ {
+
+ InitialContext iniCtx = getInitialContext();
+ Object tmp = iniCtx.lookup("ConnectionFactory");
+ ConnectionFactory qcf = (ConnectionFactory) tmp;
+ Connection conn = qcf.createConnection();
+ Destination que = (Queue) iniCtx.lookup(destination);
+ Session session = conn.createSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+ conn.start();
+ MessageProducer send = session.createProducer(que);
+ ObjectMessage tm = session.createObjectMessage(msg);
+ send.send(tm);
+ send.close();
+ conn.close();
+ }
+
+ public void testSimple() throws Exception
+ {
+ sendAMessage("Hello World", "queue/esb_gateway_channel");
+ Thread.sleep(2000); // wait for message to post.
+ String version = (String)getServer().getAttribute(new ObjectName(StatsMBean.objectName), "ExecutedVersion");
+ assertEquals(version, "scope1");
+
+ }
+
+ public void testScope() throws Exception
+ {
+ sendAMessage("Hello World", "queue/esb_gateway_channel_versioned");
+ Thread.sleep(2000); // wait for message to post.
+ String version = (String)getServer().getAttribute(new ObjectName(StatsMBean.objectName), "ExecutedVersion");
+ assertEquals(version, "scope2");
+
+ }
+ 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");
+ }
+ }
+
+}
Deleted: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTestCase.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTestCase.java 2007-07-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/SimpleDeployUnitTestCase.java 2007-07-20 21:16:15 UTC (rev 13686)
@@ -1,98 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.server;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z scott.stark at jboss.org $
- */
-
-public class SimpleDeployUnitTestCase
- extends JBossTestCase
-{
- org.jboss.logging.Logger log = getLog();
-
- static boolean deployed = false;
- static int test = 0;
-
- public SimpleDeployUnitTestCase(String name)
- {
- super(name);
- }
-
- public void sendAMessage(String msg, String destination) throws Exception
- {
-
- InitialContext iniCtx = getInitialContext();
- Object tmp = iniCtx.lookup("ConnectionFactory");
- ConnectionFactory qcf = (ConnectionFactory) tmp;
- Connection conn = qcf.createConnection();
- Destination que = (Queue) iniCtx.lookup(destination);
- Session session = conn.createSession(false, QueueSession.AUTO_ACKNOWLEDGE);
- conn.start();
- MessageProducer send = session.createProducer(que);
- ObjectMessage tm = session.createObjectMessage(msg);
- send.send(tm);
- send.close();
- conn.close();
- }
-
- public void testSimple() throws Exception
- {
- sendAMessage("Hello World", "queue/esb_gateway_channel");
- Thread.sleep(2000); // wait for message to post.
- String version = (String)getServer().getAttribute(new ObjectName(StatsMBean.objectName), "ExecutedVersion");
- assertEquals(version, "scope1");
-
- }
-
- public void testScope() throws Exception
- {
- sendAMessage("Hello World", "queue/esb_gateway_channel_versioned");
- Thread.sleep(2000); // wait for message to post.
- String version = (String)getServer().getAttribute(new ObjectName(StatsMBean.objectName), "ExecutedVersion");
- assertEquals(version, "scope2");
-
- }
- public static Test suite() throws Exception
- {
- return getDeploySetup(SimpleDeployUnitTestCase.class, "simple.esb, simple-scoped.esb");
- }
-
-}
Copied: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTest.java (from rev 13673, labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTestCase.java)
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTest.java (rev 0)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTest.java 2007-07-20 21:16:15 UTC (rev 13686)
@@ -0,0 +1,115 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.soa.esb.server.ftp;
+
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Date;
+
+import javax.management.ObjectName;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.server.StatsMBean;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z scott.stark at jboss.org $
+ */
+
+public class FtpUnitTest
+ extends JBossTestCase
+{
+ public FtpUnitTest(String name)
+ {
+ super(name);
+ }
+
+ public void testFtp() throws Exception
+ {
+ sendFtp();
+ Thread.sleep(10000); // wait for message to post.
+ String version = (String)getServer().getAttribute(new ObjectName(StatsMBean.objectName), "ExecutedVersion");
+ System.out.println("version=" + version);
+ assertEquals(version, "scope1");
+ }
+
+ public void sendFtp() throws Exception
+ {
+
+ final String hostname = "localhost:10021";
+ final String username = "esb";
+ final String password = "esb";
+ final String filename = "FtpUnitTestCase-" + new Date().getTime() + ".dat";
+ final String contents = "Hello World from FTP";
+
+ final URL url;
+ final String filenameVal;
+ if (filename.charAt(0) == '/')
+
+ {
+ filenameVal = (filename.length() > 1 ? "%2F" + filename.substring(1) : "%2F");
+ }
+
+ else
+
+ {
+ filenameVal = filename;
+ }
+
+ url = new URL("ftp://" + username + ":" + password + "@" + hostname + "/" + filenameVal);
+ System.out.println("FTP URL=" + url);
+
+ final URLConnection connection;
+ connection = url.openConnection();
+ connection.setDoOutput(true);
+ final OutputStream os;
+ os = connection.getOutputStream();
+ try
+ {
+ final PrintStream ps = new PrintStream(os);
+ ps.print(contents);
+ ps.close();
+ }
+ finally
+
+ {
+ os.close();
+ }
+ }
+
+ 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");
+ }
+ }
+
+}
Deleted: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTestCase.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTestCase.java 2007-07-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/ftp/FtpUnitTestCase.java 2007-07-20 21:16:15 UTC (rev 13686)
@@ -1,108 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb.server.ftp;
-
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Date;
-
-import javax.management.ObjectName;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.server.StatsMBean;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z scott.stark at jboss.org $
- */
-
-public class FtpUnitTestCase
- extends JBossTestCase
-{
- public FtpUnitTestCase(String name)
- {
- super(name);
- }
-
- public void testFtp() throws Exception
- {
- sendFtp();
- Thread.sleep(10000); // wait for message to post.
- String version = (String)getServer().getAttribute(new ObjectName(StatsMBean.objectName), "ExecutedVersion");
- assertEquals(version, "scope1");
- }
-
- public void sendFtp() throws Exception
- {
-
- final String hostname = "localhost";
- final String username = "esb";
- final String password = "esb";
- final String filename = "FtpUnitTestCase-" + new Date().getTime() + ".dat";
- final String contents = "Hello World from FTP";
-
- final URL url;
- final String filenameVal;
- if (filename.charAt(0) == '/')
-
- {
- filenameVal = (filename.length() > 1 ? "%2F" + filename.substring(1) : "%2F");
- }
-
- else
-
- {
- filenameVal = filename;
- }
-
- url = new URL("ftp://" + username + ":" + password + "@" + hostname + "/" + filenameVal);
-
- final URLConnection connection;
- connection = url.openConnection();
- connection.setDoOutput(true);
- final OutputStream os;
- os = connection.getOutputStream();
- try
- {
- final PrintStream ps = new PrintStream(os);
- ps.print(contents);
- ps.close();
- }
- finally
-
- {
- os.close();
- }
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(FtpUnitTestCase.class, "ftp-test.esb");
- }
-
-}
Copied: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/jca/JcaUnitTest.java (from rev 13673, labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/jca/JcaUnitTestCase.java)
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/jca/JcaUnitTest.java (rev 0)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/jca/JcaUnitTest.java 2007-07-20 21:16:15 UTC (rev 13686)
@@ -0,0 +1,96 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.soa.esb.server.jca;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.server.StatsMBean;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z scott.stark at jboss.org $
+ */
+
+public class JcaUnitTest
+ extends JBossTestCase
+{
+ org.jboss.logging.Logger log = getLog();
+
+ static boolean deployed = false;
+ static int test = 0;
+
+ public JcaUnitTest(String name)
+ {
+ super(name);
+ }
+
+ public void sendAMessage(String msg, String destination) throws Exception
+ {
+
+ InitialContext iniCtx = getInitialContext();
+ Object tmp = iniCtx.lookup("ConnectionFactory");
+ ConnectionFactory qcf = (ConnectionFactory) tmp;
+ Connection conn = qcf.createConnection();
+ Destination que = (Queue) iniCtx.lookup(destination);
+ Session session = conn.createSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+ conn.start();
+ MessageProducer send = session.createProducer(que);
+ ObjectMessage tm = session.createObjectMessage(msg);
+ send.send(tm);
+ send.close();
+ conn.close();
+ }
+
+ public void testSchemaBasedJcaGateway() throws Exception
+ {
+ sendAMessage("Hello World", "queue/esb_gateway_channel");
+ Thread.sleep(2000); // wait for message to post.
+ String version = (String)getServer().getAttribute(new ObjectName(StatsMBean.objectName), "ExecutedVersion");
+ assertEquals(version, "scope1");
+
+ }
+
+ public static Test suite() throws Exception
+ {
+ String deployESBStr = System.getProperty("org.jboss.soa.esb.qa.deployjbossesb");
+ if ("true".equalsIgnoreCase(deployESBStr)) {
+ return getDeploySetup(JcaUnitTest.class, "jbossesb.sar,jca-test.esb");
+ } else {
+ return getDeploySetup(JcaUnitTest.class, "jca-test.esb");
+ }
+ }
+
+}
Deleted: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/jca/JcaUnitTestCase.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/jca/JcaUnitTestCase.java 2007-07-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/jca/JcaUnitTestCase.java 2007-07-20 21:16:15 UTC (rev 13686)
@@ -1,91 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb.server.jca;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.server.StatsMBean;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z scott.stark at jboss.org $
- */
-
-public class JcaUnitTestCase
- extends JBossTestCase
-{
- org.jboss.logging.Logger log = getLog();
-
- static boolean deployed = false;
- static int test = 0;
-
- public JcaUnitTestCase(String name)
- {
- super(name);
- }
-
- public void sendAMessage(String msg, String destination) throws Exception
- {
-
- InitialContext iniCtx = getInitialContext();
- Object tmp = iniCtx.lookup("ConnectionFactory");
- ConnectionFactory qcf = (ConnectionFactory) tmp;
- Connection conn = qcf.createConnection();
- Destination que = (Queue) iniCtx.lookup(destination);
- Session session = conn.createSession(false, QueueSession.AUTO_ACKNOWLEDGE);
- conn.start();
- MessageProducer send = session.createProducer(que);
- ObjectMessage tm = session.createObjectMessage(msg);
- send.send(tm);
- send.close();
- conn.close();
- }
-
- public void testSchemaBasedJcaGateway() throws Exception
- {
- sendAMessage("Hello World", "queue/esb_gateway_channel");
- Thread.sleep(2000); // wait for message to post.
- String version = (String)getServer().getAttribute(new ObjectName(StatsMBean.objectName), "ExecutedVersion");
- assertEquals(version, "scope1");
-
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(JcaUnitTestCase.class, "jca-test.esb");
- }
-
-}
Modified: labs/jbossesb/trunk/qa/test.properties
===================================================================
--- labs/jbossesb/trunk/qa/test.properties 2007-07-20 20:58:43 UTC (rev 13685)
+++ labs/jbossesb/trunk/qa/test.properties 2007-07-20 21:16:15 UTC (rev 13686)
@@ -5,4 +5,8 @@
###################################################################################################
org.jboss.soa.esb.jndi.server.type=jboss
-org.jboss.soa.esb.jndi.server.url=localhost
\ No newline at end of file
+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