DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-05-29 15:30:16 +0200 (Mon, 29 May 2006)
New Revision: 1471

Modified:
   trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuildListener.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java
Log:
housekeeping


Modified: 
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
===================================================================
--- 
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java 
2006-05-29 13:05:27 UTC (rev 1470)
+++ 
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java 
2006-05-29 13:30:16 UTC (rev 1471)
@@ -269,7 +269,7 @@
     * abort the build sequence and exit.
     *
     * @param line the commandline
-    * @param resources the sorted sequence of prouject to build
+    * @param resources the sorted sequence of projects to build
     */
     private boolean process( CommandLine line, Resource[] resources ) throws 
Exception
     {

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
     2006-05-29 13:05:27 UTC (rev 1470)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
     2006-05-29 13:30:16 UTC (rev 1471)
@@ -92,6 +92,7 @@
         Library library = resource.getLibrary();
         project.addReference( "project.timestamp", new Date() );
         project.setBaseDir( resource.getBaseDir() );
+        project.addReference( "project.context", this );
         
         String[] names = resource.getPropertyNames();
         for( int i=0; i<names.length; i++ )

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuildListener.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuildListener.java
      2006-05-29 13:05:27 UTC (rev 1470)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuildListener.java
      2006-05-29 13:30:16 UTC (rev 1471)
@@ -18,6 +18,8 @@
 
 package net.dpml.tools.impl;
 
+import net.dpml.library.Resource;
+
 import net.dpml.tools.Context;
 
 import org.apache.tools.ant.BuildListener;
@@ -58,6 +60,13 @@
      */
     public void buildStarted( BuildEvent event )
     {
+        Resource resource = m_context.getResource();
+        String path = resource.getResourcePath();
+        String version = resource.getVersion();
+        Project project = m_context.getProject();
+        project.log( 
"\n-------------------------------------------------------------------------" 
);
+        project.log( path + "#" + version );
+        project.log( 
"-------------------------------------------------------------------------" );
     }
 
     /**

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
    2006-05-29 13:05:27 UTC (rev 1470)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
    2006-05-29 13:30:16 UTC (rev 1471)
@@ -138,12 +138,7 @@
     */
     public boolean build( Resource resource, String[] targets )
     {
-        String path = resource.getResourcePath();
-        String version = resource.getVersion();
         Project project = createProject( resource );
-        project.log( 
"\n-------------------------------------------------------------------------" 
);
-        project.log( path + "#" + version );
-        project.log( 
"-------------------------------------------------------------------------" );
         File template = getTemplateFile( resource );
         return build( resource, project, template, targets );
     }
@@ -325,7 +320,6 @@
         {
             Project project = newProject();
             Context context = new DefaultContext( resource, project );
-            project.addReference( "project.context", context );
             return project;
         }
         catch( Exception e )

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java 
      2006-05-29 13:05:27 UTC (rev 1470)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java 
      2006-05-29 13:30:16 UTC (rev 1471)
@@ -145,15 +145,15 @@
             
             try
             {
-                Context context = new DefaultContext( project );
-                Resource resource = context.getResource();
-                String name = resource.getName();
-                String version = resource.getVersion();
-                project.log( 
"\n-------------------------------------------------------------------------" 
);
-                project.log( name + "#" + version );
-                project.log( 
"-------------------------------------------------------------------------" );
-                project.addReference( "project.context", context );
-                return context;
+                return new DefaultContext( project );
+                //Resource resource = context.getResource();
+                //String name = resource.getName();
+                //String version = resource.getVersion();
+                //project.log( 
"\n-------------------------------------------------------------------------" 
);
+                //project.log( name + "#" + version );
+                //project.log( 
"-------------------------------------------------------------------------" );
+                //project.addReference( "project.context", context );
+                //return context;
             }
             catch( BuildException e )
             {