[jboss-svn-commits] JBL Code SVN: r34627 - labs/jbossesb/branches/JBESB_4_9_CP/qa/quickstarts.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 10 14:56:08 EDT 2010
Author: tcunning
Date: 2010-08-10 14:56:08 -0400 (Tue, 10 Aug 2010)
New Revision: 34627
Modified:
labs/jbossesb/branches/JBESB_4_9_CP/qa/quickstarts/build.xml
Log:
JBESB-2450
Simplify the clean-esb and prepare-deployment targets so that they
clean and prepare all quickstarts by default rather than just ones
specified.
Modified: labs/jbossesb/branches/JBESB_4_9_CP/qa/quickstarts/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/qa/quickstarts/build.xml 2010-08-10 18:55:13 UTC (rev 34626)
+++ labs/jbossesb/branches/JBESB_4_9_CP/qa/quickstarts/build.xml 2010-08-10 18:56:08 UTC (rev 34627)
@@ -1,5 +1,12 @@
<?xml version="1.0"?>
<project name="JUnit" default="test" basedir=".">
+
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+ <classpath>
+ <pathelement location="../../antlib/ant-contrib-1.0b3.jar"/>
+ </classpath>
+ </taskdef>
+
<property file="quickstarts.properties"/>
<property name="product.dir" location="../../product"/>
@@ -27,8 +34,10 @@
<property name="junit.jar" location="${product.dir}/../testlib/junit-4.1.jar"/>
<property file="${org.jboss.esb.properties}"/>
-
+
<import file="../base-cp.xml"/>
+
+ <property name="org.jboss.esb.test.server.config" value="default"/>
<macrodef name="runant">
<attribute name="target"/>
@@ -136,7 +145,7 @@
<attribute name="target"/>
<sequential>
<ant antfile="build.xml"
- dir="${org.jboss.esb.test.quickstarts.dir}/@{quickstart}"
+ dir="@{quickstart}"
target="@{target}" inheritAll="false">
<property name="quickstart.jbossesb.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
<property name="quickstart.jbossesb.ftp.username" value="${org.jboss.esb.test.ftp.user}"/>
@@ -155,6 +164,53 @@
<target name="clean" depends="init, clean-esb"/>
+ <target name="qclean">
+ <exec-quickstart quickstart="${quickstartfile}"
+ target="clean"/>
+ </target>
+
+ <target name="clean-esb" if="quickstarts.exist">
+ <foreach target="qclean" param="quickstartfile">
+ <path>
+ <dirset dir="${product.build}/jbossesb/samples">
+ <include name="quickstarts/*"/>
+ <exclude name="quickstarts/conf"/>
+ </dirset>
+ </path>
+ </foreach>
+ </target>
+
+ <target name="pdeploy">
+ <exec-quickstart quickstart="${quickstartfile}"
+ target="prepare-deployment"/>
+ </target>
+
+ <target name="compile-esb">
+ <foreach target="pdeploy" param="quickstartfile">
+ <path>
+ <dirset dir="${product.build}/jbossesb/samples">
+ <include name="quickstarts/*"/>
+ <exclude name="quickstarts/conf"/>
+
+ <!-- Quickstarts which require an ejb3
+ container are excepted -->
+ <exclude name="quickstarts/business_service"/>
+ <exclude name="quickstarts/ejbprocessor"/>
+
+ <!-- Quickstarts which require AS 5.0+
+ are excepted-->
+ <exclude name="quickstarts/security_saml"/>
+
+ <!-- Quickstarts which require remoting upgrades
+ are excepted -->
+ <exclude name="quickstarts/webservice_mtom"/>
+ <exclude name="quickstarts/webservice_wsaddressing"/>
+ <exclude name="quickstarts/webservice_wssecurity"/>
+ </dirset>
+ </path>
+ </foreach>
+ </target>
+
<target name="one-test">
<runant target="internal-one-test"/>
</target>
@@ -169,7 +225,7 @@
<target name="ci-clean" depends="init, clean-esb"/>
- <target name="compile" depends="clean, compile-esb">
+ <target name="compile" depends="clean, compile-esb, copy-esb">
<echo message="Compiling JUnit based Quickstart tests..."/>
@@ -184,89 +240,7 @@
</jar>
</target>
- <target name="clean-esb" if="quickstarts.exist">
- <exec-quickstart quickstart="bpm_orchestration1" target="clean"/>
- <exec-quickstart quickstart="bpm_orchestration2" target="clean"/>
- <exec-quickstart quickstart="bpm_orchestration3" target="clean"/>
- <exec-quickstart quickstart="business_rules_service" target="clean"/>
- <exec-quickstart quickstart="custom_action" target="clean"/>
- <exec-quickstart quickstart="deadletter" target="clean"/>
- <exec-quickstart quickstart="dynamic_router" target="clean"/>
- <exec-quickstart quickstart="exceptions_faults" target="clean"/>
- <exec-quickstart quickstart="fun_cbr" target="clean"/>
- <exec-quickstart quickstart="groovy_gateway" target="clean"/>
- <exec-quickstart quickstart="helloworld" target="clean"/>
- <exec-quickstart quickstart="helloworld_action" target="clean"/>
- <exec-quickstart quickstart="helloworld_file_action" target="clean"/>
- <exec-quickstart quickstart="helloworld_file_notifier" target="clean"/>
- <exec-quickstart quickstart="helloworld_sql_action" target="clean"/>
- <exec-quickstart quickstart="http_gateway" target="clean"/>
- <exec-quickstart quickstart="jms_secured" target="clean"/>
- <exec-quickstart quickstart="jms_topic" target="clean"/>
- <exec-quickstart quickstart="load_generator" target="clean"/>
- <exec-quickstart quickstart="messagefilter" target="clean"/>
- <exec-quickstart quickstart="messagestore" target="clean"/>
- <exec-quickstart quickstart="native_client" target="clean"/>
- <exec-quickstart quickstart="recipient_list" target="clean"/>
- <exec-quickstart quickstart="scheduled_services" target="clean"/>
- <exec-quickstart quickstart="scripting_groovy" target="clean"/>
- <exec-quickstart quickstart="simple_cbr" target="clean"/>
- <exec-quickstart quickstart="spring_aop" target="clean"/>
- <exec-quickstart quickstart="spring_helloworld" target="clean"/>
- <exec-quickstart quickstart="spring_jpetstore" target="clean"/>
- <exec-quickstart quickstart="static_router" target="clean"/>
- <exec-quickstart quickstart="transform_CSV2XML" target="clean"/>
- <exec-quickstart quickstart="transform_EDI2XML_Groovy_XSLT" target="clean"/>
- <exec-quickstart quickstart="transform_XML2POJO" target="clean"/>
- <exec-quickstart quickstart="transform_XML2XML_date_manipulation" target="clean"/>
- <exec-quickstart quickstart="transform_XML2XML_simple" target="clean"/>
- <exec-quickstart quickstart="wiretap" target="clean"/>
- <exec-quickstart quickstart="webservice_consumer1" target="clean"/>
- <exec-quickstart quickstart="webservice_consumer2" target="clean"/>
- <exec-quickstart quickstart="webservice_producer" target="clean"/>
- </target>
-
- <target name="compile-esb">
- <echo>Compile ESB Packages</echo>
- <exec-quickstart quickstart="bpm_orchestration1" target="prepare-deployment"/>
- <exec-quickstart quickstart="bpm_orchestration2" target="prepare-deployment"/>
- <exec-quickstart quickstart="bpm_orchestration3" target="prepare-deployment"/>
- <exec-quickstart quickstart="business_rules_service" target="prepare-deployment"/>
- <exec-quickstart quickstart="custom_action" target="prepare-deployment"/>
- <exec-quickstart quickstart="deadletter" target="prepare-deployment"/>
- <exec-quickstart quickstart="dynamic_router" target="prepare-deployment"/>
- <exec-quickstart quickstart="exceptions_faults" target="prepare-deployment"/>
-
- <exec-quickstart quickstart="fun_cbr" target="prepare-deployment"/>
- <exec-quickstart quickstart="groovy_gateway" target="prepare-deployment"/>
- <exec-quickstart quickstart="helloworld" target="prepare-deployment"/>
- <exec-quickstart quickstart="helloworld_action" target="prepare-deployment"/>
- <exec-quickstart quickstart="helloworld_file_action" target="prepare-deployment"/>
- <exec-quickstart quickstart="helloworld_file_notifier" target="prepare-deployment"/>
- <exec-quickstart quickstart="helloworld_sql_action" target="prepare-deployment"/>
- <exec-quickstart quickstart="http_gateway" target="prepare-deployment"/>
- <exec-quickstart quickstart="jms_secured" target="prepare-deployment"/>
- <exec-quickstart quickstart="jms_topic" target="prepare-deployment"/>
- <exec-quickstart quickstart="messagefilter" target="prepare-deployment"/>
- <exec-quickstart quickstart="messagestore" target="prepare-deployment"/>
- <exec-quickstart quickstart="native_client" target="prepare-deployment"/>
- <exec-quickstart quickstart="recipient_list" target="prepare-deployment"/>
- <exec-quickstart quickstart="scheduled_services" target="prepare-deployment"/>
- <exec-quickstart quickstart="scripting_groovy" target="prepare-deployment"/>
- <exec-quickstart quickstart="simple_cbr" target="prepare-deployment"/>
- <exec-quickstart quickstart="spring_aop" target="prepare-deployment"/>
- <exec-quickstart quickstart="spring_helloworld" target="prepare-deployment"/>
- <exec-quickstart quickstart="spring_jpetstore" target="prepare-deployment"/>
- <exec-quickstart quickstart="static_router" target="prepare-deployment"/>
- <exec-quickstart quickstart="transform_CSV2XML" target="prepare-deployment"/>
- <exec-quickstart quickstart="transform_EDI2XML_Groovy_XSLT" target="prepare-deployment"/>
- <exec-quickstart quickstart="transform_XML2POJO" target="prepare-deployment"/>
- <exec-quickstart quickstart="transform_XML2XML_date_manipulation" target="prepare-deployment"/>
- <exec-quickstart quickstart="transform_XML2XML_simple" target="prepare-deployment"/>
- <exec-quickstart quickstart="webservice_consumer1" target="prepare-deployment"/>
- <exec-quickstart quickstart="webservice_consumer2" target="prepare-deployment"/>
- <exec-quickstart quickstart="webservice_producer" target="prepare-deployment"/>
- <exec-quickstart quickstart="wiretap" target="prepare-deployment"/>
+ <target name="copy-esb">
<copy todir="${qa.quickstarts.build.lib}" flatten="true">
<fileset dir="${org.jboss.esb.test.quickstarts.dir}">
<include name="bpm_orchestration1/build/*.esb"/>
@@ -284,7 +258,7 @@
<include name="helloworld_file_action/build/*.esb"/>
<include name="helloworld_file_notifier/build/*.esb"/>
<include name="helloworld_sql_action/build/*.esb"/>
- <include name="http_gateway/build/*.esb"/>
+ <include name="http_gateway/build/*.esb"/>
<include name="jms_secured/build/*.esb"/>
<include name="jms_topic/build/*.esb"/>
<include name="load_generator/build/*.esb"/>
More information about the jboss-svn-commits
mailing list