svn commit: rev 20176 - in avalon/trunk/tools/project/src/main/org/apache/avalon/tools: home project/builder

[mcconnell]

Author: mcconnell
Date: Thu May 20 21:03:20 2004
New Revision: 20176

Modified:
   avalon/trunk/tools/project/src/main/org/apache/avalon/tools/home/Home.java
   
avalon/trunk/tools/project/src/main/org/apache/avalon/tools/project/builder/XMLDefinitionBuilder.java
Log:
Housekeeping.

Modified: 
avalon/trunk/tools/project/src/main/org/apache/avalon/tools/home/Home.java
==============================================================================
--- avalon/trunk/tools/project/src/main/org/apache/avalon/tools/home/Home.java  
(original)
+++ avalon/trunk/tools/project/src/main/org/apache/avalon/tools/home/Home.java  
Thu May 20 21:03:20 2004
@@ -192,8 +192,8 @@
 
     public void build( Definition definition )
     {
-        m_project.log( "\n  build sequence for definition: " + definition + 
"\n");
         Definition[] targets = getBuildSequence( definition );
+        m_project.log( "\n  build sequence for definition: " + definition + 
"\n");
         for( int i=0; i<targets.length; i++ )
         {
             Definition def = targets[i];
@@ -211,7 +211,8 @@
 
     private void buildProject( Definition definition )
     {
-        m_project.log( "\nbuild target: " + definition );
+        m_project.log( "\nbuild target: " + definition  );
+        m_project.log( "basedir: " + definition.getBasedir()  );
 
         Path path = getRepository().createPath( m_project, definition );
         m_project.log( "compile path: " + path );

Modified: 
avalon/trunk/tools/project/src/main/org/apache/avalon/tools/project/builder/XMLDefinitionBuilder.java
==============================================================================
--- 
avalon/trunk/tools/project/src/main/org/apache/avalon/tools/project/builder/XMLDefinitionBuilder.java
       (original)
+++ 
avalon/trunk/tools/project/src/main/org/apache/avalon/tools/project/builder/XMLDefinitionBuilder.java
       Thu May 20 21:03:20 2004
@@ -81,32 +81,6 @@
         return new Definition( key, basedir, info, resources, projects, 
plugins );
     }
 
-    public static Plugin createPlugin( File anchor, Element element )
-    {
-        Info info = 
-          createInfo( ElementHelper.getChild( element, "info" ) );
-
-        String key = getDefinitionKey( element, info );
-
-        File basedir = getBasedir( anchor, element );
-       
-        Element deps = ElementHelper.getChild( element, "dependencies" );
-
-        ResourceRef[] resources = 
-          createResourceRefs( 
-            ElementHelper.getChild( deps, "resources" ) );
-        
-        ProjectRef[] projects = 
-          createProjectRefs( 
-            ElementHelper.getChild( deps, "projects" ) );
-
-        PluginRef[] plugins = 
-          createPluginRefs( 
-            ElementHelper.getChild( deps, "plugins" ) );
-
-        return new Plugin( key, basedir, info, resources, projects, plugins );
-    }
-
     private static File getBasedir( File anchor, Element element )
     {
         String path = element.getAttribute( "basedir" );

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]