DPML Notify

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

Author: mcconnell
Date: 2006-04-11 00:05:36 +0200 (Tue, 11 Apr 2006)
New Revision: 1355

Modified:
   trunk/main/depot/core/build.xml
   trunk/main/depot/module.xml
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
Log:


Modified: trunk/main/depot/core/build.xml
===================================================================
--- trunk/main/depot/core/build.xml     2006-04-10 20:39:49 UTC (rev 1354)
+++ trunk/main/depot/core/build.xml     2006-04-10 22:05:36 UTC (rev 1355)
@@ -6,24 +6,9 @@
 
   <transit:import uri="local:template:dpml/tools/standard"/>
 
-  <!--
   <target name="init" depends="standard.init">
     <property name="depot.short.filename" value="${project.name}.jar"/>
-    <property name="transit.short.filename" value="dpml-transit-main.jar"/>
-    <filter token="BUILD-ID" value="${project.version}" />
-    <filter token="DEPOT-PATH" value="${depot.short.filename}"/>
-    <filter token="TRANSIT-PATH" value="${transit.short.filename}"/>
-    <filter token="DEPOT-MAIN-CLASS" value="net.dpml.depot.Main" />
-    <filter token="DEPOT-CLASSLOADER-CLASS" 
value="net.dpml.lang.SystemClassLoader" />
-    <x:filter token="DEPOT-CONSOLE-URI" feature="uri" type="jar"/>
-    <x:filter token="TRANSIT-CORE-URI" ref="dpml/transit/dpml-transit-main" 
feature="uri" type="jar"/>
-    <x:filter token="TRANSIT-CONSOLE-URI" 
ref="dpml/transit/dpml-transit-console" feature="uri" type="part" 
alias="true"/>
-    <x:filter token="DEPOT-BUILDER-URI" ref="dpml/depot/dpml-library-build" 
feature="uri" type="part" alias="true"/>
-    <x:filter token="DEPOT-EXEC-URI" ref="dpml/station/dpml-station-exec" 
feature="uri" type="part" alias="true"/>
-    <x:filter token="DEPOT-STATION-URI" 
ref="dpml/station/dpml-station-console" feature="uri" type="part" 
alias="true"/>
-    <x:filter token="DEPOT-STATION-SERVER-URI" 
ref="dpml/station/dpml-station-server" feature="uri" type="part" 
alias="true"/>
   </target>
-  -->
 
   <!--
   BOOTSTRAP TARGETS
@@ -37,6 +22,7 @@
 
   <target name="install" depends="standard.install,bin">
     <property name="local" location="${dpml.system}/local"/>
+    <echo message="INIT == ${project.version}"/>
     <echo>
 
#----------------------------------------------------------------------------------
 # Updating ${local}

Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-04-10 20:39:49 UTC (rev 1354)
+++ trunk/main/depot/module.xml 2006-04-10 22:05:36 UTC (rev 1355)
@@ -38,40 +38,6 @@
     </filters>
   </project>
    
-  <project name="dpml-depot-checkstyle" basedir="tools/checkstyle">
-    <types>
-      <type id="jar"/>
-      <part:resource alias="true" urn="dpml:checkstyle" 
path="net/dpml/tools/checkstyle/antlib.xml"/>
-    </types>
-    <dependencies>
-      <runtime>
-        <include ref="dpml/depot/dpml-tools-builder"/>
-        <include urn="artifact:jar:checkstyle/checkstyle#4.1">
-          <property name="project.api.host" value="http://api.dpml.net"/>
-          <property name="project.api.root" 
value="${project.api.host}/${project.group}/${project.version}"/>
-        </include>
-        <include urn="artifact:jar:commons-logging/commons-logging#1.0.4" />
-        <include 
urn="artifact:jar:commons-collections/commons-collections#3.1" />
-        <include 
urn="artifact:jar:commons-beanutils/commons-beanutils-core#1.7.0" />
-        <include urn="artifact:jar:bcel/bcel#5.1" />
-        <include urn="artifact:jar:antlr/antlr#2.7.2" />
-      </runtime>
-    </dependencies>
-  </project>
-
-  <project name="dpml-depot-convert" basedir="tools/convert">
-    <types>
-      <type id="jar"/>
-      <part:resource alias="true" urn="dpml:convert" 
path="net/dpml/tools/convert/antlib.xml"/>
-    </types>
-    <dependencies>
-      <runtime>
-        <include urn="artifact:jar:java2html/java2html#4.2"/>
-        <include ref="ant/ant-launcher"/>
-      </runtime>
-    </dependencies>
-  </project>
-
   <project name="dpml-depot-console" basedir="core">
     <properties>
       <property name="project.test.fork" value="true"/>
@@ -123,4 +89,38 @@
     </dependencies>
   </resource>
 
+  <project name="dpml-depot-checkstyle" basedir="tools/checkstyle">
+    <types>
+      <type id="jar"/>
+      <part:resource alias="true" urn="dpml:checkstyle" 
path="net/dpml/tools/checkstyle/antlib.xml"/>
+    </types>
+    <dependencies>
+      <runtime>
+        <include ref="dpml/depot/dpml-tools-builder"/>
+        <include urn="artifact:jar:checkstyle/checkstyle#4.1">
+          <property name="project.api.host" value="http://api.dpml.net"/>
+          <property name="project.api.root" 
value="${project.api.host}/${project.group}/${project.version}"/>
+        </include>
+        <include urn="artifact:jar:commons-logging/commons-logging#1.0.4" />
+        <include 
urn="artifact:jar:commons-collections/commons-collections#3.1" />
+        <include 
urn="artifact:jar:commons-beanutils/commons-beanutils-core#1.7.0" />
+        <include urn="artifact:jar:bcel/bcel#5.1" />
+        <include urn="artifact:jar:antlr/antlr#2.7.2" />
+      </runtime>
+    </dependencies>
+  </project>
+
+  <project name="dpml-depot-convert" basedir="tools/convert">
+    <types>
+      <type id="jar"/>
+      <part:resource alias="true" urn="dpml:convert" 
path="net/dpml/tools/convert/antlib.xml"/>
+    </types>
+    <dependencies>
+      <runtime>
+        <include urn="artifact:jar:java2html/java2html#4.2"/>
+        <include ref="ant/ant-launcher"/>
+      </runtime>
+    </dependencies>
+  </project>
+
 </module>

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-04-10 20:39:49 UTC (rev 1354)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
    2006-04-10 22:05:36 UTC (rev 1355)
@@ -307,8 +307,12 @@
         {
             String name = names[i];
             String value = resource.getProperty( name );
-            project.setNewProperty( name, value );
+            project.setProperty( name, value );
         }
+        project.setProperty( "project.name", resource.getName() );
+        project.setProperty( "project.version", resource.getVersion() );
+        project.setProperty( "project.resource.path", 
resource.getResourcePath() );
+        project.setProperty( "project.basedir", 
resource.getBaseDir().toString() );
         Filter[] filters = resource.getFilters();
         for( int i=0; i<filters.length; i++ )
         {

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
        2006-04-10 20:39:49 UTC (rev 1354)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
        2006-04-10 22:05:36 UTC (rev 1355)
@@ -69,7 +69,6 @@
         Thread.currentThread().setContextClassLoader( 
getClass().getClassLoader() );
         Resource resource = getResource();
         log( resource.toString(), Project.MSG_VERBOSE );
-        
         try
         {
             Processor[] processors = getProcessorSequence( resource );