DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Mon Dec 20 20:07:27 2004
New Revision: 1248

Modified:
   development/main/bootstrap.xml
   development/main/magic/bootstrap/build.properties
   development/main/magic/core/build.properties
   development/main/magic/core/build.xml
   development/main/transit/handler/build.properties
Log:
Upate to the bootstrap procedures to recognize the ${dpml.release.signature} 
property.

Modified: development/main/bootstrap.xml
==============================================================================
--- development/main/bootstrap.xml      (original)
+++ development/main/bootstrap.xml      Mon Dec 20 20:07:27 2004
@@ -24,12 +24,19 @@
 
   <property file="build.properties"/>
 
+  <property name="project.name" value="UNKNOWN"/>
+  <property name="project.type" value="jar"/>
+
   <available classname="junit.framework.TestCase" 
property="junit.available"/>
 
   <condition property="dpml.env.declared" value="false">
     <isset property="ENV.DPML_HOME"/>
   </condition>
 
+  <condition property="signature.declared" value="false">
+    <isset property="dpml.release.signature"/>
+  </condition>
+
   <property name="src" value="src"/>
   <property name="src.main" value="main"/>
   <property name="src.main.dir" value="${src}/${src.main}"/>
@@ -56,11 +63,20 @@
   <property name="target.deliverables.dir" 
value="${target.dir}/deliverables"/>
   <property name="target.deliverables.jars.dir" 
value="${target.deliverables.dir}/jars"/>
   
-  <target name="init" depends="check-dpml-home,declare-dpml-home"/>
+  <target name="setupReleaseFilename" if="signature.declared">
+    <property name="project.version" value="${dpml.release.signature}"/>
+  </target>
+
+  <target name="init" 
depends="check-dpml-home,declare-dpml-home,setupReleaseFilename">
+    <property name="project.version" value="SNAPSHOT"/>
+    <property name="project.filename" 
value="${project.name}-${project.version}.${project.type}"/>
+    <property name="dpml-transit-handler.filename" 
value="dpml-transit-main-${project.version}.jar"/>
+    <property name="dpml-magic-bootstrap.filename" 
value="dpml-magic-bootstrap-${project.version}.jar"/>
+  </target>
 
   <target name="prepare" depends="init">
+    <echo>VERSION: ${project.version}</echo>
     <tstamp/>
-
     <!--
     Copy etc/deliverables to target/deliverables
     -->

Modified: development/main/magic/bootstrap/build.properties
==============================================================================
--- development/main/magic/bootstrap/build.properties   (original)
+++ development/main/magic/bootstrap/build.properties   Mon Dec 20 20:07:27 
2004
@@ -1,12 +1,9 @@
 
-project.name = dpml-magic-bootstrap
-project.version = SNAPSHOT
 project.group = dpml/magic
+project.name = dpml-magic-bootstrap
 
-project.filename = ${project.name}-${project.version}.jar
 project.antlib = ${project.name}.jar
 
-dpml-transit-handler.filename = dpml-transit-main-SNAPSHOT.jar
-
+dpml-transit-handler.filename = dpml-transit-main-${project.version}.jar
 
 junit-filename = junit-3.8.1.jar

Modified: development/main/magic/core/build.properties
==============================================================================
--- development/main/magic/core/build.properties        (original)
+++ development/main/magic/core/build.properties        Mon Dec 20 20:07:27 
2004
@@ -1,14 +1,12 @@
 
 project.group = dpml/magic
 project.name = dpml-magic-core
-project.version = SNAPSHOT
 
-project.plugin.uri = 
artifact:meta:${project.group}/${project.name}#${project.version}
+#project.plugin.uri = 
artifact:meta:${project.group}/${project.name}#${project.version}
 
-project.filename = ${project.name}-${project.version}.jar
 project.antlib = ${project.name}.jar
 
+#dpml-transit-handler.filename = dpml-transit-main-${project.version}.jar
+#dpml-magic-bootstrap.filename = dpml-magic-bootstrap-${project.version}.jar
 
-dpml-transit-handler.filename = dpml-transit-main-SNAPSHOT.jar
-dpml-magic-bootstrap.filename = dpml-magic-bootstrap-SNAPSHOT.jar
 junit-filename = junit-3.8.1.jar

Modified: development/main/magic/core/build.xml
==============================================================================
--- development/main/magic/core/build.xml       (original)
+++ development/main/magic/core/build.xml       Mon Dec 20 20:07:27 2004
@@ -7,15 +7,22 @@
   <available classname="net.dpml.transit.Main" property="transit.available"/>
   <available classname="junit.framework.TestCase" 
property="junit.available"/>
 
-  <filter token="PROJECT-PLUGIN-URN" 
value="plugin:dpml/magic/dpml-magic-core"/>
-  <filter token="PROJECT-PLUGIN-URI" value="${project.plugin.uri}"/>
-
   <target name="init" depends="bootstrap.init">
     <echo>
 
#----------------------------------------------------------------------------------
 # Magic Core
 
#----------------------------------------------------------------------------------
     </echo>
+
+    <property name="dpml-magic-core.uri" 
+        value="artifact:meta:dpml/magic/dpml-magic-core#${project.version}"/>
+
+    <echo>HANDLER FILENAME: ${dpml-transit-handler.filename}</echo>
+    <echo>BOOT FILENAME: ${dpml-magic-bootstrap.filename}</echo>
+    <echo>MAGIC URI: ${dpml-magic-core.uri}</echo>
+
+    <filter token="PROJECT-PLUGIN-URN" 
value="plugin:dpml/magic/dpml-magic-core"/>
+    <filter token="PROJECT-PLUGIN-URI" value="${dpml-magic-core.uri}"/>
   </target>
 
   <!--

Modified: development/main/transit/handler/build.properties
==============================================================================
--- development/main/transit/handler/build.properties   (original)
+++ development/main/transit/handler/build.properties   Mon Dec 20 20:07:27 
2004
@@ -1,9 +1,7 @@
 
-project.name = dpml-transit-main
-project.version = SNAPSHOT
 project.group = dpml/transit
+project.name = dpml-transit-main
 
-project.filename = ${project.name}-${project.version}.jar
 project.antlib = ${project.name}.jar
 
 project.test.fork = true