svn commit: rev 21236 - in avalon/trunk: central/site/src/xdocs/central/laboratory/magic central/system/definitions central/system/dependencies runtime runtime/activation runtime/activation/api runtime/activation/impl runtime/composition runtime/composition/api runtime/composition/impl runtime/composition/spi runtime/framework runtime/framework/api runtime/framework/impl runtime/logging runtime/logging/api runtime/logging/impl runtime/logging/log4j runtime/logging/logkit runtime/logging/logkit/api runtime/logging/logkit/impl runtime/logging/logkit/plugins runtime/logging/logkit/plugins/datagram runtime/logging/logkit/plugins/socket runtime/logging/logkit/plugins/syslog runtime/logging/spi runtime/logging/test runtime/logkit runtime/merlin runtime/merlin/api runtime/merlin/cli runtime/merlin/impl runtime/merlin/impl/etc/main runtime/merlin/impl/src/resources runtime/merlin/plugin

[email protected] 14 Jun 2004 20:40:13 -0000

Newsgroups	gmane.comp.jakarta.avalon.cvs
Message-ID	<[email protected]>

Author: niclas
Date: Mon Jun 14 13:40:10 2004
New Revision: 21236

Added:
   avalon/trunk/runtime/merlin/impl/src/resources/
      - copied from rev 21119, avalon/trunk/runtime/merlin/impl/etc/main/
   avalon/trunk/runtime/merlin/impl/src/resources/kernel.xml
      - copied unchanged from rev 21235, avalon/trunk/runtime/merlin/impl/etc/main/kernel.xml
   avalon/trunk/runtime/merlin/impl/src/resources/merlin.properties
      - copied unchanged from rev 21235, avalon/trunk/runtime/merlin/impl/etc/main/merlin.properties
Removed:
   avalon/trunk/central/site/src/xdocs/central/laboratory/magic/
   avalon/trunk/central/system/definitions/
   avalon/trunk/central/system/dependencies/
   avalon/trunk/runtime/activation/api/magic.properties
   avalon/trunk/runtime/activation/api/magic.sequence
   avalon/trunk/runtime/activation/impl/magic.properties
   avalon/trunk/runtime/activation/impl/magic.sequence
   avalon/trunk/runtime/activation/magic.properties
   avalon/trunk/runtime/activation/magic.sequence
   avalon/trunk/runtime/composition/api/magic.properties
   avalon/trunk/runtime/composition/api/magic.sequence
   avalon/trunk/runtime/composition/impl/magic.properties
   avalon/trunk/runtime/composition/impl/magic.sequence
   avalon/trunk/runtime/composition/magic.properties
   avalon/trunk/runtime/composition/magic.sequence
   avalon/trunk/runtime/composition/spi/magic.properties
   avalon/trunk/runtime/composition/spi/magic.sequence
   avalon/trunk/runtime/framework/api/magic.properties
   avalon/trunk/runtime/framework/api/magic.sequence
   avalon/trunk/runtime/framework/impl/magic.properties
   avalon/trunk/runtime/framework/impl/magic.sequence
   avalon/trunk/runtime/framework/magic.properties
   avalon/trunk/runtime/framework/magic.sequence
   avalon/trunk/runtime/logging/api/magic.properties
   avalon/trunk/runtime/logging/api/magic.sequence
   avalon/trunk/runtime/logging/impl/magic.properties
   avalon/trunk/runtime/logging/impl/magic.sequence
   avalon/trunk/runtime/logging/log4j/magic.properties
   avalon/trunk/runtime/logging/log4j/magic.sequence
   avalon/trunk/runtime/logging/logkit/api/magic.properties
   avalon/trunk/runtime/logging/logkit/api/magic.sequence
   avalon/trunk/runtime/logging/logkit/impl/magic.properties
   avalon/trunk/runtime/logging/logkit/impl/magic.sequence
   avalon/trunk/runtime/logging/logkit/magic.properties
   avalon/trunk/runtime/logging/logkit/magic.sequence
   avalon/trunk/runtime/logging/logkit/plugins/datagram/magic.properties
   avalon/trunk/runtime/logging/logkit/plugins/datagram/magic.sequence
   avalon/trunk/runtime/logging/logkit/plugins/magic.properties
   avalon/trunk/runtime/logging/logkit/plugins/magic.sequence
   avalon/trunk/runtime/logging/logkit/plugins/socket/magic.properties
   avalon/trunk/runtime/logging/logkit/plugins/socket/magic.sequence
   avalon/trunk/runtime/logging/logkit/plugins/syslog/magic.properties
   avalon/trunk/runtime/logging/logkit/plugins/syslog/magic.sequence
   avalon/trunk/runtime/logging/magic.properties
   avalon/trunk/runtime/logging/magic.sequence
   avalon/trunk/runtime/logging/spi/magic.properties
   avalon/trunk/runtime/logging/spi/magic.sequence
   avalon/trunk/runtime/logging/test/magic.properties
   avalon/trunk/runtime/logging/test/magic.sequence
   avalon/trunk/runtime/logkit/magic.properties
   avalon/trunk/runtime/logkit/magic.sequence
   avalon/trunk/runtime/magic.properties
   avalon/trunk/runtime/magic.sequence
   avalon/trunk/runtime/merlin/api/magic.properties
   avalon/trunk/runtime/merlin/api/magic.sequence
   avalon/trunk/runtime/merlin/cli/magic.properties
   avalon/trunk/runtime/merlin/cli/magic.sequence
   avalon/trunk/runtime/merlin/impl/etc/main/
   avalon/trunk/runtime/merlin/impl/magic.properties
   avalon/trunk/runtime/merlin/impl/magic.sequence
   avalon/trunk/runtime/merlin/magic.properties
   avalon/trunk/runtime/merlin/magic.sequence
   avalon/trunk/runtime/merlin/plugin/magic.properties
   avalon/trunk/runtime/merlin/plugin/magic.sequence
   avalon/trunk/runtime/merlin/servlet/magic.properties
   avalon/trunk/runtime/merlin/servlet/magic.sequence
   avalon/trunk/runtime/merlin/unit/magic.properties
   avalon/trunk/runtime/merlin/unit/magic.sequence
   avalon/trunk/runtime/meta/api/magic.properties
   avalon/trunk/runtime/meta/api/magic.sequence
   avalon/trunk/runtime/meta/impl/magic.properties
   avalon/trunk/runtime/meta/impl/magic.sequence
   avalon/trunk/runtime/meta/magic.properties
   avalon/trunk/runtime/meta/magic.sequence
   avalon/trunk/runtime/meta/magic/magic.properties
   avalon/trunk/runtime/meta/magic/src/dist/magic.bsh
   avalon/trunk/runtime/meta/magic/src/dist/magic.properties
   avalon/trunk/runtime/meta/plugin/magic.properties
   avalon/trunk/runtime/meta/plugin/magic.sequence
   avalon/trunk/runtime/meta/spi/magic.properties
   avalon/trunk/runtime/meta/spi/magic.sequence
   avalon/trunk/runtime/meta/tools/magic.properties
   avalon/trunk/runtime/meta/tools/magic.sequence
   avalon/trunk/runtime/repository/api/magic.properties
   avalon/trunk/runtime/repository/api/magic.sequence
   avalon/trunk/runtime/repository/cli/magic.properties
   avalon/trunk/runtime/repository/cli/magic.sequence
   avalon/trunk/runtime/repository/impl/magic.properties
   avalon/trunk/runtime/repository/impl/magic.sequence
   avalon/trunk/runtime/repository/magic.properties
   avalon/trunk/runtime/repository/magic.sequence
   avalon/trunk/runtime/repository/main/magic.properties
   avalon/trunk/runtime/repository/main/magic.sequence
   avalon/trunk/runtime/repository/spi/magic.properties
   avalon/trunk/runtime/repository/spi/magic.sequence
   avalon/trunk/runtime/repository/test/magic.properties
   avalon/trunk/runtime/repository/test/magic.sequence
   avalon/trunk/runtime/repository/util/magic.properties
   avalon/trunk/runtime/repository/util/magic.sequence
   avalon/trunk/runtime/util/configuration/magic.properties
   avalon/trunk/runtime/util/configuration/magic.sequence
   avalon/trunk/runtime/util/criteria/magic.properties
   avalon/trunk/runtime/util/criteria/magic.sequence
   avalon/trunk/runtime/util/defaults/magic.properties
   avalon/trunk/runtime/util/defaults/magic.sequence
   avalon/trunk/runtime/util/env/magic.properties
   avalon/trunk/runtime/util/env/magic.sequence
   avalon/trunk/runtime/util/exception/magic.properties
   avalon/trunk/runtime/util/exception/magic.sequence
   avalon/trunk/runtime/util/extension/api/magic.properties
   avalon/trunk/runtime/util/extension/api/magic.sequence
   avalon/trunk/runtime/util/extension/impl/magic.properties
   avalon/trunk/runtime/util/extension/impl/magic.sequence
   avalon/trunk/runtime/util/extension/magic.properties
   avalon/trunk/runtime/util/extension/magic.sequence
   avalon/trunk/runtime/util/i18n/magic.properties
   avalon/trunk/runtime/util/i18n/magic.sequence
   avalon/trunk/runtime/util/magic.properties
   avalon/trunk/runtime/util/magic.sequence
   avalon/trunk/tools/magic/
Log:
Killing the Magic Butterfly, as I believe Stephen's effort is more long-term sound.