jdillon 2003/08/14 10:08:00
Modified: . maven.xml project.xml
etc maven.xml
modules/common maven.xml
modules/core maven.xml project.xml
modules/twiddle maven.xml
Added: etc global.properties
Log:
o Hooking up specs/* to the build
o Using a 'default' goal to allow attainGoal and the reactor to
execute it easily.
Revision Changes Path
1.11 +72 -60 incubator-geronimo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven.xml 14 Aug 2003 15:43:25 -0000 1.10
+++ maven.xml 14 Aug 2003 17:08:00 -0000 1.11
@@ -2,67 +2,49 @@
<!-- $Id$ -->
-<project default="modules:build"
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven">
-
- <!-- ===================== -->
- <!-- Module Initialization -->
- <!-- ===================== -->
-
- <ant:property file="${basedir}/etc/project.properties"/>
-
-
- <preGoal name="xdoc:jelly-transform">
- <attainGoal name="html2xdoc"/>
- <attainGoal name="faq"/>
- </preGoal>
-
-
- <goal name="run" prereqs="set.classpath"
- description="Runs the Geronimo Server using the current build">
- <ant:java classname="org.apache.geronimo.Main" fork="yes">
- <ant:classpath refid="test.classpath"/>
- </ant:java>
- </goal>
-
- <goal name="set.classpath" prereqs="java:compile, test:compile"
- description="Sets up the classpath for running things">
- <ant:path id="test.classpath">
- <ant:pathelement path="target/test-classes"/>
- <ant:pathelement path="modules/core/src/conf/"/>
- <ant:pathelement path="${maven.build.dest}"/>
- <ant:path refid="maven.dependency.classpath"/>
- </ant:path>
- </goal>
-
+<project default="default"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
- <goal name="modules:reactor">
+ <goal name="modules:reactor:init">
+ <j:if test="${empty(module)}">
+ <j:set var="module" value="*"/>
+ </j:if>
+
+ <j:if test="${empty(modules.includes)}">
+ <j:set var="modules.includes"
value="modules/${module}/project.xml,specs/${module}/project.xml"/>
+ </j:if>
+
+ <j:if test="${empty(modules.excludes)}">
+ <j:set var="modules.excludes" value=""/>
+ </j:if>
+ </goal>
+
+ <goal name="modules:reactor" prereqs="modules:reactor:init">
<maven:reactor
- basedir="${basedir}/modules"
- includes="*/project.xml"
- excludes="xmlbeans/project.xml"
+ basedir="${basedir}"
+ includes="${modules.includes}"
+ excludes="${modules.excludes}"
banner="Executing (${goals}):"
ignoreFailures="false"
goals="${goals}"
/>
</goal>
- <goal name="modules:build">
- <j:set var="goals" value="jar:install"/>
- <attainGoal name="modules:reactor"/>
- </goal>
-
- <goal name="modules:rebuild">
- <j:set var="goals" value="clean, jar:install"/>
+ <goal name="modules:default">
+ <j:set var="goals" value="default"/>
<attainGoal name="modules:reactor"/>
</goal>
+ <goal name="modules:build">
+ <attainGoal name="modules:default"/>
+ </goal>
+
<goal name="modules:site">
<j:set var="goals" value="site"/>
<attainGoal name="modules:reactor"/>
@@ -82,46 +64,50 @@
<attainGoal name="modules:clean"/>
</preGoal>
- <goal name="build">
- <attainGoal name="modules:build"/>
- </goal>
+ <preGoal name="default">
+ <attainGoal name="modules:default"/>
+ </preGoal>
- <goal name="rebuild">
- <attainGoal name="modules:rebuild"/>
- </goal>
+
+ <!-- =============================== -->
+ <!-- Documentation & Site Generation -->
+ <!-- =============================== -->
<goal name="javadoc">
<attainGoal name="modules:javadoc"/>
</goal>
-
+ <preGoal name="xdoc:jelly-transform">
+ <attainGoal name="html2xdoc"/>
+ <attainGoal name="faq"/>
+ </preGoal>
<postGoal name="site">
<maven:attainGoal name="modules:site"/>
<maven:attainGoal name="modules:copy-site"/>
</postGoal>
-
<goal name="modules:copy-site" prereqs="modules:site"
description="copy the generated websites of all the modules into the
root project">
<!-- a dummy scope tag to change XML namespace to ant -->
<j:scope xmlns="jelly:ant">
-
+
<fileScanner var="scanner">
<fileset dir="${basedir}/modules" includes="*/project.xml"
excludes="xmlbeans/project.xml"/>
</fileScanner>
-
+
<j:forEach var="file" items="${scanner.iterator()}">
<j:set var="name">${file.parentFile.name}</j:set>
<j:set var="outDir">${basedir}/target/docs/modules/${name}</j:set>
-
+
<echo>Copying module ${name} to ${outDir}</echo>
<mkdir dir="${outDir}"/>
<copy todir="${outDir}">
<fileset dir="${basedir}/modules/${name}/target/docs"/>
</copy>
</j:forEach>
+
</j:scope>
</goal>
@@ -132,15 +118,41 @@
<!-- a dummy scope tag to change XML namespace to ant -->
<j:scope xmlns="jelly:ant">
+
<j:if test="${empty(geronimo.cvs.docdir)}">
<j:set var="geronimo.cvs.docdir"
value="../incubator-site/build/site/projects/geronimo"/>
</j:if>
-
-
+
<mkdir dir="${geronimo.cvs.docdir}"/>
<copy todir="${geronimo.cvs.docdir}">
<fileset dir="${basedir}/target/docs"/>
</copy>
+
</j:scope>
</goal>
+
+
+ <!-- ============================== -->
+ <!-- Helpers to run Apache Geronimo -->
+ <!-- ============================== -->
+
+ <!-- jason: need to fix this -->
+
+ <goal name="run" prereqs="set.classpath"
+ description="Runs the Geronimo Server using the current build">
+ <ant:java classname="org.apache.geronimo.Main" fork="yes">
+ <ant:classpath refid="test.classpath"/>
+ </ant:java>
+ </goal>
+
+ <goal name="set.classpath" prereqs="java:compile, test:compile"
+ description="Sets up the classpath for running things">
+ <ant:path id="test.classpath">
+ <ant:pathelement path="target/test-classes"/>
+ <ant:pathelement path="modules/core/src/conf/"/>
+ <ant:pathelement path="${maven.build.dest}"/>
+ <ant:path refid="maven.dependency.classpath"/>
+ </ant:path>
+ </goal>
+
</project>
1.13 +51 -49 incubator-geronimo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 14 Aug 2003 15:43:25 -0000 1.12
+++ project.xml 14 Aug 2003 17:08:00 -0000 1.13
@@ -14,53 +14,55 @@
<id>geronimo</id>
<currentVersion>1.0-alpha-1-SNAPSHOT</currentVersion>
-
-
- <dependencies>
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- <url>http://jakarta.apache.org/commons/logging/</url>
- </dependency>
-
- <dependency>
- <id>commons-httpclient</id>
- <version>2.0-beta1</version>
- <url>http://jakarta.apache.org/commons/httpclient/</url>
- </dependency>
-
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- </dependency>
-
- <dependency>
- <id>concurrent</id>
- <version>1.3.2</version>
- </dependency>
-
- <dependency>
- <id>javacc</id>
- <jar>JavaCC.zip</jar>
- </dependency>
-
- <dependency>
- <id>mx4j</id>
- <version>SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <id>mx4j+tools</id>
- <version>SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <id>servletapi</id>
- <version>SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
+
+ <!--
+
+ <dependencies>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ </dependency>
+
+ <dependency>
+ <id>commons-httpclient</id>
+ <version>2.0-beta1</version>
+ <url>http://jakarta.apache.org/commons/httpclient/</url>
+ </dependency>
+
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.8</version>
+ </dependency>
+
+ <dependency>
+ <id>concurrent</id>
+ <version>1.3.2</version>
+ </dependency>
+
+ <dependency>
+ <id>javacc</id>
+ <jar>JavaCC.zip</jar>
+ </dependency>
+
+ <dependency>
+ <id>mx4j</id>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <id>mx4j+tools</id>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <id>servletapi</id>
+ <version>SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ -->
+
<!-- =================== -->
<!-- Build Specification -->
<!-- =================== -->
@@ -68,7 +70,7 @@
<build>
<sourceDirectory></sourceDirectory>
<unitTestSourceDirectory></unitTestSourceDirectory>
-
+
<resources>
<resource>
<directory>${basedir}/modules/core/src/conf</directory>
1.2 +39 -2 incubator-geronimo/etc/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/etc/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 12 Aug 2003 14:44:09 -0000 1.1
+++ maven.xml 14 Aug 2003 17:08:00 -0000 1.2
@@ -2,5 +2,42 @@
<!-- $Id$ -->
-<project>
+<project
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:ant="jelly:ant">
+
+ <!-- ================= -->
+ <!-- Global Properties -->
+ <!-- ================= -->
+
+ <!-- Determine what the top-level project root is -->
+ <j:set var="project.root"
value="${pom.parentBasedir().getParentFile().getCanonicalFile()}"/>
+
+ <!-- Load the global properties -->
+ <ant:property file="${project.root}/etc/globals.properties"/>
+
+
+ <!-- ==================== -->
+ <!-- Default Global Goals -->
+ <!-- ==================== -->
+
+ <goal name="default">
+ <attainGoal name="jar:install"/>
+ </goal>
+
+ <goal name="build">
+ <attainGoal name="default"/>
+ </goal>
+
+ <goal name="rebuild">
+ <attainGoal name="clean"/>
+ <attainGoal name="build"/>
+ </goal>
+
+ <!-- For testing -->
+ <goal name="hello">
+ <ant:echo>H E L L O</ant:echo>
+ </goal>
+
</project>
1.1 incubator-geronimo/etc/global.properties
Index: global.properties
===================================================================
##
## $Id: global.properties,v 1.1 2003/08/14 17:08:00 jdillon Exp $
##
#####################################################
# Build and Deployment
#####################################################
maven.repo.remote=http://www.ibiblio.org/maven/
maven.compile.source=1.4
maven.compile.target=1.4
maven.junit.fork=true
maven.simian.linecount=3
#####################################################
# Properties related to project-site
#####################################################
maven.xdoc.date=left
maven.xdoc.version=${pom.currentVersion}
maven.linkcheck.enable=true
maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/
maven.javadoc.source=1.4
#####################################################
# Site Colors
#####################################################
#maven.ui.body.background=#FFFFFF
#maven.ui.body.foreground=#1F354D
#maven.ui.section.background=#A2B7C5
#maven.ui.section.foreground=#FFFFFF
#maven.ui.subsection.foreground=#1F354D
#maven.ui.subsection.background=#F2F5F7
#maven.ui.table.header.background=#E5E3DB
#maven.ui.table.header.foreground=#686868
#maven.ui.table.row.odd.foreground=#686868
#maven.ui.table.row.even.background=#F5F4F1
#maven.ui.table.row.odd.background=#F5F4F1
#maven.ui.table.row.even.foreground=#686868
#maven.ui.banner.background=#FFFFFF
#maven.ui.banner.foreground=#FFFFFF
#maven.ui.banner.border.top=#A2B7C5
#maven.ui.banner.border.bottom=#A2B7C5
#maven.ui.source.background=#FFFFFF
#maven.ui.source.foreground=#000000
#maven.ui.source.border.right=#A2B7C5
#maven.ui.source.border.top=#A2B7C5
#maven.ui.source.border.left=#A2B7C5
#maven.ui.source.border.bottom=#A2B7C5
#maven.ui.navcol.background=#F2F5F7
#maven.ui.navcol.background.ns4=#F2F5F7
#maven.ui.navcol.foreground=#000000
#maven.ui.navcol.foreground.ns4=#555
#maven.ui.navcol.border.top=#F2F5F7
#maven.ui.navcol.border.right=#A2B7C5
#maven.ui.navcol.border.bottom=#A2B7C5
#maven.ui.breadcrumbs.background=#D5E1E9
#maven.ui.breadcrumbs.foreground=#000000
#maven.ui.breadcrumbs.border.bottom=#A2B7C5
#maven.ui.breadcrumbs.border.top=#D5E1E9
#maven.ui.href.link=#1F354D
#maven.ui.href.link.active=#FF5A00
#maven.ui.href.link.selfref=#1F354D
1.2 +2 -8 incubator-geronimo/modules/common/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/common/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 12 Aug 2003 15:33:05 -0000 1.1
+++ maven.xml 14 Aug 2003 17:08:00 -0000 1.2
@@ -2,15 +2,9 @@
<!-- $Id$ -->
-<project
+<project default="default"
xmlns:j="jelly:core"
xmlns:u="jelly:util"
xmlns:ant="jelly:ant">
- <!-- ===================== -->
- <!-- Module Initialization -->
- <!-- ===================== -->
-
- <ant:property file="${basedir}/../../etc/project.properties"/>
-
</project>
1.4 +6 -11 incubator-geronimo/modules/core/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 12 Aug 2003 14:48:56 -0000 1.3
+++ maven.xml 14 Aug 2003 17:08:00 -0000 1.4
@@ -2,16 +2,10 @@
<!-- $Id$ -->
-<project default="jar:install"
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven">
-
- <!-- ===================== -->
- <!-- Module Initialization -->
- <!-- ===================== -->
-
- <ant:property file="${basedir}/../../etc/project.properties"/>
+<project default="default"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
<preGoal name="xdoc:jelly-transform">
<attainGoal name="html2xdoc"/>
@@ -31,4 +25,5 @@
javacchome="${maven.repo.local}/javacc/jars"/>
-->
</preGoal>
+
</project>
1.5 +30 -1 incubator-geronimo/modules/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 14 Aug 2003 10:04:40 -0000 1.4
+++ project.xml 14 Aug 2003 17:08:00 -0000 1.5
@@ -25,6 +25,35 @@
<!-- ============ -->
<dependencies>
+
+ <!-- Module Dependencies -->
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>DEV</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee</artifactId>
+ <version>DEV</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jsr77</artifactId>
+ <version>DEV</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jsr88</artifactId>
+ <version>DEV</version>
+ </dependency>
+
+ <!-- Thirdparty -->
+
<dependency>
<id>commons-logging</id>
<version>1.0.3</version>
1.3 +2 -9 incubator-geronimo/modules/twiddle/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/twiddle/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 13 Aug 2003 11:07:51 -0000 1.2
+++ maven.xml 14 Aug 2003 17:08:00 -0000 1.3
@@ -2,18 +2,11 @@
<!-- $Id$ -->
-<project
+<project default="default"
xmlns:j="jelly:core"
xmlns:u="jelly:util"
xmlns:ant="jelly:ant"
xmlns:castor="castor">
-
- <!-- ===================== -->
- <!-- Module Initialization -->
- <!-- ===================== -->
-
- <ant:property file="${basedir}/../../etc/project.properties"/>
-
<!-- ================================= -->
<!-- Compile XML->Java Binding Sources -->
