You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2003/08/14 14:37:50 UTC
cvs commit: incubator-geronimo project.properties maven.xml README.txt
jstrachan 2003/08/14 05:37:50
Modified: xdocs navigation.xml
. project.properties maven.xml README.txt
Log:
updated the Maven build process to be allowed to build the full website of all the modules in one integrated website.
also added a target to copy the website into CVS which is the current way to redeploy a website in the incubator, unfortunately
Revision Changes Path
1.5 +2 -0 incubator-geronimo/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/xdocs/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 12 Aug 2003 10:39:44 -0000 1.4
+++ navigation.xml 14 Aug 2003 12:37:50 -0000 1.5
@@ -20,7 +20,9 @@
<item name="Related Projects" href="/reuse.html"/>
</menu>
<menu name="Modules">
+ <item name="Common" href="/modules/core/"/>
<item name="Core Container" href="/modules/core/"/>
+ <item name="Twiddle" href="/modules/twiddle/"/>
</menu>
<menu name="Apache Community">
1.4 +3 -1 incubator-geronimo/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/incubator-geronimo/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 12 Aug 2003 14:48:56 -0000 1.3
+++ project.properties 14 Aug 2003 12:37:50 -0000 1.4
@@ -2,4 +2,6 @@
## $Id$
##
+# the directory containing the geronimo website in CVS
+geronimo.cvs.docdir = ../incubator-site/build/site/projects/geronimo
1.9 +57 -1 incubator-geronimo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/maven.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- maven.xml 13 Aug 2003 11:55:59 -0000 1.8
+++ maven.xml 14 Aug 2003 12:37:50 -0000 1.9
@@ -46,6 +46,7 @@
<maven:reactor
basedir="${basedir}/modules"
includes="*/project.xml"
+ excludes="xmlbeans/project.xml"
banner="Executing (${goals}):"
ignoreFailures="false"
goals="${goals}"
@@ -67,6 +68,11 @@
<attainGoal name="modules:reactor"/>
</goal>
+ <goal name="modules:javadoc">
+ <j:set var="goals" value="javadoc"/>
+ <attainGoal name="modules:reactor"/>
+ </goal>
+
<goal name="modules:clean">
<j:set var="goals" value="clean"/>
<attainGoal name="modules:reactor"/>
@@ -84,4 +90,54 @@
<attainGoal name="modules:rebuild"/>
</goal>
+ <goal name="javadoc">
+ <attainGoal name="modules:javadoc"/>
+ </goal>
+
+
+
+ <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>
+
+ <goal name="site:tocvs" prereqs="modules:copy-site"
+ description="Creates the entire website and copies it to the local CVS repository so that it can be checked in to update the Incubator site">
+
+ <j:choose xmlns="jelly:ant">
+ <j:when test="${empty(geronimo.cvs.docdir)}">
+ <echo>You must define a variable called geronimo.cvs.docdir to copy documentation to CVS</echo>
+ </j:when>
+ <j:otherwise>
+ <mkdir dir="${geronimo.cvs.docdir}"/>
+ <copy todir="${geronimo.cvs.docdir}">
+ <fileset dir="${basedir}/target/docs"/>
+ </copy>
+ </j:otherwise>
+ </j:choose>
+ </goal>
</project>
1.5 +6 -6 incubator-geronimo/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/incubator-geronimo/README.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.txt 12 Aug 2003 07:30:10 -0000 1.4
+++ README.txt 14 Aug 2003 12:37:50 -0000 1.5
@@ -12,18 +12,18 @@
maven
-to run JUnit test cases
+to build Geronimo running all of the Unit test cases
- maven test
+ maven build
+
+to do a clean rebuild of Geronimo type
+
+ maven rebuild
to try run the Geronimo server type
maven run
-to get the javadocs type
-
- maven javadoc
-
or for the HTML website
maven site