mcconnell 2003/09/09 15:00:44
Modified: meta maven.xml project.xml
meta/api project.xml
meta/api/src/java/org/apache/avalon/meta/info
ContextDescriptor.java EntryDescriptor.java
Type.java
meta/impl project.xml
meta/impl/src/java/org/apache/avalon/meta/info/builder
XMLServiceCreator.java XMLTypeCreator.java
meta/plugin project.xml
meta/site maven.xml project.xml
meta/spi project.xml
meta/tools project.xml
meta/tools/src/java/org/apache/avalon/meta/info/ant
MetaTask.java
Added: meta project.properties
Log:
Update the build to use framework 4.1.5-RC3 and i18n RC1 plus synchronizze build to
use same patterns as avalone framework build.
Revision Changes Path
1.5 +209 -50 avalon-sandbox/meta/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 15 Jul 2003 20:03:03 -0000 1.4
+++ maven.xml 9 Sep 2003 22:00:42 -0000 1.5
@@ -1,36 +1,85 @@
-<project default="do-install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+<project default="avalon:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../project.properties"/>
- <property file="project.properties"/>
- <property name="maven.jar.manifest.extensions.add" value="true"/>
- <property name="maven.checkstyle.format" value="avalon"/>
- <property name="pom.organization.identifier" value="ASF"/>
- <property name="pom.specificationVersion" value="1.0"/>
+ <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="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}"/>
+
+ <ant:property name="maven.dist.assembly.dir"
+ value="${maven.build.dir}/temp"/>
+ <ant:property name="maven.dist.bin.archive.dir"
+ value="${maven.dist.assembly.dir}/bin"/>
+ <ant:property name="maven.dist.src.archive.dir"
+ value="${maven.dist.assembly.dir}/src"/>
+ <ant:property name="maven.dist.bin.assembly.dir"
+ value="${maven.dist.assembly.dir}/bin/${pom.artifactId}"/>
+ <ant:property name="maven.dist.src.assembly.dir"
+ value="${maven.dist.assembly.dir}/src/${pom.artifactId}"/>
+ <ant:property name="maven.dist.dir"
+ value="${maven.build.dir}/distributions"/>
- <goal name="do-install"
- description="Build the Avalon Meta distribution." >
+ <goal name="avalon:clean" prereqs="clean">
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
- excludes="plugin/*,site/*"
- goals="jar:install-snapshot"
+ goals="clean"
+ banner="Cleaning:"
+ ignoreFailures="false"/>
+ </goal>
+
+ <goal name="avalon:build">
+
+ <echo>
+
+Building the framework using the default target "avalon:build".
+The complete set of target include:
+
+ avalon:clean
+ avalon:build
+ avalon:build-snapshot
+ avalon:dist
+ avalon:site
+ </echo>
+
+ <maven:reactor
+ basedir="${basedir}"
+ includes="*/project.xml"
+ excludes="site/project.xml,plugin/project.xml"
+ goals="jar:install"
banner="Building:"
- ignoreFailures="false" />
- <attainGoal name="do-plugin"/>
+ ignoreFailures="false"/>
+ <ant:copy todir="${maven.build.dir}">
+ <ant:fileset dir="${basedir}/api/target">
+ <ant:include name="${pom.artifactId}-api-${pom.currentVersion}.jar"/>
+ </ant:fileset>
+ <ant:fileset dir="${basedir}/spi/target">
+ <ant:include name="${pom.artifactId}-spi-${pom.currentVersion}.jar"/>
+ </ant:fileset>
+ <ant:fileset dir="${basedir}/impl/target">
+ <ant:include name="${pom.artifactId}-impl-${pom.currentVersion}.jar"/>
+ </ant:fileset>
+ <ant:fileset dir="${basedir}/tools/target">
+ <ant:include name="${pom.artifactId}-tools-${pom.currentVersion}.jar"/>
+ </ant:fileset>
+ </ant:copy>
+
</goal>
- <goal name="do-clean" prereqs="clean">
+ <goal name="avalon:build-snapshot">
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
- excludes="site/*"
- goals="clean:clean"
- banner="Cleaning subproject:"
+ excludes="site/project.xml,plugin/project.xml"
+ goals="jar:install-snapshot"
+ banner="Building snapshot:"
ignoreFailures="false"/>
</goal>
- <goal name="do-plugin">
+ <goal name="avalon:plugin" prereqs="avalon:build">
<maven:reactor
basedir="${basedir}"
includes="plugin/project.xml"
@@ -40,40 +89,150 @@
/>
</goal>
- <goal name="do-site">
+ <goal name="avalon:dist" prereqs="avalon:plugin,avalon:site,xdist"/>
+
+ <goal name="avalon:site" prereqs="avalon:build">
+ <ant:mkdir dir="${maven.build.dir}"/>
<maven:reactor
basedir="${basedir}"
includes="site/project.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}" />
- </javadoc>
+ goals="site"
+ banner="Building site:"
+ ignoreFailures="false"/>
+ </goal>
+
+ <goal
+ name="xdist:prepare-bin-filesystem"
+ description="Builds the jar files.">
+
+ <ant:delete dir="${maven.dist.bin.assembly.dir}"/>
+ <ant:mkdir dir="${maven.dist.bin.assembly.dir}"/>
+ <ant:echo>
+ +-------------------------------------------------------+
+ | C R E A T I N G B I N A R Y D I S T R I B U T I O N |
+ +-------------------------------------------------------+
+ </ant:echo>
+ <ant:copy todir="${maven.dist.bin.assembly.dir}">
+ <ant:fileset dir=".">
+ <ant:include name="README.txt"/>
+ <ant:include name="LICENSE*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <!-- Copy Jars -->
+ <ant:copy todir="${maven.dist.bin.assembly.dir}">
+ <ant:fileset dir="${maven.build.dir}">
+ <ant:include name="${pom.artifactId}-api-${pom.currentVersion}.jar"/>
+ <ant:include name="${pom.artifactId}-spi-${pom.currentVersion}.jar"/>
+ <ant:include name="${pom.artifactId}-impl-${pom.currentVersion}.jar"/>
+ <ant:include name="${pom.artifactId}-tools-${pom.currentVersion}.jar"/>
+ </ant:fileset>
+ <ant:fileset dir="${basedir}/site/target">
+ <ant:include name="docs/**"/>
+ </ant:fileset>
+ </ant:copy>
+ </goal>
+
+ <goal
+ name="xdist:prepare-src-filesystem"
+ description="Builds the source distribution file system.">
+ <ant:delete dir="${maven.dist.src.assembly.dir}" />
+ <ant:mkdir dir="${maven.dist.src.assembly.dir}" />
+
+ <ant:echo>
+ +-------------------------------------------------------+
+ | C R E A T I N G S O U R C E D I S T R I B U T I O N |
+ +-------------------------------------------------------+
+ </ant:echo>
+
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
+ <ant:fileset dir=".">
+ <ant:include name="README.txt"/>
+ <ant:include name="LICENSE*"/>
+ <ant:include name="project.properties"/>
+ <ant:include name="maven.xml"/>
+ <ant:include name="project.xml"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <!-- Copy Source -->
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
+ <ant:fileset dir="${basedir}">
+ <include name="api/**"/>
+ <include name="spi/**"/>
+ <include name="impl/**"/>
+ <include name="tools/**"/>
+ <include name="site/**"/>
+ <exclude name="**/target/**"/>
+ <exclude name="**/*.log"/>
+ </ant:fileset>
+ </ant:copy>
+
+ </goal>
+
+ <goal name="xdist"
+ prereqs="xdist:build"
+ description="Build a complete distribution.">
+ </goal>
+
+ <goal
+ name="xdist:build"
+ prereqs="xdist:build-bin,xdist:build-src"
+ description="Build a complete distribution.">
+ </goal>
+
+ <goal
+ name="xdist:build-setup"
+ description="Set up directories for a distribution build">
+ <ant:delete dir="${maven.dist.dir}"/>
+ <ant:mkdir dir="${maven.dist.dir}"/>
+ </goal>
+
+ <goal
+ name="xdist:build-bin"
+ prereqs="xdist:build-setup,xdist:prepare-bin-filesystem"
+ description="Build the binary distribution.">
+
+ <!-- Create a tar.gz file -->
+ <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
+ <ant:tarfileset dir="${maven.dist.bin.archive.dir}"/>
+ </ant:tar>
+
+ <ant:gzip
+ zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
+ src="${maven.dist.dir}/${maven.final.name}.tar"
+ />
+
+ <ant:delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
+
+ <!-- Create a zip file -->
+ <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
+ <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
+ </ant:zip>
+ </goal>
+
+ <goal
+ name="xdist:build-src"
+ prereqs="xdist:build-setup,xdist:prepare-src-filesystem"
+ description="Build the source distribution.">
+
+ <!-- Create a tar.gz file -->
+ <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
+ <ant:tarfileset dir="${maven.dist.src.archive.dir}"/>
+ </ant:tar>
+
+ <ant:gzip
+ zipfile="${maven.dist.dir}/${maven.final.name}-src.tar.gz"
+ src="${maven.dist.dir}/${maven.final.name}-src.tar"
+ />
+
+ <ant:delete file="${maven.dist.dir}/${maven.final.name}-src.tar"/>
+
+ <!-- Create a zip file -->
+ <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
+ <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
+ </ant:zip>
+
</goal>
</project>
1.4 +22 -18 avalon-sandbox/meta/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 14 Jul 2003 20:14:23 -0000 1.3
+++ project.xml 9 Sep 2003 22:00:42 -0000 1.4
@@ -1,45 +1,43 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<project>
- <pomVersion>3</pomVersion>
- <groupId>avalon-meta</groupId>
<name>Avalon Meta</name>
+ <groupId>avalon-meta</groupId>
+ <id>avalon-meta</id>
+ <currentVersion>1.1-RC1</currentVersion>
+ <inceptionYear>2000</inceptionYear>
<organization>
<name>Apache Software Foundation</name>
- <url>http://avalon.apache.org/</url>
+ <url>http://jakarta.apache.org/</url>
<logo>http://avalon.apache.org/images/apache-avalon-logo.png</logo>
</organization>
- <inceptionYear>1997</inceptionYear>
+ <package>org.apache.avalon.meta</package>
- <package></package>
- <gumpRepositoryId>avalon-sandbox</gumpRepositoryId>
-
- <url>http://avalon.apache.org/sandbox/meta/index.html</url>
+ <url>http://avalon.apache.org/meta</url>
<issueTrackingUrl>http://nagoya.apache.org/</issueTrackingUrl>
-
- <siteAddress>avalon.apache.org</siteAddress>
- <siteDirectory>${root.site.directory}/meta</siteDirectory>
+ <siteAddress>avalon.apache.org/meta</siteAddress>
+ <siteDirectory>/site/avalon/meta/</siteDirectory>
<distributionDirectory></distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:avalon-sandbox/meta</connection>
<url>http://cvs.apache.org/viewcvs/avalon-sandbox/meta/</url>
</repository>
-
+
<mailingLists>
<mailingList>
- <name>Avalon Developer List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <name>Avalon Dev List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
<archive>http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]</archive>
</mailingList>
<mailingList>
<name>Avalon User List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
<archive>http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]</archive>
</mailingList>
</mailingLists>
@@ -170,5 +168,11 @@
<jars></jars>
</build>
+
+ <reports>
+ <report>maven-changelog-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ </reports>
</project>
1.3 +1 -27 avalon-sandbox/meta/project.properties
1.3 +2 -2 avalon-sandbox/meta/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/api/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 12 Jul 2003 08:44:11 -0000 1.2
+++ project.xml 9 Sep 2003 22:00:42 -0000 1.3
@@ -18,12 +18,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId> <!-- testing -->
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.9 +1 -2
avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/ContextDescriptor.java
Index: ContextDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/ContextDescriptor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ContextDescriptor.java 28 Jul 2003 13:26:55 -0000 1.8
+++ ContextDescriptor.java 9 Sep 2003 22:00:42 -0000 1.9
@@ -135,7 +135,6 @@
/**
* Create a standard descriptor without attributes.
- * @param classname the classname of a castable interface
* @param entries the set of entries required within the context
*/
public ContextDescriptor( final EntryDescriptor[] entries )
1.7 +4 -3
avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/EntryDescriptor.java
Index: EntryDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/EntryDescriptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EntryDescriptor.java 14 Jul 2003 04:31:58 -0000 1.6
+++ EntryDescriptor.java 9 Sep 2003 22:00:42 -0000 1.7
@@ -95,7 +95,7 @@
/**
* Construct an non-volotile required Entry.
* @param key the context entry key
- * @param type the classname of the context entry
+ * @param classname the classname of the context entry
* @exception NullPointerException if the key or type value are null
*/
public EntryDescriptor( final String key,
@@ -123,7 +123,7 @@
* @param key the context entry key
* @param classname the classname of the context entry
* @param optional TRUE if this is an optional entry
- * @param immutable TRUE if the entry is consider to be immutable
+ * @param isVolatile TRUE if the entry is consider to be immutable
* @exception NullPointerException if the key or type value are null
*/
public EntryDescriptor( final String key,
@@ -236,6 +236,7 @@
/**
* Test is the supplied object is equal to this object.
+ * @pparam other the object to compare with this instance
* @return true if the object are equivalent
*/
public boolean equals( Object other )
1.13 +2 -2
avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/Type.java
Index: Type.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/Type.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Type.java 18 Jul 2003 08:26:29 -0000 1.12
+++ Type.java 9 Sep 2003 22:00:42 -0000 1.13
@@ -348,7 +348,7 @@
/**
* Return the extension supporting the supplied stage.
*
- * @param key the lifecycle stage that this type requires a handler for
+ * @param stage the lifecycle stage that this type requires a handler for
* @return a matching extension or null if no matching extension
*/
public ExtensionDescriptor getExtension( StageDescriptor stage )
1.6 +6 -6 avalon-sandbox/meta/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/impl/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 21 Aug 2003 19:34:33 -0000 1.5
+++ project.xml 9 Sep 2003 22:00:43 -0000 1.6
@@ -19,35 +19,35 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<id>excalibur-i18n</id>
- <version>1.0</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<id>excalibur-configuration</id>
- <version>1.1-dev</version>
+ <version>1.1-RC1</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
1.5 +3 -7
avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLServiceCreator.java
Index: XMLServiceCreator.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLServiceCreator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLServiceCreator.java 26 Aug 2003 11:38:51 -0000 1.4
+++ XMLServiceCreator.java 9 Sep 2003 22:00:43 -0000 1.5
@@ -165,14 +165,10 @@
{
value = child.getAttribute( "value" );
}
- catch( ConfigurationException ce )
+ catch( Throwable e )
{
- final String error =
- "Missing 'value' attribute in 'attribute' element.\n"
- + ConfigurationUtil.list( child );
- throw new BuildException( error, ce );
+ value = child.getValue( "" );
}
-
attributes.setProperty( key, value );
}
return attributes;
1.14 +1 -2
avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
Index: XMLTypeCreator.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XMLTypeCreator.java 26 Aug 2003 11:38:51 -0000 1.13
+++ XMLTypeCreator.java 9 Sep 2003 22:00:43 -0000 1.14
@@ -343,7 +343,6 @@
* A utility method to build a [EMAIL PROTECTED] DependencyDescriptor}
* object from specified configuraiton.
*
- * @param classname The classname of Component (used for logging purposes)
* @param dependency the dependency configuration
* @return the created DependencyDescriptor
* @throws BuildException if an error occurs
1.6 +6 -8 avalon-sandbox/meta/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/plugin/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 21 Aug 2003 19:34:33 -0000 1.5
+++ project.xml 9 Sep 2003 22:00:43 -0000 1.6
@@ -15,37 +15,37 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-tools</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
@@ -57,8 +57,6 @@
<id>qdox</id>
<version>1.1</version>
</dependency>
-
- <!-- pre JDK 1.4 dependencies -->
<!-- pre JDK 1.4 dependencies -->
1.2 +29 -0 avalon-sandbox/meta/site/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 14 Jul 2003 20:22:17 -0000 1.1
+++ maven.xml 9 Sep 2003 22:00:43 -0000 1.2
@@ -10,6 +10,35 @@
<preGoal name="site">
<attainGoal name="license"/>
+ <attainGoal name="xjavadoc"/>
</preGoal>
+
+ <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}" />
+ </javadoc>
+ </goal>
+
</project>
1.4 +8 -10 avalon-sandbox/meta/site/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 21 Aug 2003 19:34:33 -0000 1.3
+++ project.xml 9 Sep 2003 22:00:43 -0000 1.4
@@ -11,40 +11,40 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-tools</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<id>excalibur-i18n</id>
- <version>1.0</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<id>excalibur-configuration</id>
- <version>1.1-dev</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
@@ -55,8 +55,6 @@
<id>qdox</id>
<version>1.1</version>
</dependency>
-
- <!-- pre JDK 1.4 dependencies -->
<!-- pre JDK 1.4 dependencies -->
1.3 +2 -2 avalon-sandbox/meta/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/spi/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 12 Jul 2003 08:44:11 -0000 1.2
+++ project.xml 9 Sep 2003 22:00:43 -0000 1.3
@@ -19,13 +19,13 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
</dependencies>
1.5 +6 -8 avalon-sandbox/meta/tools/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/tools/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 21 Aug 2003 19:34:33 -0000 1.4
+++ project.xml 9 Sep 2003 22:00:43 -0000 1.5
@@ -27,34 +27,34 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<id>excalibur-configuration</id>
- <version>1.1-dev</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
@@ -65,8 +65,6 @@
<id>qdox</id>
<version>1.1</version>
</dependency>
-
- <!-- pre JDK 1.4 dependencies -->
<!-- pre JDK 1.4 dependencies -->
1.9 +2 -2
avalon-sandbox/meta/tools/src/java/org/apache/avalon/meta/info/ant/MetaTask.java
Index: MetaTask.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/tools/src/java/org/apache/avalon/meta/info/ant/MetaTask.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MetaTask.java 26 Jul 2003 11:10:11 -0000 1.8
+++ MetaTask.java 9 Sep 2003 22:00:43 -0000 1.9
@@ -167,7 +167,7 @@
* Set the file type to be used for meta info type
* documents. May be one of "xinfo" or "xtype".
*
- * @param force the flag for forcing output
+ * @param postfix the postfix value
*/
public void setPostfix( String postfix )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
