[portal-commits] JBoss Portal SVN: r8939 - in modules/test/trunk: build and 16 other directories.

Author: bdaw Date: 2007-11-15 05:56:16 -0500 (Thu, 15 Nov 2007) New Revision: 8939 Added: modules/test/trunk/tooling/src/ modules/test/trunk/tooling/src/main/ modules/test/trunk/tooling/src/main/java/ modules/test/trunk/tooling/src/main/java/org/ modules/test/trunk/tooling/src/main/java/org/jboss/ modules/test/trunk/tooling/src/main/java/org/jboss/unit/ modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/JavaBuilder.java modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ToolingConstants.java modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ant/ modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/maven2/ Removed: modules/test/trunk/build/build-thirdparty.xml modules/test/trunk/build/build.bat modules/test/trunk/build/build.sh modules/test/trunk/build/build.xml modules/test/trunk/build/distrib.xml modules/test/trunk/build/etc/ modules/test/trunk/mc/build.bat modules/test/trunk/mc/build.sh modules/test/trunk/mc/build.xml modules/test/trunk/remote/build.bat modules/test/trunk/remote/build.sh modules/test/trunk/remote/build.xml modules/test/trunk/test/build.bat modules/test/trunk/test/build.sh modules/test/trunk/test/build.xml modules/test/trunk/testsuite/ modules/test/trunk/tooling/ant/src/main/java/ modules/test/trunk/tooling/build.bat modules/test/trunk/tooling/build.sh modules/test/trunk/tooling/build.xml modules/test/trunk/tooling/core/ modules/test/trunk/tooling/maven2/src/main/java/ modules/test/trunk/tools/ modules/test/trunk/unit/build.bat modules/test/trunk/unit/build.sh modules/test/trunk/unit/build.xml Modified: modules/test/trunk/pom.xml modules/test/trunk/tooling/ant/pom.xml modules/test/trunk/tooling/maven2/pom.xml modules/test/trunk/tooling/pom.xml Log: remove ant and reorganize tooling submodules Deleted: modules/test/trunk/build/build-thirdparty.xml =================================================================== --- modules/test/trunk/build/build-thirdparty.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/build/build-thirdparty.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,122 +0,0 @@ -<?xml version="1.0"?> -<project name="main.build" - default="synchronize" - basedir="."> - - <!-- Property File definitions --> - <!--<property file="local.properties"/> - <property file="synchronize.properties"/>--> - <property environment="env"/> - - <!-- Property Definitions --> - <property name="generatedLibrariesFiles" value="../thirdparty/libraries.ent"/> - - - <property name="jboss.tasks.path" - value="../tools/lib/jbossbuild.jar"/> - - <!-- Allow jbossbuild.repository to be set from (in order or priority) - + Command line -Djbossbuild.repository=... - + synchronize.properties jbossbuild.repository setting - + JBOSS_REPOSITORY environment variable - --> - <condition property="jbossbuild.repository" value="${env.JBOSS_REPOSITORY}"> - <isset property="env.JBOSS_REPOSITORY"/> - </condition> - <!-- Fall back to default --> - <property name="jbossbuild.repository" value="http://repository.jboss.com"/> - - <!-- File Imports --> - <import file="../tools/etc/jbossbuild/tasks.xml"/> - - - <!-- Main Definition of dependencies --> - <build id="jbossportal-thirdparty" - impltitle="JBossPortal" - implversion="1.0.0" - implvendor="JBoss, a division of Red Hat Inc." - implurl="http://www.jboss.org" - description="JBoss Portal" - cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss" - thirdpartypath="../thirdparty/" - location="${jbossbuild.repository}" - targetdefs="targets"> - - <!-- - The repository is in CVS under the module repository.jboss.com whose contents - are pushed to the http://repository.jboss.com site. - --> - - <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/> - - <componentref name="apache-ant" version="1.6.5-junit"/> - - <componentref name="codehaus/cargo" version="0.9-portal"/> - - <componentref name="hibernate" version="3.2.0.CR2"/> - <componentref name="apache-log4j" version="1.2.14"/> - <componentref name="junit" version="3.8.1"/> - <componentref name="sun-servlet" version="2.4"/> - <componentref name="apache-httpclient" version="3.0.1"/> - <componentref name="apache-logging" version="1.0.5.SP1-jboss"/> - <componentref name="sun-opends" version="snapshot"/> - <componentref name="jboss/remoting" version="2.2.1.GA"/> - - <!-- For embedding components --> - <componentref name="jbossas/core-libs" version="4.0.4.GA"/> - - <!-- MC 2.0.0.Beta4 --> - <componentref name="jboss/microcontainer" version="2.0.0.Beta4"/> - <componentref name="jboss/aop" version="2.0.0.alpha6"/> - <componentref name="jboss/jbossxb" version="2.0.0.CR4"/> - <componentref name="jboss/jboss-vfs" version="2.0.0.Beta4"/> - <componentref name="jboss/common-core" version="2.2.1.GA"/> - <componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/> <!-- 2.0.3.GA --> - <componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/> <!-- 2.0.3.GA --> - <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/> <!-- 2.0.3.GA --> - <componentref name="javassist" version="3.6.0.CR1"/> <!-- 3.6-beta --> - <componentref name="apache-xerces" version="2.7.1"/> - <componentref name="junit" version="3.8.1"/> - <componentref name="apache-log4j" version="1.2.14"/> - <componentref name="sun-jaf" version="1.1"/> - <componentref name="wutka-dtdparser" version="1.2.1"/> - <componentref name="trove" version="1.0.2"/> <!-- 2.1.1 --> - - - <!-- MC 2.0.0.Beta3 --> -<!-- - <componentref name="jboss/microcontainer" version="2.0.0.Beta3"/> - <componentref name="jboss/aop" version="2.0.0.alpha4"/> - <componentref name="jboss/jbossxb" version="2.0.0.CR2"/> - <componentref name="jboss/jboss-vfs" version="2.0.0.Beta4"/> - <componentref name="jboss/common-core" version="2.0.4.Alpha"/> - <componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/> - <componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/> - <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/> - <componentref name="javassist" version="3.5.0.CR1"/> - <componentref name="apache-log4j" version="1.2.14"/> - <componentref name="apache-xerces" version="2.7.1"/> - <componentref name="sun-jaf" version="1.1"/> - <componentref name="junit" version="3.8.1"/> - <componentref name="wutka-dtdparser" version="1.2.1"/> - <componentref name="trove" version="1.0.2"/> ---> - - </build> - - <synchronizeinfo/> - - <target name="generate-lib-file" - description="generate libraries.ent and thirdparty license info" - depends="synchronize"> - <gen-lib-file filename="${generatedLibrariesFiles}"/> - <visit-componentref-graph - componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor"/> - </target> - - <!-- Generate the targets --> - <generate generate="jbossportal-thirdparty"/> - - - -</project> Deleted: modules/test/trunk/build/build.bat =================================================================== --- modules/test/trunk/build/build.bat 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/build/build.bat 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,54 +0,0 @@ -@echo off -rem -rem Invokes a script of the same name in the 'tools' module. -rem -rem The 'tools' module is expected to be a peer directory of the directory -rem in which this script lives. -rem -rem @author Jason Dillon <jason(a)planet57.com&gt; -rem - -rem $Id: build.bat 2 2005-01-14 23:01:32Z vietj $ - -setlocal - -set PROGNAME=%~nx0 -set DIRNAME=%~dp0 - -rem Legacy shell support -if x%PROGNAME%==x set PROGNAME=build.bat -if x%DIRNAME%==x set DIRNAME=.\ - -set MODULE_ROOT=%DIRNAME% -if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools -set TARGET=%TOOLS_ROOT%\bin\build.bat -set ARGS=%* - -rem Start'er up yo -goto main - -:debug -if not x%DEBUG%==x echo %PROGNAME%: %* -goto :EOF - -:main -call :debug PROGNAME=%PROGNAME% -call :debug DIRNAME=%DIRNAME% -call :debug TOOLS_ROOT=%TOOLS_ROOT% -call :debug TARGET=%TARGET% - -if exist %TARGET% call :call-script & goto :EOF -rem else fail, we can not go on - -echo %PROGNAME%: *ERROR* The target executable does not exist: -echo %PROGNAME%: -echo %PROGNAME%: %TARGET% -echo %PROGNAME%: -echo %PROGNAME%: Please make sure you have checked out the 'tools' module -echo %PROGNAME%: and make sure it is up to date. -goto :EOF - -:call-script -call :debug Executing %TARGET% %ARGS% -call %TARGET% %ARGS% -goto :EOF Deleted: modules/test/trunk/build/build.sh =================================================================== --- modules/test/trunk/build/build.sh 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/build/build.sh 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,49 +0,0 @@ -#!/bin/sh -## -## Invokes a script of the same name in the 'tools' module. -## -## The 'tools' module is expected to be a peer directory of the directory -## in which this script lives. -## -## @author Jason Dillon <jason(a)planet57.com&gt; -## - -# $Id: build.sh 2 2005-01-14 23:01:32Z vietj $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` - -# Buss it yo -main() { - if [ "x$TOOLS_ROOT" = "x" ]; then - TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` - fi - - MODULE_ROOT=`cd $DIRNAME; pwd` - export TOOLS_ROOT MODULE_ROOT DEBUG TRACE - - # Where is the target script? - target="$TOOLS_ROOT/bin/$PROGNAME" - if [ ! -f "$target" ]; then - echo "${PROGNAME}: *ERROR* The target executable does not exist:" - echo "${PROGNAME}:" - echo "${PROGNAME}: $target" - echo "${PROGNAME}:" - echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" - echo "${PROGNAME}: and make sure it is up to date." - exit 2 - fi - - # Get busy yo! - if [ "x$DEBUG" != "x" ]; then - echo "${PROGNAME}: Executing: /bin/sh $target $@" - fi - if [ "x$TRACE" = "x" ]; then - exec /bin/sh $target "$@" - else - exec /bin/sh -x $target "$@" - fi -} - -# Lets get ready to rumble! -main "$@" Deleted: modules/test/trunk/build/build.xml =================================================================== --- modules/test/trunk/build/build.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/build/build.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,335 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - - - ]> - -<!-- $Id: build.xml 7880 2007-08-09 12:38:58Z thomas.heute(a)jboss.com $ --> - -<!--+======================================================================+--> -<!--| JBoss Portal: The OpenSource Portal |--> -<!--| |--> -<!--| Distributable under LGPL license. |--> -<!--| See terms of license at http://www.gnu.org. |--> -<!--| |--> -<!--| This file has been designed to work with the 'tools' module and |--> -<!--| Buildmagic extentions. |--> -<!--+======================================================================+--> - -<project default="main" name="JBoss Portal"> - - <!--+====================================================================+--> - <!--| Setup |--> - <!--| |--> - <!--| Include the common build elements. |--> - <!--| |--> - <!--| This defines several different targets, properties and paths. |--> - <!--| It also sets up the basic extention tasks amoung other things. |--> - <!--+====================================================================+--> - - &buildmagic; - &modules; - &defaults; - - <!--+====================================================================+--> - <!--| Initialization |--> - <!--| |--> - <!--| Initialize the build system. Other targets should depend on |--> - <!--| 'init'. |--> - <!--+====================================================================+--> - - <target name="init" unless="init.disable" depends="_buildmagic:init"> - </target> - - - <!--+====================================================================+--> - <!--| Configuration |--> - <!--| |--> - <!--| This target is invoked by the Buildmagic initialization logic |--> - <!--| and should contain module specific configuration elements. |--> - <!--+====================================================================+--> - - <target name="configure" unless="configure.disable"> - - <!--+==============================+--> - <!--| Project version information. |--> - <!--+==============================+--> - - <property name="version.major" value="1"/> - <property name="version.minor" value="0"/> - <property name="version.revision" value="0"/> - <property name="version.tag" value="GA"/> - <property name="version.name" value=""/> - - <!-- This must be set to the CVS tag for any release --> - <property name="version.cvstag" value="HEAD"/> - - <!-- Module name(s) & version --> - <property name="module.version" - value="${version.major}.${version.minor}.${version.revision}${version.tag}"/> - - <!-- ========= --> - <!-- Libraries --> - <!-- ========= --> - - <!-- The combined library classpath --> - - <path id="library.classpath"> - </path> - - <!-- Configure modules --> - <call target="configure-modules"/> - <path id="dependentmodule.classpath"> - <!-- Add dependent module classpath elements here. --> - </path> - - <!--+=======================================+--> - <!--| Override any default properties here. |--> - <!--+=======================================+--> - - <!-- Configure defaults & build tools --> - - <call target="configure-defaults"/> - - <!--+=======================================+--> - <!--| Define module specific elements here. |--> - <!--+=======================================+--> - - <!--+================================+--> - <!--| Define project structure here. |--> - <!--+================================+--> - - <!-- The group to use by default --> - <property name="groups" value="default"/> - - <!-- Sets up the module configuration. --> - <moduleconfig property="modules" selected="${groups}"> - - <!-- Modules --> - - <module name="test"/> - <module name="unit"/> - <module name="mc"/> - <module name="remote"/> - <module name="tooling"/> - - <!-- Module groups --> - - <group name="test"> - <include - modules="test,unit,mc,remote,tooling"/> - </group> - - <group name="default"> - <include groups="test"/> - </group> - - </moduleconfig> - - <!-- Configure project defaults --> - <call target="configure-project"/> - - </target> - <target name="modules-all" depends="_buildmagic:modules:all"/> - <target name="modules-most" depends="_buildmagic:modules:most"/> - <target name="modules-main" depends="_buildmagic:modules:main"/> - <target name="modules-release" depends="_buildmagic:modules:release"/> - <target name="modules-tests" depends="_buildmagic:modules:tests"/> - <target name="modules-clean" depends="_buildmagic:modules:clean"/> - <target name="modules-clobber" depends="_buildmagic:modules:clobber"/> - <target name="modules-package-tests" depends="_buildmagic:modules:package-tests"/> - - <!--+====================================================================+--> - <!--| Module Pass-through Hooks |--> - <!--| |--> - <!--| These hooks are executed after the above pass-through targets have |--> - <!--| finished with a given module. |--> - <!--+====================================================================+--> - - <!-- Add module pass-through hooks here. --> - - - <!--+====================================================================+--> - <!--| Compile |--> - <!--| |--> - <!--| This target should depend on other compile-* targets for each |--> - <!--| different type of compile that needs to be performed, short of |--> - <!--| documentation compiles. |--> - <!--+====================================================================+--> - - <target name="compile"/> - - <!--+====================================================================+--> - <!--| Generate Output |--> - <!--| |--> - <!--| Generates the target output for this module. Target output is |--> - <!--| the output which is ment to be released or used by external |--> - <!--| modules. |--> - <!--+====================================================================+--> - - <target name="output" - description="Generate all target output." - depends="init"> - <!-- Add module specific elements here. --> - </target> - - <!--+====================================================================+--> - <!--| Documents |--> - <!--| |--> - <!--| Generate all documentation for this module. |--> - <!--+====================================================================+--> - - <target name="docs"> - <ant antfile="build-targets.xml" target="_default:docs"/> - <!-- Add module specific elements here. --> - </target> - - <!--+====================================================================+--> - <!--| Install & Release |--> - <!--+====================================================================+--> - - <target name="release" - description="Builds the default release structure." - depends="modules-most, output"/> - - <target name="release-full" - description="Builds the full release structure." - depends="modules-all, release"/> - - <!--+====================================================================+--> - <!--| Misc. |--> - <!--| |--> - <!--| Standard targets and pseudo-targets. |--> - <!--+====================================================================+--> - - <target name="clean" depends="createthirdparty, modules-clean, _buildmagic:clean" - description="Cleans up most generated files."> - <!-- Add module specific elements here. --> - </target> - - <target name="clobber" depends="_buildmagic:clobber, clean, modules-clobber" - description="Cleans up all generated files."> - <!-- Add module specific elements here. --> - </target> - - <target name="main" depends="most" - description="Executes the default target (most)."/> - - <target name="all" depends="createthirdparty, modules-all" - description="Executes all modules and builds everything."/> - - <target name="most" depends="createthirdparty, modules-most" - description="Executes all modules and builds most everything."/> - - <target name="help" depends="_buildmagic:help:build" - description="Show this help message."/> - - <!-- - | Deploy the application - --> - - <!--<target name="initsetup">--> - <!--<available property="cmsdata" file="${jboss.home}/server/${portal.deploy.dir}/data/portal"/> --> - <!--</target>--> - - <!--<target name="setup" depends="initsetup" unless="cmsdata">--> - <!--<unzip src="../core/src/bin/setup/cms-content.zip" dest="${jboss.home}/server/${portal.deploy.dir}/data"/>--> - <!--</target>--> - - <target name="deploy" - description="Deploy." - depends="main"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <copy file="../core/output/lib/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}" - overwrite="true"/> - </target> - - <target name="undeploy" - description="Undeploy." - depends="init"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/> - </target> - - <target name="deploy-all" - description="Deploy all archives." - depends="most"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <copy file="../core/output/lib/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-admin/output/lib//portal-admin.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-cms/output/lib/portal-cms.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-management/output/lib/portal-management.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-basic-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-news-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-jsp-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-weather-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <!--<copy file="../core-search/output/lib/portal-search.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>--> - <copy file="../widget/output/lib/widget.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../wsrp/output/lib/portal-wsrp.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - </target> - - <target name="undeploy-all" - description="Undeploy all archives." - depends="init"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-admin.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-cms.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-management.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-basic-samples.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-news-samples.war"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-jsp-samples.war"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-weather-samples.war"/> - <!--<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-search.sar"/>--> - <delete file="${jboss.home}/server/${portal.deploy.dir}/widget.war"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp.sar"/> - </target> - - <target name="exploded-deploy" - description="Deploy exploded sar." - depends="main"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/> - <mkdir dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/> - <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"> - <fileset dir="../core/output/resources/jboss-portal.sar"/> - </copy> - </target> - - <target name="javadoc"> - <mkdir dir="javadoc"/> - <javadoc destdir="javadoc"> - <classpath> - <fileset dir="../thirdparty" includes="**/*.jar"/> - </classpath> - <packageset dir="../test/src/main"> - <exclude name="org/jboss/test/**"/> - </packageset> - </javadoc> - </target> - - <!-- create the thirdparty folder from items in the repository --> - <!-- then generate a new libraries.ent file and include it in --> - <!-- the build --> - <target name="createthirdparty" unless="inhibit.downloads" - depends="check.inhibit.downloads"> - <ant antfile="build-thirdparty.xml" target="generate-lib-file"/> - </target> - - <!-- check if thirdparty libraries are to be downloaded --> - <target name="check.inhibit.downloads"> - <condition property="inhibit.downloads"> - <or> - <uptodate property="dependencies.current" - srcfile="build-thirdparty.xml" - targetfile="../thirdparty/libraries.ent"/> - <istrue value="${nodownload}"/> - </or> - </condition> - </target> - -</project> Deleted: modules/test/trunk/build/distrib.xml =================================================================== --- modules/test/trunk/build/distrib.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/build/distrib.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,398 +0,0 @@ -<project default="main" name="JBoss Portal"> - - <property name="source.dir" value="../../jboss-portal-2.6"/> - <property name="docs.dir" value="${source.dir}-docs"/> - <property name="release.version" value="2.6.1.GA"/> - - <!-- --> - <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/> - <property name="portal.release.ha.name" value="jboss-portal-ha-${release.version}"/> - - <!-- --> - <property name="portal.build.src" value="output/${portal.release.normal.name}-src"/> - <property name="portal.build.normal.bin" value="output/${portal.release.normal.name}"/> - <property name="portal.build.ha.bin" value="output/${portal.release.ha.name}"/> - <property name="portal.build.normal.bundled" value="output/${portal.release.normal.name}-bundled"/> - <property name="portal.build.ha.bundled" value="output/${portal.release.ha.name}-bundled"/> - - <property environment="env"/> - - <target name="init" unless="jboss.home"> - <property name="jboss.home" value="${env.JBOSS_HOME}"/> - <echo message="Using JBoss install from $JBOSS_HOME: ${jboss.home}"/> - </target> - - <!-- - <property name="forums.release.name" value="jboss-forums-${release.version}"/> - <property name="forums.build.bin" value="output/${forums.release.name}"/> - <property name="forums.build.src" value="output/${forums.release.name}-src"/> - --> - <!-- Licenses --> - <target name="licenses"> - <fileset id="thirdparty-licenses" dir="../thirdparty/licenses"> - <include name="antlr.txt"/> - <include name="apache-2.0.txt"/> - <include name="bsd.txt"/> - <include name="cddl.txt"/> - <include name="cpl-1.0/txt"/> - <include name="day-jcr.txt"/> - <include name="dom4j.txt"/> - <include name="ehcache.txt"/> - <include name="gpl.txt"/> - <include name="hsqldb.txt"/> - <include name="httpunit.txt"/> - <include name="ironsmith.txt"/> - <include name="lgpl.txt"/> - <include name="nekohtml.txt"/> - <include name="oswego.txt"/> - <include name="public-domain.txt"/> - <include name="slf4j.txt"/> - <include name="sun-jaf.txt"/> - <include name="sun-javamail.txt"/> - <include name="xdoclet.txt"/> - </fileset> - <mkdir dir="output/docs/licenses"/> - <concat destfile="output/docs/licenses/thirdparty-licenses.txt"> - <fileset refid="thirdparty-licenses"/> - </concat> - <copy todir="output/docs/licenses"> - <fileset refid="thirdparty-licenses"/> - <fileset dir="licences" includes="JBossEULA.txt"/> - </copy> - </target> - - <!-- Normal build --> - <target name="_normal.build" depends="init" unless="normal.build.done"> - <ant dir="${source.dir}/build" antfile="build.xml"/> - - <!-- to prevent building several times --> - <property name="normal.build.done" value="true"/> - </target> - - <!-- Build JBoss Portal artifacts --> - <target name="source.build" depends="_normal.build"> - <!-- HA specific targets --> - <ant dir="${source.dir}/core" antfile="build.xml" target="output-ha"/> - <ant dir="${source.dir}/core-cms" antfile="build.xml" target="output-ha"/> - - <!-- Datasource files --> - <ant dir="${source.dir}/core" antfile="build.xml" target="datasource"> - <!-- Hack because invoking the datasource generation from another build file replace ${/} --> - <property name="/" value="${/}"/> - </ant> - - <ant dir="${source.dir}/wsrp" antfile="build.xml" target="output"/> - <ant dir="${source.dir}/wsrp" antfile="build.xml" target="explode"/> - </target> - - <!-- Build JBoss Portal documentation --> - <target name="doc.build" depends="_normal.build" unless="no-doc"> - <ant dir="${docs.dir}/referenceGuide" antfile="build.xml"/> - <ant dir="${docs.dir}/userGuide" antfile="build.xml"/> - <ant dir="${docs.dir}/quickstartuser" antfile="build.xml"/> - </target> - - <!-- Build JBoss Portal --> - <target name="build" depends="source.build,doc.build"/> - - - <!--<macrodef name="package-doc"> - <attribute name="todir"/> - <sequential> - <mkdir dir="${todir}"/> - <mkdir dir="${todir}/referenceGuide"/> - <copy todir="${todir}/referenceGuide"> - <fileset dir="${docs.dir}/referenceGuide/build/en/"/> - </copy> - <mkdir dir="${todir}/userGuide"/> - <copy todir="${todir}/userGuide"> - <fileset dir="${docs.dir}/userGuide/build/en/"/> - </copy> - <mkdir dir="${todir}/quickstartuser"/> - <copy todir="${todir}/quickstartuser"> - <fileset dir="${docs.dir}/quickstartuser/build/en/"/> - </copy> - </sequential> - </macrodef>--> - - <target name="package-doc"> - <sequential> - <mkdir dir="${todir}"/> - <mkdir dir="${todir}/referenceGuide"/> - <copy todir="${todir}/referenceGuide"> - <fileset dir="${docs.dir}/referenceGuide/build/en/"/> - </copy> - <mkdir dir="${todir}/userGuide"/> - <copy todir="${todir}/userGuide"> - <fileset dir="${docs.dir}/userGuide/build/en/"/> - </copy> - <mkdir dir="${todir}/quickstartuser"/> - <copy todir="${todir}/quickstartuser"> - <fileset dir="${docs.dir}/quickstartuser/build/en/"/> - </copy> - </sequential> - </target> - - <target name="package-ds"> - <sequential> - <mkdir dir="${todir}"/> - <copy todir="${todir}"> - <fileset dir="${source.dir}/core/output/resources/setup" includes="portal-*-ds.xml"/> - </copy> - </sequential> - </target> - - <target name="package-samples"> - <sequential> - <mkdir dir="${todir}"/> - <copy todir="${todir}"> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-basic-samples.sar/**"/> - </copy> - <copy file="${docs.dir}/readmeFiles/samples-readme.txt" tofile="${todir}/readme.txt"/> - </sequential> - </target> - - <target name="patch-log4j"> - <patch patchfile="${source.dir}/build/etc/resources/jboss-log4j.xml.diff" - originalfile="${todir}/conf/jboss-log4j.xml" strip="1"/> - </target> - - <!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc--> - <target name="package-bin" unless="no-doc"> - <sequential> - <mkdir dir="${todir}"/> - <antcall target="package-doc"> - <param name="todir" value="${todir}/docs"/> - </antcall> - <antcall target="package-ds"> - <param name="todir" value="${todir}/setup"/> - </antcall> - <antcall target="package-samples"> - <param name="todir" value="${todir}/samples"/> - </antcall> - <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/> - <copy todir="${todir}/docs/portal/licenses"> - <fileset dir="output/docs/licenses"/> - </copy> - </sequential> - </target> - - <target name="package-bundled" unless="no-doc"> - <sequential> - <mkdir dir="${todir}"/> - <antcall target="package-doc"> - <param name="todir" value="${todir}/docs/portal"/> - </antcall> - <antcall target="package-ds"> - <param name="todir" value="${todir}/setup"/> - </antcall> - <antcall target="package-samples"> - <param name="todir" value="${todir}/samples"/> - </antcall> - <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/> - <copy todir="${todir}/docs/portal/licenses"> - <fileset dir="output/docs/licenses"/> - </copy> - </sequential> - </target> - - <!-- --> - <target name="package"> - - <!-- Create the output directory --> - <mkdir dir="output"/> - - <!-- - | JBoss Portal source distribution - --> - - <mkdir dir="${portal.build.src}"/> - <antcall target="package-doc"> - <param name="todir" value="${portal.build.src}/docs"/> - </antcall> - <copy file="${docs.dir}/readmeFiles/jboss-portal-src.README" todir="${portal.build.src}"/> - <copy todir="${portal.build.src}"> - <fileset dir="${source.dir}" includes="**/*" - excludes="*/output/**,**/CVS/*,**/build.log,build/local.properties,forums/**,thirdparty/**"/> - </copy> - <copy todir="${portal.build.src}/docs/portal/licenses"> - <fileset dir="output/docs/licenses"/> - </copy> - <fixcrlf srcdir="${portal.build.src}" includes="**/*.sh" eol="lf" eof="remove"/> - <fixcrlf srcdir="${portal.build.src}" includes="**/*.bat" eol="crlf"/> - - <!-- - | JBoss Portal binaries distribution - --> - - <antcall target="package-normal"/> - <antcall target="package-ha"/> - <antcall target="package-normal-bundled"/> - <antcall target="package-ha-bundled"/> - </target> - - <!-- - | JBoss Portal binary distribution - --> - - <target name="package-normal" description="package jboss-portal.sar"> - <mkdir dir="${portal.build.normal.bin}"/> - <antcall target="package-bin"> - <param name="todir" value="${portal.build.normal.bin}"/> - </antcall> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> - <fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/> - </copy> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-cms.sar"> - <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/> - </copy> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> - <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> - <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> - <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> - </copy> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/samples"> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/> - </copy> - <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"> - <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> - </copy> - </target> - - <!-- - | JBoss Portal ha binaries distribution - --> - <target name="package-ha" description="package jboss-portal-ha.sar"> - <mkdir dir="${portal.build.ha.bin}"/> - <antcall target="package-bin"> - <param name="todir" value="${portal.build.ha.bin}"/> - </antcall> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> - <fileset dir="${source.dir}/core/output/resources/jboss-portal-ha.sar"/> - </copy> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-cms.sar"> - <fileset dir="${source.dir}/core-cms/output/resources/portal-cms-ha.sar" includes="**"/> - </copy> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> - <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> - <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> - <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> - </copy> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/samples"> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/> - </copy> - <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"> - <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> - </copy> - <copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/> - </target> - - - <!-- - | JBoss Portal bundled distribution - --> - <target name="package-normal-bundled" depends="package-normal" if="jboss.home" - description="package jboss-portal bundled with JBoss AS"> - <mkdir dir="${portal.build.normal.bundled}"/> - <antcall target="package-bundled"> - <param name="todir" value="${portal.build.normal.bundled}"/> - </antcall> - <copy todir="${portal.build.normal.bundled}/server/default/deploy/jboss-portal.sar"> - <fileset dir="${portal.build.normal.bin}/jboss-portal.sar"/> - </copy> - <copy todir="${portal.build.normal.bundled}/server/default/deploy"> - <fileset dir="${portal.build.normal.bin}/setup" includes="portal-hsqldb-ds.xml"/> - </copy> - <copy todir="${portal.build.normal.bundled}"> - <fileset dir="${jboss.home}"> - <include name="bin/**"/> - <include name="client/**"/> - <include name="docs/**"/> - <include name="lib/**"/> - <include name="server/default/**"/> - </fileset> - </copy> - <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${portal.build.normal.bundled}"/> - <antcall target="patch-log4j"> - <param name="todir" value="${portal.build.normal.bundled}/server/default"/> - </antcall> - </target> - - <!-- - | JBoss Portal ha bundled distribution - --> - - <target name="package-ha-bundled" depends="package-ha" if="jboss.home" - description="package jboss-portal-ha bundled with JBoss AS"> - <mkdir dir="${portal.build.ha.bundled}"/> - <antcall target="package-bundled"> - <param name="todir" value="${portal.build.ha.bundled}"/> - </antcall> - <copy todir="${portal.build.ha.bundled}/server/all/deploy/jboss-portal-ha.sar"> - <fileset dir="${portal.build.ha.bin}/jboss-portal-ha.sar"/> - </copy> - <copy todir="${portal.build.ha.bundled}"> - <fileset dir="${jboss.home}"> - <include name="bin/**"/> - <include name="client/**"/> - <include name="docs/**"/> - <include name="lib/**"/> - <include name="server/all/**"/> - </fileset> - </copy> - <copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bundled}"/> - <antcall target="patch-log4j"> - <param name="todir" value="${portal.build.normal.bundled}/server/default"/> - </antcall> - - </target> - - <!-- Create packages --> - <target name="zip"> - - <tar destfile="${portal.build.src}.tar.gz" - compression="gzip"> - <tarfileset prefix="${portal.release.normal.name}-src" filemode="775" dir="${portal.build.src}"/> - </tar> - <checksum file="${portal.build.src}.tar.gz"/> - - <zip destfile="${portal.build.normal.bin}.zip"> - <zipfileset prefix="${portal.release.normal.name}" dir="${portal.build.normal.bin}"/> - </zip> - <checksum file="${portal.build.normal.bin}.zip"/> - - <zip destfile="${portal.build.ha.bin}.zip"> - <zipfileset prefix="${portal.release.ha.name}" dir="${portal.build.ha.bin}"/> - </zip> - <checksum file="${portal.build.ha.bin}.zip"/> - - <zip destfile="${portal.build.normal.bundled}.zip"> - <zipfileset prefix="${portal.release.normal.name}" dir="${portal.build.normal.bundled}"/> - </zip> - <checksum file="${portal.build.normal.bin}.zip"/> - - <zip destfile="${portal.build.ha.bundled}.zip"> - <zipfileset prefix="${portal.release.ha.name}" dir="${portal.build.ha.bundled}"/> - </zip> - <checksum file="${portal.build.ha.bundled}.zip"/> - - <!-- - <tar destfile="${forums.build.src}.tar.gz" - compression="gzip"> - <tarfileset dir="output/${forums.release.name}-src" - prefix="${forums.release.name}-src"/> - </tar> - <zip destfile="${forums.build.bin}.zip" - basedir="output/${forums.release.name}"/> - --> - </target> - - <!-- Build and compress everything --> - <target name="main" depends="licenses,build,package,zip" description="do everything - build source, doc, distro"/> -</project> Deleted: modules/test/trunk/mc/build.bat =================================================================== --- modules/test/trunk/mc/build.bat 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/mc/build.bat 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,54 +0,0 @@ -@echo off -rem -rem Invokes a script of the same name in the 'tools' module. -rem -rem The 'tools' module is expected to be a peer directory of the directory -rem in which this script lives. -rem -rem @author Jason Dillon <jason(a)planet57.com&gt; -rem - -rem $Id: build.bat 1829 2006-03-05 13:20:08Z julien $ - -setlocal - -set PROGNAME=%~nx0 -set DIRNAME=%~dp0 - -rem Legacy shell support -if x%PROGNAME%==x set PROGNAME=build.bat -if x%DIRNAME%==x set DIRNAME=.\ - -set MODULE_ROOT=%DIRNAME% -if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools -set TARGET=%TOOLS_ROOT%\bin\build.bat -set ARGS=%* - -rem Start'er up yo -goto main - -:debug -if not x%DEBUG%==x echo %PROGNAME%: %* -goto :EOF - -:main -call :debug PROGNAME=%PROGNAME% -call :debug DIRNAME=%DIRNAME% -call :debug TOOLS_ROOT=%TOOLS_ROOT% -call :debug TARGET=%TARGET% - -if exist %TARGET% call :call-script & goto :EOF -rem else fail, we can not go on - -echo %PROGNAME%: *ERROR* The target executable does not exist: -echo %PROGNAME%: -echo %PROGNAME%: %TARGET% -echo %PROGNAME%: -echo %PROGNAME%: Please make sure you have checked out the 'tools' module -echo %PROGNAME%: and make sure it is up to date. -goto :EOF - -:call-script -call :debug Executing %TARGET% %ARGS% -call %TARGET% %ARGS% -goto :EOF Deleted: modules/test/trunk/mc/build.sh =================================================================== --- modules/test/trunk/mc/build.sh 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/mc/build.sh 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,49 +0,0 @@ -#!/bin/sh -## -## Invokes a script of the same name in the 'tools' module. -## -## The 'tools' module is expected to be a peer directory of the directory -## in which this script lives. -## -## @author Jason Dillon <jason(a)planet57.com&gt; -## - -# $Id: build.sh 1829 2006-03-05 13:20:08Z julien $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` - -# Buss it yo -main() { - if [ "x$TOOLS_ROOT" = "x" ]; then - TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` - fi - - MODULE_ROOT=`cd $DIRNAME; pwd` - export TOOLS_ROOT MODULE_ROOT DEBUG TRACE - - # Where is the target script? - target="$TOOLS_ROOT/bin/$PROGNAME" - if [ ! -f "$target" ]; then - echo "${PROGNAME}: *ERROR* The target executable does not exist:" - echo "${PROGNAME}:" - echo "${PROGNAME}: $target" - echo "${PROGNAME}:" - echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" - echo "${PROGNAME}: and make sure it is up to date." - exit 2 - fi - - # Get busy yo! - if [ "x$DEBUG" != "x" ]; then - echo "${PROGNAME}: Executing: /bin/sh $target $@" - fi - if [ "x$TRACE" = "x" ]; then - exec /bin/sh $target "$@" - else - exec /bin/sh -x $target "$@" - fi -} - -# Lets get ready to rumble! -main "$@" Deleted: modules/test/trunk/mc/build.xml =================================================================== --- modules/test/trunk/mc/build.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/mc/build.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,253 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE project [ - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> - ]> - -<!-- $Id: build.xml 7954 2007-08-16 14:51:00Z julien(a)jboss.com $ --> - -<!--+======================================================================+--> -<!--| JBoss Portal (The OpenSource Portal) Build File |--> -<!--| |--> -<!--| Distributable under LGPL license. |--> -<!--| See terms of license at http://www.gnu.org. |--> -<!--| |--> -<!--| This file has been designed to work with the 'tools' module and |--> -<!--| Buildmagic extentions. |--> -<!--+======================================================================+--> - -<project default="main" name="JBoss Portal"> - - <!--+====================================================================+--> - <!--| Setup |--> - <!--| |--> - <!--| Include the common build elements. |--> - <!--| |--> - <!--| This defines several different targets, properties and paths. |--> - <!--| It also sets up the basic extention tasks amoung other things. |--> - <!--+====================================================================+--> - - &buildmagic; - &modules; - &defaults; - &tools; - &targets; - - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <!-- - | Initialize the build system. Must depend on '_buildmagic:init'. - | Other targets should depend on 'init' or things will mysteriously fail. - --> - - <target name="init" unless="init.disable" depends="_buildmagic:init"> - </target> - - <!--+====================================================================+--> - <!--| Configuration |--> - <!--| |--> - <!--| This target is invoked by the Buildmagic initialization logic |--> - <!--| and should contain module specific configuration elements. |--> - <!--+====================================================================+--> - - <target name="configure" unless="configure.disable"> - - <!-- Configure thirdparty libraries --> - &libraries; - <path id="library.classpath"> - <path refid="junit.junit.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="jboss.microcontainer.classpath"/> - <path refid="jboss/common.core.classpath"/> - <path refid="jboss/common.logging.spi.classpath"/> - </path> - - <!-- Configure modules --> - <call target="configure-modules"/> - <path id="dependentmodule.classpath"> - <path refid="jboss.unit.classpath"/> - </path> - - <!--+=======================================+--> - <!--| Override any default properties here. |--> - <!--+=======================================+--> - - <!--+=======================================+--> - <!--| Define module specific elements here. |--> - <!--+=======================================+--> - <property name="javadoc.private" value="false"/> - <property name="javadoc.protected" value="false"/> - <property name="javadoc.packages" value="org.jboss.unit.*"/> - - <!-- Configure defaults & build tools --> - <call target="configure-defaults"/> - <call target="configure-tools"/> - - </target> - - <!--+====================================================================+--> - <!--| Compile |--> - <!--| |--> - <!--| This target should depend on other compile-* targets for each |--> - <!--| different type of compile that needs to be performed, short of |--> - <!--| documentation compiles. |--> - <!--+====================================================================+--> - - <target name="compile" - description="Compile all source files." - depends="_default:compile-classes, - _default:compile-etc, - _default:compile-resources"> - <!-- Add module specific elements here. --> - - <!-- Workaround to include test classes from maven convention --> - - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - target="${javac.target}" - debug="${javac.debug}" - source="${javac.source}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="${maven.module.test.sources}"/> - <classpath> - <path refid="javac.classpath"/> - <pathelement location="${build.classes}"/> - </classpath> - - <include name="${javac.includes}"/> - </javac> - - </target> - - <!--+====================================================================+--> - <!--| Generate Output |--> - <!--| |--> - <!--| Generates the target output for this module. Target output is |--> - <!--| the output which is ment to be released or used by external |--> - <!--| modules. |--> - <!--+====================================================================+--> - - <target name="output" - description="Generate all target output." - depends="compile"> - - <mkdir dir="${build.lib}"/> - - <jar jarfile="${build.lib}/jboss-unit-mc-lib.jar"> - <fileset dir="${build.classes}"> - <exclude name="org/jboss/test/**"/> - </fileset> - <fileset dir="${maven.module.resources}"/> - </jar> - - <jar jarfile="${build.lib}/jboss-unit-mc-test.jar"> - <fileset dir="${build.classes}"> - <exclude name="org/jboss/unit/**"/> - </fileset> - <fileset dir="${maven.module.test.resources}"/> - </jar> - - </target> - - <!-- ================================================================== --> - <!-- Cleaning --> - <!-- ================================================================== --> - - <!-- Clean up all build output --> - <target name="clean" depends="_default:clean"> - <!-- Add module specific elements here. --> - </target> - - <!--+====================================================================+--> - <!--| Documents |--> - <!--| |--> - <!--| Generate all documentation for this module. |--> - <!--+====================================================================+--> - - <target name="docs" depends="_default:docs"> - <!-- Add module specific elements here. --> - </target> - - <!-- ================================================================== --> - <!-- Misc. --> - <!-- ================================================================== --> - - <target name="main" depends="most"/> - <target name="all" depends="_default:all"/> - <target name="most" depends="_default:most"/> - <target name="help" depends="_default:help"/> - - <target name="test" depends="output"> - - <java classname="org.jboss.test.unit.mc.MCTestLifeCycleTests" fork="true"> - - - <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.jdk.JDK14LoggerPlugin"/> - <sysproperty key="java.util.logging.config.file" value="logging.properties"/> - -<!-- - <jvmarg value="-Xdebug"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> ---> - <classpath> - <path refid="junit.junit.classpath"/> - - <path location="${build.lib}/jboss-unit-mc-lib.jar"/> - <path location="${build.lib}/jboss-unit-mc-test.jar"/> - <path location="${build.resources}/test"/> - - <path refid="jboss.unit.classpath"/> - - <path refid="apache.log4j.classpath"/> - <path refid="jboss.microcontainer.classpath"/> - <path refid="jboss/common.core.classpath"/> - <path refid="jboss/common.logging.spi.classpath"/> - <path refid="jboss/common.logging.jdk.classpath"/> - <path refid="jboss.aop.classpath"/> - <path refid="oswego.concurrent.classpath"/> - <path refid="javassist.javassist.classpath"/> - <path refid="trove.trove.classpath"/> - <path refid="jboss.jbossxb.classpath"/> - <path refid="apache.xerces.classpath"/> - - </classpath> - </java> - - </target> - -</project> Modified: modules/test/trunk/pom.xml =================================================================== --- modules/test/trunk/pom.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/pom.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -28,7 +28,8 @@ <modules> <module>build</module> <module>unit</module> - <module>tooling</module> + <module>tooling/ant</module> + <module>tooling/maven2</module> <module>mc</module> <module>remote</module> <module>test/core</module> Deleted: modules/test/trunk/remote/build.bat =================================================================== --- modules/test/trunk/remote/build.bat 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/remote/build.bat 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,54 +0,0 @@ -@echo off -rem -rem Invokes a script of the same name in the 'tools' module. -rem -rem The 'tools' module is expected to be a peer directory of the directory -rem in which this script lives. -rem -rem @author Jason Dillon <jason(a)planet57.com&gt; -rem - -rem $Id: build.bat 1829 2006-03-05 13:20:08Z julien $ - -setlocal - -set PROGNAME=%~nx0 -set DIRNAME=%~dp0 - -rem Legacy shell support -if x%PROGNAME%==x set PROGNAME=build.bat -if x%DIRNAME%==x set DIRNAME=.\ - -set MODULE_ROOT=%DIRNAME% -if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools -set TARGET=%TOOLS_ROOT%\bin\build.bat -set ARGS=%* - -rem Start'er up yo -goto main - -:debug -if not x%DEBUG%==x echo %PROGNAME%: %* -goto :EOF - -:main -call :debug PROGNAME=%PROGNAME% -call :debug DIRNAME=%DIRNAME% -call :debug TOOLS_ROOT=%TOOLS_ROOT% -call :debug TARGET=%TARGET% - -if exist %TARGET% call :call-script & goto :EOF -rem else fail, we can not go on - -echo %PROGNAME%: *ERROR* The target executable does not exist: -echo %PROGNAME%: -echo %PROGNAME%: %TARGET% -echo %PROGNAME%: -echo %PROGNAME%: Please make sure you have checked out the 'tools' module -echo %PROGNAME%: and make sure it is up to date. -goto :EOF - -:call-script -call :debug Executing %TARGET% %ARGS% -call %TARGET% %ARGS% -goto :EOF Deleted: modules/test/trunk/remote/build.sh =================================================================== --- modules/test/trunk/remote/build.sh 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/remote/build.sh 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,49 +0,0 @@ -#!/bin/sh -## -## Invokes a script of the same name in the 'tools' module. -## -## The 'tools' module is expected to be a peer directory of the directory -## in which this script lives. -## -## @author Jason Dillon <jason(a)planet57.com&gt; -## - -# $Id: build.sh 1829 2006-03-05 13:20:08Z julien $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` - -# Buss it yo -main() { - if [ "x$TOOLS_ROOT" = "x" ]; then - TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` - fi - - MODULE_ROOT=`cd $DIRNAME; pwd` - export TOOLS_ROOT MODULE_ROOT DEBUG TRACE - - # Where is the target script? - target="$TOOLS_ROOT/bin/$PROGNAME" - if [ ! -f "$target" ]; then - echo "${PROGNAME}: *ERROR* The target executable does not exist:" - echo "${PROGNAME}:" - echo "${PROGNAME}: $target" - echo "${PROGNAME}:" - echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" - echo "${PROGNAME}: and make sure it is up to date." - exit 2 - fi - - # Get busy yo! - if [ "x$DEBUG" != "x" ]; then - echo "${PROGNAME}: Executing: /bin/sh $target $@" - fi - if [ "x$TRACE" = "x" ]; then - exec /bin/sh $target "$@" - else - exec /bin/sh -x $target "$@" - fi -} - -# Lets get ready to rumble! -main "$@" Deleted: modules/test/trunk/remote/build.xml =================================================================== --- modules/test/trunk/remote/build.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/remote/build.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,242 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE project [ - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> - ]> - -<!-- $Id: build.xml 7954 2007-08-16 14:51:00Z julien(a)jboss.com $ --> - -<!--+======================================================================+--> -<!--| JBoss Portal (The OpenSource Portal) Build File |--> -<!--| |--> -<!--| Distributable under LGPL license. |--> -<!--| See terms of license at http://www.gnu.org. |--> -<!--| |--> -<!--| This file has been designed to work with the 'tools' module and |--> -<!--| Buildmagic extentions. |--> -<!--+======================================================================+--> - -<project default="main" name="JBoss Portal"> - - <!--+====================================================================+--> - <!--| Setup |--> - <!--| |--> - <!--| Include the common build elements. |--> - <!--| |--> - <!--| This defines several different targets, properties and paths. |--> - <!--| It also sets up the basic extention tasks amoung other things. |--> - <!--+====================================================================+--> - - &buildmagic; - &modules; - &defaults; - &tools; - &targets; - - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <!-- - | Initialize the build system. Must depend on '_buildmagic:init'. - | Other targets should depend on 'init' or things will mysteriously fail. - --> - - <target name="init" unless="init.disable" depends="_buildmagic:init"> - </target> - - <!--+====================================================================+--> - <!--| Configuration |--> - <!--| |--> - <!--| This target is invoked by the Buildmagic initialization logic |--> - <!--| and should contain module specific configuration elements. |--> - <!--+====================================================================+--> - - <target name="configure" unless="configure.disable"> - - <!-- Configure thirdparty libraries --> - &libraries; - <path id="library.classpath"> - <path refid="junit.junit.classpath"/> - <path refid="jboss.portal/modules/common.classpath"/> - - <path refid="apache.log4j.classpath"/> - - <path refid="apache.httpclient.classpath"/> - <path refid="apache.codec.classpath"/> - <path refid="apache.logging.classpath"/> - - <path refid="jboss/common.core.classpath"/> - <path refid="jboss/common.logging.spi.classpath"/> - <path refid="jboss.microcontainer.classpath"/> - </path> - - <!-- Configure modules --> - <call target="configure-modules"/> - <path id="dependentmodule.classpath"> - <path refid="portal.test.classpath"/> - <path refid="jboss.unit.classpath"/> - </path> - - <!--+=======================================+--> - <!--| Override any default properties here. |--> - <!--+=======================================+--> - - <!--+=======================================+--> - <!--| Define module specific elements here. |--> - <!--+=======================================+--> - <property name="javadoc.private" value="false"/> - <property name="javadoc.protected" value="false"/> - <property name="javadoc.packages" value="org.jboss.unit.*"/> - - <!-- Configure defaults & build tools --> - <call target="configure-defaults"/> - <call target="configure-tools"/> - - </target> - - <!--+====================================================================+--> - <!--| Compile |--> - <!--| |--> - <!--| This target should depend on other compile-* targets for each |--> - <!--| different type of compile that needs to be performed, short of |--> - <!--| documentation compiles. |--> - <!--+====================================================================+--> - - <target name="compile" - description="Compile all source files." - depends="_default:compile-classes, - _default:compile-etc, - _default:compile-resources"> - <!-- Add module specific elements here. --> - - <!-- Workaround to include test classes from maven convention --> - - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - target="${javac.target}" - debug="${javac.debug}" - source="${javac.source}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="${maven.module.test.sources}"/> - <classpath> - <path refid="javac.classpath"/> - <pathelement location="${build.classes}"/> - </classpath> - - <include name="${javac.includes}"/> - </javac> - - </target> - - <!--+====================================================================+--> - <!--| Generate Output |--> - <!--| |--> - <!--| Generates the target output for this module. Target output is |--> - <!--| the output which is ment to be released or used by external |--> - <!--| modules. |--> - <!--+====================================================================+--> - - <target name="output" - description="Generate all target output." - depends="compile"> - - <mkdir dir="${build.lib}"/> - - <jar jarfile="${build.lib}/jboss-unit-remote-lib.jar"> - <fileset dir="${build.classes}"> - <exclude name="org/jboss/test/**"/> - </fileset> - <fileset dir="${maven.module.resources}"/> - </jar> - - <jar jarfile="${build.lib}/jboss-unit-remote-test.jar"> - <fileset dir="${build.classes}"> - <exclude name="org/jboss/unit/**"/> - </fileset> - <fileset dir="${maven.module.test.resources}"/> - </jar> - - </target> - - <!-- ================================================================== --> - <!-- Cleaning --> - <!-- ================================================================== --> - - <!-- Clean up all build output --> - <target name="clean" depends="_default:clean"> - <!-- Add module specific elements here. --> - </target> - - <!--+====================================================================+--> - <!--| Documents |--> - <!--| |--> - <!--| Generate all documentation for this module. |--> - <!--+====================================================================+--> - - <target name="docs" depends="_default:docs"> - <!-- Add module specific elements here. --> - </target> - - <!-- ================================================================== --> - <!-- Misc. --> - <!-- ================================================================== --> - - <target name="main" depends="most"/> - <target name="all" depends="_default:all"/> - <target name="most" depends="_default:most"/> - <target name="help" depends="_default:help"/> - - <target name="test" depends="output"> - - <java classname="org.jboss.test.unit.AllTests" fork="true"> -<!-- - <jvmarg value="-Xdebug"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> ---> - <classpath> - <path refid="junit.junit.classpath"/> - <path location="${build.lib}/jboss-unit-lib.jar"/> - <path location="${build.lib}/jboss-unit-test.jar"/> - <path location="${build.resources}/test"/> - - <path location="${build.lib}/jboss-unit-remote-test.jar"/> - </classpath> - </java> - - </target> - -</project> Deleted: modules/test/trunk/test/build.bat =================================================================== --- modules/test/trunk/test/build.bat 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/test/build.bat 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,54 +0,0 @@ -@echo off -rem -rem Invokes a script of the same name in the 'tools' module. -rem -rem The 'tools' module is expected to be a peer directory of the directory -rem in which this script lives. -rem -rem @author Jason Dillon <jason(a)planet57.com&gt; -rem - -rem $Id: build.bat 1829 2006-03-05 13:20:08Z julien $ - -setlocal - -set PROGNAME=%~nx0 -set DIRNAME=%~dp0 - -rem Legacy shell support -if x%PROGNAME%==x set PROGNAME=build.bat -if x%DIRNAME%==x set DIRNAME=.\ - -set MODULE_ROOT=%DIRNAME% -if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools -set TARGET=%TOOLS_ROOT%\bin\build.bat -set ARGS=%* - -rem Start'er up yo -goto main - -:debug -if not x%DEBUG%==x echo %PROGNAME%: %* -goto :EOF - -:main -call :debug PROGNAME=%PROGNAME% -call :debug DIRNAME=%DIRNAME% -call :debug TOOLS_ROOT=%TOOLS_ROOT% -call :debug TARGET=%TARGET% - -if exist %TARGET% call :call-script & goto :EOF -rem else fail, we can not go on - -echo %PROGNAME%: *ERROR* The target executable does not exist: -echo %PROGNAME%: -echo %PROGNAME%: %TARGET% -echo %PROGNAME%: -echo %PROGNAME%: Please make sure you have checked out the 'tools' module -echo %PROGNAME%: and make sure it is up to date. -goto :EOF - -:call-script -call :debug Executing %TARGET% %ARGS% -call %TARGET% %ARGS% -goto :EOF Deleted: modules/test/trunk/test/build.sh =================================================================== --- modules/test/trunk/test/build.sh 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/test/build.sh 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,49 +0,0 @@ -#!/bin/sh -## -## Invokes a script of the same name in the 'tools' module. -## -## The 'tools' module is expected to be a peer directory of the directory -## in which this script lives. -## -## @author Jason Dillon <jason(a)planet57.com&gt; -## - -# $Id: build.sh 1829 2006-03-05 13:20:08Z julien $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` - -# Buss it yo -main() { - if [ "x$TOOLS_ROOT" = "x" ]; then - TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` - fi - - MODULE_ROOT=`cd $DIRNAME; pwd` - export TOOLS_ROOT MODULE_ROOT DEBUG TRACE - - # Where is the target script? - target="$TOOLS_ROOT/bin/$PROGNAME" - if [ ! -f "$target" ]; then - echo "${PROGNAME}: *ERROR* The target executable does not exist:" - echo "${PROGNAME}:" - echo "${PROGNAME}: $target" - echo "${PROGNAME}:" - echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" - echo "${PROGNAME}: and make sure it is up to date." - exit 2 - fi - - # Get busy yo! - if [ "x$DEBUG" != "x" ]; then - echo "${PROGNAME}: Executing: /bin/sh $target $@" - fi - if [ "x$TRACE" = "x" ]; then - exec /bin/sh $target "$@" - else - exec /bin/sh -x $target "$@" - fi -} - -# Lets get ready to rumble! -main "$@" Deleted: modules/test/trunk/test/build.xml =================================================================== --- modules/test/trunk/test/build.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/test/build.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,344 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE project [ - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> - ]> - -<!-- $Id: build.xml 7954 2007-08-16 14:51:00Z julien(a)jboss.com $ --> - -<!--+======================================================================+--> -<!--| JBoss Portal (The OpenSource Portal) Build File |--> -<!--| |--> -<!--| Distributable under LGPL license. |--> -<!--| See terms of license at http://www.gnu.org. |--> -<!--| |--> -<!--| This file has been designed to work with the 'tools' module and |--> -<!--| Buildmagic extentions. |--> -<!--+======================================================================+--> - -<project default="main" name="JBoss Portal"> - - <!--+====================================================================+--> - <!--| Setup |--> - <!--| |--> - <!--| Include the common build elements. |--> - <!--| |--> - <!--| This defines several different targets, properties and paths. |--> - <!--| It also sets up the basic extention tasks amoung other things. |--> - <!--+====================================================================+--> - - &buildmagic; - &modules; - &defaults; - &tools; - &targets; - - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <!-- - | Initialize the build system. Must depend on '_buildmagic:init'. - | Other targets should depend on 'init' or things will mysteriously fail. - --> - - <target name="init" unless="init.disable" depends="_buildmagic:init"> - </target> - - <!--+====================================================================+--> - <!--| Configuration |--> - <!--| |--> - <!--| This target is invoked by the Buildmagic initialization logic |--> - <!--| and should contain module specific configuration elements. |--> - <!--+====================================================================+--> - - <target name="configure" unless="configure.disable"> - - <property name="javac.excludes" value="org/jboss/portal/test/framework/runner/**"/> - - <!-- Configure thirdparty libraries --> - &libraries; - <path id="library.classpath"> - <path refid="jboss.portal/modules/common.classpath"/> - - <!-- For embedded services --> - <path refid="dom4j.dom4j.classpath"/> - <path refid="jbossas/core.libs.classpath"/> - <path refid="hibernate.hibernate.classpath"/> - <path refid="sun.opends.classpath"/> - - <path refid="oswego.concurrent.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="junit.junit.classpath"/> - <path refid="sun.servlet.classpath"/> - <path refid="jboss.remoting.classpath"/> - <path refid="codehaus.cargo.classpath"/> - - </path> - - <!-- Configure modules --> - <call target="configure-modules"/> - <path id="dependentmodule.classpath"> - </path> - - <!--+=======================================+--> - <!--| Override any default properties here. |--> - <!--+=======================================+--> - - <!-- Configure defaults & build tools --> - <call target="configure-defaults"/> - <call target="configure-tools"/> - - <!--+=======================================+--> - <!--| Define module specific elements here. |--> - <!--+=======================================+--> - <property name="javadoc.private" value="true"/> - <property name="javadoc.protected" value="false"/> - - </target> - - <!--+====================================================================+--> - <!--| Compile |--> - <!--| |--> - <!--| This target should depend on other compile-* targets for each |--> - <!--| different type of compile that needs to be performed, short of |--> - <!--| documentation compiles. |--> - <!--+====================================================================+--> - - <target name="compile" - description="Compile all source files." - depends="compile-classes, - _default:compile-etc, - _default:compile-resources"> - <!-- Add module specific elements here. --> - </target> - - <target name="compile-classes" depends="_buildmagic:init"> - <mkdir dir="${build.classes}"/> - - <!-- Hack, required to avoid duplicate javac targets --> - <mkdir dir="${build.gen.classes}"/> - - <!-- Remove classes which depend on changed files, so they will rebuild. --> - <depend srcdir="${source.java}:${build.gen.classes}" - destdir="${build.classes}" - dump="${javac.depend.dump}" - closure="${javac.depend.closure}"> - <include name="${javac.includes}"/> - <exclude name="${javac.excludes}"/> - </depend> - - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - target="${javac.target}" - debug="${javac.debug}" - source="${javac.source}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="${maven.module.source}:${build.gen.classes}"/> - <classpath refid="javac.classpath"/> - - <include name="${javac.includes}"/> - <exclude name="${javac.excludes}"/> - </javac> - - - <!--Process manifest file--> - <copy todir="${build.resources}" filtering="yes"> - <fileset dir="./core/resources"> - <include name="**/*.mf"/> - <patternset refid="compile-resources.filter.pattern"/> - </fileset> - </copy> - - </target> - - - <!--+====================================================================+--> - <!--| Generate Output |--> - <!--| |--> - <!--| Generates the target output for this module. Target output is |--> - <!--| the output which is ment to be released or used by external |--> - <!--| modules. |--> - <!--+====================================================================+--> - - <target name="output" - description="Generate all target output." - depends="compile"> - - <mkdir dir="${build.lib}"/> - - <!-- --> - <jar jarfile="${build.lib}/portal-test-lib.jar" manifest="${build.resources}/META-INF/portal-test-lib-jar.mf"> - <fileset dir="${build.classes}"> - <exclude name="org/jboss/portal/test/framework/impl/**"/> - <exclude name="org/jboss/test/**"/> - </fileset> - </jar> - - <!-- --> - <jar jarfile="${build.lib}/portal-test-jboss-lib.jar" manifest="${build.resources}/META-INF/portal-test-lib-jar.mf"> - <fileset dir="${build.classes}"> - <include name="org/jboss/portal/test/framework/impl/jboss/**"/> - <include name="org/jboss/portal/test/framework/embedded/opends/**"/> - </fileset> - <fileset dir="./jboss/resources"/> - </jar> - - <!-- --> - <jar jarfile="${build.lib}/portal-test-generic-lib.jar" manifest="${build.resources}/META-INF/portal-test-lib-jar.mf"> - <fileset dir="${build.classes}"> - <include name="org/jboss/portal/test/framework/impl/generic/**"/> - </fileset> - <fileset dir="./generic/resources"/> - </jar> - - <!-- --> - <jar jarfile="${build.lib}/portal-test-agent.sar"> - <fileset dir="./agent/resources"/> - <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> - <fileset dir="${build.lib}" includes="portal-test-lib.jar"/> - <fileset dir="${build.lib}" includes="portal-test-jboss-lib.jar"/> - </jar> - - <!-- What we put in the repository --> - <mkdir dir="${module.output}/export"/> - <mkdir dir="${module.output}/export/lib"/> - <mkdir dir="${module.output}/export/resources"/> - <copy todir="${module.output}/export/lib"> - <fileset dir="${build.lib}"/> - </copy> - <zip file="${module.output}/export/lib/opends.zip"> - <fileset dir="./core/resources/config/opends"/> - </zip> - <copy todir="${module.output}/export/resources"> - <fileset dir="./core/resources/config" includes="*.xml"/> - </copy> - - </target> - - <!-- ================================================================== --> - <!-- Cleaning --> - <!-- ================================================================== --> - - <!-- Clean up all build output --> - <target name="clean" depends="_default:clean"> - <!-- Add module specific elements here. --> - </target> - - <!--+====================================================================+--> - <!--| Documents |--> - <!--| |--> - <!--| Generate all documentation for this module. |--> - <!--+====================================================================+--> - - <target name="docs" depends="_default:docs"> - <!-- Add module specific elements here. --> - </target> - - <!-- ================================================================== --> - <!-- Misc. --> - <!-- ================================================================== --> - - <target name="main" depends="most"/> - <target name="all" depends="_default:all"/> - <target name="most" depends="_default:most"/> - <target name="help" depends="_default:help"/> - - <!-- ================================================================== --> - <!-- Deployment --> - <!-- ================================================================== --> - - <target name="deploy" - description="Deploy." - depends="output"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <copy file="${build.lib}/portal-test.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/> - </target> - - <target name="undeploy" - description="Undeploy." - depends="init"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-test.sar"/> - </target> - - <!-- ============================= --> - <!-- Paths etc. for the retro task --> - <!-- ============================= --> - - -<!-- - <test todir="${test.reports}" name="org.jboss.portal.test.common.test.junit.POJOJunitTestTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.common.test.InfoTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.common.test.TestParameterValueTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.common.test.TestParametrizationTestCase"/> ---> - - <!-- Run jbossretro on the classes --> - <!--<target name="retro" depends="_default:most">--> - - <!--<property name="build.lib.retro" value="${module.output}/lib14"/>--> - <!--<path id="jbossretro.classpath">--> - <!--<path refid="apache.ant.classpath"/>--> - <!--<path refid="jboss.jbossretro.classpath"/>--> - <!--<path refid="jboss/backport.concurrent.classpath"/>--> - <!--<path refid="javassist.classpath"/>--> - <!--</path>--> - - <!--<taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>--> - - <!--<mkdir dir="selenium-java-client-driver"/>--> - <!--<mkdir dir="selenium-java-client-driver-backport"/>--> - <!--<unzip src="selenium-java-client-driver.jar" dest="selenium-java-client-driver"/>--> - <!--<retro compilerclasspathref="jbossretro.classpath" destdir="selenium-java-client-driver-backport">--> - <!--<classpath refid="jbossretro.classpath"/>--> - <!--<classpath refid="library.classpath"/>--> - <!--<classpath refid="dependentmodule.classpath"/>--> - <!--<classpath>--> - <!--<pathelement location="selenium-java-client-driver"/>--> - <!--</classpath>--> - <!--<src path="selenium-java-client-driver"/>--> - <!--</retro>--> - <!--<jar destfile="selenium-java-client-driver-backport.jar">--> - <!--<fileset dir="selenium-java-client-driver-backport"/>--> - <!--</jar>--> - - <!--</target>--> - - <target name="package-tests"> - </target> - -</project> Modified: modules/test/trunk/tooling/ant/pom.xml =================================================================== --- modules/test/trunk/tooling/ant/pom.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/tooling/ant/pom.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -24,13 +24,19 @@ <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit</artifactId> </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling</artifactId> - </dependency> </dependencies> - <properties> - - </properties> -</project> \ No newline at end of file + <build> + <sourceDirectory>../src/main/java</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jboss/unit/tooling/maven2/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> +</project> Deleted: modules/test/trunk/tooling/build.bat =================================================================== --- modules/test/trunk/tooling/build.bat 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/tooling/build.bat 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,54 +0,0 @@ -@echo off -rem -rem Invokes a script of the same name in the 'tools' module. -rem -rem The 'tools' module is expected to be a peer directory of the directory -rem in which this script lives. -rem -rem @author Jason Dillon <jason(a)planet57.com&gt; -rem - -rem $Id: build.bat 1829 2006-03-05 13:20:08Z julien $ - -setlocal - -set PROGNAME=%~nx0 -set DIRNAME=%~dp0 - -rem Legacy shell support -if x%PROGNAME%==x set PROGNAME=build.bat -if x%DIRNAME%==x set DIRNAME=.\ - -set MODULE_ROOT=%DIRNAME% -if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools -set TARGET=%TOOLS_ROOT%\bin\build.bat -set ARGS=%* - -rem Start'er up yo -goto main - -:debug -if not x%DEBUG%==x echo %PROGNAME%: %* -goto :EOF - -:main -call :debug PROGNAME=%PROGNAME% -call :debug DIRNAME=%DIRNAME% -call :debug TOOLS_ROOT=%TOOLS_ROOT% -call :debug TARGET=%TARGET% - -if exist %TARGET% call :call-script & goto :EOF -rem else fail, we can not go on - -echo %PROGNAME%: *ERROR* The target executable does not exist: -echo %PROGNAME%: -echo %PROGNAME%: %TARGET% -echo %PROGNAME%: -echo %PROGNAME%: Please make sure you have checked out the 'tools' module -echo %PROGNAME%: and make sure it is up to date. -goto :EOF - -:call-script -call :debug Executing %TARGET% %ARGS% -call %TARGET% %ARGS% -goto :EOF Deleted: modules/test/trunk/tooling/build.sh =================================================================== --- modules/test/trunk/tooling/build.sh 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/tooling/build.sh 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,49 +0,0 @@ -#!/bin/sh -## -## Invokes a script of the same name in the 'tools' module. -## -## The 'tools' module is expected to be a peer directory of the directory -## in which this script lives. -## -## @author Jason Dillon <jason(a)planet57.com&gt; -## - -# $Id: build.sh 1829 2006-03-05 13:20:08Z julien $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` - -# Buss it yo -main() { - if [ "x$TOOLS_ROOT" = "x" ]; then - TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` - fi - - MODULE_ROOT=`cd $DIRNAME; pwd` - export TOOLS_ROOT MODULE_ROOT DEBUG TRACE - - # Where is the target script? - target="$TOOLS_ROOT/bin/$PROGNAME" - if [ ! -f "$target" ]; then - echo "${PROGNAME}: *ERROR* The target executable does not exist:" - echo "${PROGNAME}:" - echo "${PROGNAME}: $target" - echo "${PROGNAME}:" - echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" - echo "${PROGNAME}: and make sure it is up to date." - exit 2 - fi - - # Get busy yo! - if [ "x$DEBUG" != "x" ]; then - echo "${PROGNAME}: Executing: /bin/sh $target $@" - fi - if [ "x$TRACE" = "x" ]; then - exec /bin/sh $target "$@" - else - exec /bin/sh -x $target "$@" - fi -} - -# Lets get ready to rumble! -main "$@" Deleted: modules/test/trunk/tooling/build.xml =================================================================== --- modules/test/trunk/tooling/build.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/tooling/build.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,377 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE project [ - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> - ]> - -<!-- $Id: build.xml 7954 2007-08-16 14:51:00Z julien(a)jboss.com $ --> - -<!--+======================================================================+--> -<!--| JBoss Portal (The OpenSource Portal) Build File |--> -<!--| |--> -<!--| Distributable under LGPL license. |--> -<!--| See terms of license at http://www.gnu.org. |--> -<!--| |--> -<!--| This file has been designed to work with the 'tools' module and |--> -<!--| Buildmagic extentions. |--> -<!--+======================================================================+--> - -<project default="main" name="JBoss Portal"> - - <!--+====================================================================+--> - <!--| Setup |--> - <!--| |--> - <!--| Include the common build elements. |--> - <!--| |--> - <!--| This defines several different targets, properties and paths. |--> - <!--| It also sets up the basic extention tasks amoung other things. |--> - <!--+====================================================================+--> - - &buildmagic; - &modules; - &defaults; - &tools; - &targets; - - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <!-- - | Initialize the build system. Must depend on '_buildmagic:init'. - | Other targets should depend on 'init' or things will mysteriously fail. - --> - - <target name="init" unless="init.disable" depends="_buildmagic:init"> - </target> - - <!--+====================================================================+--> - <!--| Configuration |--> - <!--| |--> - <!--| This target is invoked by the Buildmagic initialization logic |--> - <!--| and should contain module specific configuration elements. |--> - <!--+====================================================================+--> - - <target name="configure" unless="configure.disable"> - - <!-- Configure thirdparty libraries --> - &libraries; - <path id="library.classpath"> - <path location="../tools/lib/ant-junit.jar"/> - <path location="${apache.ant.lib}/ant.jar"/> - <path location="${project.root}/unit/"/> - </path> - - <!-- Configure modules --> - <call target="configure-modules"/> - <path id="dependentmodule.classpath"> - <path refid="jboss.unit.classpath"/> - </path> - - <!--+=======================================+--> - <!--| Override any default properties here. |--> - <!--+=======================================+--> - - <!--+=======================================+--> - <!--| Define module specific elements here. |--> - <!--+=======================================+--> - <property name="javadoc.private" value="false"/> - <property name="javadoc.protected" value="false"/> - <property name="javadoc.packages" value="org.jboss.unit.*"/> - - <!-- Configure defaults & build tools --> - <call target="configure-defaults"/> - <call target="configure-tools"/> - - </target> - - <!--+====================================================================+--> - <!--| Compile |--> - <!--| |--> - <!--| This target should depend on other compile-* targets for each |--> - <!--| different type of compile that needs to be performed, short of |--> - <!--| documentation compiles. |--> - <!--+====================================================================+--> - - <target name="compile" - description="Compile all source files." - depends="_buildmagic:init,configure-defaults" - > - - <!--depends="_default:compile-classes, - _default:compile-etc, - _default:compile-resources"--> - - <!-- Add module specific elements here. --> - - - <!-- Workaround to include stuff from maven convention --> - - <!--<property name="build.classes" value="./output/classes"/>--> - <mkdir dir="${build.classes}"/> - - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - target="${javac.target}" - debug="${javac.debug}" - source="${javac.source}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="./core/src/main/java"/> - <classpath> - <path refid="javac.classpath"/> - <pathelement location="${build.classes}"/> - </classpath> - - <include name="${javac.includes}"/> - </javac> - - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - target="${javac.target}" - debug="${javac.debug}" - source="${javac.source}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="./ant/src/main/java"/> - <classpath> - <path refid="javac.classpath"/> - <pathelement location="${build.classes}"/> - </classpath> - - <include name="${javac.includes}"/> - </javac> - - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - target="${javac.target}" - debug="${javac.debug}" - source="${javac.source}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="./ant/src/test/java"/> - <classpath> - <path refid="javac.classpath"/> - <pathelement location="${build.classes}"/> - </classpath> - - <include name="${javac.includes}"/> - </javac> - - - <!--<mkdir dir="${build.resources}"/>--> - <!--<copy todir="${build.resources}" filtering="yes">--> - <!--<fileset dir="./ant/src/test/resources">--> - <!--<patternset refid="compile-resources.filter.pattern"/>--> - <!--</fileset>--> - <!--</copy>--> - <!--<copy todir="${build.resources}" filtering="no">--> - <!--<fileset dir="./ant/src/test/resources">--> - <!--<patternset refid="compile-resources.pattern"/>--> - <!--</fileset>--> - <!--</copy>--> - - </target> - - <!--+====================================================================+--> - <!--| Generate Output |--> - <!--| |--> - <!--| Generates the target output for this module. Target output is |--> - <!--| the output which is ment to be released or used by external |--> - <!--| modules. |--> - <!--+====================================================================+--> - - <target name="output" - description="Generate all target output." - depends="compile"> - - <mkdir dir="${build.lib}"/> - - <jar jarfile="${build.lib}/jboss-unit-tooling-lib.jar"> - <fileset dir="${build.classes}"> - <exclude name="org/jboss/test/**"/> - </fileset> - </jar> - - <jar jarfile="${build.lib}/jboss-unit-tooling-test.jar"> - <fileset dir="${build.classes}"> - <exclude name="org/jboss/unit/**"/> - </fileset> - <fileset dir="./ant/src/test/resources"/> - </jar> - - </target> - - <!-- ================================================================== --> - <!-- Cleaning --> - <!-- ================================================================== --> - - <!-- Clean up all build output --> - <target name="clean" depends="_default:clean"> - <!-- Add module specific elements here. --> - </target> - - <!--+====================================================================+--> - <!--| Documents |--> - <!--| |--> - <!--| Generate all documentation for this module. |--> - <!--+====================================================================+--> - - <target name="docs" depends="_default:docs"> - <!-- Add module specific elements here. --> - </target> - - <!-- ================================================================== --> - <!-- Misc. --> - <!-- ================================================================== --> - - <target name="main" depends="most"/> - <target name="all" depends="_default:all"/> - <target name="most" depends="_default:most"/> - <target name="help" depends="_default:help"/> - - <!--<target name="test" depends="output"> - - <java classname="org.jboss.test.unit.AllTests" fork="true"> ---><!-- - <jvmarg value="-Xdebug"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> ---><!-- - <classpath> - <path location="${build.lib}/jboss-unit-lib.jar"/> - <path location="${build.lib}/jboss-unit-test.jar"/> - <path location="${build.resources}/test"/> - </classpath> - </java> - - </target>--> - - <target name="tests-ant" depends="output" > - <path id="jboss.unit.tooling.test.classpath"> - <pathelement location="${build.lib}/jboss-unit-tooling-lib.jar"/> - <pathelement location="${build.lib}/jboss-unit-tooling-test.jar"/> - <path refid="dependentmodule.classpath"/> - </path> - <taskdef - name="jboss-unit" - classname="org.jboss.unit.tooling.ant.JBossUnitTask" - classpathref="jboss.unit.tooling.test.classpath"/> - - - <jboss-unit> - - - <tests config="./ant/src/test/resources/simple-tests.xml" suiteName="one"> - <!-- no include tag means invoke all --> - <!-- but you can still exclude some tests --> - <property name="propName" value="propValue"/> - - <parameter name="param1"> - <value>one</value> - <value>two</value> - <value>three</value> - </parameter> - - <parameter name="param2"> - <value>2one</value> - <value>2two</value> - <value>2three</value> - </parameter> - - <exclude id="otherTestTwo"/> - </tests> - - <tests config="./ant/src/test/resources/assertkeyword-unit.xml"> - </tests> - - <!--<tests config="./output/resources/test/simple-tests.xml"> - <include id="testOne"/> - <include id="otherTestOne"/> - <exclude ids="testOne,testTwo"/> - </tests> - - <tests config="output/resources/test/simple-tests.xml" suiteName="three"> - <include id="otherTestOne"/> - <include id="testOne"/> - <include id="otherTestTwo"/> - </tests> - - <tests config="output/resources/test/simple-tests.xml" suiteName="four"> - <include keywords="simpleTag"/> - </tests>--> - - - <!--<tests config="output/resources/test/simple-tests.xml">--> - <!-- this one should fail as attribute 'id' is exclusive --> - <!--<include id="otherTestOne" ids="testOne,testTwo" keywords="lola,lolo,loli"/>--> - <!--</tests>--> - - <!-- provide noConsole="true" to disable console output --> - <reports> - <!-- if toDir for xml reports doesn't exist it'll be created --> - <!-- at the moment it produces xmls in junit format --> - <xml toDir="./output/test-results/xml"/> - - <!-- html reports uses junit reporting task and will reuse reports generated by <xml> task--> - <html toDir="./output/test-results/html"/> - </reports> - - <sysproperty key="toto" value="totoValue"/> - <sysproperty key="nono" value="nonoValue"/> - - <classpath> - - <path location="${build.lib}/jboss-unit-tooling-lib.jar"/> - <path location="${build.lib}/jboss-unit-tooling-test.jar"/> - <path refid="dependentmodule.classpath"/> - - </classpath> - - - </jboss-unit > - - - - </target> - -</project> Modified: modules/test/trunk/tooling/maven2/pom.xml =================================================================== --- modules/test/trunk/tooling/maven2/pom.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/tooling/maven2/pom.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -40,13 +40,21 @@ <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit</artifactId> </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling</artifactId> - </dependency> </dependencies> - <properties/> + <build> + <sourceDirectory>../src/main/java</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jboss/unit/tooling/ant/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: modules/test/trunk/tooling/pom.xml =================================================================== --- modules/test/trunk/tooling/pom.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/tooling/pom.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -14,7 +14,6 @@ <name>JBoss Unit Tooling (aggregator)</name> <version>1.1.0-SNAPSHOT</version> <modules> - <module>core</module> <module>ant</module> <module>maven2</module> </modules> Copied: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/JavaBuilder.java (from rev 8938, modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/JavaBuilder.java) =================================================================== --- modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/JavaBuilder.java (rev 0) +++ modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/JavaBuilder.java 2007-11-15 10:56:16 UTC (rev 8939) @@ -0,0 +1,762 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, 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.unit.tooling; + +import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.Environment; +import org.apache.tools.ant.types.Assertions; +import org.apache.tools.ant.taskdefs.Java; +import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PROPERTIES; +import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PROPERTY; +import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PARAMETERS; +import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PARAMETER; + +import java.util.HashSet; +import java.util.Set; +import java.util.Map; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.LinkedList; + +import static org.jboss.unit.tooling.ToolingConstants.*; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class JavaBuilder +{ + + private Project antProject; + + private String config; + + private String suiteName; + + private Set<String> includeIDs = new HashSet<String>(); + + private Set<String> includeKeywords = new HashSet<String>(); + + private Set<String> excludeIDs = new HashSet<String>(); + + private Set<String> excludeKeywords = new HashSet<String>(); + + private boolean jPDA = false; + + private boolean fork = true; + + private String xmlReportDir; + + private String htmlReportDir; + + private Map<String,String> properties = new HashMap<String,String>(); + + private Map<String,List<String>> parameters = new HashMap<String, List<String>>(); + + public JavaBuilder() + { + init(); + } + + public JavaBuilder(Project antProject) + { + this.antProject = antProject; + init(); + } + + private void init() + { + if (antProject == null) + { + antProject = new Project(); + antProject.init(); + } + } + + public Java buildJava() + { + Java java = (Java)antProject.createTask("java"); + + java.setClassname("org.jboss.unit.tooling.Main"); + + // Set jboss logging to use JUL + Environment.Variable pluginProperty = new Environment.Variable(); + pluginProperty.setKey("org.jboss.logging.Logger.pluginClass"); + pluginProperty.setValue("org.jboss.logging.jdk.JDK14LoggerPlugin"); + java.addSysproperty(pluginProperty); + + // Set JUL to configure using the logging.properties file found in the current dir + Environment.Variable julProperty = new Environment.Variable(); + julProperty.setKey("java.util.logging.config.file"); + julProperty.setValue("logging.properties"); + java.addSysproperty(julProperty); + + // We enable by default all assertions : todo make it configurable perhaps (see JDK doc about assertions) + Assertions assertions = new Assertions(); + assertions.setProject(antProject); + assertions.addEnable(new Assertions.EnabledAssertion()); + java.addAssertions(assertions); + + // Beginning of jpda option implementation, need to improve it + if (jPDA) + { + Environment.Variable javaDotCompilerProperty = new Environment.Variable(); + javaDotCompilerProperty.setKey("java.compiler"); + javaDotCompilerProperty.setValue("NONE"); + java.addSysproperty(javaDotCompilerProperty); + java.setJvmargs("-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"); + } + + // Set fork + if (isFork()) + { + java.setFork(true); + } + + + java.createArg().setValue(OPT_CONFIG + "=" + config); + + if (getSuiteName() != null) + { + java.createArg().setValue(OPT_SUITE_NAME + "=" + getSuiteName()); + } + + if (getXmlReportDir() != null) + { + java.createArg().setValue(OPT_XML_REPORT_DIR + "=" + getXmlReportDir()); + } + + if (getHtmlReportDir() != null) + { + java.createArg().setValue(OPT_HTML_REPORT_DIR + "=" + getHtmlReportDir()); + } + + if (includeIDs.size() != 0) + { + java.createArg().setValue(generateArgument(includeIDs, OPT_IDS)); + } + + if (includeKeywords.size() != 0) + { + java.createArg().setValue(generateArgument(includeKeywords, OPT_KEYWORDS)); + } + + if (excludeIDs.size() != 0) + { + java.createArg().setValue(generateArgument(excludeIDs, OPT_EX_IDS)); + } + + if (excludeKeywords.size() != 0) + { + java.createArg().setValue(generateArgument(excludeKeywords, OPT_EX_KEYWORDS)); + } + + + if (properties.size() > 0) + { + + StringBuilder props = new StringBuilder("["); + + for (Iterator<String> iterator = properties.keySet().iterator(); iterator.hasNext();) + { + String propertyKey = iterator.next(); + + String propertyValue = properties.get(propertyKey); + + props.append(propertyKey + "=" + propertyValue); + + if (iterator.hasNext()) + { + props.append(","); + } + else + { + props.append("]"); + } + } + + java.createArg().setValue(OPT_PROPERTIES + "=" + props); + + } + + + if (!parameters.isEmpty()) + { + StringBuilder params = new StringBuilder("["); + + Set<String> paramNames = parameters.keySet(); + + for (Iterator<String> stringIterator = paramNames.iterator(); stringIterator.hasNext();) + { + String name = stringIterator.next(); + + + List<String> paramValues = parameters.get(name); + + for (Iterator<String> iterator = paramValues.iterator(); iterator.hasNext();) + { + String value = iterator.next(); + + + params.append(name) + .append("=") + .append(value); + + if (iterator.hasNext()) + { + params.append(","); + } + } + + if (stringIterator.hasNext()) + { + params.append(","); + } + else + { + params.append("]"); + } + + } + + java.createArg().setValue(OPT_PARAMETERS + "=" + params); + + } + + + + return java; + } + + + + public String getConfig() + { + return config; + } + + public void setConfig(String config) + { + if (config == null) + { + throw new IllegalArgumentException("config cannot be null"); + } + this.config = config; + } + + public String getSuiteName() + { + return suiteName; + } + + public void setSuiteName(String suiteName) + { + if (suiteName == null) + { + throw new IllegalArgumentException("suiteName cannot be null"); + } + this.suiteName = suiteName; + } + + public void addIncludeID(String id) + { + if (id == null) + { + throw new IllegalArgumentException("id cannot be null"); + } + + includeIDs.add(id); + } + + public void addUnparsedIncludeIDs(String ids) + { + if (ids == null) + { + throw new IllegalArgumentException("ids cannot be null"); + } + + addUnparsedString(getIncludeIDs(), ids); + } + + public Set<String> getIncludeIDs() + { + return includeIDs; + } + + public void setIncludeIDs(Set<String> includeIDs) + { + if (includeIDs == null) + { + throw new IllegalArgumentException("includeIDs cannot be null"); + } + + this.includeIDs = includeIDs; + } + + public void addIncludeKeyword(String keyword) + { + if (keyword == null) + { + throw new IllegalArgumentException("keyword cannot be null"); + } + + includeKeywords.add(keyword); + } + + + public void addUnparsedIncludeKeywords(String keywords) + { + if (keywords == null) + { + throw new IllegalArgumentException("keywords cannot be null"); + } + + addUnparsedString(getIncludeKeywords(), keywords); + } + + public Set<String> getIncludeKeywords() + { + return includeKeywords; + } + + public void setIncludeKeywords(Set<String> includeKeywords) + { + if ( includeKeywords == null) + { + throw new IllegalArgumentException("includeKeywords cannot be null"); + } + + this.includeKeywords = includeKeywords; + } + + public void addExcludeID(String id) + { + if (id == null) + { + throw new IllegalArgumentException("id cannot be null"); + } + + excludeIDs.add(id); + } + + public void addUnparsedExcludeIDs(String ids) + { + if (ids == null) + { + throw new IllegalArgumentException("ids cannot be null"); + } + + addUnparsedString(getExcludeIDs(), ids); + } + + public Set<String> getExcludeIDs() + { + return excludeIDs; + } + + public void setExcludeIDs(Set<String> excludeIDs) + { + if (excludeIDs == null) + { + throw new IllegalArgumentException("excludeIDs cannot be null"); + } + + this.excludeIDs = excludeIDs; + } + + public void addExcludeKeyword(String keyword) + { + if (keyword == null) + { + throw new IllegalArgumentException("keyword cannot be null"); + } + + excludeKeywords.add(keyword); + } + + public void addUnparsedExcludeKeywords(String keywords) + { + if (keywords == null) + { + throw new IllegalArgumentException("keywords cannot be null"); + } + + addUnparsedString(getExcludeKeywords(), keywords); + } + + public Set<String> getExcludeKeywords() + { + return excludeKeywords; + } + + public void setExcludeKeywords(Set<String> excludeKeywords) + { + if (excludeKeywords == null) + { + throw new IllegalArgumentException("excludeKeywords cannot be null"); + } + + this.excludeKeywords = excludeKeywords; + } + + public boolean isJPDA() + { + return jPDA; + } + + public void setJPDA(boolean jPDA) + { + this.jPDA = jPDA; + } + + public boolean isFork() + { + return fork; + } + + public void setFork(boolean fork) + { + this.fork = fork; + } + + private void addUnparsedString(Set<String> set, String valueString) + { + if (valueString == null) + { + throw new IllegalArgumentException("valueString cannot be null"); + } + String[] parsedValues = valueString.split(","); + for (String keyword : parsedValues) + { + set.add(keyword.trim()); + } + } + + + public String getXmlReportDir() + { + return xmlReportDir; + } + + public void setXmlReportDir(String xmlReportDir) + { + this.xmlReportDir = xmlReportDir; + } + + public String getHtmlReportDir() + { + return htmlReportDir; + } + + public void setHtmlReportDir(String htmlReportDir) + { + this.htmlReportDir = htmlReportDir; + } + + public Project getAntProject() + { + return antProject; + } + + public void setAntProject(Project antProject) + { + this.antProject = antProject; + } + + public Map<String, String> getProperties() + { + return properties; + } + + public void setProperties(Map<String, String> properties) + { + this.properties = properties; + } + + public void addProperties(Map<String,String> toAdd) + { + if (toAdd == null) + { + throw new IllegalArgumentException("property map cannot be null"); + } + + properties.putAll(toAdd); + } + + + public void addProperty(String key, String value) + { + if (key == null || value == null) + { + throw new IllegalArgumentException("Key and value must not be null"); + } + + properties.put(key, value); + } + + public void updateFQNProperties(Map toUpdate) + { + + String sysProperties = (String)toUpdate.get(JBOSS_UNIT_PROPERTIES); + + if (sysProperties != null && sysProperties.length() > 0) + { + + Map<String,String> parsedProps = JavaBuilder.parseProperties(sysProperties); + + properties.putAll(parsedProps); + } + + for (Object sysPropKey : toUpdate.keySet()) + { + + if (sysPropKey.toString().startsWith(JBOSS_UNIT_PROPERTY)) + { + String propertyString = sysPropKey + "=" + toUpdate.get(sysPropKey); + + propertyString = propertyString.replaceFirst(JBOSS_UNIT_PROPERTY + "\\.", ""); + + // + String[] patternValues = propertyString.split("="); + + // + if (patternValues.length != 2) + { + throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + propertyString); + } + + properties.put(patternValues[0],patternValues[1]); + + } + + + } + + } + + public static Map<String,String> parseProperties(String propertiesString) + { + if (!propertiesString.matches("\\[.+=.+(,.+=.+)*\\]")) + { + throw new IllegalArgumentException("Properties don't follow proper format: [a=b,c=d,e=f]"); + } + + Map<String,String> parsedProps = new HashMap<String,String>(); + + propertiesString = propertiesString.replaceAll("\\[","").replaceAll("\\]",""); + + String propertyGroups[] = propertiesString.split(","); + + for (String propertyGroup : propertyGroups) + { + + String property[] = propertyGroup.split("="); + + // + if (property.length != 2) + { + throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + property); + } + + parsedProps.put(property[0],property[1]); + } + return parsedProps; + } + + public Map<String, List<String>> getParameters() + { + return parameters; + } + + public void setParameters(Map<String, List<String>> parameters) + { + this.parameters = parameters; + } + + + public void addParameters(Map<String, List<String>> toAdd) + { + + if (toAdd == null) + { + throw new IllegalArgumentException("parameter map cannot be null"); + } + + parameters.putAll(toAdd); + + } + + public void addParameter(String key, List<String> addValues) + { + + if (key == null || addValues == null) + { + throw new IllegalArgumentException("parameter key and values list cannot be null"); + } + + List<String> values; + + if (parameters.containsKey(key)) + { + values = parameters.get(key); + } + else + { + values = new LinkedList<String>(); + } + + values.addAll(addValues); + + parameters.put(key, values); + + } + + public void updateFQNParameters(Map toUpdate) + { + + Object sysParameters = toUpdate.get(JBOSS_UNIT_PARAMETERS); + + if (sysParameters != null && sysParameters.toString().length() > 0) + { + + Map<String,List<String>> parsedParams = parseParameters(sysParameters.toString()); + + + parameters.putAll(parsedParams); + } + + for (Object sysPropKey : toUpdate.keySet()) + { + if (sysPropKey.toString().startsWith(JBOSS_UNIT_PARAMETER + ".")) + { + String propertyString = sysPropKey + "=" + toUpdate.get(sysPropKey); + + propertyString = propertyString.replaceFirst(JBOSS_UNIT_PARAMETER + "\\.", ""); + + + // + String[] parameter = propertyString.split("=",2); + + // + if (parameter.length != 2) + { + throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + propertyString); + } + + + List parameterValues = new LinkedList<String>(); + + if (parameter[1].matches("\\[.+(,.+)*\\]")) + { + + + + String valuesString = parameter[1]; + + valuesString = valuesString.replaceAll("\\[","").replaceAll("\\]",""); + + String[] values = valuesString.split(","); + + for (String value : values) + { + parameterValues.add(value); + } + + } + else + { + parameterValues.add(parameter[1]); + } + + if (parameters.containsKey(parameter[0])) + { + parameters.get(parameter[0]).addAll(parameterValues); + } + else + { + parameters.put(parameter[0], parameterValues); + } + } + } + } + + private Map<String, List<String>> parseParameters(String parametersString) + { + + if (!parametersString.matches("\\[.+=.+(,.+=.+)*\\]")) + { + throw new IllegalArgumentException("Parameters don't follow proper format: [a=b,c=d,e=f]"); + } + + Map<String,List<String>> parsedParams = new HashMap<String,List<String>>(); + + parametersString = parametersString.replaceAll("\\[","").replaceAll("\\]",""); + + String parameterGroups[] = parametersString.split(","); + + for (String parameterGroup : parameterGroups) + { + + String parameter[] = parameterGroup.split("="); + + // + if (parameter.length != 2) + { + throw new IllegalArgumentException("Parameter not accepted, it should match a=b and it is " + parameter); + } + + List<String> values; + + if (parsedParams.containsKey(parameter[0])) + { + values = parsedParams.get(parameter[0]); + } + else + { + values = new LinkedList<String>(); + } + + values.add(parameter[1]); + + parsedParams.put(parameter[0], values); + } + + return parsedParams; + + + } + + private String generateArgument(Set<String> values, String argumentName) + { + + StringBuffer argument = new StringBuffer(argumentName).append("="); + for (String s : values) + { + argument.append(s).append(","); + } + // Remove last ',' + argument.deleteCharAt(argument.length() - 1); + return argument.toString(); + } +} Copied: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java (from rev 8938, modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java) =================================================================== --- modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java (rev 0) +++ modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java 2007-11-15 10:56:16 UTC (rev 8939) @@ -0,0 +1,50 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, 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.unit.tooling; + +import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.Task; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public class TaskExecutingThread extends Thread +{ + + private Task task; + + private TaskExecutingThread() + { + } + + public TaskExecutingThread(Task task) + { + this.task = task; + } + + public void run() + { + this.task.execute(); + } +} Copied: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ToolingConstants.java (from rev 8938, modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/ToolingConstants.java) =================================================================== --- modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ToolingConstants.java (rev 0) +++ modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ToolingConstants.java 2007-11-15 10:56:16 UTC (rev 8939) @@ -0,0 +1,71 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, 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.unit.tooling; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public final class ToolingConstants +{ + + public static final String JBOSS_UNIT_PROPERTIES = "jboss.unit.properties"; + + public static final String JBOSS_UNIT_PROPERTY = "jboss.unit.property"; + + public static final String JBOSS_UNIT_PARAMETER = "jboss.unit.parameter"; + + public static final String JBOSS_UNIT_PARAMETERS = "jboss.unit.parameters"; + + public static final String OPT_ID = "--id"; + + public static final String OPT_IDS = "--ids"; + + public static final String OPT_KEYWORDS = "--keywords"; + + public static final String OPT_EX_ID = "--ex_id"; + + public static final String OPT_EX_IDS = "--ex_ids"; + + public static final String OPT_EX_KEYWORDS = "--ex_keywords"; + + public static final String OPT_CONFIG = "--config"; + + public static final String OPT_SUITE_NAME = "--suite_name"; + + public static final String OPT_NO_CONSOLE = "--no_console"; + + public static final String OPT_XML_REPORT_DIR = "--xml_report_dir"; + + public static final String OPT_HTML_REPORT_DIR = "--html_report_dir"; + + public static final String OPT_PROPERTY = "--property"; + + public static final String OPT_PROPERTIES = "--properties"; + + public static final String OPT_PARAMETER = "--parameter"; + + public static final String OPT_PARAMETERS = "--parameters"; + + +} Copied: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ant (from rev 8938, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant) Copied: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/maven2 (from rev 8938, modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2) Deleted: modules/test/trunk/unit/build.bat =================================================================== --- modules/test/trunk/unit/build.bat 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/unit/build.bat 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,54 +0,0 @@ -@echo off -rem -rem Invokes a script of the same name in the 'tools' module. -rem -rem The 'tools' module is expected to be a peer directory of the directory -rem in which this script lives. -rem -rem @author Jason Dillon <jason(a)planet57.com&gt; -rem - -rem $Id: build.bat 1829 2006-03-05 13:20:08Z julien $ - -setlocal - -set PROGNAME=%~nx0 -set DIRNAME=%~dp0 - -rem Legacy shell support -if x%PROGNAME%==x set PROGNAME=build.bat -if x%DIRNAME%==x set DIRNAME=.\ - -set MODULE_ROOT=%DIRNAME% -if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools -set TARGET=%TOOLS_ROOT%\bin\build.bat -set ARGS=%* - -rem Start'er up yo -goto main - -:debug -if not x%DEBUG%==x echo %PROGNAME%: %* -goto :EOF - -:main -call :debug PROGNAME=%PROGNAME% -call :debug DIRNAME=%DIRNAME% -call :debug TOOLS_ROOT=%TOOLS_ROOT% -call :debug TARGET=%TARGET% - -if exist %TARGET% call :call-script & goto :EOF -rem else fail, we can not go on - -echo %PROGNAME%: *ERROR* The target executable does not exist: -echo %PROGNAME%: -echo %PROGNAME%: %TARGET% -echo %PROGNAME%: -echo %PROGNAME%: Please make sure you have checked out the 'tools' module -echo %PROGNAME%: and make sure it is up to date. -goto :EOF - -:call-script -call :debug Executing %TARGET% %ARGS% -call %TARGET% %ARGS% -goto :EOF Deleted: modules/test/trunk/unit/build.sh =================================================================== --- modules/test/trunk/unit/build.sh 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/unit/build.sh 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,49 +0,0 @@ -#!/bin/sh -## -## Invokes a script of the same name in the 'tools' module. -## -## The 'tools' module is expected to be a peer directory of the directory -## in which this script lives. -## -## @author Jason Dillon <jason(a)planet57.com&gt; -## - -# $Id: build.sh 1829 2006-03-05 13:20:08Z julien $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` - -# Buss it yo -main() { - if [ "x$TOOLS_ROOT" = "x" ]; then - TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` - fi - - MODULE_ROOT=`cd $DIRNAME; pwd` - export TOOLS_ROOT MODULE_ROOT DEBUG TRACE - - # Where is the target script? - target="$TOOLS_ROOT/bin/$PROGNAME" - if [ ! -f "$target" ]; then - echo "${PROGNAME}: *ERROR* The target executable does not exist:" - echo "${PROGNAME}:" - echo "${PROGNAME}: $target" - echo "${PROGNAME}:" - echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" - echo "${PROGNAME}: and make sure it is up to date." - exit 2 - fi - - # Get busy yo! - if [ "x$DEBUG" != "x" ]; then - echo "${PROGNAME}: Executing: /bin/sh $target $@" - fi - if [ "x$TRACE" = "x" ]; then - exec /bin/sh $target "$@" - else - exec /bin/sh -x $target "$@" - fi -} - -# Lets get ready to rumble! -main "$@" Deleted: modules/test/trunk/unit/build.xml =================================================================== --- modules/test/trunk/unit/build.xml 2007-11-15 08:59:47 UTC (rev 8938) +++ modules/test/trunk/unit/build.xml 2007-11-15 10:56:16 UTC (rev 8939) @@ -1,238 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE project [ - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> - ]> - -<!-- $Id: build.xml 7954 2007-08-16 14:51:00Z julien(a)jboss.com $ --> - -<!--+======================================================================+--> -<!--| JBoss Portal (The OpenSource Portal) Build File |--> -<!--| |--> -<!--| Distributable under LGPL license. |--> -<!--| See terms of license at http://www.gnu.org. |--> -<!--| |--> -<!--| This file has been designed to work with the 'tools' module and |--> -<!--| Buildmagic extentions. |--> -<!--+======================================================================+--> - -<project default="main" name="JBoss Portal"> - - <!--+====================================================================+--> - <!--| Setup |--> - <!--| |--> - <!--| Include the common build elements. |--> - <!--| |--> - <!--| This defines several different targets, properties and paths. |--> - <!--| It also sets up the basic extention tasks amoung other things. |--> - <!--+====================================================================+--> - - &buildmagic; - &modules; - &defaults; - &tools; - &targets; - - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <!-- - | Initialize the build system. Must depend on '_buildmagic:init'. - | Other targets should depend on 'init' or things will mysteriously fail. - --> - - <target name="init" unless="init.disable" depends="_buildmagic:init"> - </target> - - <!--+====================================================================+--> - <!--| Configuration |--> - <!--| |--> - <!--| This target is invoked by the Buildmagic initialization logic |--> - <!--| and should contain module specific configuration elements. |--> - <!--+====================================================================+--> - - <target name="configure" unless="configure.disable"> - - <!-- Configure thirdparty libraries --> - &libraries; - <path id="library.classpath"> - <path refid="junit.junit.classpath"/> - </path> - - <!-- Configure modules --> - <call target="configure-modules"/> - <path id="dependentmodule.classpath"> - </path> - - <!--+=======================================+--> - <!--| Override any default properties here. |--> - <!--+=======================================+--> - - <!--+=======================================+--> - <!--| Define module specific elements here. |--> - <!--+=======================================+--> - <property name="javadoc.private" value="false"/> - <property name="javadoc.protected" value="false"/> - <property name="javadoc.packages" value="org.jboss.unit.*"/> - - <!-- Configure defaults & build tools --> - <call target="configure-defaults"/> - <call target="configure-tools"/> - - </target> - - <!--+====================================================================+--> - <!--| Compile |--> - <!--| |--> - <!--| This target should depend on other compile-* targets for each |--> - <!--| different type of compile that needs to be performed, short of |--> - <!--| documentation compiles. |--> - <!--+====================================================================+--> - - <target name="compile" - description="Compile all source files." - depends="_default:compile-classes, - _default:compile-etc, - _default:compile-resources"> - <!-- Add module specific elements here. --> - - - <!-- Workaround to include test classes from maven convention --> - - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - target="${javac.target}" - debug="${javac.debug}" - source="${javac.source}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="${maven.module.test.sources}"/> - <classpath> - <path refid="javac.classpath"/> - <pathelement location="${build.classes}"/> - </classpath> - - <include name="${javac.includes}"/> - </javac> - - </target> - - <!--+====================================================================+--> - <!--| Generate Output |--> - <!--| |--> - <!--| Generates the target output for this module. Target output is |--> - <!--| the output which is ment to be released or used by external |--> - <!--| modules. |--> - <!--+====================================================================+--> - - <target name="output" - description="Generate all target output." - depends="compile"> - - <mkdir dir="${build.lib}"/> - - <jar jarfile="${build.lib}/jboss-unit-lib.jar"> - <fileset dir="${build.classes}"> - <exclude name="org/jboss/test/**"/> - </fileset> - <fileset dir="${maven.module.resources}"/> - </jar> - - <jar jarfile="${build.lib}/jboss-unit-test.jar"> - <fileset dir="${build.classes}"> - <exclude name="org/jboss/unit/**"/> - </fileset> - <fileset dir="${maven.module.test.resources}"/> - </jar> - - </target> - - <!-- ================================================================== --> - <!-- Cleaning --> - <!-- ================================================================== --> - - <!-- Clean up all build output --> - <target name="clean" depends="_default:clean"> - <!-- Add module specific elements here. --> - </target> - - <!--+====================================================================+--> - <!--| Documents |--> - <!--| |--> - <!--| Generate all documentation for this module. |--> - <!--+====================================================================+--> - - <target name="docs" depends="_default:docs"> - <!-- Add module specific elements here. --> - </target> - - <!-- ================================================================== --> - <!-- Misc. --> - <!-- ================================================================== --> - - <target name="main" depends="most"/> - <target name="all" depends="_default:all"/> - <target name="most" depends="_default:most"/> - <target name="help" depends="_default:help"/> - - <target name="test" depends="output"> - - <java classname="org.jboss.test.unit.AllTests" fork="true"> -<!-- - <jvmarg value="-Xdebug"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> ---> - - <classpath> - <path refid="junit.junit.classpath"/> - <path location="${build.lib}/jboss-unit-lib.jar"/> - <path location="${build.lib}/jboss-unit-test.jar"/> - <path location="${build.resources}/test"/> - </classpath> - </java> - - </target> - - <target name="reports" depends="init"> - <junitreport todir="output/tests"> - <fileset dir="output/tests"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="output/tests"/> - </junitreport> - </target> - -</project>