DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Sat Apr 23 14:46:36 2005
New Revision: 2382

Removed:
   
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeWriterTask.java
Modified:
   
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/antlib.xml
   development/main/metro/composition/info/build.xml
   development/main/metro/index.xml
Log:
Include a copy of meta/api into the composition package for use by ft.

Modified: 
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/antlib.xml
==============================================================================
--- 
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/antlib.xml
 (original)
+++ 
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/antlib.xml
 Sat Apr 23 14:46:36 2005
@@ -2,8 +2,6 @@
 
 <antlib>
   <taskdef name="type" 
classname="net.dpml.composition.builder.TypeBuilderTask"/>
-  <taskdef name="type-writer" 
classname="net.dpml.composition.builder.TypeWriterTask"/>
   <taskdef name="types" classname="net.dpml.composition.builder.TypesTask"/>
-  <!--<taskdef name="container" 
classname="net.dpml.composition.builder.ContainerBuilderTask"/>-->
   <taskdef name="component" 
classname="net.dpml.composition.builder.ComponentBuilderTask"/>
 </antlib>

Modified: development/main/metro/composition/info/build.xml
==============================================================================
--- development/main/metro/composition/info/build.xml   (original)
+++ development/main/metro/composition/info/build.xml   Sat Apr 23 14:46:36 
2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="dpml-meta-api" default="install" basedir="."
+<project name="dpml-composition-info" default="install" basedir="."
     xmlns:transit="antlib:net.dpml.transit">
 
   <transit:import uri="artifact:template:dpml/magic/standard"/>

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml    (original)
+++ development/main/metro/index.xml    Sat Apr 23 14:46:36 2005
@@ -415,6 +415,24 @@
 
   <!-- FT Composition -->
 
+  <project basedir="composition/info">
+    <info>
+      <group>dpml/metro/private</group>
+      <name>dpml-composition-info</name>
+      <version>1.0.0</version>
+      <status>SNAPSHOT</status>
+      <types>
+        <type>jar</type>
+      </types>
+    </info>
+    <dependencies>
+      <include key="dpml-parameters-api"/>
+      <include key="dpml-configuration-api"/>
+      <include key="dpml-configuration-impl" build="false" test="true" 
runtime="false"/>
+      <include key="dpml-parameters-impl" build="false" test="true" 
runtime="false"/>
+    </dependencies>
+  </project>
+
   <project basedir="composition/api">
     <info>
       <group>dpml/metro/private</group>
@@ -428,7 +446,7 @@
     <dependencies>
       <include key="dpml-parts-api"/>
       <include key="dpml-transit-main"/>
-      <include key="dpml-meta-api"/>
+      <include key="dpml-composition-info"/>
       <include key="dpml-util-i18n"/>
       <include key="dpml-configuration-api"/>
       <include key="dpml-context-api"/>
@@ -456,10 +474,11 @@
       <include key="dpml-transit-main" tag="api"/>
       <include key="dpml-activity-api" tag="api"/>
       <include key="dpml-parameters-api" tag="api"/>
+      <include key="dpml-composition-info" tag="api"/>
       <include key="dpml-configuration-api" tag="api"/>
       <include key="dpml-parts-api" tag="spi"/>
       <include key="dpml-composition-api" tag="spi"/>
-      <include key="dpml-meta-api" tag="spi"/>
+      <include key="dpml-composition-info" tag="spi"/>
       <include key="dpml-system-api" tag="spi"/>
       <include key="dpml-util-exception"/>
       <include key="dpml-parameters-impl"/>
@@ -479,9 +498,7 @@
       </types>
     </info>
     <dependencies>
-      <include key="dpml-meta-api"/>
-      <include key="dpml-meta-spi"/>
-      <include key="dpml-meta-tools"/>
+      <include key="dpml-composition-info"/>
       <include key="dpml-parts-api"/>
       <include key="dpml-magic-core"/>
       <include key="dpml-logging-spi"/>