Chronological Thread  

< Chronological >       < Thread >

---

Author: mcconnell AT dpml.net
Date: Sat Apr 23 01:13:16 2005
New Revision: 2362

Added:
development/main/metro/classic/api/
- copied from r2352, development/main/metro/composition/api/
development/main/metro/classic/api/build.xml
- copied, changed from r2361,
development/main/metro/composition/api/build.xml
development/main/metro/classic/api/src/
- copied from r2361, development/main/metro/composition/api/src/
development/main/metro/classic/impl/
- copied from r2352, development/main/metro/composition/impl/
development/main/metro/classic/impl/build.xml
- copied, changed from r2361,
development/main/metro/composition/impl/build.xml
development/main/metro/classic/impl/etc/
- copied from r2361, development/main/metro/composition/impl/etc/
development/main/metro/classic/impl/src/
- copied from r2361, development/main/metro/composition/impl/src/
development/main/metro/classic/spi/
- copied from r2352, development/main/metro/composition/spi/
development/main/metro/classic/spi/build.xml
- copied, changed from r2361,
development/main/metro/composition/spi/build.xml
development/main/metro/classic/spi/src/
- copied from r2361, development/main/metro/composition/spi/src/
Removed:
development/main/metro/composition/api/
development/main/metro/composition/impl/
development/main/metro/composition/spi/
Modified:
development/central/site/build.xml
development/central/site/src/docs/magic/latest/tasks/export.xml

development/central/site/src/docs/metro/latest/composition/directives/container/classloader/classpath/index.xml

development/central/site/src/docs/metro/latest/composition/directives/container/index.xml
development/central/tutorials/metro/index.xml
development/central/tutorials/metro/main/build.xml
development/laboratory/ (props changed)
development/laboratory/components/http/index.xml
development/laboratory/components/index-planet-old.xml
development/laboratory/spells/xdoclet/tutorial/build.xml
development/laboratory/unsorted/central/site/build.xml

development/laboratory/unsorted/central/site/src/docs/guide/quick/hello/internal.xml

development/laboratory/unsorted/central/site/src/docs/products/magic/tasks/export.xml

development/laboratory/unsorted/central/site/src/docs/products/metro/composition/directives/container/classloader/classpath/index.xml

development/laboratory/unsorted/central/site/src/docs/products/metro/composition/directives/container/index.xml
development/laboratory/unsorted/composition/api/build.xml
development/laboratory/users/mcconnell/mgr/index.xml
development/laboratory/users/niclas/iso8583/index.xml
development/laboratory/users/niclas/processing/index.xml
development/main/metro/build.xml
development/main/metro/classic/test/build.xml
development/main/metro/index.xml
development/main/metro/main/build.xml
development/main/metro/unit/build.xml
Log:
moving composition api, spi and impl to metro/classic/...

Modified: development/central/site/build.xml
==============================================================================
--- development/central/site/build.xml (original)
+++ development/central/site/build.xml Sat Apr 23 01:13:16 2005
@@ -21,7 +21,7 @@
<x:filter key="dpml-service-api" feature="spec"
token="SERVICE-API-SPEC"/>
<!--x:filter key="dpml-tutorial-hello" feature="spec"
token="TUTORIAL-HELLO-SPEC"/-->
<x:filter key="dpml-system-impl" feature="plugin"
token="SYSTEM-PLUGIN-URI"/>
- <x:filter key="dpml-composition-impl" feature="plugin"
token="COMPOSITION-PLUGIN-URI"/>
+ <x:filter key="dpml-classic-impl" feature="plugin"
token="COMPOSITION-PLUGIN-URI"/>
<x:filter key="dpml-logging-logkit-impl" feature="plugin"
token="LOGGING-LOGKIT-PLUGIN-URI"/>
<x:filter key="dpml-logging-log4j" feature="plugin"
token="LOGGING-LOG4J-PLUGIN-URI"/>
<x:filter key="dpml-activation-impl" feature="plugin"
token="RUNTIME-PLUGIN-URI"/>

Modified: development/central/site/src/docs/magic/latest/tasks/export.xml
==============================================================================
--- development/central/site/src/docs/magic/latest/tasks/export.xml
(original)
+++ development/central/site/src/docs/magic/latest/tasks/export.xml Sat
Apr 23 01:13:16 2005
@@ -51,7 +51,7 @@
# API dependencies.
#
dpml.artifact.dependency.api.0 =
artifact:jar:dpml/activation/dpml-activation-api#SNAPSHOT
-dpml.artifact.dependency.api.1 =
artifact:jar:dpml/composition/dpml-composition-spi#SNAPSHOT
+dpml.artifact.dependency.api.1 =
artifact:jar:dpml/composition/dpml-classic-spi#SNAPSHOT
dpml.artifact.dependency.api.2 =
artifact:jar:dpml/system/dpml-system-spi#SNAPSHOT
dpml.artifact.dependency.api.3 =
artifact:jar:dpml/context/dpml-context-api#SNAPSHOT
dpml.artifact.dependency.api.4 =
artifact:jar:dpml/logging/dpml-logging-spi#SNAPSHOT
@@ -59,7 +59,7 @@
dpml.artifact.dependency.api.6 =
artifact:jar:dpml/logging/dpml-logging-data#SNAPSHOT
dpml.artifact.dependency.api.7 =
artifact:jar:dpml/system/dpml-system-api#SNAPSHOT
dpml.artifact.dependency.api.8 =
artifact:jar:dpml/transit/dpml-transit-main#SNAPSHOT
-dpml.artifact.dependency.api.9 =
artifact:jar:dpml/composition/dpml-composition-api#SNAPSHOT
+dpml.artifact.dependency.api.9 =
artifact:jar:dpml/composition/dpml-classic-api#SNAPSHOT
dpml.artifact.dependency.api.10 =
artifact:jar:dpml/meta/dpml-meta-api#SNAPSHOT
dpml.artifact.dependency.api.11 =
artifact:jar:dpml/parameters/dpml-parameters-api#SNAPSHOT
dpml.artifact.dependency.api.12 =
artifact:jar:dpml/configuration/dpml-configuration-api#SNAPSHOT

Modified:
development/central/site/src/docs/metro/latest/composition/directives/container/classloader/classpath/index.xml
==============================================================================
---
development/central/site/src/docs/metro/latest/composition/directives/container/classloader/classpath/index.xml
(original)
+++
development/central/site/src/docs/metro/latest/composition/directives/container/classloader/classpath/index.xml
Sat Apr 23 01:13:16 2005
@@ -58,7 +58,7 @@
&lt;artifact&gt;<font
color="darkred">jar:dpml/configuration/dpml-configuration-api#316</font>&lt;/artifact&gt;
&lt;artifact&gt;<font
color="darkred">jar:dpml/service/dpml-service-api#316</font>&lt;/artifact&gt;
&lt;artifact&gt;<font
color="darkred">jar:dpml/activity/dpml-activity-api#316</font>&lt;/artifact&gt;
- &lt;artifact&gt;<font
color="darkred">jar:dpml/composition/dpml-composition-api#316</font>&lt;/artifact&gt;
+ &lt;artifact&gt;<font
color="darkred">jar:dpml/composition/dpml-classic-api#316</font>&lt;/artifact&gt;
&lt;artifact&gt;<font
color="darkred">jar:dpml/transit/dpml-transit-main#316</font>&lt;/artifact&gt;
&lt;artifact&gt;<font
color="darkred">jar:dpml/meta/dpml-meta-api#316</font>&lt;/artifact&gt;
&lt;artifact&gt;<font
color="darkred">jar:dpml/parameters/dpml-parameters-api#316</font>&lt;/artifact&gt;

Modified:
development/central/site/src/docs/metro/latest/composition/directives/container/index.xml
==============================================================================
---
development/central/site/src/docs/metro/latest/composition/directives/container/index.xml
(original)
+++
development/central/site/src/docs/metro/latest/composition/directives/container/index.xml
Sat Apr 23 01:13:16 2005
@@ -76,7 +76,7 @@

<artifact>jar:dpml/configuration/dpml-configuration-api#SNAPSHOT</artifact>
<artifact>jar:dpml/service/dpml-service-api#SNAPSHOT</artifact>
<artifact>jar:dpml/activity/dpml-activity-api#SNAPSHOT</artifact>
- <artifact>jar:dpml/composition/dpml-composition-api#SNAPSHOT</artifact>
+ <artifact>jar:dpml/composition/dpml-classic-api#SNAPSHOT</artifact>
<artifact>jar:dpml/transit/dpml-transit-main#SNAPSHOT</artifact>
<artifact>jar:dpml/meta/dpml-meta-api#SNAPSHOT</artifact>
<artifact>jar:dpml/parameters/dpml-parameters-api#SNAPSHOT</artifact>

Modified: development/central/tutorials/metro/index.xml
==============================================================================
--- development/central/tutorials/metro/index.xml (original)
+++ development/central/tutorials/metro/index.xml Sat Apr 23 01:13:16
2005
@@ -127,7 +127,7 @@
</types>
</info>
<dependencies>
- <include key="dpml-composition-api" runtime="false"/>
+ <include key="dpml-classic-api" runtime="false"/>
<include key="dpml-configuration-api"/>
<include key="dpml-context-api"/>
<include key="dpml-configuration-impl"/>
@@ -337,10 +337,10 @@
</info>
<dependencies>
<include key="dpml-util-exception" />
- <include key="dpml-composition-spi" />
+ <include key="dpml-classic-spi" />
<include key="dpml-tutorial-hello" build="false"/>
<include key="dpml-system-impl" build="false"/>
- <include key="dpml-composition-impl" build="false"/>
+ <include key="dpml-classic-impl" build="false"/>
</dependencies>
</project>


Modified: development/central/tutorials/metro/main/build.xml
==============================================================================
--- development/central/tutorials/metro/main/build.xml (original)
+++ development/central/tutorials/metro/main/build.xml Sat Apr 23 01:13:16
2005
@@ -8,7 +8,7 @@
<target name="init" depends="standard.init">
<x:filter key="dpml-system-impl" feature="plugin"
token="SYSTEM-PLUGIN-URI"/>
- <x:filter key="dpml-composition-impl" feature="plugin"
+ <x:filter key="dpml-classic-impl" feature="plugin"
token="COMPOSITION-IMPL-URI"/>
<x:filter key="dpml-tutorial-hello" feature="uri"
token="HELLO-TUTORIAL-URI"/>

Modified: development/laboratory/components/http/index.xml
==============================================================================
--- development/laboratory/components/http/index.xml (original)
+++ development/laboratory/components/http/index.xml Sat Apr 23 01:13:16
2005
@@ -58,7 +58,7 @@
</info>
<dependencies>
<include key="dpml-http-api"/>
- <include key="dpml-composition-api" runtime="false"/>
+ <include key="dpml-classic-api" runtime="false"/>
<include key="org.mortbay.jetty"/>
</dependencies>
<plugins>
@@ -97,7 +97,7 @@
<include key="dpml-service-api"/>
<include key="dpml-http-spi"/>
<include key="dpml-http-util"/>
- <include key="dpml-composition-api" runtime="false"/>
+ <include key="dpml-classic-api" runtime="false"/>
<include key="dpml-configuration-impl"/>
<include key="org.mortbay.jetty"/>
<include key="org.mortbay.jaas"/>

Modified: development/laboratory/components/index-planet-old.xml
==============================================================================
--- development/laboratory/components/index-planet-old.xml (original)
+++ development/laboratory/components/index-planet-old.xml Sat Apr 23
01:13:16 2005
@@ -178,7 +178,7 @@
</info>
<dependencies>
<include key="dpml-finder-api"/>
- <include key="dpml-composition-api" runtime="false"/>
+ <include key="dpml-classic-api" runtime="false"/>
</dependencies>
<plugins>
<include key="dpml-meta-tools"/>
@@ -215,7 +215,7 @@
<status>SNAPSHOT</status>
</info>
<dependencies>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
</dependencies>
</project>

@@ -327,7 +327,7 @@
<include key="dpml-logging-spi"/>
<include key="dpml-db-api"/>
<include key="dpml-logging-spi"/>
- <include key="dpml-composition-api" runtime="false"/>
+ <include key="dpml-classic-api" runtime="false"/>
<include key="concurrent"/>
<include key="hsqldb"/>
</dependencies>
@@ -400,7 +400,7 @@
<include key="dpml-configuration-impl"/>
<include key="dpml-jms-api"/>
<include key="geronimo-spec-jta"/>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
<include key="commons-digester"/>
<include key="commons-logging"/>
<include key="commons-beanutils"/>
@@ -433,7 +433,7 @@
<status>SNAPSHOT</status>
</info>
<dependencies>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
</dependencies>
</project>

@@ -447,7 +447,7 @@
<dependencies>
<include key="dpml-activity-api"/>
<include key="dpml-console-api"/>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
</dependencies>
<plugins>
<include key="dpml-meta-tools"/>
@@ -463,7 +463,7 @@
</info>
<dependencies>
<include key="dpml-console-api"/>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
<include key="dpml-transit-main"/>
</dependencies>
<plugins>
@@ -521,7 +521,7 @@
<include key="dpml-activity-api"/>
<include key="dpml-reflector-api"/>
<include key="dpml-reflector-spi"/>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
<include key="org.mortbay.jetty"/>
<include key="dpml-http-spi"/>
</dependencies>
@@ -540,7 +540,7 @@
</info>
<dependencies>
<include key="dpml-reflector-spi"/>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
</dependencies>
<plugins>
<include key="dpml-meta-tools"/>

Modified: development/laboratory/spells/xdoclet/tutorial/build.xml
==============================================================================
--- development/laboratory/spells/xdoclet/tutorial/build.xml (original)
+++ development/laboratory/spells/xdoclet/tutorial/build.xml Sat Apr 23
01:13:16 2005
@@ -19,7 +19,7 @@
token="SERVICE-API-SPEC"/>
<x:filter key="dpml-system-impl" feature="plugin"
token="SYSTEM-PLUGIN-URI"/>
- <x:filter key="dpml-composition-impl" feature="plugin"
+ <x:filter key="dpml-classic-impl" feature="plugin"
token="COMPOSITION-PLUGIN-URI"/>
<x:filter key="dpml-logging-logkit-impl" feature="plugin"
token="LOGGING-LOGKIT-PLUGIN-URI"/>

Modified: development/laboratory/unsorted/central/site/build.xml
==============================================================================
--- development/laboratory/unsorted/central/site/build.xml (original)
+++ development/laboratory/unsorted/central/site/build.xml Sat Apr 23
01:13:16 2005
@@ -19,7 +19,7 @@
token="SERVICE-API-SPEC"/>
<x:filter key="dpml-system-impl" feature="plugin"
token="SYSTEM-PLUGIN-URI"/>
- <x:filter key="dpml-composition-impl" feature="plugin"
+ <x:filter key="dpml-classic-impl" feature="plugin"
token="COMPOSITION-PLUGIN-URI"/>
<x:filter key="dpml-logging-logkit-impl" feature="plugin"
token="LOGGING-LOGKIT-PLUGIN-URI"/>

Modified:
development/laboratory/unsorted/central/site/src/docs/guide/quick/hello/internal.xml
==============================================================================
---
development/laboratory/unsorted/central/site/src/docs/guide/quick/hello/internal.xml
(original)
+++
development/laboratory/unsorted/central/site/src/docs/guide/quick/hello/internal.xml
Sat Apr 23 01:13:16 2005
@@ -63,7 +63,7 @@
[INFO ] (dpml): Metro Context
--------------------------------------------------------------------------
${dpml.metro.system.artifact} :
artifact:meta:dpml/system/dpml-system-impl#SNAPSHOT
-${dpml.metro.main.artifact} :
artifact:meta:dpml/composition/dpml-composition-impl#SNAPSHOT
+${dpml.metro.main.artifact} :
artifact:meta:dpml/composition/dpml-classic-impl#SNAPSHOT
--------------------------------------------------------------------------
[INFO ] (tutorial.hello): Hello World!
]]></source>
@@ -234,9 +234,9 @@
--------------------------------------------------------------------------
[DEBUG ] (dpml) : system context initialization
[DEBUG ] (dpml): system context established
-[DEBUG ] (dpml): loading plugin:
[artifact:meta:dpml/composition/dpml-composition-impl#SNAPSHOT].
-[DEBUG ] (dpml) : building:
artifact:meta:dpml/composition/dpml-composition-impl#SNAPSHOT
-[DEBUG ] (dpml) : using local copy:
artifact:meta:dpml/composition/dpml-composition-impl#SNAPSHOT
+[DEBUG ] (dpml): loading plugin:
[artifact:meta:dpml/composition/dpml-classic-impl#SNAPSHOT].
+[DEBUG ] (dpml) : building:
artifact:meta:dpml/composition/dpml-classic-impl#SNAPSHOT
+[DEBUG ] (dpml) : using local copy:
artifact:meta:dpml/composition/dpml-classic-impl#SNAPSHOT
[DEBUG ] (dpml) : building classload stack
[DEBUG ] (dpml) : api classloader size: 11
[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/extension/dpml-extension-api#SNAPSHOT
@@ -244,15 +244,15 @@
[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/util/dpml-util-i18n#SNAPSHOT
[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/configuration/dpml-configuration-api#SNAPSHOT
[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/meta/dpml-meta-api#SNAPSHOT
-[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/composition/dpml-composition-api#SNAPSHOT
+[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/composition/dpml-classic-api#SNAPSHOT
[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/parameters/dpml-parameters-api#SNAPSHOT
[DEBUG ] (dpml) : spi classloader size: 4
[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/meta/dpml-meta-spi#SNAPSHOT
-[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/composition/dpml-composition-spi#SNAPSHOT
+[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/composition/dpml-classic-spi#SNAPSHOT
[DEBUG ] (dpml) : impl classloader size: 10
[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/meta/dpml-meta-impl#SNAPSHOT
[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/configuration/dpml-configuration-impl#SNAPSHOT
-[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/composition/dpml-composition-impl#SNAPSHOT
+[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/composition/dpml-classic-impl#SNAPSHOT
[DEBUG ] (dpml) : using local copy: artifact:jar:commons-cli/commons-cli#1.0
[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/util/dpml-util-cli#SNAPSHOT
[DEBUG ] (dpml) : using local copy:
artifact:jar:dpml/util/dpml-util-criteria#SNAPSHOT
@@ -325,7 +325,7 @@
[DEBUG ] (dpml): Metro Context
--------------------------------------------------------------------------
${dpml.metro.system.artifact} :
artifact:meta:dpml/system/dpml-system-impl#SNAPSHOT
-${dpml.metro.main.artifact} :
artifact:meta:dpml/composition/dpml-composition-impl#SNAPSHOT
+${dpml.metro.main.artifact} :
artifact:meta:dpml/composition/dpml-classic-impl#SNAPSHOT
--------------------------------------------------------------------------
[DEBUG ] (): initiating assembly
[DEBUG ] (): state: assembly

Modified:
development/laboratory/unsorted/central/site/src/docs/products/magic/tasks/export.xml
==============================================================================
---
development/laboratory/unsorted/central/site/src/docs/products/magic/tasks/export.xml
(original)
+++
development/laboratory/unsorted/central/site/src/docs/products/magic/tasks/export.xml
Sat Apr 23 01:13:16 2005
@@ -51,7 +51,7 @@
# API dependencies.
#
dpml.artifact.dependency.api.0 =
artifact:jar:dpml/activation/dpml-activation-api#SNAPSHOT
-dpml.artifact.dependency.api.1 =
artifact:jar:dpml/composition/dpml-composition-spi#SNAPSHOT
+dpml.artifact.dependency.api.1 =
artifact:jar:dpml/composition/dpml-classic-spi#SNAPSHOT
dpml.artifact.dependency.api.2 =
artifact:jar:dpml/system/dpml-system-spi#SNAPSHOT
dpml.artifact.dependency.api.3 =
artifact:jar:dpml/context/dpml-context-api#SNAPSHOT
dpml.artifact.dependency.api.4 =
artifact:jar:dpml/logging/dpml-logging-spi#SNAPSHOT
@@ -59,7 +59,7 @@
dpml.artifact.dependency.api.6 =
artifact:jar:dpml/logging/dpml-logging-data#SNAPSHOT
dpml.artifact.dependency.api.7 =
artifact:jar:dpml/system/dpml-system-api#SNAPSHOT
dpml.artifact.dependency.api.8 =
artifact:jar:dpml/transit/dpml-transit-main#SNAPSHOT
-dpml.artifact.dependency.api.9 =
artifact:jar:dpml/composition/dpml-composition-api#SNAPSHOT
+dpml.artifact.dependency.api.9 =
artifact:jar:dpml/composition/dpml-classic-api#SNAPSHOT
dpml.artifact.dependency.api.10 =
artifact:jar:dpml/meta/dpml-meta-api#SNAPSHOT
dpml.artifact.dependency.api.11 =
artifact:jar:dpml/parameters/dpml-parameters-api#SNAPSHOT
dpml.artifact.dependency.api.12 =
artifact:jar:dpml/configuration/dpml-configuration-api#SNAPSHOT

Modified:
development/laboratory/unsorted/central/site/src/docs/products/metro/composition/directives/container/classloader/classpath/index.xml
==============================================================================
---
development/laboratory/unsorted/central/site/src/docs/products/metro/composition/directives/container/classloader/classpath/index.xml
(original)
+++
development/laboratory/unsorted/central/site/src/docs/products/metro/composition/directives/container/classloader/classpath/index.xml
Sat Apr 23 01:13:16 2005
@@ -58,7 +58,7 @@
&lt;artifact&gt;<font
color="darkred">jar:dpml/configuration/dpml-configuration-api#316</font>&lt;/artifact&gt;
&lt;artifact&gt;<font
color="darkred">jar:dpml/service/dpml-service-api#316</font>&lt;/artifact&gt;
&lt;artifact&gt;<font
color="darkred">jar:dpml/activity/dpml-activity-api#316</font>&lt;/artifact&gt;
- &lt;artifact&gt;<font
color="darkred">jar:dpml/composition/dpml-composition-api#316</font>&lt;/artifact&gt;
+ &lt;artifact&gt;<font
color="darkred">jar:dpml/composition/dpml-classic-api#316</font>&lt;/artifact&gt;
&lt;artifact&gt;<font
color="darkred">jar:dpml/transit/dpml-transit-main#316</font>&lt;/artifact&gt;
&lt;artifact&gt;<font
color="darkred">jar:dpml/meta/dpml-meta-api#316</font>&lt;/artifact&gt;
&lt;artifact&gt;<font
color="darkred">jar:dpml/parameters/dpml-parameters-api#316</font>&lt;/artifact&gt;

Modified:
development/laboratory/unsorted/central/site/src/docs/products/metro/composition/directives/container/index.xml
==============================================================================
---
development/laboratory/unsorted/central/site/src/docs/products/metro/composition/directives/container/index.xml
(original)
+++
development/laboratory/unsorted/central/site/src/docs/products/metro/composition/directives/container/index.xml
Sat Apr 23 01:13:16 2005
@@ -76,7 +76,7 @@

<artifact>jar:dpml/configuration/dpml-configuration-api#SNAPSHOT</artifact>
<artifact>jar:dpml/service/dpml-service-api#SNAPSHOT</artifact>
<artifact>jar:dpml/activity/dpml-activity-api#SNAPSHOT</artifact>
- <artifact>jar:dpml/composition/dpml-composition-api#SNAPSHOT</artifact>
+ <artifact>jar:dpml/composition/dpml-classic-api#SNAPSHOT</artifact>
<artifact>jar:dpml/transit/dpml-transit-main#SNAPSHOT</artifact>
<artifact>jar:dpml/meta/dpml-meta-api#SNAPSHOT</artifact>
<artifact>jar:dpml/parameters/dpml-parameters-api#SNAPSHOT</artifact>

Modified: development/laboratory/unsorted/composition/api/build.xml
==============================================================================
--- development/laboratory/unsorted/composition/api/build.xml (original)
+++ development/laboratory/unsorted/composition/api/build.xml Sat Apr 23
01:13:16 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-composition-api" default="install" basedir="."
+<project name="dpml-classic-api" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<transit:import uri="artifact:template:dpml/magic/standard"/>

Modified: development/laboratory/users/mcconnell/mgr/index.xml
==============================================================================
--- development/laboratory/users/mcconnell/mgr/index.xml (original)
+++ development/laboratory/users/mcconnell/mgr/index.xml Sat Apr 23
01:13:16 2005
@@ -47,7 +47,7 @@
<include key="dpml-activity-api"/>
<include key="dpml-configuration-api"/>
<include key="dpml-logging-api"/>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
</dependencies>
<plugins>
<include key="dpml-meta-tools"/>

Modified: development/laboratory/users/niclas/iso8583/index.xml
==============================================================================
--- development/laboratory/users/niclas/iso8583/index.xml (original)
+++ development/laboratory/users/niclas/iso8583/index.xml Sat Apr 23
01:13:16 2005
@@ -58,7 +58,7 @@
<include key="dpml-iso8583-api" />
<include key="dpml-activity-api" />
<include key="dpml-logging-api" />
- <include key="dpml-composition-api" />
+ <include key="dpml-classic-api" />
<include key="dpml-context-api" />
<include key="dpml-context-impl" build="false" runtime="false"
test="true" />
<include key="dpml-parameters-api"/>

Modified: development/laboratory/users/niclas/processing/index.xml
==============================================================================
--- development/laboratory/users/niclas/processing/index.xml (original)
+++ development/laboratory/users/niclas/processing/index.xml Sat Apr 23
01:13:16 2005
@@ -50,7 +50,7 @@
<group>dpml/planet/processing/controller</group>
</info>
<dependencies>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
<include key="dpml-context-api"/>
<include key="dpml-processing-api"/>
<include key="dpml-parameters-api" />

Modified: development/main/metro/build.xml
==============================================================================
--- development/main/metro/build.xml (original)
+++ development/main/metro/build.xml Sat Apr 23 01:13:16 2005
@@ -50,8 +50,13 @@
</fileset>
</replace>
-->
- <replace token="net.dpml.parts.state" value="net.dpml.parts.state"
dir=".">
- <include name="**/*.java"/>
+ <replace token="dpml-classic-api" value="dpml-classic-api" dir=".">
+ <include name="**/*.xml"/>
+ </replace>
+ <replace token="dpml-classic-spi" value="dpml-classic-spi" dir=".">
+ <include name="**/*.xml"/>
+ </replace>
+ <replace token="dpml-classic-impl" value="dpml-classic-impl" dir=".">
<include name="**/*.xml"/>
</replace>
</target>

Copied: development/main/metro/classic/api/build.xml (from r2361,
development/main/metro/composition/api/build.xml)
==============================================================================
--- development/main/metro/composition/api/build.xml (original)
+++ development/main/metro/classic/api/build.xml Sat Apr 23 01:13:16
2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-composition-api" default="install" basedir="."
+<project name="dpml-classic-api" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<transit:import uri="artifact:template:dpml/magic/standard"/>

Copied: development/main/metro/classic/impl/build.xml (from r2361,
development/main/metro/composition/impl/build.xml)
==============================================================================
--- development/main/metro/composition/impl/build.xml (original)
+++ development/main/metro/classic/impl/build.xml Sat Apr 23 01:13:16
2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-composition-impl" default="install" basedir="."
+<project name="dpml-classic-impl" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<transit:import uri="artifact:template:dpml/magic/standard"/>

Copied: development/main/metro/classic/spi/build.xml (from r2361,
development/main/metro/composition/spi/build.xml)
==============================================================================
--- development/main/metro/composition/spi/build.xml (original)
+++ development/main/metro/classic/spi/build.xml Sat Apr 23 01:13:16
2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-composition-spi" default="install" basedir="."
+<project name="dpml-classic-spi" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<transit:import uri="artifact:template:dpml/magic/standard"/>

Modified: development/main/metro/classic/test/build.xml
==============================================================================
--- development/main/metro/classic/test/build.xml (original)
+++ development/main/metro/classic/test/build.xml Sat Apr 23 01:13:16
2005
@@ -6,7 +6,7 @@
<transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
- <x:filter feature="plugin" key="dpml-composition-impl"
token="COMPOSITION_IMPL_URI"/>
+ <x:filter feature="plugin" key="dpml-classic-impl"
token="COMPOSITION_IMPL_URI"/>
<x:filter feature="plugin" key="dpml-system-impl"
token="TRANSIT-IMPL-SPEC"/>
<x:filter feature="uri" key="avalon-framework-api"
token="AVALON-API-SPEC"/>
<x:filter feature="uri" key="avalon-framework-impl"
token="AVALON-IMPL-SPEC"/>

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml (original)
+++ development/main/metro/index.xml Sat Apr 23 01:13:16 2005
@@ -270,7 +270,7 @@
<include key="dpml-util-criteria"/>
<include key="dpml-util-cli"/>
<include key="dpml-system-impl" build="false"/>
- <include key="dpml-composition-impl" build="false"/>
+ <include key="dpml-classic-impl" build="false"/>
<include key="commons-cli"/>
</dependencies>
</project>
@@ -288,8 +288,8 @@
</info>
<dependencies>
<include key="dpml-parts-api" tag="api"/>
- <include key="dpml-composition-spi"/>
- <include key="dpml-composition-impl" build="false"/>
+ <include key="dpml-classic-spi"/>
+ <include key="dpml-classic-impl" build="false"/>
<include key="dpml-configuration-api"/>
<include key="dpml-configuration-impl"/>
<include key="dpml-context-api"/>
@@ -307,10 +307,10 @@

<!-- Composition -->

- <project basedir="composition/api">
+ <project basedir="classic/api">
<info>
<group>dpml/metro/protected</group>
- <name>dpml-composition-api</name>
+ <name>dpml-classic-api</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<types>
@@ -335,10 +335,10 @@

<!-- Composition -->

- <project basedir="composition/spi">
+ <project basedir="classic/spi">
<info>
<group>dpml/metro/private</group>
- <name>dpml-composition-spi</name>
+ <name>dpml-classic-spi</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<types>
@@ -347,15 +347,15 @@
</info>
<dependencies>
<include key="dpml-system-api"/>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
<include key="dpml-logging-spi"/>
</dependencies>
</project>

- <project basedir="composition/impl">
+ <project basedir="classic/impl">
<info>
<group>dpml/metro/private</group>
- <name>dpml-composition-impl</name>
+ <name>dpml-classic-impl</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<types>
@@ -368,11 +368,11 @@
<include key="dpml-logging-api" tag="api"/>
<include key="dpml-activity-api" tag="api"/>
<include key="dpml-parameters-api" tag="api"/>
- <include key="dpml-composition-api" tag="api"/>
+ <include key="dpml-classic-api" tag="api"/>
<include key="dpml-configuration-api" tag="api"/>
<include key="dpml-service-api" tag="api"/>
<include key="dpml-meta-api" tag="api"/>
- <include key="dpml-composition-spi" tag="spi"/>
+ <include key="dpml-classic-spi" tag="spi"/>
<include key="dpml-meta-spi" tag="spi"/>
<include key="dpml-configuration-impl"/>
<include key="dpml-meta-impl"/>
@@ -398,10 +398,10 @@
</info>
<dependencies>
<include key="dpml-system-api"/>
- <include key="dpml-composition-spi"/>
- <include key="dpml-composition-impl"/>
+ <include key="dpml-classic-spi"/>
+ <include key="dpml-classic-impl"/>
<include key="dpml-system-impl" test="false"/>
- <include key="dpml-composition-impl" test="false"/>
+ <include key="dpml-classic-impl" test="false"/>
<include key="dpml-util-exception"/>
<include key="dpml-test-testa" test="false"/>
<include key="dpml-test-testb" test="false"/>
@@ -434,7 +434,7 @@
<include key="dpml-configuration-api" tag="api"/>
<include key="dpml-activity-api" tag="api"/>
<include key="dpml-parts-api" tag="spi"/>
- <include key="dpml-composition-api" tag="spi"/>
+ <include key="dpml-classic-api" tag="spi"/>
<include key="dpml-system-api" tag="spi"/>
<include key="dpml-util-exception"/>
<include key="commons-cli"/>
@@ -464,7 +464,7 @@
<include key="dpml-configuration-impl"/>
<include key="dpml-parameters-api"/>
<include key="dpml-parameters-impl"/>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
<include key="dpml-composition-control"/>
<include key="xstream"/>
</dependencies>
@@ -813,7 +813,7 @@
</types>
</info>
<dependencies>
- <include key="dpml-composition-spi"/>
+ <include key="dpml-classic-spi"/>
</dependencies>
</project>

@@ -831,8 +831,8 @@
<dependencies>
<include key="dpml-activation-api" tag="api"/>
<include key="dpml-activity-api" tag="api"/>
- <include key="dpml-composition-api" tag="api"/>
- <include key="dpml-composition-spi" tag="spi"/>
+ <include key="dpml-classic-api" tag="api"/>
+ <include key="dpml-classic-spi" tag="spi"/>
<include key="dpml-util-i18n"/>
<include key="dpml-util-defaults"/>
<include key="dpml-system-api"/>
@@ -852,11 +852,11 @@
</types>
</info>
<dependencies>
- <include key="dpml-composition-api" tag="api"/>
+ <include key="dpml-classic-api" tag="api"/>
<include key="avalon-framework-api" tag="api"/>
<include key="dpml-activation-api" tag="api"/>
<include key="dpml-system-api" tag="spi"/>
- <include key="dpml-composition-spi" tag="spi"/>
+ <include key="dpml-classic-spi" tag="spi"/>
<include key="dpml-util-i18n"/>
<include key="dpml-util-defaults"/>
<include key="dpml-context-impl"/>
@@ -879,7 +879,7 @@
<dependencies>
<include key="dpml-transit-main" tag="api"/>
<include key="dpml-activation-api" tag="api"/>
- <include key="dpml-composition-api" tag="api"/>
+ <include key="dpml-classic-api" tag="api"/>
<include key="dpml-parts-api" tag="api"/>
<include key="dpml-activation-metro-provider" build="false"/>
<include key="dpml-activation-avalon-provider" build="false"/>
@@ -935,7 +935,7 @@
<include key="dpml-configuration-api"/>
<include key="dpml-service-api"/>
<include key="dpml-activity-api"/>
- <include key="dpml-composition-api"/>
+ <include key="dpml-classic-api"/>
<include key="dpml-context-impl"/>
</dependencies>
<plugins>

Modified: development/main/metro/main/build.xml
==============================================================================
--- development/main/metro/main/build.xml (original)
+++ development/main/metro/main/build.xml Sat Apr 23 01:13:16 2005
@@ -10,7 +10,7 @@
<x:filter feature="plugin" key="dpml-composition-control"
token="TEST-URI"/>
<x:filter feature="plugin" key="dpml-system-impl"
token="SYSTEM-PLUGIN-URI"/>
<x:filter feature="plugin" key="dpml-composition-control"
token="FREIGHT-TRAIN-CONTROLLER-URI"/>
- <x:filter feature="plugin" key="dpml-composition-impl"
token="COMPOSITION-IMPL-ARTIFACT-URI"/>
+ <x:filter feature="plugin" key="dpml-classic-impl"
token="COMPOSITION-IMPL-ARTIFACT-URI"/>
<x:filter feature="plugin" key="dpml-activation-impl"
token="RUNTIME-IMPL-ARTIFACT-URI"/>
<x:filter feature="version" key="dpml-transit-main"
token="TRANSIT_VERSION"/>


Modified: development/main/metro/unit/build.xml
==============================================================================
--- development/main/metro/unit/build.xml (original)
+++ development/main/metro/unit/build.xml Sat Apr 23 01:13:16 2005
@@ -6,7 +6,7 @@
<transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
- <x:filter feature="plugin" key="dpml-composition-impl"
token="COMPOSITION_PLUGIN_URI"/>
+ <x:filter feature="plugin" key="dpml-classic-impl"
token="COMPOSITION_PLUGIN_URI"/>
<x:filter feature="plugin" key="dpml-system-impl"
token="SYSTEM-PLUGIN-URI"/>
</target>

---

• svn commit: r2362 - in development: central/site central/site/src/docs/magic/latest/tasks central/site/src/docs/metro/latest/composition/directives/container central/site/src/docs/metro/latest/composition/directives/container/classloader/classpath central/tutorials/metro central/tutorials/metro/main laboratory laboratory/components laboratory/components/http laboratory/spells/xdoclet/tutorial laboratory/unsorted/central/site laboratory/unsorted/central/site/src/docs/guide/quick/hello laboratory/unsorted/central/site/src/docs/products/magic/tasks laboratory/unsorted/central/site/src/docs/products/metro/composition/directives/container laboratory/unsorted/central/site/src/docs/products/metro/composition/directives/container/classloader/classpath laboratory/unsorted/composition/api laboratory/users/mcconnell/mgr laboratory/users/niclas/iso8583 laboratory/users/niclas/processing main/metro main/metro/classic/api main/metro/classic/api/src main/metro/classic/impl main/metro/classic/impl/etc main/metro/classic/impl/src main/metro/classic/spi main/metro/classic/spi/src main/metro/classic/test main/metro/composition/api main/metro/composition/impl main/metro/composition/spi main/metro/main main/metro/unit, mcconnell, 04/22/2005

---

Archive powered by MHonArc 2.6.24.