You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/02/17 12:06:17 UTC
cvs commit: avalon/repository maven.xml project.properties project.xml
mcconnell 2004/02/17 03:06:17
Modified: repository maven.xml project.properties project.xml
Log:
Add support for an initial context factory that exposes the application root directory. This provides sufficent info for dealing with properties management with an IDE.
Revision Changes Path
1.15 +33 -10 avalon/repository/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/maven.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maven.xml 4 Feb 2004 16:16:49 -0000 1.14
+++ maven.xml 17 Feb 2004 11:06:17 -0000 1.15
@@ -48,6 +48,7 @@
==============================================================================
-->
+ <ant:property file="project.properties"/>
<ant:property name="pom.specificationVersion" value="1.2"/>
<ant:property name="pom.organization.identifier" value="ASF"/>
<ant:property name="maven.docs.src" value="${basedir}/site/xdocs"/>
@@ -104,6 +105,7 @@
</j:if>
</j:if>
</j:forEach>
+
</goal>
<!--
@@ -341,6 +343,24 @@
<goal name="xjavadoc">
+
+ <maven:reactor basedir="${basedir}"
+ includes="**/project.xml"
+ excludes="project.xml,**/target/**,**/test/project.xml"
+ banner="Site Prep:"
+ ignoreFailures="false"
+ postProcessing="true" />
+
+ <ant:path id="template.classpath">
+ <j:forEach var="child" items="${reactorProjects}">
+ <j:set var="deps" value="${child.dependencies}"/>
+ <j:forEach var="dep" items="${deps}">
+ <ant:pathelement
+ path="${maven.repo.local}/${dep.getArtifactDirectory()}/jars/${dep.getArtifact()}"/>
+ </j:forEach>
+ </j:forEach>
+ </ant:path>
+
<ant:mkdir dir="${maven.build.dir}/docs/api" />
<ant:property name="copyright"
value="Copyright &copy; ${year} ${pom.organization.name}. All Rights Reserved." />
@@ -352,19 +372,22 @@
bottom="${copyright}"
additionalparam="-breakiterator -J-Xmx128m "
packagenames="*,org.*">
+
+ <classpath>
+ <path refid="template.classpath"/>
+ </classpath>
+
<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}/util/src/java"/>
- <sourcepath path="${basedir}/main/src/java"/>
- <sourcepath path="${basedir}/cli/src/java"/>
- <classpath>
- <path refid="maven.dependency.classpath"/>
- </classpath>
- <link href="http://java.sun.com/j2se/1.4.2/docs/api/" />
+
+ <j:forEach var="child" items="${reactorProjects}">
+ <sourcepath path="${child.file.parentFile}/src/java"/>
+ </j:forEach>
+
+ <link href="${sun.j2se.link}" />
+ <link href="${avalon.util.link}" />
+
</ant:javadoc>
</goal>
1.4 +1 -1 avalon/repository/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/repository/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 10 Dec 2003 10:10:23 -0000 1.3
+++ project.properties 17 Feb 2004 11:06:17 -0000 1.4
@@ -15,7 +15,7 @@
# file.
#
-sun.j2se.link = http://java.sun.com/j2ee/1.4/docs/api/
+sun.j2se.link = http://java.sun.com/j2se/1.4/docs/api/
avalon.util.link = http://avalon.apache.org/util/api/
maven.javadoc.links = ${sun.j2se.link},${avalon.util.link}
1.13 +15 -0 avalon/repository/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 31 Jan 2004 13:29:49 -0000 1.12
+++ project.xml 17 Feb 2004 11:06:17 -0000 1.13
@@ -81,6 +81,21 @@
</release>
</releases>
+ <packageGroups>
+ <packageGroup>
+ <title>API/SPI</title>
+ <packages>org.apache.avalon.repository,org.apache.avalon.repository.meta,org.apache.avalon.repository.provider</packages>
+ </packageGroup>
+ <packageGroup>
+ <title>Bootstrap and Standard Repository</title>
+ <packages>org.apache.avalon.repository.main,org.apache.avalon.repository.util,org.apache.avalon.repository.impl</packages>
+ </packageGroup>
+ <packageGroup>
+ <title>Suppliment</title>
+ <packages>org.apache.avalon.repository.cli,org.apache.avalon.repository.jmx</packages>
+ </packageGroup>
+ </packageGroups>
+
<build>
<nagEmailAddress>dev@avalon.apache.org</nagEmailAddress>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org