DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Mon Dec 20 20:47:06 2004
New Revision: 1250

Modified:
   
development/main/magic/core/src/main/net/dpml/magic/builder/XMLDefinitionBuilder.java
   development/main/metro/tutorials/composition/build.xml
Log:
Fix a bug related to the resolution of the verion when dealing with local 
projects that do not devclare a version.

Modified: 
development/main/magic/core/src/main/net/dpml/magic/builder/XMLDefinitionBuilder.java
==============================================================================
--- 
development/main/magic/core/src/main/net/dpml/magic/builder/XMLDefinitionBuilder.java
       (original)
+++ 
development/main/magic/core/src/main/net/dpml/magic/builder/XMLDefinitionBuilder.java
       Mon Dec 20 20:47:06 2004
@@ -190,14 +190,26 @@
 
     private static String createVersion( Index home, Element info, boolean 
external )
     {
-        if( home.isaRelease() && !external )
+        String version = ElementHelper.getValue( ElementHelper.getChild( 
info, "version" ) );
+        if( external )
+        {
+            return version;
+        }
+
+        if( home.isaRelease() )
         {
-            return home.getReleaseSignature();
+            if( null == version )
+            {
+                return null;
+            }
+            else
+            {
+                return home.getReleaseSignature();
+            }
         }
         else
         {
-            return ElementHelper.getValue(
-               ElementHelper.getChild( info, "version" ) );
+            return version;
         }
     }
 

Modified: development/main/metro/tutorials/composition/build.xml
==============================================================================
--- development/main/metro/tutorials/composition/build.xml      (original)
+++ development/main/metro/tutorials/composition/build.xml      Mon Dec 20 
20:47:06 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <project name="dpml-composition-tutorial" default="default" basedir="." 
-    xmlns:magic="antlib:net.dpml.magic" 
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+    xmlns:magic="antlib:net.dpml.magic"  >
 
   <magic:import uri="artifact:template:dpml/magic/reactor"/>