svn commit: rev 36733 - avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks

Author: mcconnell
Date: Sun Aug 22 18:35:38 2004
New Revision: 36733

Modified:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java
Log:
update to include plugin dependencies within gump descriptor

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java	Sun Aug 22 18:35:38 2004
@@ -519,10 +519,11 @@
                 }
                 String key = resource.getKey();
                 String alias = Resource.getKeyForResource( resource );
+                String id = resource.getGump().getId();
+
                 writer.write( 
                    "\n      <depend property=\"gump.resource." + key 
                    + "\" project=\"" + alias + "\"" );
-                String id = resource.getGump().getId();
                 if( null != id )
                 {
                     writer.write( " id=\"" + id + "\"" );
@@ -645,6 +646,15 @@
             Resource resource = getHome().getResource( refs[i] );
             boolean ignorable = isIgnorableDependency( resource );
             if( !ignorable && !list.contains( resource ) )
+            {
+                list.add( resource );
+            }
+        }
+        ResourceRef[] plugins = def.getPluginRefs();
+        for( int i=0; i<plugins.length; i++ )
+        {
+            Resource resource = getHome().getResource( plugins[i] );
+            if( !list.contains( resource ) )
             {
                 list.add( resource );
             }