[jboss-cvs] jboss-seam ...
Peter Muir
peter at bleepbleep.org.uk
Fri Aug 17 10:03:02 EDT 2007
User: pmuir
Date: 07/08/17 10:03:02
Modified: jboss-seam build.2.xml build.properties.sample pom.xml
build.xml
Log:
More dependency management
Revision Changes Path
1.2 +44 -113 jboss-seam/build.2.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.2.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build.2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build.2.xml 16 Aug 2007 10:53:46 -0000 1.1
+++ build.2.xml 17 Aug 2007 14:03:02 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<project name="Seam2" default="build" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+<project name="Seam2" default="build" basedir=".">
<tstamp />
@@ -43,7 +43,6 @@
<!-- set global properties for this build -->
-
<!-- Targets -->
<property name="classes.dir" value="classes" />
<property name="classes.core.dir" value="${classes.dir}/coreclasses" />
@@ -58,6 +57,18 @@
<property name="ui.dir" value="ui" />
<property name="seamgen.dir" value="${basedir}/seam-gen" />
+ <!-- Build resources -->
+ <property name="build.dir" value="${basedir}/build" />
+ <property name="build.thirdparty.dir" value="${basedir}/build/thirdparty" />
+ <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" />
+
<!-- Source directories -->
<property name="src.core.dir" value="src/main" />
<property name="src.ui.dir" value="${ui.dir}/src" />
@@ -75,11 +86,15 @@
<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.thirdparty.dir" value="${basedir}/build/thirdparty" />
- <property name="build.lib.dir" value="${build.dir}/lib" />
- <property name="maven.dir" value="${build.dir}/maven" />
+ <!-- POMs -->
+ <pomfile name="core.pom" value="${build.dir}/core.pom.xml" />
+ <pomfile name="debug.pom" value="${build.dir}/debug.pom.xml" />
+ <pomfile name="gen.pom" value="${build.dir}/gen.pom.xml" />
+ <pomfile name="ioc.pom" value="${build.dir}/ioc.pom.xml" />
+ <pomfile name="mail.pom" value="${build.dir}/mail.pom.xml" />
+ <pomfile name="pdf.pom" value="${build.dir}/pdf.pom.xml" />
+ <pomfile name="remoting.pom" value="${build.dir}/remoting.pom.xml" />
+ <pomfile name="ui.pom" value="${ui.dir}/pom.xml" />
<!-- Documentation -->
<property name="doc.dir" value="doc" />
@@ -180,18 +195,7 @@
<include name="**/*.png" />
</patternset>
-
- <!-- ########################## MAVEN2 #########################-->
-
- <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" />
-
- <target name="init">
- <artifact:pom file="${basedir}/pom.xml" id="seam.pom" />
- <artifact:install>
- <pom refid="seam.pom" />
- </artifact:install>
- </target>
+ <target name="init" />
<!-- ########################## BUILD TARGETS ##########################-->
@@ -218,14 +222,7 @@
<target name="initcore" depends="init">
- <artifact:pom file="${build.dir}/core.pom.xml" id="core.pom" />
- <init classesdir="${classes.core.dir}" srcdir="${src.core.dir}" modulename="Core" />
- <artifact:dependencies pathId="compile.core.path" useScope="compile">
- <pom refid="core.pom" />
- </artifact:dependencies>
- <artifact:dependencies filesetId="compile.core.fileset" versionsId="compile.core.versions" useScope="compile">
- <pom refid="core.pom" />
- </artifact:dependencies>
+ <init classesdir="${classes.core.dir}" srcdir="${src.core.dir}" modulename="core" pom="${core.pom}" />
</target>
<target name="antlr" description="Generate ANTLR parser" depends="initcore">
@@ -243,23 +240,13 @@
</target>
<target name="jarcore" depends="compilecore" description="Build the distribution .jar file using M2 dependency management">
- <archive classesdir="${classes.core.dir}" module="jboss-seam" />
- <artifact:install file="${basedir}/jboss-seam.jar">
- <pom refid="core.pom" />
- </artifact:install>
+ <archive classesdir="${classes.core.dir}" module="jboss-seam" pom="${core.pom}" />
</target>
<!-- ########################### PDF TARGETS ###########################-->
<target name="initpdf" depends="init, jarcore, jarui">
- <artifact:pom file="${build.dir}/pdf.pom.xml" id="pdf.pom" />
- <init classesdir="${classes.pdf.dir}" srcdir="${src.pdf.dir}" modulename="PDF" />
- <artifact:dependencies pathId="compile.pdf.path" useScope="compile">
- <pom refid="pdf.pom" />
- </artifact:dependencies>
- <artifact:dependencies filesetId="compile.pdf.fileset" versionsId="compile.pdf.versions" useScope="compile">
- <pom refid="pdf.pom" />
- </artifact:dependencies>
+ <init classesdir="${classes.pdf.dir}" srcdir="${src.pdf.dir}" modulename="pdf" pom="${pdf.pom}" />
</target>
<target name="compilepdf" depends="initpdf, select-compiler">
@@ -267,24 +254,14 @@
</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" />
- <artifact:install file="${basedir}/jboss-seam-pdf.jar">
- <pom refid="pdf.pom" />
- </artifact:install>
+ <archive classesdir="${classes.pdf.dir}" module="jboss-seam-pdf" pom="${pdf.pom}" />
</target>
<!-- ########################### IOC TARGETS ###########################-->
<target name="initioc" depends="init, jarcore">
- <init classesdir="${classes.ioc.dir}" srcdir="${src.ioc.dir}" modulename="ioc" />
- <artifact:pom file="${build.dir}/ioc.pom.xml" id="ioc.pom" />
- <artifact:dependencies pathId="compile.ioc.path" useScope="compile">
- <pom refid="ioc.pom" />
- </artifact:dependencies>
- <artifact:dependencies filesetId="compile.ioc.fileset" versionsId="compile.ioc.versions" useScope="compile">
- <pom refid="ioc.pom" />
- </artifact:dependencies>
+ <init classesdir="${classes.ioc.dir}" srcdir="${src.ioc.dir}" modulename="ioc" pom="${ioc.pom}" />
</target>
<target name="compileioc" depends="initioc, select-compiler">
@@ -292,24 +269,14 @@
</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" />
- <artifact:install file="${basedir}/jboss-seam-ioc.jar">
- <pom refid="ioc.pom" />
- </artifact:install>
+ <archive classesdir="${classes.ioc.dir}" module="jboss-seam-ioc" pom="${ioc.pom}" />
</target>
<!-- ########################### MAIL TARGETS ###########################-->
<target name="initmail" depends="init, jarcore, jarui, jarpdf">
- <init classesdir="${classes.mail.dir}" srcdir="${src.mail.dir}" modulename="Mail" />
- <artifact:pom file="${build.dir}/mail.pom.xml" id="mail.pom" />
- <artifact:dependencies pathId="compile.mail.path" useScope="compile">
- <pom refid="mail.pom" />
- </artifact:dependencies>
- <artifact:dependencies filesetId="compile.mail.fileset" versionsId="compile.mail.versions" useScope="compile">
- <pom refid="mail.pom" />
- </artifact:dependencies>
+ <init classesdir="${classes.mail.dir}" srcdir="${src.mail.dir}" modulename="mail" pom="${mail.pom}" />
</target>
<target name="compilemail" depends="initmail, select-compiler">
@@ -317,24 +284,14 @@
</target>
<target name="jarmail" depends="compilemail" description="Build the distribution .jar file for the IOC package">
- <archive classesdir="${classes.mail.dir}" module="jboss-seam-mail" />
- <artifact:install file="${basedir}/jboss-seam-mail.jar">
- <pom refid="mail.pom" />
- </artifact:install>
+ <archive classesdir="${classes.mail.dir}" module="jboss-seam-mail" pom="${mail.pom}" />
</target>
<!-- ########################### DEBUG TARGETS ###########################-->
<target name="initdebug" depends="init, jarcore">
- <init classesdir="${classes.debug.dir}" srcdir="${src.debug.dir}" modulename="Debug" />
- <artifact:pom file="${build.dir}/debug.pom.xml" id="debug.pom" />
- <artifact:dependencies pathId="compile.debug.path" useScope="compile">
- <pom refid="debug.pom" />
- </artifact:dependencies>
- <artifact:dependencies filesetId="compile.debug.fileset" versionsId="compile.debug.versions" useScope="compile">
- <pom refid="debug.pom" />
- </artifact:dependencies>
+ <init classesdir="${classes.debug.dir}" srcdir="${src.debug.dir}" modulename="debug" pom="${debug.pom}" />
</target>
<target name="compiledebug" depends="initdebug, select-compiler">
@@ -342,24 +299,14 @@
</target>
<target name="jardebug" depends="compiledebug" description="Build the distribution .jar file for the IOC package">
- <archive classesdir="${classes.debug.dir}" module="jboss-seam-debug" />
- <artifact:install file="${basedir}/jboss-seam-debug.jar">
- <pom refid="debug.pom" />
- </artifact:install>
+ <archive classesdir="${classes.debug.dir}" module="jboss-seam-debug" pom="${debug.pom}" />
</target>
<!-- ########################### GEN TARGETS ###########################-->
<target name="initgen" depends="init, jarcore">
- <init classesdir="${classes.gen.dir}" srcdir="${src.gen.dir}" modulename="GEN" />
- <artifact:pom file="${build.dir}/gen.pom.xml" id="gen.pom" />
- <artifact:dependencies pathId="compile.gen.path" useScope="compile">
- <pom refid="gen.pom" />
- </artifact:dependencies>
- <artifact:dependencies filesetId="compile.gen.fileset" versionsId="compile.gen.versions" useScope="compile">
- <pom refid="gen.pom" />
- </artifact:dependencies>
+ <init classesdir="${classes.gen.dir}" srcdir="${src.gen.dir}" modulename="gen" pom="${gen.pom}" />
</target>
<target name="compilegen" depends="initgen, select-compiler">
@@ -367,25 +314,14 @@
</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" />
- <artifact:install file="${basedir}/jboss-seam-gen.jar">
- <pom refid="gen.pom" />
- </artifact:install>
+ <archive classesdir="${classes.gen.dir}" module="jboss-seam-gen" pom="${gen.pom}" />
</target>
<!-- ########################### REMOTING TARGETS ###########################-->
<target name="initremoting" depends="init, jarcore">
- <init classesdir="${classes.remoting.dir}" srcdir="${src.remoting.dir}" modulename="Remoting" />
- <artifact:pom file="${build.dir}/remoting.pom.xml" id="remoting.pom" />
- <artifact:dependencies pathId="compile.remoting.path" useScope="compile">
- <pom refid="remoting.pom" />
- </artifact:dependencies>
- <artifact:pom file="${build.dir}/remoting.pom.xml" id="remoting.pom" />
- <artifact:dependencies filesetId="compile.remoting.fileset" versionsId="compile.remoting.versions" useScope="compile">
- <pom refid="remoting.pom" />
- </artifact:dependencies>
+ <init classesdir="${classes.remoting.dir}" srcdir="${src.remoting.dir}" modulename="remoting" pom="${remoting.pom}" />
</target>
<target name="compileremoting" depends="initremoting, select-compiler">
@@ -393,25 +329,16 @@
</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" />
- <artifact:install file="${basedir}/jboss-seam-remoting.jar">
- <pom refid="remoting.pom" />
- </artifact:install>
+ <archive classesdir="${classes.remoting.dir}" module="jboss-seam-remoting" pom="${remoting.pom}" />
</target>
<!-- ########################### UI TARGETS ###########################-->
<target name="initui" depends="init, jarcore">
- <artifact:pom file="${ui.dir}/pom.xml" id="ui.pom" />
- <artifact:dependencies pathId="compile.ui.path" useScope="compile">
- <pom refid="ui.pom" />
- </artifact:dependencies>
- <artifact:dependencies filesetId="compile.ui.fileset" versionsId="compile.ui.versions" useScope="compile">
- <pom refid="ui.pom" />
- </artifact:dependencies>
+ <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="init, jarcore">
+ <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="install" />
<copy file="${ui.dir}/target/jboss-seam-ui.jar" tofile="${basedir}/${name}-ui.jar" />
@@ -842,6 +769,7 @@
<attribute name="modulename" />
<attribute name="classesdir" />
<attribute name="srcdir" />
+ <attribute name="pom" />
<attribute name="message" default="Build ${Name} @{modulename} ${version}" />
<sequential>
<echo message="@{message}" />
@@ -851,6 +779,7 @@
<patternset refid="meta.files" />
</fileset>
</copy>
+ <dependencies id="@{modulename}" scope="compile" pom="@{pom}" />
</sequential>
</macrodef>
@@ -872,6 +801,7 @@
<macrodef name="archive">
<attribute name="module" />
<attribute name="classesdir" />
+ <attribute name="pom" />
<sequential>
<jar jarfile="${basedir}/@{module}.jar" basedir="@{classesdir}">
<include name="**/*.class" />
@@ -884,6 +814,7 @@
</jar>
<mkdir dir="${dist.dir}" />
<copy file="${basedir}/@{module}.jar" todir="${dist.dir}" />
+ <install jar="${basedir}/@{module}.jar" pom="@{pom}" />
</sequential>
</macrodef>
1.9 +1 -1 jboss-seam/build.properties.sample
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.properties.sample
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build.properties.sample,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- build.properties.sample 17 Aug 2007 02:09:10 -0000 1.8
+++ build.properties.sample 17 Aug 2007 14:03:02 -0000 1.9
@@ -7,5 +7,5 @@
#validate.xml=true
# Compiled Seam artifacts (JARs, documentation, etc.) will be copied to this directory if specified,
-# otherwise ../jboss-seam-<timestamp>.<randomnumber>/ is used
+# otherwise ../jboss-seam-<version>.<patchlevel>/ is used
#dist.dir=../jboss-seam-dist
\ No newline at end of file
1.4 +1 -11 jboss-seam/pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- pom.xml 16 Aug 2007 10:53:46 -0000 1.3
+++ pom.xml 17 Aug 2007 14:03:02 -0000 1.4
@@ -6,7 +6,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<url>http://jboss.com/products/seam</url>
- <version>2.0.0.BETA</version>
+ <version>@seam.version@</version>
<name>JBoss Seam</name>
<packaging>pom</packaging>
<modules>
@@ -15,10 +15,6 @@
<pluginRepositories>
<pluginRepository>
<releases />
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
<id>repository.jboss.com</id>
<name>JBoss Repository</name>
<url>http://repository.jboss.com/maven2</url>
@@ -50,11 +46,6 @@
<id>maven2.java.net</id>
<url>http://download.java.net/maven/2/</url>
</repository>
- <repository>
- <id>local</id>
- <name>Local Repository</name>
- <url>file://${basedir}/../build/repository</url>
- </repository>
</repositories>
<dependencyManagement>
@@ -185,7 +176,6 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>3.2.1.ga</version>
-
</dependency>
<dependency>
1.260 +16 -38 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.259
retrieving revision 1.260
diff -u -b -r1.259 -r1.260
--- build.xml 16 Aug 2007 17:21:44 -0000 1.259
+++ build.xml 17 Aug 2007 14:03:02 -0000 1.260
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<project name="Seam" default="build" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+<project name="Seam" default="build" basedir=".">
<tstamp />
@@ -81,6 +81,13 @@
<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" />
+ <pomfile name="seam.pom" value="${basedir}/pom.xml" />
+ <pomfile name="core.pom" value="${build.dir}/core.pom.xml" />
<!-- Documentation -->
<property name="doc.dir" value="doc" />
@@ -200,40 +207,16 @@
<!-- ########################## MAVEN2 #########################-->
- <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" />
-
<target name="installExtraDependencies">
-
- <!-- JBoss POJO Cache -->
-
- <artifact:pom file="${build.dir}/thirdparty/jboss-cache-jdk50.pom.xml" id="jboss-cache-jdk50.pom" />
- <artifact:install file="${lib.dir}/jboss-cache-jdk50.jar">
- <pom refid="jboss-cache-jdk50.pom" />
- </artifact:install>
-
- <!-- Testng -->
-
- <artifact:pom file="${build.dir}/thirdparty/testng.pom.xml" id="testng.pom" />
- <artifact:install file="${lib.dir}/testng-5.6-jdk15.jar">
- <pom refid="testng.pom" />
- </artifact:install>
-
- <!-- JBPM JPDL -->
-
- <artifact:pom file="${build.dir}/thirdparty/jbpm-jpdl.pom.xml" id="jbpm-jpdl.pom" />
- <artifact:install file="${lib.dir}/jbpm-jpdl.jar">
- <pom refid="jbpm-jpdl.pom" />
- </artifact:install>
-
+ <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" depends="installExtraDependencies">
<!-- Install the parent pom -->
- <artifact:pom file="${basedir}/pom.xml" id="seam.pom" />
- <artifact:install>
- <pom refid="seam.pom" />
- </artifact:install>
+ <install pom="${seam.pom}" />
</target>
<!-- ########################## BUILD TARGETS ##########################-->
@@ -250,8 +233,6 @@
<target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui" description="Build all four distribution .jar files" />
- <!--<target name="build.m2" depends="jarcore.m2,jarpdf.m2,jarioc.m2,jarmail.m2,jarremoting.m2,jardebug.m2,jargen.m2,jarui.m2" 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">
@@ -399,10 +380,7 @@
<!-- ########################### UI TARGETS ###########################-->
<target name="jarui" description="Build the distribution .jar file for the UI package based on A4J CDK" depends="init.m2">
- <artifact:pom file="${build.dir}/core.pom.xml" id="core.pom" />
- <artifact:install file="${basedir}/jboss-seam.jar">
- <pom refid="core.pom" />
- </artifact:install>
+ <install pom="${core.pom}" jar="${basedir}/jboss-seam.jar" />
<echo message="Installed jboss-seam-core pom" />
<mkdir dir="${dist.dir}" />
<cdk target="package" />
More information about the jboss-cvs-commits
mailing list