jdillon 2003/08/14 12:41:15
Modified: . maven.xml project.xml
etc project.xml
modules/common project.xml
xdocs navigation.xml
Added: modules/common/xdocs navigation.xml
modules/core/xdocs navigation.xml
modules/twiddle/xdocs navigation.xml
specs/j2ee/xdocs navigation.xml
specs/jsr77/xdocs navigation.xml
specs/jsr88/xdocs navigation.xml
Log:
o fixed site generation to indclude spec modules
o added navigation to modules
Revision Changes Path
1.13 +28 -15 incubator-geronimo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/maven.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maven.xml 14 Aug 2003 17:23:38 -0000 1.12
+++ maven.xml 14 Aug 2003 19:41:15 -0000 1.13
@@ -82,37 +82,54 @@
<attainGoal name="faq"/>
</preGoal>
- <postGoal name="site">
- <maven:attainGoal name="modules:site"/>
- <maven:attainGoal name="modules:copy-site"/>
+ <!-- Turn off reports for the top-level project -->
+ <postGoal name="xdoc:register-reports">
+ <attainGoal name="maven-license-plugin"/>
+ <attainGoal name="maven-checkstyle-plugin"/>
+ <attainGoal name="maven-pmd-plugin"/>
+ <attainGoal name="maven-simian-plugin"/>
+ <attainGoal name="maven-jdepend-plugin"/>
+ <attainGoal name="maven-changelog-plugin"/>
+ <attainGoal name="maven-statcvs-plugin"/>
+ <attainGoal name="maven-file-activity-plugin"/>
+ <attainGoal name="maven-developer-activity-plugin"/>
+ <attainGoal name="maven-jxr-plugin"/>
+ <attainGoal name="maven-javadoc-plugin"/>
+ <attainGoal name="maven-junit-report-plugin"/>
+ <attainGoal name="maven-clover-plugin"/>
</postGoal>
+ <preGoal name="site">
+ <attainGoal name="modules:copy-site"/>
+ </preGoal>
+
<goal name="modules:copy-site" prereqs="modules:site"
- description="copy the generated websites of all the modules into the
root project">
+ 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"/>
+ <fileset dir="${basedir}"
+ includes="${modules.includes}"
+ excludes="${modules.excludes}"/>
</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>
+ <j:set var="type">${file.parentFile.parentFile.name}</j:set>
+ <j:set var="outDir">${basedir}/target/docs/${type}/${name}</j:set>
- <echo>Copying module ${name} to ${outDir}</echo>
+ <echo>Copying module ${name} documentation to ${outDir}</echo>
<mkdir dir="${outDir}"/>
<copy todir="${outDir}">
- <fileset dir="${basedir}/modules/${name}/target/docs"/>
+ <fileset dir="${basedir}/${type}/${name}/target/docs"/>
</copy>
</j:forEach>
</j:scope>
</goal>
- <!-- site, modules:copy-site -->
-
<goal name="site:tocvs" prereqs=""
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">
@@ -136,14 +153,10 @@
<!-- Helpers to run Apache Geronimo -->
<!-- ============================== -->
- <!-- jason: need to fix this -->
-
<goal name="run" description="Runs the Geronimo Server using the current
build">
-
<j:set var="module" value="core"/>
<j:set var="goals" value="run"/>
<attainGoal name="modules:reactor"/>
-
</goal>
</project>
1.14 +3 -68 incubator-geronimo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 14 Aug 2003 17:08:00 -0000 1.13
+++ project.xml 14 Aug 2003 19:41:15 -0000 1.14
@@ -3,6 +3,7 @@
<!-- $Id$ -->
<project>
+
<pomVersion>3</pomVersion>
<extend>${basedir}/etc/project.xml</extend>
@@ -13,72 +14,6 @@
<name>Geronimo</name>
<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>
-
- -->
-
- <!-- =================== -->
- <!-- Build Specification -->
- <!-- =================== -->
+ <currentVersion>DEV</currentVersion>
- <build>
- <sourceDirectory></sourceDirectory>
- <unitTestSourceDirectory></unitTestSourceDirectory>
-
- <resources>
- <resource>
- <directory>${basedir}/modules/core/src/conf</directory>
- <includes>
- <include>*.properties</include>
- </includes>
- </resource>
- </resources>
- </build>
-
</project>
1.6 +9 -8 incubator-geronimo/etc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/etc/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 14 Aug 2003 15:43:25 -0000 1.5
+++ project.xml 14 Aug 2003 19:41:15 -0000 1.6
@@ -3,8 +3,9 @@
<!-- $Id$ -->
<project>
+
<pomVersion>3</pomVersion>
-
+
<!-- ============== -->
<!-- Identification -->
<!-- ============== -->
@@ -85,7 +86,7 @@
<!-- ========== -->
<!-- Developers -->
<!-- ========== -->
-
+
<developers>
<developer>
<name>Bruce Snyder</name>
@@ -192,12 +193,12 @@
<organization></organization>
</developer>
</developers>
-
-
+
+
<!-- ============ -->
<!-- Contributors -->
<!-- ============ -->
-
+
<contributors>
<contributor>
<name>Ed Letifov</name>
@@ -237,7 +238,7 @@
<!-- ======= -->
<!-- Reports -->
<!-- ======= -->
-
+
<reports>
<report>maven-license-plugin</report>
<report>maven-checkstyle-plugin</report>
@@ -253,5 +254,5 @@
<report>maven-junit-report-plugin</report>
<report>maven-clover-plugin</report>
</reports>
-
+
</project>
1.3 +3 -10 incubator-geronimo/modules/common/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/common/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 12 Aug 2003 18:25:52 -0000 1.2
+++ project.xml 14 Aug 2003 19:41:15 -0000 1.3
@@ -32,7 +32,7 @@
<dependency>
<id>commons-logging</id>
<version>1.0.3</version>
- <url>http://jakarta.apache.org/commons/logging</url>
+ <url>http://jakarta.apache.org/commons/logging.html</url>
</dependency>
<dependency>
@@ -44,17 +44,10 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
- <version>1.1.1</version>
+ <version>SNAPSHOT</version>
<url>http://mx4j.sourceforge.net</url>
</dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-tools</artifactId>
- <version>1.1.1</version>
- <url>http://mx4j.sourceforge.net</url>
- </dependency>
-
</dependencies>
</project>
1.1 incubator-geronimo/modules/common/xdocs/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: navigation.xml,v 1.1 2003/08/14 19:41:15 jdillon Exp $ -->
<project name="Apache Geronimo :: Common">
<title>Apache Geronimo :: Common</title>
<body>
<links>
<item name="Apache" href="http://apache.org"/>
<item name="Geronimo" href="../../index.html"/>
</links>
</body>
</project>
1.1 incubator-geronimo/modules/core/xdocs/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: navigation.xml,v 1.1 2003/08/14 19:41:15 jdillon Exp $ -->
<project name="Apache Geronimo :: Core J2EE Container">
<title>Apache Geronimo :: Core J2EE Container</title>
<body>
<links>
<item name="Apache" href="http://apache.org"/>
<item name="Geronimo" href="../../index.html"/>
</links>
</body>
</project>
1.1 incubator-geronimo/modules/twiddle/xdocs/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: navigation.xml,v 1.1 2003/08/14 19:41:15 jdillon Exp $ -->
<project name="Apache Geronimo :: Twiddle">
<title>Apache Geronimo :: Twiddle</title>
<body>
<links>
<item name="Apache" href="http://apache.org"/>
<item name="Geronimo" href="../../index.html"/>
</links>
</body>
</project>
1.1 incubator-geronimo/specs/j2ee/xdocs/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: navigation.xml,v 1.1 2003/08/14 19:41:15 jdillon Exp $ -->
<project name="Apache Geronimo :: J2EE Specification">
<title>Apache Geronimo :: J2EE Specification</title>
<body>
<links>
<item name="Apache" href="http://apache.org"/>
<item name="Geronimo" href="../../index.html"/>
</links>
</body>
</project>
1.1 incubator-geronimo/specs/jsr77/xdocs/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: navigation.xml,v 1.1 2003/08/14 19:41:15 jdillon Exp $ -->
<project name="Apache Geronimo :: JSR-77 Specification">
<title>Apache Geronimo :: JSR-77 Specification</title>
<body>
<links>
<item name="Apache" href="http://apache.org"/>
<item name="Geronimo" href="../../index.html"/>
</links>
</body>
</project>
1.1 incubator-geronimo/specs/jsr88/xdocs/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: navigation.xml,v 1.1 2003/08/14 19:41:15 jdillon Exp $ -->
<project name="Apache Geronimo :: JSR-88 Specification">
<title>Apache Geronimo :: JSR-88 Specification</title>
<body>
<links>
<item name="Apache" href="http://apache.org"/>
<item name="Geronimo" href="../../index.html"/>
</links>
</body>
</project>
1.6 +12 -5 incubator-geronimo/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/xdocs/navigation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 14 Aug 2003 12:37:50 -0000 1.5
+++ navigation.xml 14 Aug 2003 19:41:15 -0000 1.6
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Geronimo">
+<project name="Apache Geronimo">
- <title>Geronimo</title>
+ <title>Apache Geronimo</title>
<organizationLogo href="/images/group-logo.gif">Apache</organizationLogo>
<body>
@@ -19,10 +19,17 @@
-->
<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/"/>
+ <item name="Common" href="/modules/copmmon/index.html"/>
+ <item name="Core Container"
href="/modules/core/index.html"/>
+ <item name="Twiddle"
href="/modules/twiddle/index.html"/>
+ </menu>
+
+ <menu name="Specifications">
+ <item name="J2EE" href="/specs/j2ee/index.html"/>
+ <item name="JSR-77" href="/specs/jsr77/index.html"/>
+ <item name="JSR-88" href="/specs/jsr88/index.html"/>
</menu>
<menu name="Apache Community">
