DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Mon Dec 27 00:24:43 2004
New Revision: 1301

Modified:
   
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java
   development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java
Log:


Modified: 
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java
==============================================================================
--- 
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java
      (original)
+++ 
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java
      Mon Dec 27 00:24:43 2004
@@ -97,6 +97,7 @@
         }
         project.addReference( "ant.ComponentHelper", helper );
         project.addBuildListener( helper );
+
     }
 
    /**
@@ -154,7 +155,15 @@
    {
        setProject( project );
        m_parent = parent;
-       parent.setNext( this );
+       if( null != parent )
+       {
+           parent.setNext( this );
+       }
+
+       addTaskDefinition( "antlib:net.dpml.magic:init", MainTask.class );
+       addTaskDefinition( "antlib:net.dpml.magic:plugin", PluginTask.class );
+       addTaskDefinition( "antlib:net.dpml.magic:import", 
ImportArtifactTask.class );
+
    }
 
    //------------------------------------------------------------------------
@@ -185,22 +194,24 @@
     */
     public Object createComponent( String name ) 
     {
+        Object object = super.createComponent( name );
+        if( null != object )
+        {
+            return object;
+        }
+
         int k = name.lastIndexOf( ":" );
         if( k > 0 )
         {
             String urn = name.substring( 0, k );
             String task = name.substring( k+1 );
             URI uri = convertUrnToURI( urn );
-            if( null == uri )
-            {
-                return super.createComponent( name );
-            }
-            else
+            if( null != uri )
             {
                 String alias = urn.toString() + ":" + task;
                 if( m_parent != null )
                 {
-                    Object object = m_parent.createComponent( alias );
+                    object = m_parent.createComponent( alias );
                     if( null != object )
                     {
                         final String message =
@@ -214,14 +225,11 @@
                     }
                 }
                 installPlugin( uri, urn, task );
-                Object object = super.createComponent( alias );
-                return object;
+                return super.createComponent( alias );
             }
         }
-        else
-        {
-            return super.createComponent( name );
-        }
+
+        return super.createComponent( name );
     }
 
    /**

Modified: 
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java
==============================================================================
--- 
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java  
(original)
+++ 
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java  
Mon Dec 27 00:24:43 2004
@@ -136,6 +136,7 @@
         createTags( javadoc );
         javadoc.init();
         javadoc.setDestdir( root );
+        javadoc.setUse( true );
         final Path source = javadoc.createSourcepath();
 
         addDefinitionSource( definition, javadoc, source );
@@ -458,13 +459,6 @@
             }
             else
             {
-                //final Resource resource = index.getResource( m_key );
-                //final File cache = index.getDocsDirectory();
-                //final String spec =
-                //  resource.getInfo().getSpecification( "/", "/" );
-                //final String path = spec + "/api";
-                //return new File( cache, path );
-
                 final Resource resource = index.getResource( m_key );
                 final File cache = index.getDocsDirectory();
                 final String path = resource.getInfo().getJavadocPath();