[jboss-cvs] jboss-seam ...
Peter Muir
peter at bleepbleep.org.uk
Thu Sep 20 14:35:53 EDT 2007
User: pmuir
Date: 07/09/20 14:35:52
Modified: jboss-seam seam.bat build.xml seam
Removed: jboss-seam build.2.xml pom.xml
Log:
Dependency management
Revision Changes Path
1.23 +1 -1 jboss-seam/seam.bat
(In the diff below, changes in quantity of whitespace are not shown.)
Index: seam.bat
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam.bat,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- seam.bat 6 Jun 2007 20:31:50 -0000 1.22
+++ seam.bat 20 Sep 2007 18:35:51 -0000 1.23
@@ -17,7 +17,7 @@
if %SEAMTASK% == help (goto help)
-java -cp "%JAVA_HOME%\lib\tools.jar;%DIRNAME%\lib\ant-launcher.jar;%DIRNAME%\lib\ant-nodeps.jar;%DIRNAME%\lib\ant.jar" -Dant.home="%DIRNAME%\lib" org.apache.tools.ant.launch.Launcher -buildfile "%SEAMGENDIR%\build.xml" %ARGS%
+java -cp "%JAVA_HOME%\lib\tools.jar;%DIRNAME%\build\lib\ant-launcher.jar;%DIRNAME%\build\lib\ant-nodeps.jar;%DIRNAME%\build\lib\ant.jar" -Dant.home="%DIRNAME%\lib" org.apache.tools.ant.launch.Launcher -buildfile "%SEAMGENDIR%\build.xml" %ARGS%
goto END_NO_PAUSE
1.268 +129 -185 jboss-seam/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build.xml,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -b -r1.267 -r1.268
--- build.xml 19 Sep 2007 13:46:02 -0000 1.267
+++ build.xml 20 Sep 2007 18:35:51 -0000 1.268
@@ -43,6 +43,8 @@
<!-- set global properties for this build -->
+ <property name="seam.dir" value="${basedir}" />
+
<!-- Targets -->
<property name="classes.dir" value="classes" />
@@ -70,23 +72,15 @@
<property name="src.test.dir" value="src/test/misc" />
<!-- Library directories -->
- <property name="lib.dir" value="${basedir}/lib" />
<property name="mail.dir" value="${basedir}/mail" />
- <property name="drools.lib.dir" value="${basedir}/drools/lib" />
<property name="eejb.conf.dir" value="${basedir}/bootstrap" />
- <property name="drools.dir" value="${basedir}/drools" />
- <property name="hibernate.dir" value="${basedir}/hibernate" />
<!-- Build resources -->
- <property name="build.dir" value="${basedir}/build" />
- <property name="build.lib.dir" value="${build.dir}/lib" />
- <property name="maven.dir" value="${build.dir}/maven" />
- <property name="seam.dir" value="${basedir}" />
- <path id="maven-ant-tasks.classpath" path="${build.lib.dir}/maven-ant-tasks.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
-
-
- <import file="${build.dir}/utilities.xml" />
+ <property name="build.dir" value="${seam.dir}/build" />
+ <property name="tmp.dir" value="${classes.dir}" />
+ <import file="${build.dir}/utilities.build.xml" />
+ <import file="${build.dir}/common.build.xml" />
+ <property name="lib.dir" value="${basedir}/lib" />
<!-- Documentation -->
<property name="doc.dir" value="doc" />
@@ -128,14 +122,11 @@
<property name="classes.coverage.dir" value="classes/coverage" />
<property name="classes.test.core.dir" value="${classes.dir}/test/core" />
- <property name="classes.coverage.core.dir" value="${classes.coverage.dir}/core" />
<property name="test.dir" value="${basedir}/test-output" />
<property name="report.dir" value="${basedir}/test-report" />
<property name="coverage.dir" value="${basedir}/coverage-output" />
- <property name="testng.jar" value="${basedir}/lib/testng-5.6-jdk15.jar" />
-
<property name="bootstrap.dir" value="${basedir}/bootstrap" />
<!-- CI -->
@@ -146,28 +137,6 @@
<property name="javac.debug" value="true" />
<property name="javac.deprecation" value="false" />
- <fileset id="lib" dir="${basedir}" description="compile-time dependencies">
- <include name="lib/*.jar" />
- <include name="drools/lib/*.jar" />
- <include name="mail/buni-meldware/lib/*.jar" />
- </fileset>
-
- <path id="build.classpath">
- <fileset refid="lib" />
- <fileset dir="${basedir}">
- <include name="${name}.jar" />
- </fileset>
- </path>
-
- <path id="test.classpath">
- <path path="${classes.test.core.dir}" />
- <path path="${classes.coverage.core.dir}" />
- <path path="${classes.test.dir}" />
- <path refid="classpath.emma" />
- <fileset refid="lib" />
- <pathelement location="${basedir}/${name}-remoting.jar" />
- </path>
-
<path id="classpath.emma">
<pathelement location="${basedir}/extras/emma/emma.jar" />
<pathelement location="${basedir}/extras/emma/emma_ant.jar" />
@@ -203,56 +172,22 @@
<include name="**/*.png" />
</patternset>
-
- <!-- ########################## MAVEN2 #########################-->
-
- <target name="installExtraDependencies" depends="init.m2">
- <install pom="${build.dir}/thirdparty/jboss-cache-jdk50.pom.xml" jar="${lib.dir}/jboss-cache-jdk50.jar" />
- <install pom="${build.dir}/thirdparty/testng.pom.xml" jar="${lib.dir}/testng-5.6-jdk15.jar" />
- <install pom="${build.dir}/thirdparty/jbpm-jpdl.pom.xml" jar="${lib.dir}/jbpm-jpdl.jar" />
- <install pom="${build.dir}/thirdparty/jboss-el.pom.xml" jar="${lib.dir}/jboss-el.jar" />
- </target>
-
- <target name="init.m2">
- <!-- Install the parent pom -->
- <pomfile name="seam.pom" value="${basedir}/pom.xml" />
- <pomfile name="core.pom" value="${build.dir}/core.pom.xml" />
- <install pom="${seam.pom}" />
- </target>
-
<!-- ########################## BUILD TARGETS ##########################-->
- <target name="clean" description="Cleans up the build directory" depends="init.m2">
- <delete dir="${classes.dir}" quiet="${quietclean}"/>
+ <target name="init" />
+
+ <target name="clean" description="Cleans up the build directory" depends="init">
+ <cdk target="clean" />
+ <delete dir="${classes.dir}" quiet="${quietclean}" />
<delete dir="${test.dir}" quiet="${quietclean}" />
<delete dir="${report.dir}" quiet="${quietclean}" />
+ <delete dir="${lib.dir}" quiet="${quietclean}" />
<delete dir="${coverage.dir}" quiet="${quietclean}" />
- <delete file="coverage.ec" failonerror="false" quiet="${quietclean}"/>
- <cdk target="clean" />
+ <delete file="coverage.ec" failonerror="false" quiet="${quietclean}" />
</target>
<target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui" description="Build all four distribution .jar files" />
- <target name="antlr" description="Generate ANTLR parser">
- <mkdir dir="${src.core.dir}/org/jboss/seam/text" />
- <taskdef name="antlrtask" classname="org.apache.tools.ant.taskdefs.optional.ANTLR">
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="ant-antlr*.jar" />
- <include name="antlr-*.jar" />
- </fileset>
- </classpath>
- </taskdef>
- <antlrtask target="seam-text.g" outputdirectory="${src.core.dir}/org/jboss/seam/text">
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="ant-antlr*.jar" />
- <include name="antlr-*.jar" />
- </fileset>
- </classpath>
- </antlrtask>
- </target>
-
<target name="select-compiler">
<available classname="org.eclipse.jdt.core.JDTCompilerAdapter" property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
</target>
@@ -260,143 +195,131 @@
<!-- ########################### CORE TARGETS ##########################-->
- <target name="initcore">
- <init classesdir="${classes.core.dir}" srcdir="${src.core.dir}" modulename="Core" />
+ <target name="initcore" depends="init">
+ <init classesdir="${classes.core.dir}" srcdir="${src.core.dir}" modulename="core" pom="${core.pom}" />
+ </target>
+
+ <target name="antlr" description="Generate ANTLR parser">
+ <mkdir dir="${src.core.dir}/org/jboss/seam/text" />
+ <taskdef name="antlrtask" classname="org.apache.tools.ant.taskdefs.optional.ANTLR">
+ <classpath refid="compile.core.path" />
+ </taskdef>
+ <antlrtask target="seam-text.g" outputdirectory="${src.core.dir}/org/jboss/seam/text">
+ <classpath refid="compile.core.path" />
+ </antlrtask>
</target>
<target name="compilecore" depends="initcore,select-compiler,antlr">
- <compile classesdir="${classes.core.dir}" srcdir="${src.core.dir}" />
+ <compile classesdir="${classes.core.dir}" srcdir="${src.core.dir}" classpath="compile.core.path" />
</target>
- <target name="jarcore" depends="compilecore" description="Build the distribution .jar file for the core package">
- <archive classesdir="${classes.core.dir}" module="jboss-seam" />
+ <target name="jarcore" depends="compilecore" description="Build the distribution .jar file using M2 dependency management">
+ <archive classesdir="${classes.core.dir}" module="jboss-seam" pom="${core.pom}" />
</target>
<!-- ########################### PDF TARGETS ###########################-->
- <target name="initpdf">
- <init classesdir="${classes.pdf.dir}" srcdir="${src.pdf.dir}" modulename="PDF" />
+ <target name="initpdf" depends="init, jarcore, jarui">
+ <init classesdir="${classes.pdf.dir}" srcdir="${src.pdf.dir}" modulename="pdf" pom="${pdf.pom}" />
</target>
- <target name="compilepdf" depends="initpdf,select-compiler,jarui">
- <compile classesdir="${classes.pdf.dir}" srcdir="${src.pdf.dir}">
- <compile.classpath>
- <fileset dir="${basedir}">
- <include name="jboss-seam-ui.jar" />
- </fileset>
- </compile.classpath>
- </compile>
+ <target name="compilepdf" depends="initpdf, select-compiler">
+ <compile classesdir="${classes.pdf.dir}" srcdir="${src.pdf.dir}" classpath="compile.pdf.path" />
</target>
<target name="jarpdf" depends="compilepdf" description="Build the distribution .jar file for the PDF package">
- <archive classesdir="${classes.pdf.dir}" module="jboss-seam-pdf" />
+ <archive classesdir="${classes.pdf.dir}" module="jboss-seam-pdf" pom="${pdf.pom}" />
</target>
+
<!-- ########################### IOC TARGETS ###########################-->
- <target name="initioc">
- <init classesdir="${classes.ioc.dir}" srcdir="${src.ioc.dir}" modulename="ioc" />
+ <target name="initioc" depends="init, jarcore">
+ <init classesdir="${classes.ioc.dir}" srcdir="${src.ioc.dir}" modulename="ioc" pom="${ioc.pom}" />
</target>
<target name="compileioc" depends="initioc, select-compiler">
- <compile classesdir="${classes.ioc.dir}" srcdir="${src.ioc.dir}" />
+ <compile classesdir="${classes.ioc.dir}" srcdir="${src.ioc.dir}" classpath="compile.ioc.path" />
</target>
<target name="jarioc" depends="compileioc" description="Build the distribution .jar file for the IOC package">
- <archive classesdir="${classes.ioc.dir}" module="jboss-seam-ioc" />
+ <archive classesdir="${classes.ioc.dir}" module="jboss-seam-ioc" pom="${ioc.pom}" />
</target>
<!-- ########################### MAIL TARGETS ###########################-->
- <target name="initmail">
- <init classesdir="${classes.mail.dir}" srcdir="${src.mail.dir}" modulename="Mail" />
+ <target name="initmail" depends="init, jarcore, jarui, jarpdf">
+ <init classesdir="${classes.mail.dir}" srcdir="${src.mail.dir}" modulename="mail" pom="${mail.pom}" />
</target>
- <target name="compilemail" depends="initmail,select-compiler,jarpdf,jarui">
- <compile classesdir="${classes.mail.dir}" srcdir="${src.mail.dir}">
- <compile.classpath>
- <fileset dir="${basedir}">
- <include name="jboss-seam-ui.jar" />
- <include name="jboss-seam-pdf.jar" />
- </fileset>
- </compile.classpath>
- </compile>
+ <target name="compilemail" depends="initmail, select-compiler">
+ <compile classesdir="${classes.mail.dir}" srcdir="${src.mail.dir}" classpath="compile.mail.path" />
</target>
- <target name="jarmail" depends="compilemail" description="Build the distribution .jar file for the Mail package">
- <archive classesdir="${classes.mail.dir}" module="jboss-seam-mail" />
+ <target name="jarmail" depends="compilemail" description="Build the distribution .jar file for the IOC package">
+ <archive classesdir="${classes.mail.dir}" module="jboss-seam-mail" pom="${mail.pom}" />
</target>
<!-- ########################### DEBUG TARGETS ###########################-->
- <target name="initdebug">
- <init classesdir="${classes.debug.dir}" srcdir="${src.debug.dir}" modulename="Debug" />
+ <target name="initdebug" depends="init, jarcore">
+ <init classesdir="${classes.debug.dir}" srcdir="${src.debug.dir}" modulename="debug" pom="${debug.pom}" />
</target>
- <target name="compiledebug" depends="initdebug,select-compiler">
- <compile classesdir="${classes.debug.dir}" srcdir="${src.debug.dir}" />
+ <target name="compiledebug" depends="initdebug, select-compiler">
+ <compile classesdir="${classes.debug.dir}" srcdir="${src.debug.dir}" classpath="compile.debug.path" />
</target>
- <target name="jardebug" depends="compiledebug" description="Build the distribution .jar file for the Debug package">
- <archive classesdir="${classes.debug.dir}" module="jboss-seam-debug" />
+ <target name="jardebug" depends="compiledebug" description="Build the distribution .jar file for the IOC package">
+ <archive classesdir="${classes.debug.dir}" module="jboss-seam-debug" pom="${debug.pom}" />
</target>
<!-- ########################### GEN TARGETS ###########################-->
- <target name="initgen">
- <init classesdir="${classes.gen.dir}" srcdir="${src.gen.dir}" modulename="GEN" />
+ <target name="initgen" depends="init, jarcore">
+ <init classesdir="${classes.gen.dir}" srcdir="${src.gen.dir}" modulename="gen" pom="${gen.pom}" />
</target>
- <target name="compilegen" depends="initgen,select-compiler">
- <compile classesdir="${classes.gen.dir}" srcdir="${src.gen.dir}" />
+ <target name="compilegen" depends="initgen, select-compiler">
+ <compile classesdir="${classes.gen.dir}" srcdir="${src.gen.dir}" classpath="compile.gen.path" />
</target>
- <target name="jargen" depends="compilegen" description="Build the distribution .jar file for the GEN package">
- <archive classesdir="${classes.gen.dir}" module="jboss-seam-gen" />
+ <target name="jargen" depends="compilegen" description="Build the distribution .jar file for the gen package">
+ <archive classesdir="${classes.gen.dir}" module="jboss-seam-gen" pom="${gen.pom}" />
</target>
<!-- ########################### REMOTING TARGETS ###########################-->
- <target name="initremoting">
- <init classesdir="${classes.remoting.dir}" srcdir="${src.remoting.dir}" modulename="Remoting" />
+ <target name="initremoting" depends="init, jarcore">
+ <init classesdir="${classes.remoting.dir}" srcdir="${src.remoting.dir}" modulename="remoting" pom="${remoting.pom}" />
</target>
- <target name="compileremoting" depends="initremoting,select-compiler">
- <compile classesdir="${classes.remoting.dir}" srcdir="${src.remoting.dir}" />
+ <target name="compileremoting" depends="initremoting, select-compiler">
+ <compile classesdir="${classes.remoting.dir}" srcdir="${src.remoting.dir}" classpath="compile.remoting.path" />
</target>
<target name="jarremoting" depends="compileremoting" description="Build the distribution .jar file for the Remoting package">
- <archive classesdir="${classes.remoting.dir}" module="jboss-seam-remoting" />
+ <archive classesdir="${classes.remoting.dir}" module="jboss-seam-remoting" pom="${remoting.pom}" />
</target>
-
<!-- ########################### UI TARGETS ###########################-->
- <target name="jarui" description="Build the distribution .jar file for the UI package based on A4J CDK" depends="init.m2, installExtraDependencies">
- <install pom="${core.pom}" jar="${basedir}/jboss-seam.jar" />
- <echo message="Installed jboss-seam-core pom" />
+ <target name="initui" depends="init, jarcore">
+ <dependencies id="ui" scope="compile" pom="${ui.pom}" />
+ </target>
+
+ <target name="jarui" description="Build the distribution .jar file for the UI package based on A4J CDK" depends="initui">
<mkdir dir="${dist.dir}" />
- <cdk target="package" />
+ <cdk target="install" />
<copy file="${ui.dir}/target/jboss-seam-ui.jar" tofile="${basedir}/${name}-ui.jar" />
<copy file="${basedir}/${name}-ui.jar" todir="${dist.dir}" />
</target>
- <!-- ########################### TEST TARGETS ##########################-->
-
- <target name="inittest">
- <init classesdir="${classes.test.dir}" srcdir="${src.test.dir}" modulename="Tests" />
- </target>
-
- <target name="compiletest" depends="inittest,select-compiler,antlr,jarremoting">
- <compile classesdir="${classes.test.dir}" srcdir="${src.test.dir}" classpath="test.classpath" />
- </target>
-
-
<!-- ########################## 'ALL' TARGETS ##########################-->
<target name="cleanall" depends="clean,cleandist" description="Cleans up everything">
@@ -428,7 +351,6 @@
<ant dir="examples/quartz" target="clean" inheritall="false" />
<ant dir="examples/wiki" target="clean" inheritall="false" />
<ant dir="examples/seamdiscs" target="clean" inheritall="false" />
- <ant dir="examples/seambay" target="clean" inheritall="false" />
</target>
<target name="undeployall" description="Undeploy all examples">
@@ -457,7 +379,6 @@
<ant dir="examples/quartz" target="undeploy" inheritall="false" />
<ant dir="examples/wiki" target="undeploy" inheritall="false" />
<ant dir="examples/seamdiscs" target="undeploy" inheritall="false" />
- <ant dir="examples/seambay" target="undeploy" inheritall="false" />
<!-- Unexplode from JBoss -->
<ant dir="examples/booking" target="unexplode" inheritall="false" />
@@ -482,7 +403,6 @@
<ant dir="examples/groovybooking" target="unexplode" inheritall="false" />
<ant dir="examples/quartz" target="unexplode" inheritall="false" />
<ant dir="examples/seamdiscs" target="unexplode" inheritall="false" />
- <ant dir="examples/seambay" target="unexplode" inheritall="false" />
<!-- Undeploy from Tomcat -->
<ant dir="examples/booking" target="tomcat.undeploy" inheritall="false" />
@@ -516,8 +436,7 @@
<ant dir="examples/todo" target="test" inheritall="false" />
<ant dir="examples/blog" target="test" inheritall="false" />
<ant dir="examples/ui" target="test" inheritall="false" />
- <ant dir="examples/seambay" target="test" inheritall="false" />
- <ant dir="examples/wiki" target="test" inheritall="false" >
+ <ant dir="examples/wiki" target="test" inheritall="false">
<property name="test.output.dir" value="${test.dir}/wiki" />
</ant>
<!--<ant dir="examples/portal" target="test" inheritall="false" />-->
@@ -576,44 +495,37 @@
</copy>
</target>
- <target name="copylib">
- <mkdir dir="${dist.lib.dir}" />
- <copy todir="${dist.lib.dir}">
- <fileset dir="${lib.dir}">
- <include name="*.*" />
- </fileset>
- </copy>
+ <target name="copylib" depends="copyseam, copyseamdependencies">
<copy todir="${dist.eejb.conf.dir}">
<fileset dir="${eejb.conf.dir}">
<include name="**/*" />
- <exclude name="tmp/**/*"/>
+ <exclude name="tmp/**/*" />
</fileset>
</copy>
- <copy file="${eejb.conf.dir}/readme.txt" todir="${dist.eejb.conf.dir}" />
- <copy todir="${dist.drools.dir}">
- <fileset dir="${drools.dir}">
- <include name="**/*.*" />
- </fileset>
- </copy>
- <copy todir="${dist.hibernate.dir}">
- <fileset dir="${hibernate.dir}">
- <include name="**/*.*" />
- </fileset>
- </copy>
<copy todir="${dist.mail.dir}">
<fileset dir="${mail.dir}">
<include name="**/*.*" />
</fileset>
</copy>
+
+
+ <copy todir="${dist.lib.dir}">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar" />
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="copybuild">
<copy todir="${dist.build.dir}">
<fileset dir="${build.dir}">
<include name="**/*.*" />
</fileset>
</copy>
-
</target>
<target name="copyexamples">
@@ -643,7 +555,6 @@
<include name="seamdiscs/**/*" />
<include name="quartz/**/*" />
<include name="wiki/**/*" />
- <include name="seambay/**/*" />
<!--<include name="portal/**/*" />-->
<include name="drools/**/*" />
<include name="remoting/chatroom/**/*" />
@@ -675,9 +586,11 @@
<copy file="readme.txt" todir="${dist.dir}" />
<copy file="lgpl.txt" todir="${dist.dir}" />
<copy file="changelog.txt" todir="${dist.dir}" />
- <copy file="build.properties" todir="${dist.dir}" />
+ <copy file="build.properties.sample" tofile="${dist.dir}/build.properties" />
+ <propertyfile file="${dist.dir}/build.properties">
+ <entry key="mavenized" value="false"/>
+ </propertyfile>
<copy file="build.xml" todir="${dist.dir}" />
- <copy file="pom.xml" todir="${dist.dir}" />
<copy file="seam" todir="${dist.dir}" />
<copy file="seam-text.g" todir="${dist.dir}" />
<copy file="seam.bat" todir="${dist.dir}" />
@@ -693,6 +606,7 @@
</replace>
</target>
+
<target name="dist" depends="cleandist,build,javadoc,copysource,copylib,copyexamples,copyseamgen,refdoc,extras" description="Build everything and package">
<zip zipfile="${dist.location}/${dist.name}.zip">
<zipfileset prefix="${dist.name}" dir="${dist.dir}" />
@@ -705,10 +619,10 @@
<!-- ########################## DOCUMENTATION TARGETS ##########################-->
- <target name="javadoc" description="Compile the Javadoc API documentation to dist dir">
+ <target name="javadoc" description="Compile the Javadoc API documentation to dist dir" depends="initcore">
<mkdir dir="${dist.api.dir}" />
- <javadoc classpathref="build.classpath" destdir="${dist.api.dir}" use="true" protected="true" version="true" windowtitle="${Name} API Documentation" Overview="${doc.api.dir}/package.html" doctitle="${Name} API Documentation" stylesheetfile="${doc.api.dir}/jdstyle.css" link="${javadoc.link}">
+ <javadoc classpathref="compile.core.path" destdir="${dist.api.dir}" use="true" protected="true" version="true" windowtitle="${Name} API Documentation" Overview="${doc.api.dir}/package.html" doctitle="${Name} API Documentation" stylesheetfile="${doc.api.dir}/jdstyle.css" link="${javadoc.link}">
<packageset dir="${src.core.dir}" defaultexcludes="yes">
<include name="org/jboss/seam/**" />
@@ -745,18 +659,31 @@
<!-- ########################### TEST TARGETS ###########################-->
+ <target name="compiletest" depends="inittestcore,select-compiler,antlr,jarremoting">
+ <compile classesdir="${classes.test.dir}" srcdir="${src.test.dir}" classpath="test.core.path" />
+ </target>
+
<target name="inittestcore" depends="build">
+ <init classesdir="${classes.test.dir}" srcdir="${src.test.dir}" modulename="core" pom="${core.pom}" scope="test" message=""/>
<copy todir="${classes.test.core.dir}">
<fileset dir="${classes.core.dir}" includes="**/*.*" />
</copy>
</target>
+
<target name="testcore" depends="inittestcore,compiletest" description="Run the core unit tests">
- <taskdef resource="testngtasks" classpath="${testng.jar}" />
- <property name="test.cp" refid="test.classpath" />
+ <taskdef resource="testngtasks" classpathref="test.core.path" />
+ <property name="cp" refid="test.core.path" />
+ <echo >${cp}</echo>
<testng>
<jvmarg value="-Djava.awt.headless=true" />
- <classpath refid="test.classpath" />
+ <classpath>
+ <path path="${classes.test.core.dir}" />
+ <path path="${classes.test.dir}" />
+ <path refid="classpath.emma" />
+ <path refid="test.core.path" />
+ <pathelement location="${lib.dir}/jboss-seam-remoting.jar"/>
+ </classpath>
<xmlfileset dir="${src.test.dir}" includes="**/*.xml" />
</testng>
</target>
@@ -787,7 +714,6 @@
<target name="instrumentcore" depends="compilecore">
<taskdef resource="emma_ant.properties" classpathref="classpath.emma" />
- <mkdir dir="${classes.coverage.core.dir}" />
<mkdir dir="${coverage.dir}/core" />
<emma>
<instr instrpath="${classes.core.dir}" mode="overwrite" metadatafile="${coverage.dir}/coveragecore.em">
@@ -821,7 +747,9 @@
<attribute name="modulename" />
<attribute name="classesdir" />
<attribute name="srcdir" />
+ <attribute name="pom" />
<attribute name="message" default="Build ${Name} @{modulename} ${version}" />
+ <attribute name="scope" default="compile" />
<sequential>
<echo message="@{message}" />
<mkdir dir="@{classesdir}" />
@@ -830,13 +758,14 @@
<patternset refid="meta.files" />
</fileset>
</copy>
+ <dependencies id="@{modulename}" scope="@{scope}" pom="@{pom}" />
</sequential>
</macrodef>
<macrodef name="compile">
<attribute name="classesdir" />
<attribute name="srcdir" />
- <attribute name="classpath" default="build.classpath" />
+ <attribute name="classpath" />
<element name="compile.classpath" optional="true" />
<sequential>
<javac source="1.5" target="1.5" destdir="@{classesdir}" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on" srcdir="@{srcdir}">
@@ -851,8 +780,10 @@
<macrodef name="archive">
<attribute name="module" />
<attribute name="classesdir" />
+ <attribute name="pom" />
<sequential>
- <jar jarfile="${basedir}/@{module}.jar" basedir="@{classesdir}">
+ <mkdir dir="${lib.dir}" />
+ <jar jarfile="${lib.dir}/@{module}.jar" basedir="@{classesdir}">
<include name="**/*.class" />
<exclude name="**/test/*.class" />
<patternset refid="meta.files" />
@@ -861,8 +792,7 @@
<attribute name="Implementation-Version" value="${version}.${patchlevel}" />
</manifest>
</jar>
- <mkdir dir="${dist.dir}" />
- <copy file="${basedir}/@{module}.jar" todir="${dist.dir}" />
+ <install jar="${lib.dir}/@{module}.jar" pom="@{pom}" />
</sequential>
</macrodef>
@@ -871,7 +801,7 @@
<attribute name="target" />
<sequential>
<pomfile name="ui.pom" value="${build.dir}/ui.pom.xml" tofile="${ui.dir}/pom.xml" />
- <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="${basedir}">
+ <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="${basedir}/ui">
<classpath>
<fileset dir="${maven.dir}/core/boot">
<include name="*.jar" />
@@ -905,4 +835,18 @@
</sequential>
</macrodef>
+ <macrodef name="copylib">
+ <attribute name="fileset" />
+ <attribute name="versions" />
+ <sequential>
+ <copy todir="${dist.lib.dir}" verbose="on">
+ <fileset refid="@{fileset}">
+ <!-- Need to exclude jboss-seam-* -->
+ <!--<exclude name="**/jboss-seam*.jar" />-->
+ </fileset>
+ <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="@{versions}" to="flatten" />
+ </copy>
+ </sequential>
+ </macrodef>
+
</project>
1.21 +2 -2 jboss-seam/seam
(In the diff below, changes in quantity of whitespace are not shown.)
Index: seam
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- seam 6 Jun 2007 20:31:50 -0000 1.20
+++ seam 20 Sep 2007 18:35:52 -0000 1.21
@@ -30,9 +30,9 @@
cat README
elif $cygwin
then
- java -cp "${JAVA_HOME}\lib\tools.jar;..\lib\ant-launcher.jar;..\lib\ant-nodeps.jar;..\lib\ant.jar" -Dant.home=..\lib org.apache.tools.ant.launch.Launcher ${*}
+ java -cp "${JAVA_HOME}\lib\tools.jar;..\build\lib\ant-launcher.jar;..\build\lib\ant-nodeps.jar;..\build\lib\ant.jar" -Dant.home=..\lib org.apache.tools.ant.launch.Launcher ${*}
else
- java -cp "${JAVA_HOME}/lib/tools.jar:../lib/ant-launcher.jar:../lib/ant-nodeps.jar:../lib/ant.jar" -Dant.home=../lib org.apache.tools.ant.launch.Launcher ${*}
+ java -cp "${JAVA_HOME}/lib/tools.jar:${SEAM_HOME}/build/lib/ant-launcher.jar:${SEAM_HOME}/build/lib/ant-nodeps.jar:${SEAM_HOME}/build/lib/ant.jar" -Dant.home=../lib org.apache.tools.ant.launch.Launcher ${*}
fi
cd ..
More information about the jboss-cvs-commits
mailing list