Skip to Content.
Sympa Menu

notify-dpml - r883 - in trunk/main: . depot/tools/builder/src/main/net/dpml/tools/tasks

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r883 - in trunk/main: . depot/tools/builder/src/main/net/dpml/tools/tasks
  • Date: Sun, 8 Jan 2006 22:50:29 +0100

Author: mcconnell
Date: 2006-01-08 22:50:27 +0100 (Sun, 08 Jan 2006)
New Revision: 883

Modified:
trunk/main/build.xml
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavacTask.java

trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java
Log:
resolve javadoc task issue when running under JDK 1.5
- update classpath creation to ensure a valid classpath is supplied (was
including all deps)
- updated javac task to eliminate replication of package.html files

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2006-01-08 21:23:07 UTC (rev 882)
+++ trunk/main/build.xml 2006-01-08 21:50:27 UTC (rev 883)
@@ -205,7 +205,7 @@
</copy>
</target>

- <target name="javadoc" depends="build">
+ <target name="javadoc" depends="prepare">
<x:javadoc title="DPML Component Management Platform" >
<link href="http://java.sun.com/j2se/1.4/docs/api"/>
<link href="http://api.dpml.net/ant/1.6.5"/>

Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavacTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavacTask.java
2006-01-08 21:23:07 UTC (rev 882)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavacTask.java
2006-01-08 21:50:27 UTC (rev 883)
@@ -204,7 +204,7 @@
javac.init();
javac.execute();

- copy( m_source, m_destination, false, "**/*.*", "**/*.java" );
+ copy( m_source, m_destination, false, "**/*.*",
"**/*.java,**/package.html" );

}


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-01-08 21:23:07 UTC (rev 882)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java
2006-01-08 21:50:27 UTC (rev 883)
@@ -148,7 +148,7 @@
// all of the projects within the module
//

- Resource[] providers = resource.getAggregatedProviders(
Scope.RUNTIME, true, true );
+ Resource[] providers = resource.getClasspathProviders( Scope.RUNTIME
);
final Path classpath = getContext().createPath( providers, true,
true );
process( resource, classpath, api );
}




  • r883 - in trunk/main: . depot/tools/builder/src/main/net/dpml/tools/tasks, mcconnell at BerliOS, 01/08/2006

Archive powered by MHonArc 2.6.24.

Top of Page