You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by mc...@apache.org on 2004/06/26 18:28:27 UTC

svn commit: rev 22151 - in incubator/directory/eve/branches/plus: . src/java/org/apache/eve/client

Author: mcconnell
Date: Sat Jun 26 09:28:27 2004
New Revision: 22151

Added:
   incubator/directory/eve/branches/plus/avalon-index.xml
   incubator/directory/eve/branches/plus/src/java/org/apache/eve/client/ClientModule.xconfig
Modified:
   incubator/directory/eve/branches/plus/build.xml
   incubator/directory/eve/branches/plus/index.xml
Log:
add an index to avalon modules, update the eve index and add a default config for the client module

Added: incubator/directory/eve/branches/plus/avalon-index.xml
==============================================================================
--- (empty file)
+++ incubator/directory/eve/branches/plus/avalon-index.xml	Sat Jun 26 09:28:27 2004
@@ -0,0 +1,906 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<system>
+
+  <!--
+  Declaration of the binary resources available through
+  the repository used by local projects.
+  -->
+
+  <resource>
+    <info>
+      <group>log4j</group>
+      <name>log4j</name>
+      <version>1.2.8</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <resource>
+    <info>
+      <group>servletapi</group>
+      <name>servletapi</name>
+      <version>2.3</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <resource>
+    <info>
+      <group>ant</group>
+      <name>ant</name>
+      <version>1.6.1</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <resource>
+    <info>
+      <group>ant</group>
+      <name>ant-nodeps</name>
+      <version>1.6.1</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <resource>
+    <info>
+      <group>ant</group>
+      <name>ant-junit</name>
+      <version>1.6.1</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <resource>
+    <info>
+      <group>qdox</group>
+      <name>qdox</name>
+      <version>1.3</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <resource>
+    <info>
+      <group>commons-cli</group>
+      <name>commons-cli</name>
+      <version>1.0</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <resource>
+    <info>
+      <group>junit</group>
+      <name>junit</name>
+      <version>3.8.1</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <resource>
+    <info>
+      <group>avalonx/supplemental</group>
+      <name>mailapi</name>
+      <version>1.3.1</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <resource>
+    <info>
+      <group>avalonx/supplemental</group>
+      <name>jms</name>
+      <version>1.1</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <!--
+  Avalon eXternal Supplemental.
+  -->
+
+  <project basedir="../supplemental">
+    <info>
+      <group>avalonx/supplemental</group>
+      <name>avalonx-supplemental</name>
+      <version>1.0</version>
+    </info>
+  </project>
+
+  <!--
+  Avalon Tools.
+  -->
+
+  <project basedir="../../tools/magic">
+    <info>
+      <group>avalon/tools</group>
+      <name>avalon-tools-magic</name>
+    </info>
+    <dependencies>
+      <include key="ant"/>
+      <include key="junit"/>
+      <include key="ant-junit"/>
+      <include key="ant-nodeps"/>
+    </dependencies>
+  </project>
+
+  <!--
+  Avalon Central.
+  -->
+
+  <project basedir="../site">
+    <info>
+      <group>avalon</group>
+      <name>site</name>
+    </info>
+    <dependencies>
+      <include key="avalon-runtime" runtime="false" build="false" test="false"/>
+      <include key="avalon-tools-magic" runtime="false" build="false" test="false"/>
+    </dependencies>
+  </project>
+
+  <!--
+  Avalon LogKit.
+  -->
+
+  <project basedir="../../runtime/logkit">
+    <info>
+      <group>avalon/logkit</group>
+      <name>avalon-logkit</name>
+      <version>2.0.0</version>
+    </info>
+    <dependencies>
+      <include key="avalonx-supplemental" build="false" test="false"/>
+      <include key="log4j" runtime="false"/>
+      <include key="servletapi" runtime="false"/>
+      <include key="mailapi" runtime="false"/>
+      <include key="jms" runtime="false"/>
+    </dependencies>
+  </project>
+
+  <!--
+  Avalon Framework.
+  -->
+
+  <project basedir="../../runtime/framework/api">
+    <info>
+      <group>avalon/framework</group>
+      <name>avalon-framework-api</name>
+      <version>4.3.0</version>
+      <status>SNAPSHOT</status> <!-- impact on derived versions ? -->
+    </info>
+  </project>
+
+  <project basedir="../../runtime/framework/legacy">
+    <info>
+      <group>avalon/framework</group>
+      <name>avalon-framework-legacy</name>
+      <version>4.3.0</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+      <include key="avalon-logkit" runtime="true" test="false"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/framework/impl">
+    <info>
+      <group>avalon/framework</group>
+      <name>avalon-framework-impl</name>
+      <version>4.3.0</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api" tag="api"/>
+      <include key="avalon-framework-legacy" />
+    </dependencies>
+  </project>
+
+  <!--
+  Avalon Utilities.
+  -->
+
+  <project basedir="../../runtime/util/configuration">
+    <info>
+      <group>avalon/util</group>
+      <name>avalon-util-configuration</name>
+      <version>1.0.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+      <include key="avalon-framework-impl"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/util/criteria">
+    <info>
+      <group>avalon/util</group>
+      <name>avalon-util-criteria</name>
+      <version>1.1.0</version>
+    </info>
+  </project>
+
+  <project basedir="../../runtime/util/defaults">
+    <info>
+      <group>avalon/util</group>
+      <name>avalon-util-defaults</name>
+      <version>1.2.1</version>
+    </info>
+    <dependencies>
+      <include key="avalon-util-env"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/util/env">
+    <info>
+      <group>avalon/util</group>
+      <name>avalon-util-env</name>
+      <version>1.1.1</version>
+    </info>
+  </project>
+
+  <project basedir="../../runtime/util/exception">
+    <info>
+      <group>avalon/util</group>
+      <name>avalon-util-exception</name>
+      <version>1.0.0</version>
+    </info>
+  </project>
+
+  <project basedir="../../runtime/util/i18n">
+    <info>
+      <group>avalon/util</group>
+      <name>avalon-util-i18n</name>
+      <version>1.0.0</version>
+    </info>
+  </project>
+
+  <project basedir="../../runtime/util/extension/api">
+    <info>
+      <group>avalon/util</group>
+      <name>avalon-util-extension-api</name>
+      <version>1.2.0</version>
+    </info>
+  </project>
+
+  <project basedir="../../runtime/util/extension/impl">
+    <info>
+      <group>avalon/util</group>
+      <name>avalon-util-extension-impl</name>
+      <version>1.2.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-util-extension-api"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/util/lifecycle">
+    <info>
+      <group>avalon/util</group>
+      <name>avalon-util-lifecycle</name>
+      <version>1.1.1</version>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+    </dependencies>
+  </project>
+
+  <!--
+  Avalon Meta.
+  -->
+
+  <project basedir="../../runtime/meta/api">
+    <info>
+      <group>avalon/meta</group>
+      <name>avalon-meta-api</name>
+      <version>1.4.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+      <include key="avalon-framework-impl" build="false" test="true" runtime="false"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/meta/spi">
+    <info>
+      <group>avalon/meta</group>
+      <name>avalon-meta-spi</name>
+      <version>1.4.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-meta-api"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/meta/impl">
+    <info>
+      <group>avalon/meta</group>
+      <name>avalon-meta-impl</name>
+      <version>1.4.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-meta-spi"/>
+      <include key="avalon-util-i18n"/>
+      <include key="avalon-util-configuration"/>
+    </dependencies>
+  </project>
+
+  <plugin basedir="../../runtime/meta/tools">
+    <info>
+      <group>avalon/meta</group>
+      <name>avalon-meta-tools</name>
+      <version>1.4.1</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-meta-impl"/>
+      <include key="qdox"/>
+    </dependencies>
+    <tasks>
+      <taskdef name="meta" class="org.apache.avalon.meta.info.ant.MetaTask"/>
+    </tasks>
+    <listeners>
+      <listener class="org.apache.avalon.meta.info.ant.MetaBuildListener"/>
+    </listeners>
+  </plugin>
+
+  <!--
+  Avalon Test.
+  -->
+
+  <project basedir="../../runtime/test/dynamics">
+    <info>
+      <group>avalon/test</group>
+      <name>avalon-test-dynamics</name>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-impl"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="../../runtime/test/playground">
+    <info>
+      <group>avalon/test</group>
+      <name>avalon-test-playground</name>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-impl"/>
+      <include key="avalon-util-lifecycle"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="../../runtime/test/testa">
+    <info>
+      <group>avalon/test</group>
+      <name>avalon-test-testa</name>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+      <include key="avalon-util-configuration"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="../../runtime/test/testb">
+    <info>
+      <group>avalon/test</group>
+      <name>avalon-test-testb</name>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="../../runtime/test/testc">
+    <info>
+      <group>avalon/test</group>ss
+      <name>avalon-test-testc</name>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="../../runtime/test/testd">
+    <info>
+      <group>avalon/test</group>
+      <name>avalon-test-testd</name>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="../../runtime/test/teste">
+    <info>
+      <group>avalon/test</group>
+      <name>avalon-test-teste</name>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="../../runtime/test/includes">
+    <info>
+      <group>avalon/test</group>
+      <name>avalon-test-includes</name>
+    </info>
+    <dependencies>
+      <include key="avalon-test-playground" build="false" runtime="false"/>
+      <include key="avalon-test-testa" build="false" runtime="false"/>
+      <include key="avalon-test-testb" build="false" runtime="false"/>
+      <include key="avalon-test-testc" build="false" runtime="false"/>
+      <include key="avalon-test-testd" build="false" runtime="false"/>
+      <include key="avalon-test-teste" build="false" runtime="false"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/test/components">
+    <info>
+      <group>avalon/test</group>
+      <name>avalon-test-components</name>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <!--
+  Avalon Repository.
+  -->
+
+  <project basedir="../../runtime/repository/api">
+    <info>
+      <group>avalon/repository</group>
+      <name>avalon-repository-api</name>
+      <version>2.1.0</version> <!-- artifact uri additions -->
+      <status>SNAPSHOT</status>
+    </info>
+  </project>
+
+  <project basedir="../../runtime/repository/spi">
+    <info>
+      <group>avalon/repository</group>
+      <name>avalon-repository-spi</name>
+      <version>2.0.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-repository-api"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/repository/util">
+    <info>
+      <group>avalon/repository</group>
+      <name>avalon-repository-util</name>
+      <version>2.0.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-repository-api"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/repository/impl">
+    <info>
+      <group>avalon/repository</group>
+      <name>avalon-repository-impl</name>
+      <version>2.1.0</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-repository-main" runtime="false"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/repository/main">
+    <info>
+      <group>avalon/repository</group>
+      <name>avalon-repository-main</name>
+      <version>2.1.0</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-repository-spi"/>
+      <include key="avalon-repository-util"/>
+      <include key="avalon-util-exception"/>
+      <include key="avalon-util-env"/>
+      <include key="avalon-util-i18n"/>
+      <include key="avalon-util-criteria"/>
+      <include key="avalon-util-defaults"/>
+    </dependencies>
+  </project>
+
+  <!-- TODO: update cli scripts to incorporate runtime classpath -->
+  <project basedir="../../runtime/repository/cli">
+    <info>
+      <group>avalon/repository</group>
+      <name>avalon-repository-cli</name>
+      <version>2.1.0</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-repository-main"/>
+      <include key="commons-cli"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/repository/test">
+    <info>
+      <group>avalon/repository</group>
+      <name>avalon-repository-test</name>
+    </info>
+    <dependencies>
+      <include key="avalon-repository-impl" test="false"/>
+      <include key="avalon-repository-main"/>
+      <include key="avalon-framework-impl" test="true"/>
+      <include key="avalon-repository-cli" build="false" test="false"/>
+    </dependencies>
+  </project>
+
+  <!--
+  Avalon Logging.
+  -->
+
+  <project basedir="../../runtime/logging/api">
+    <info>
+      <group>avalon/logging</group>
+      <name>avalon-logging-api</name>
+      <version>1.0.0</version>
+    </info>
+  </project>
+
+  <project basedir="../../runtime/logging/spi">
+    <info>
+      <group>avalon/logging</group>
+      <name>avalon-logging-spi</name>
+      <version>1.0.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-logging-api"/>
+      <include key="avalon-repository-spi"/>
+      <include key="avalon-framework-api"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/logging/impl">
+    <info>
+      <group>avalon/logging</group>
+      <name>avalon-logging-impl</name>
+      <version>1.0.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-logging-spi"/>
+      <include key="avalon-repository-main" runtime="false"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/logging/log4j">
+    <info>
+      <group>avalon/logging</group>
+      <name>avalon-logging-log4j</name>
+      <version>1.0.1</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-logging-impl" runtime="false"/>
+      <include key="log4j"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/logging/logkit/api">
+    <info>
+      <group>avalon/logging</group>
+      <name>avalon-logging-logkit-api</name>
+      <version>1.0.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-logging-spi" runtime="false"/>
+      <include key="avalon-logkit"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/logging/logkit/impl">
+    <info>
+      <group>avalon/logging</group>
+      <name>avalon-logging-logkit-impl</name>
+      <version>1.0.1</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-logging-logkit-api"/>
+      <include key="avalon-logging-impl" runtime="false"/>
+      <include key="avalon-util-configuration"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/logging/logkit/plugins/datagram">
+    <info>
+      <group>avalon/logging</group>
+      <name>avalon-logging-logkit-datagram</name>
+      <version>1.0.1</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-logging-logkit-api" runtime="false"/>
+      <include key="avalon-repository-main" runtime="false"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/logging/logkit/plugins/socket">
+    <info>
+      <group>avalon/logging</group>
+      <name>avalon-logging-logkit-socket</name>
+      <version>1.0.1</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-logging-logkit-api" runtime="false"/>
+      <include key="avalon-repository-main" runtime="false"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/logging/logkit/plugins/syslog">
+    <info>
+      <group>avalon/logging</group>
+      <name>avalon-logging-logkit-syslog</name>
+      <version>1.0.1</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-logging-logkit-api" runtime="false"/>
+      <include key="avalon-repository-main" runtime="false"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/logging/test">
+    <info>
+      <group>avalon/logging</group>
+      <name>avalon-logging-test</name>
+    </info>
+    <dependencies>
+      <include key="avalon-logging-logkit-impl" test="false"/>
+      <include key="avalon-logging-log4j" test="false"/>
+      <include key="avalon-logging-logkit-syslog" test="false"/>
+      <include key="avalon-logging-logkit-socket" test="false"/>
+      <include key="avalon-logging-logkit-datagram" test="false"/>
+      <include key="avalon-repository-main"/>
+      <include key="avalon-logging-impl"/>
+      <include key="avalon-framework-impl"/>
+      <include key="avalon-repository-test" build="false" test="false"/>
+    </dependencies>
+  </project>
+
+  <!--
+  Avalon Composition.
+  -->
+
+  <project basedir="../../runtime/composition/api">
+    <info>
+      <group>avalon/composition</group>
+      <name>avalon-composition-api</name>
+      <version>2.0.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-util-extension-api"/>
+      <include key="avalon-repository-api"/>
+      <include key="avalon-logging-api"/>
+      <include key="avalon-meta-api"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/composition/spi">
+    <info>
+      <group>avalon/composition</group>
+      <name>avalon-composition-spi</name>
+      <version>2.0.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-composition-api"/>
+      <include key="avalon-logging-spi"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/composition/impl">
+    <info>
+      <group>avalon/composition</group>
+      <name>avalon-composition-impl</name>
+      <version>2.0.1</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-composition-spi"/>
+      <include key="avalon-repository-main"/>
+      <include key="avalon-meta-impl"/>
+      <include key="avalon-util-configuration"/>
+      <include key="avalon-util-extension-impl"/>
+      <include key="avalon-util-lifecycle"/>
+      <include key="avalon-logging-impl" build="false" test="true"/>
+      <include key="avalon-test-dynamics" build="false" test="false"/>
+      <include key="avalon-test-includes" build="false" test="true"/>
+      <include key="avalon-logging-test" build="false" test="false"/>
+    </dependencies>
+  </project>
+
+  <!--
+  Avalon Activation.
+  -->
+
+  <project basedir="../../runtime/activation/api">
+    <info>
+      <group>avalon/activation</group>
+      <name>avalon-activation-api</name>
+      <version>2.0.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-composition-api"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/activation/impl">
+    <info>
+      <group>avalon/activation</group>
+      <name>avalon-activation-impl</name>
+      <version>2.0.1</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-util-lifecycle"/>
+      <include key="avalon-util-i18n"/>
+      <include key="avalon-util-defaults"/>
+      <include key="avalon-repository-spi"/>
+      <include key="avalon-composition-spi"/>
+      <include key="avalon-activation-api"/>
+      <include key="avalon-framework-impl"/>
+      <include key="avalon-composition-impl" build="false" test="true"/>
+      <include key="avalon-test-components" build="false" test="true"/>
+      <include key="avalon-test-playground" build="false" test="true"/>
+    </dependencies>
+  </project>
+
+  <!--
+  Avalon Merlin.
+  -->
+
+  <project basedir="../../runtime/merlin/api">
+    <info>
+      <group>avalon/merlin</group>
+      <name>avalon-merlin-api</name>
+      <version>3.3.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-composition-api"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/merlin/impl">
+    <info>
+      <group>avalon/merlin</group>
+      <name>avalon-merlin-impl</name>
+      <version>3.3.1</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api" tag="api"/>
+      <include key="avalon-util-lifecycle" tag="api"/>
+      <include key="avalon-util-extension-api" tag="spi"/>
+      <include key="avalon-merlin-api" tag="spi"/>
+      <include key="avalon-repository-api" tag="spi"/>
+      <include key="avalon-meta-spi" tag="spi"/>
+      <include key="avalon-repository-spi" tag="spi"/>
+      <include key="avalon-logging-spi" tag="spi"/>
+      <include key="avalon-logging-impl" tag="impl"/>
+      <include key="avalon-composition-spi" tag="spi"/>
+      <include key="avalon-composition-impl" tag="impl"/>
+      <include key="avalon-util-configuration" tag="impl"/>
+      <include key="avalon-repository-main" runtime="false"/>
+      <include key="avalon-activation-impl" build="false" test="false"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/merlin/cli">
+    <info>
+      <group>avalon/merlin</group>
+      <name>avalon-merlin-cli</name>
+      <version>3.3.1</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-merlin-impl" build="false" test="false"/>
+      <include key="avalon-repository-main"/>
+      <include key="commons-cli"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/main" key="avalon-runtime">
+    <info>
+      <group>avalon</group>
+      <name>runtime</name>
+      <version>3.3.1</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api" tag="api"/>
+      <include key="avalon-util-lifecycle" tag="api"/>
+      <include key="avalon-util-extension-api" tag="spi"/>
+      <include key="avalon-merlin-api" tag="spi"/>
+      <include key="avalon-repository-api" tag="spi"/>
+      <include key="avalon-meta-spi" tag="spi"/>
+      <include key="avalon-repository-spi" tag="spi"/>
+      <include key="avalon-logging-spi" tag="spi"/>
+      <include key="avalon-logging-impl" tag="impl"/>
+      <include key="avalon-composition-spi" tag="spi"/>
+      <include key="avalon-composition-impl" tag="impl"/>
+      <include key="avalon-util-configuration" tag="impl"/>
+      <include key="avalon-repository-main" runtime="false"/>
+      <include key="avalon-activation-impl" build="false" test="false"/>
+      <include key="avalon-merlin-api" tag="spi"/>
+      <include key="avalon-merlin-impl"/>
+      <include key="avalon-merlin-cli"/>
+      <include key="log4j" runtime="false"/>
+      <include key="servletapi"/>
+      <include key="mailapi"/>
+      <include key="jms"/>
+    </dependencies>
+  </project>
+
+  <!--
+  <project basedir="../../runtime/merlin/unit">
+    <info>
+      <group>avalon/merlin</group>
+      <name>avalon-merlin-unit</name>
+      <version>3.3.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-repository-main"/>
+      <include key="avalon-merlin-impl" build="false" test="false"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../runtime/merlin/tools">
+    <info>
+      <group>avalon/merlin</group>
+      <name>avalon-merlin-tools</name>
+      <version>3.3.0</version>
+    </info>
+    <dependencies>
+      <include key="avalon-repository-main"/>
+      <include key="avalon-merlin-impl" build="false" test="false"/>
+    </dependencies>
+  </project>
+
+  <project basedir="../../tools/bootstrap">
+    <info>
+      <group>avalon/tools</group>
+      <name>avalon-tools-bootstrap</name>
+    </info>
+  </project>
+  -->
+
+</system>

Modified: incubator/directory/eve/branches/plus/build.xml
==============================================================================
--- incubator/directory/eve/branches/plus/build.xml	(original)
+++ incubator/directory/eve/branches/plus/build.xml	Sat Jun 26 09:28:27 2004
@@ -12,7 +12,7 @@
     <antlr target="target/build/etc/antlr/schema.g" 
         outputdirectory="target/build/main/org/apache/eve/schema">
       <classpath>
-        <pathelement path="${magic.home}/main/antlr/jars/antlr-2.7.2.jar"/>
+        <pathelement path="${magic.cache}/antlr/jars/antlr-2.7.2.jar"/>
       </classpath>
     </antlr>
   </target>

Modified: incubator/directory/eve/branches/plus/index.xml
==============================================================================
--- incubator/directory/eve/branches/plus/index.xml	(original)
+++ incubator/directory/eve/branches/plus/index.xml	Sat Jun 26 09:28:27 2004
@@ -2,29 +2,8 @@
 
 <system>
 
-  <resource>
-    <info>
-      <group>avalon/framework</group>
-      <name>avalon-framework-api</name>
-      <version>4.2.1</version>
-    </info>
-  </resource>
+  <import index="avalon-index.xml"/>
 
-  <resource>
-    <info>
-      <group>avalon/framework</group>
-      <name>avalon-framework-impl</name>
-      <version>4.2.1</version>
-    </info>
-  </resource>
-
-  <resource>
-    <info>
-      <group>avalon/logkit</group>
-      <name>avalon-logkit</name>
-      <version>2.0.0</version>
-    </info>
-  </resource>
 
   <resource>
     <info>
@@ -103,14 +82,6 @@
       <group>oro</group>
       <name>oro</name>
       <version>2.0.7</version>
-    </info>
-  </resource>
-
-  <resource>
-    <info>
-      <group>avalon/meta</group>
-      <name>avalon-meta-tools</name>
-      <version>1.4.0</version>
     </info>
   </resource>
 

Added: incubator/directory/eve/branches/plus/src/java/org/apache/eve/client/ClientModule.xconfig
==============================================================================
--- (empty file)
+++ incubator/directory/eve/branches/plus/src/java/org/apache/eve/client/ClientModule.xconfig	Sat Jun 26 09:28:27 2004
@@ -0,0 +1,4 @@
+<configuration>
+  <stage name="client" poolname="clientstage"/>
+</configuration>
+