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

Author: mcconnell
Date: Sat Jul  3 06:31:11 2004
New Revision: 22500

Modified:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java
Log:
remove gump target which should result in default target semantics

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	Sat Jul  3 06:31:11 2004
@@ -84,7 +84,7 @@
 
     public static class Template extends FileHolder
     {
-        private String m_target = "gump";
+        private String m_target;
 
         public void setTarget( String target )
         {
@@ -394,11 +394,23 @@
                       "\n      <!-- external references -->" );
                 }
                 String key = resource.getKey();
-                String alias = getKeyForResource( resource );
-                writer.write( 
-                  "\n      <depend property=\"gump.resource." + key 
-                  + "\" project=\"" + alias 
-                  + "\"/>" );
+                String id = resource.getGump().getId();
+                if( null == id )
+                {
+                    String alias = getKeyForResource( resource );
+                    writer.write( 
+                      "\n      <depend property=\"gump.resource." + key 
+                      + "\" project=\"" + alias 
+                      + "\"/>" );
+                }
+                else
+                {
+                    String alias = getKeyForResource( resource );
+                    writer.write( 
+                      "\n      <depend property=\"gump.resource." + key 
+                      + "\" project=\"" + alias 
+                      + "\" id=\"" + id + "\"/>" );
+                }
             }
         }