mcconnell 2003/11/11 20:46:52
Modified: meta maven.xml project.properties
meta/site/etc site.jsl
Added: meta platform.xml
Removed: meta/site maven.xml project.properties project.xml
Log:
I've been doing some digging into this problem. The inital reason why a file url was
included in the maven.xdocs.jsl was due to a bug back in Maven 8. That bug was
resolved in maven 9, however the workaround seems to still be present in the meta
package build procedures. I've tried to resolve this using the approach that Alexis
suggested (and a dozen other variations) but this breaks under Windows.
Conclusion - there is a problem in variable resolution that is probably linked to
ant properties verus jelly variable assignments in the context of reactor builds.
This update involves the shifting of all site related defintions from
site/project.xml to the root directory under platform.xml (the same approach as used
in the merlin package). This ensures that we are always running from the same
${basedir) and that the properties file and meven.xml are the same when running a
build and when running site generation. Under this approach the defintion of the
maven.xdoc.jsl is simply "site/etc/site.jsl".
Revision Changes Path
1.3 +34 -9 avalon/meta/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/meta/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 4 Oct 2003 11:51:25 -0000 1.2
+++ maven.xml 12 Nov 2003 04:46:52 -0000 1.3
@@ -4,9 +4,7 @@
<ant:property name="maven.ui.banner.background" value="#fff"/>
<ant:property name="maven.ui.banner.foreground" value="#000"/>
- <ant:property name="maven.xdoc.jsl"
value="file:/${basedir}/../site/etc/site.jsl"/>
- <ant:property name="maven.license.licenseFile" value="${basedir}/../LICENSE.txt"/>
- <ant:property name="maven.javadoc.stylesheet"
value="${basedir}/../site/etc/stylesheet.css"/>
+ <ant:property name="maven.docs.src" value="${basedir}/site/xdocs"/>
<ant:property name="sun.j2se.link"
value="http://java.sun.com/j2se/1.4/docs/api/"/>
<ant:property name="framework.api.link"
value="http://avalon.apache.org/framework/api/"/>
<ant:property name="maven.javadoc.links"
value="${sun.j2se.link},${framework.api.link}"/>
@@ -51,7 +49,7 @@
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
- excludes="site/project.xml,plugin/project.xml"
+ excludes="plugin/project.xml"
goals="jar:install"
banner="Building:"
ignoreFailures="false"/>
@@ -76,7 +74,7 @@
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
- excludes="site/project.xml,plugin/project.xml"
+ excludes="plugin/project.xml"
goals="jar:install-snapshot"
banner="Building snapshot:"
ignoreFailures="false"/>
@@ -103,12 +101,41 @@
<ant:mkdir dir="${maven.build.dir}"/>
<maven:reactor
basedir="${basedir}"
- includes="site/project.xml"
- goals="site"
+ includes="platform.xml"
+ goals="license,xjavadoc,site"
banner="Building site:"
ignoreFailures="false"/>
</goal>
+ <goal name="xjavadoc">
+ <mkdir dir="${basedir}/target/docs/api" />
+ <property name="copyright"
+ value="Copyright &copy; ${year} ${pom.organization.name}. All Rights
Reserved." />
+ <property name="title" value="${pom.name} ${pom.currentVersion} API"/>
+ <javadoc destdir="${basedir}/target/docs/api"
+ doctitle="<h1>Avalon Meta</h1>"
+ noindex="false" author="true" use="true"
+ windowtitle="${title}"
+ bottom="${copyright}"
+ additionalparam="-breakiterator -J-Xmx128m "
+ packagenames="*,org.*">
+ <j:forEach var="packageGroup" items="${pom.packageGroups}">
+ <group title="${packageGroup.title}"
packages="${packageGroup.packages}"/>
+ </j:forEach>
+ <sourcepath path="${basedir}/api/src/java"/>
+ <sourcepath path="${basedir}/spi/src/java"/>
+ <sourcepath path="${basedir}/impl/src/java"/>
+ <sourcepath path="${basedir}/tools/src/java"/>
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ </classpath>
+ <link href="${sun.j2se.link}" />
+ <link href="${avalon.framework.link}" />
+ <link href="${ant.link}" />
+ <link href="${qdox.link}" />
+ </javadoc>
+ </goal>
+
<goal
name="xdist:prepare-bin-filesystem"
description="Builds the jar files.">
@@ -135,8 +162,6 @@
<ant:include name="${pom.artifactId}-impl-${pom.currentVersion}.jar"/>
<ant:include name="${pom.artifactId}-tools-${pom.currentVersion}.jar"/>
<ant:include name="${pom.artifactId}-plugin-${meta.plugin.version}.jar"/>
- </ant:fileset>
- <ant:fileset dir="${basedir}/site/target">
<ant:include name="docs/**"/>
</ant:fileset>
</ant:copy>
1.2 +23 -0 avalon/meta/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/meta/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 24 Sep 2003 08:14:55 -0000 1.1
+++ project.properties 12 Nov 2003 04:46:52 -0000 1.2
@@ -1,2 +1,25 @@
maven.junit.fork = yes
+
+#
+# Banner background and foreground colors.
+#
+
+maven.ui.banner.background = #fff
+maven.ui.banner.foreground = #000
+maven.xdoc.jsl = ./site/etc/site.jsl
+maven.license.licenseFile = LICENSE.txt
+maven.javadoc.stylesheet =${basedir}/site/etc/stylesheet.css
+maven.xdoc.poweredby.image=
+
+#
+# Declaration of the remote links to assign on javadoc generation.
+# Link declarations can be overriden in the user's build.properties
+# file.
+#
+
+qdox.link = http://qdox.codehaus.org/apidocs/
+ant.link = http://nagoya.apache.org/gump/javadoc/ant/build/javadocs/
+sun.j2se.link = http://java.sun.com/j2se/1.4/docs/api/
+avalon.framework.link = http://avalon.apache.org/framework/api/
+maven.javadoc.links =
${sun.j2se.link},${ant.link},${qdox.link},${avalon.framework.link}
1.1 avalon/meta/platform.xml
Index: platform.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<extend>${basedir}/project.xml</extend>
<package>org.apache.avalon.meta</package>
<dependencies>
<!-- avalon dependecies -->
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
<version>4.1.5</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
<version>4.1.5</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
<version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
<version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
<version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-tools</artifactId>
<version>1.2.1-dev</version>
</dependency>
<dependency>
<id>excalibur-i18n</id>
<version>1.1</version>
</dependency>
<dependency>
<id>excalibur-configuration</id>
<version>1.1</version>
</dependency>
<dependency>
<id>ant</id>
<version>1.5</version>
</dependency>
<dependency>
<id>qdox</id>
<version>1.1</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
<dependency>
<id>xml-apis</id>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId>
<version>2.0.2</version>
</dependency>
<dependency>
<id>xerces</id>
<version>2.4.0</version>
</dependency>
</dependencies>
<packageGroups>
<packageGroup>
<title>Type Descriptor API</title>
<packages>org.apache.avalon.meta.info</packages>
</packageGroup>
<packageGroup>
<title>Meta Model Services</title>
<packages>org.apache.avalon.*</packages>
</packageGroup>
</packageGroups>
<reports>
<report>maven-changelog-plugin</report>
<report>maven-file-activity-plugin</report>
<report>maven-developer-activity-plugin</report>
</reports>
</project>
1.4 +4 -0 avalon/meta/site/etc/site.jsl
Index: site.jsl
===================================================================
RCS file: /home/cvs/avalon/meta/site/etc/site.jsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- site.jsl 28 Oct 2003 14:43:22 -0000 1.3
+++ site.jsl 12 Nov 2003 04:46:52 -0000 1.4
@@ -186,11 +186,13 @@
<j:if test="${includeProjectDocumentation.equals('yes')}">
<div>
<strong>Project Documentation</strong>
+ <!--
<div>
<small>
<a href="${relativePath}/index.html">About ${pom.name}</a>
</small>
</div>
+ -->
<div>
<small>
<a href="${relativePath}/project-info.html">Project Info</a>
@@ -291,6 +293,7 @@
</j:if>
</j:if>
</j:if>
+ <!--
<j:set var="devProcess" value="false"/>
<util:available file="${maven.docs.src}/development-process.xml">
<j:set var="devProcess" value="true"/>
@@ -310,6 +313,7 @@
</small>
</div>
</j:if>
+ -->
</div>
</j:if>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
