notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1669 - in trunk: central/site main main/depot/tools/builder/src/main/net/dpml/tools/tasks main/metro/tools/src/main/net/dpml/metro/tools

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1669 - in trunk: central/site main main/depot/tools/builder/src/main/net/dpml/tools/tasks main/metro/tools/src/main/net/dpml/metro/tools
Date: Tue, 25 Jul 2006 20:47:17 +0200

Author: mcconnell
Date: 2006-07-25 20:47:13 +0200 (Tue, 25 Jul 2006)
New Revision: 1669

Modified:
trunk/central/site/build.xml
trunk/main/build.xml

trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java
trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
Log:
1. fix bug in catalog task
2. update site docs generation to include juit reports, apis, and catalog

Modified: trunk/central/site/build.xml
===================================================================
--- trunk/central/site/build.xml 2006-07-25 17:49:29 UTC (rev 1668)
+++ trunk/central/site/build.xml 2006-07-25 18:47:13 UTC (rev 1669)
@@ -2,10 +2,15 @@

<project name="dpml-central" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
- xmlns:x="dpml:depot" >
+ xmlns:x="dpml:depot"
+ xmlns:c="dpml:metro">

<transit:import uri="local:template:dpml/tools/standard"/>

+ <target name="init" depends="standard.init">
+ <x:property name="dpml.module.version" ref="dpml" feature="version"/>
+ </target>
+
<target name="prepare" depends="standard.prepare">


@@ -165,14 +170,29 @@
</target>

- <target name="build" depends="standard.build,docs,javadoc"/>
+ <target name="build" depends="standard.build,docs,javadoc,catalog"/>

+ <target name="catalog" depends="init">
+ <property name="catalog.path"
location="${basedir}/target/docs/reports/${dpml.module.version}/catalog"/>
+ <mkdir dir="${catalog.path}"/>
+ <x:plugin uri="link:part:dpml/metro/dpml-metro-tools"/>
+ <c:catalog title="DPML Catalog" dest="${catalog.path}">
+ <fileset dir="${basedir}/../../main">
+ <include name="**/target/classes/main/**/*.type"/>
+ <exclude name="**/test/**/*.*"/>
+ </fileset>
+ </c:catalog>
+ </target>
+
<target name="docs" depends="prepare">
<x:docs dest="${dpml.data}/docs"/>
</target>

- <target name="javadoc" depends="prepare">
- <x:javadoc title="DPML Component Management Platform" access="protected"
ref="dpml">
+ <target name="javadoc" depends="init">
+ <property name="api.path"
location="${basedir}/target/docs/api/dpml/${dpml.module.version}"/>
+ <mkdir dir="${api.path}"/>
+ <x:javadoc title="DPML Component Management Platform" access="protected"
ref="dpml"
+ dest="${api.path}">
<link href="http://java.sun.com/j2se/1.4/docs/api"/>
<link href="http://api.dpml.net/javax/servlet/2.5"/>
<link href="http://api.dpml.net/jetty/20060213"/>
@@ -217,11 +237,11 @@
</x:javadoc>
</target>

- <target name="junit-report" depends="prepare">
- <property name="junit.html"
location="${project.target.reports.dir}/junit"/>
+ <target name="junit-report" depends="init">
+ <property name="junit.html"
location="${basedir}/target/docs/reports/${dpml.module.version}/junit"/>
<mkdir dir="${junit.html}"/>
<junitreport todir="${junit.html}">
- <fileset dir="../../main">
+ <fileset dir="${basedir}/../../main">
<include name="**/target/reports/test/TEST-*.xml"/>
</fileset>
<report format="frames" todir="${junit.html}"
styledir="${dpml.prefs}/dpml/tools/xsls"/>

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2006-07-25 17:49:29 UTC (rev 1668)
+++ trunk/main/build.xml 2006-07-25 18:47:13 UTC (rev 1669)
@@ -42,15 +42,6 @@
<mkdir dir="${share.docs}"/>
</target>

- <target name="build" depends="standard.build">
- <x:plugin uri="link:part:dpml/metro/dpml-metro-tools"/>
- <c:catalog title="DPML Catalog">
- <fileset dir="${basedir}">
- <include name="**/target/classes/main/**/*.type"/>
- </fileset>
- </c:catalog>
- </target>
-
<target name="package" depends="standard.package"/> 

<target name="install" depends="standard.install,zip,tar,nsis">
@@ -239,67 +230,6 @@
</copy>
</target>

- 
-
- 
-
<target name="checkstyle" depends="prepare">
<property name="checkstyle.dir"
location="${basedir}/target/reports/checkstyle"/>
<property name="checkstyle.data"
location="${checkstyle.dir}/checkstyle.xml"/>

Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java
2006-07-25 17:49:29 UTC (rev 1668)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java
2006-07-25 18:47:13 UTC (rev 1669)
@@ -65,6 +65,7 @@
private List m_groups = new ArrayList();
private File m_overview;
private AccessType m_access;
+ private File m_dest;

//-----------------------------------------------------------------------
// JavadocTask
@@ -101,6 +102,15 @@
}

/**
+ * Override the default destination.
+ * @param dir the destination directory
+ */
+ public void setDest( final File dir )
+ {
+ m_dest = dir;
+ }
+
+ /**
* Create and add a new link to the javadoc run.
* @return the new link
*/
@@ -145,7 +155,7 @@

log( "Generating javadoc for project: " + resource,
Project.MSG_VERBOSE );

- File api = getContext().getTargetReportsJavadocDirectory();
+ File api = getDestination();
mkDir( api );

//
@@ -157,6 +167,18 @@
final Path classpath = getContext().createPath( providers, true,
true );
process( resource, classpath, api );
}
+
+ private File getDestination()
+ {
+ if( null == m_dest )
+ {
+ return getContext().getTargetReportsJavadocDirectory();
+ }
+ else
+ {
+ return m_dest;
+ }
+ }

//-----------------------------------------------------------------------
// internal

Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
===================================================================
--- trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
2006-07-25 17:49:29 UTC (rev 1668)
+++ trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
2006-07-25 18:47:13 UTC (rev 1669)
@@ -796,7 +796,14 @@

private File getWorkingDirectory()
{
- return m_work;
+ if( null == m_destination )
+ {
+ return m_work;
+ }
+ else
+ {
+ return m_destination;
+ }
}

private File[] getTypes()
@@ -811,11 +818,11 @@
{
ArrayList list = new ArrayList();
Project project = getProject();
- File basedir = project.getBaseDir();
FileSet[] filesets = (FileSet[]) m_filesets.toArray( new
FileSet[0] );
for( int i=0; i < filesets.length; i++ )
{
FileSet fileset = filesets[i];
+ File basedir = fileset.getDir( project );
DirectoryScanner ds = fileset.getDirectoryScanner( project );
String[] files = ds.getIncludedFiles();
for( int j=0; j < files.length; j++ )

r1669 - in trunk: central/site main main/depot/tools/builder/src/main/net/dpml/tools/tasks main/metro/tools/src/main/net/dpml/metro/tools, mcconnell at BerliOS, 07/25/2006