Skip to Content.
Sympa Menu

notify-dpml - r930 - in trunk/main: . depot depot/tools depot/tools/builder/src/main/net/dpml/tools/tasks depot/tools/convert depot/tools/convert/src depot/tools/convert/src/main depot/tools/convert/src/main/net depot/tools/convert/src/main/net/dpml depot/tools/convert/src/main/net/dpml/tools depot/tools/convert/src/main/net/dpml/tools/convert transit/tools/src/main/net/dpml/transit/tools

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: r930 - in trunk/main: . depot depot/tools depot/tools/builder/src/main/net/dpml/tools/tasks depot/tools/convert depot/tools/convert/src depot/tools/convert/src/main depot/tools/convert/src/main/net depot/tools/convert/src/main/net/dpml depot/tools/convert/src/main/net/dpml/tools depot/tools/convert/src/main/net/dpml/tools/convert transit/tools/src/main/net/dpml/transit/tools
  • Date: Mon, 16 Jan 2006 20:51:02 +0100

Author: mcconnell
Date: 2006-01-16 20:50:58 +0100 (Mon, 16 Jan 2006)
New Revision: 930

Added:
trunk/main/depot/tools/convert/
trunk/main/depot/tools/convert/src/
trunk/main/depot/tools/convert/src/main/
trunk/main/depot/tools/convert/src/main/net/
trunk/main/depot/tools/convert/src/main/net/dpml/
trunk/main/depot/tools/convert/src/main/net/dpml/tools/
trunk/main/depot/tools/convert/src/main/net/dpml/tools/convert/
trunk/main/depot/tools/convert/src/main/net/dpml/tools/convert/antlib.xml
Modified:
trunk/main/depot/module.xml

trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java
trunk/main/library.xml
trunk/main/transit/tools/src/main/net/dpml/transit/tools/PluginTask.java
Log:
Addition of a Java to HTML converter.

Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-01-16 19:17:05 UTC (rev 929)
+++ trunk/main/depot/module.xml 2006-01-16 19:50:58 UTC (rev 930)
@@ -59,7 +59,7 @@
<type id="jar"/>
<type id="plugin" alias="true">
<property name="project.plugin.resource"
- value="net/dpml/builder/checkstyle/antlib.xml"/>
+ value="net/dpml/tools/checkstyle/antlib.xml"/>
<property name="project.plugin.urn"
value="dpml:checkstyle"/>
</type>
@@ -78,6 +78,22 @@
</dependencies>
</project>

+ <project name="dpml-depot-convert" basedir="tools/convert">
+ <types>
+ <type id="jar"/>
+ <type id="plugin" alias="true">
+ <property name="project.plugin.resource"
+ value="net/dpml/tools/convert/antlib.xml"/>
+ <property name="project.plugin.urn"
+ value="dpml:convert"/>
+ </type>
+ </types>
+ <dependencies>
+ <include urn="artifact:jar:java2html/java2html#4.2"/>
+ <include ref="ant/ant-launcher"/>
+ </dependencies>
+ </project>
+
<project name="dpml-depot-console" basedir="core/console">
<types>
<type id="jar"/>

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-16 19:17:05 UTC (rev 929)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java
2006-01-16 19:50:58 UTC (rev 930)
@@ -51,6 +51,11 @@
*/
public static final String JAVADOC_ACCESS_KEY = "project.javadoc.access";

+ /**
+ * Property key for declaration of the lionksource option.
+ */
+ public static final String JAVADOC_LINK_SOURCE_KEY =
"project.javadoc.linksource";
+
//-----------------------------------------------------------------------
// state
//-----------------------------------------------------------------------
@@ -189,6 +194,11 @@
javadoc.setAccess( m_access );
}

+ if( "true".equals( getContext().getProperty(
JAVADOC_LINK_SOURCE_KEY, "false" ) ) )
+ {
+ javadoc.setLinksource( true );
+ }
+
aggregateLinks( javadoc, resource );
Link[] links = (Link[]) m_links.toArray( new Link[0] );
for( int i=0; i<links.length; i++ )

Added:
trunk/main/depot/tools/convert/src/main/net/dpml/tools/convert/antlib.xml
===================================================================
--- trunk/main/depot/tools/convert/src/main/net/dpml/tools/convert/antlib.xml
2006-01-16 19:17:05 UTC (rev 929)
+++ trunk/main/depot/tools/convert/src/main/net/dpml/tools/convert/antlib.xml
2006-01-16 19:50:58 UTC (rev 930)
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<antlib>
+ <taskdef name="convert" classname="de.java2html.anttasks.Java2HtmlTask"/>
+</antlib>

Modified: trunk/main/library.xml
===================================================================
--- trunk/main/library.xml 2006-01-16 19:17:05 UTC (rev 929)
+++ trunk/main/library.xml 2006-01-16 19:50:58 UTC (rev 930)
@@ -25,6 +25,7 @@
<property name="project.resource.host"
value="http://repository.dpml.net"/>
<property name="project.api.host" value="http://api.dpml.net"/>
<property name="project.svn.host"
value="svn://svn.berlios.de/dpml/trunk/main"/>
+ <property name="project.javadoc.linksource" value="true"/>
</properties>

<module base="transit"/>

Modified:
trunk/main/transit/tools/src/main/net/dpml/transit/tools/PluginTask.java
===================================================================
--- trunk/main/transit/tools/src/main/net/dpml/transit/tools/PluginTask.java
2006-01-16 19:17:05 UTC (rev 929)
+++ trunk/main/transit/tools/src/main/net/dpml/transit/tools/PluginTask.java
2006-01-16 19:50:58 UTC (rev 930)
@@ -54,6 +54,11 @@
private String m_uri;

/**
+ * Overloaded plugin urn.
+ */
+ private String m_urn;
+
+ /**
* A list of tasks declared by the plugin declaration.
*/
private List m_tasks = new ArrayList();
@@ -134,6 +139,15 @@
}

/**
+ * Overload the urn to assign to the plugin.
+ * @param urn the urn to use
+ */
+ public void setUrn( String urn )
+ {
+ m_urn = urn;
+ }
+
+ /**
* Return the artifact uri of the plugin.
* @return the plugin uri
*/
@@ -168,7 +182,6 @@
}

final Project project = getProject();
- //ClassLoader classloader = this.getClass().getClassLoader();
ClassLoader classloader =
Thread.currentThread().getContextClassLoader();
final ComponentHelper helper =
ComponentHelper.getComponentHelper( project );
@@ -283,13 +296,9 @@
throw new BuildException( error, getLocation() );
}

- String urn = antlib.getURN();
+ String urn = getAntLibURN( antlib, descriptor );
if( null == urn )
{
- urn = descriptor.getURN();
- }
- if( null == urn )
- {
final String error =
"URN for the antlib is not declared in the plugin descriptor "
+ "or antlib directive ["
@@ -318,6 +327,23 @@
loadTypeDef( classloader, helper, classname, urn + ":" + name );
}
}
+
+ private String getAntLibURN( Antlib antlib, Plugin descriptor )
+ {
+ if( null != m_urn )
+ {
+ return m_urn;
+ }
+ String urn = antlib.getURN();
+ if( null != urn )
+ {
+ return urn;
+ }
+ else
+ {
+ return descriptor.getURN();
+ }
+ }

/**
* Load a single task defintion.




  • r930 - in trunk/main: . depot depot/tools depot/tools/builder/src/main/net/dpml/tools/tasks depot/tools/convert depot/tools/convert/src depot/tools/convert/src/main depot/tools/convert/src/main/net depot/tools/convert/src/main/net/dpml depot/tools/convert/src/main/net/dpml/tools depot/tools/convert/src/main/net/dpml/tools/convert transit/tools/src/main/net/dpml/transit/tools, mcconnell at BerliOS, 01/16/2006

Archive powered by MHonArc 2.6.24.

Top of Page