DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Thu Feb 17 02:36:34 2005
New Revision: 1797

Modified:
   development/main/build.bat
   development/main/home/standard.xml
   
development/main/magic/core/src/main/net/dpml/magic/builder/IndexBuilder.java
Log:
fix issue with testcase references to number modules

Modified: development/main/build.bat
==============================================================================
--- development/main/build.bat  (original)
+++ development/main/build.bat  Thu Feb 17 02:36:34 2005
@@ -4,7 +4,21 @@
 set ID=%2
 set TARGET=%1
 IF "%TARGET%" == "" set TARGET="all"
-CALL %TARGET%
+
+IF %TARGET% == transit (
+  CALL :home
+) ELSE IF %TARGET% == "home" (
+  CALL :home
+) ELSE IF %TARGET% == magic ( 
+  CALL :magic
+) ELSE IF %TARGET% == metro (
+  CALL :magic
+) ELSE IF %TARGET% == all (
+  CALL :all
+} ELSE (
+  ECHO Invalid target - 'all', 'transit', 'magic', or 'metro'.
+)
+GOTO end
 
 :all
 CALL :home
@@ -29,6 +43,12 @@
 POPD
 GOTO :EOF
 
+:transit
+PUSHD home
+CALL :build clean install
+POPD
+GOTO :EOF
+
 :magic
 PUSHD magic
 CALL :build clean install

Modified: development/main/home/standard.xml
==============================================================================
--- development/main/home/standard.xml  (original)
+++ development/main/home/standard.xml  Thu Feb 17 02:36:34 2005
@@ -403,6 +403,7 @@
            showoutput="true" 
            haltonfailure="yes" failureproperty="junit.failure"
            haltonerror="no" errorproperty="junit.error">
+      <sysproperty key="dpml.build.signature" 
value="${dpml.build.signature}"/>
       <classpath>
         <path refid="project.test.path"/>
         <pathelement location="${target.test-classes.dir}"/>

Modified: 
development/main/magic/core/src/main/net/dpml/magic/builder/IndexBuilder.java
==============================================================================
--- 
development/main/magic/core/src/main/net/dpml/magic/builder/IndexBuilder.java 
      (original)
+++ 
development/main/magic/core/src/main/net/dpml/magic/builder/IndexBuilder.java 
      Thu Feb 17 02:36:34 2005
@@ -49,7 +49,7 @@
     public static final String RELEASE_SIGNATURE_KEY = 
"dpml.release.signature";
 
    /**
-    * Immutable key to the build identifier
+    * Immutable key to the build identifier.
     */
     public static final String BUILD_SIGNATURE_KEY = "dpml.build.signature";
 
@@ -81,6 +81,7 @@
         log( "magic builder established", Project.MSG_VERBOSE );
 
         m_signature = getBuildSignature();
+
         if( null == m_signature )
         {
             project.setProperty( BUILD_SIGNATURE_KEY, "SNAPSHOT" );
@@ -157,7 +158,15 @@
 
     private String getBuildSignature()
     {
-        return getProject().getProperty( RELEASE_SIGNATURE_KEY );
+        String signature = System.getProperty( BUILD_SIGNATURE_KEY );
+        if( null != signature )
+        {
+            return signature;
+        }
+        else
+        {
+            return getProject().getProperty( RELEASE_SIGNATURE_KEY );
+        }
     }
 
     private File getIndexFile( Project project )