svn commit: rev 20838 - in avalon/trunk: 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/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/plugin runtime/merlin/servlet runtime/merlin/unit runtime/meta runtime/meta/api runtime/meta/impl runtime/meta/plugin runtime/meta/spi runtime/meta/tools runtime/repository runtime/repository/api runtime/repository/cli runtime/repository/impl runtime/repository/main runtime/repository/spi runtime/repository/test runtime/repository/util runtime/util runtime/util/criteria runtime/util/defaults runtime/util/env runtime/util/exception runtime/util/extension runtime/util/extension/api runtime/util/extension/impl runtime/util/i18n

[niclas]

Author: niclas
Date: Sat Jun  5 11:18:50 2004
New Revision: 20838

Added:
   avalon/trunk/central/system/definitions/avalon-logging-api
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-api
   avalon/trunk/central/system/definitions/avalon-logging-impl
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-impl
   avalon/trunk/central/system/definitions/avalon-logging-log4j
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-log4j
   avalon/trunk/central/system/definitions/avalon-logging-logkit-api
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-logkit-api
   avalon/trunk/central/system/definitions/avalon-logging-logkit-datagram
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-logkit-datagram
   avalon/trunk/central/system/definitions/avalon-logging-logkit-impl
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-logkit-impl
   avalon/trunk/central/system/definitions/avalon-logging-logkit-socket
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-logkit-socket
   avalon/trunk/central/system/definitions/avalon-logging-logkit-syslog
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-logkit-syslog
   avalon/trunk/central/system/definitions/avalon-logging-spi
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-spi
   avalon/trunk/central/system/definitions/avalon-logging-test
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-test
   avalon/trunk/central/system/definitions/avalon-meta-api
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-meta-api
   avalon/trunk/central/system/definitions/avalon-meta-impl
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-meta-impl
   avalon/trunk/central/system/definitions/avalon-meta-plugin
   avalon/trunk/central/system/definitions/avalon-meta-spi
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-meta-spi
   avalon/trunk/central/system/definitions/avalon-meta-tools
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-meta-tools
   avalon/trunk/central/system/definitions/avalon-repository-api
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-repository-api
   avalon/trunk/central/system/definitions/avalon-repository-cli
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-repository-cli
   avalon/trunk/central/system/definitions/avalon-repository-impl
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-repository-impl
   avalon/trunk/central/system/definitions/avalon-repository-main
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-repository-main
   avalon/trunk/central/system/definitions/avalon-repository-spi
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-repository-spi
   avalon/trunk/central/system/definitions/avalon-repository-test
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-repository-test
   avalon/trunk/central/system/definitions/avalon-repository-util
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-repository-util
   avalon/trunk/central/system/definitions/avalon-util-configuration
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-util-configuration
   avalon/trunk/central/system/definitions/avalon-util-criteria
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-util-criteria
   avalon/trunk/central/system/definitions/avalon-util-defaults
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-util-defaults
   avalon/trunk/central/system/definitions/avalon-util-env
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-util-env
   avalon/trunk/central/system/definitions/avalon-util-exception
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-util-exception
   avalon/trunk/central/system/definitions/avalon-util-extension-api
   avalon/trunk/central/system/definitions/avalon-util-extension-impl
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-util-extension-impl
   avalon/trunk/central/system/definitions/avalon-util-i18n
      - copied, changed from rev 20832, 
avalon/trunk/central/system/definitions/merlin-util-i18n
   avalon/trunk/central/system/definitions/jms
   avalon/trunk/central/system/definitions/mailapi
   avalon/trunk/central/system/definitions/merlin-plugin
   avalon/trunk/central/system/dependencies/avalon-framework-impl
   avalon/trunk/central/system/dependencies/avalon-logging-impl
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-impl
   avalon/trunk/central/system/dependencies/avalon-logging-log4j
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-log4j
   avalon/trunk/central/system/dependencies/avalon-logging-logkit-api
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-logkit-api
   avalon/trunk/central/system/dependencies/avalon-logging-logkit-datagram
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-logkit-datagram
   avalon/trunk/central/system/dependencies/avalon-logging-logkit-impl
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-logkit-impl
   avalon/trunk/central/system/dependencies/avalon-logging-logkit-socket
      - copied, changed from rev 20834, 
avalon/trunk/central/system/dependencies/avalon--logging-logkit-socket
   avalon/trunk/central/system/dependencies/avalon-logging-logkit-syslog
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-logkit-syslog
   avalon/trunk/central/system/dependencies/avalon-logging-spi
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-spi
   avalon/trunk/central/system/dependencies/avalon-logging-test
      - copied unchanged from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-test
   avalon/trunk/central/system/dependencies/avalon-logkit
   avalon/trunk/central/system/dependencies/avalon-meta-api
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-meta-api
   avalon/trunk/central/system/dependencies/avalon-meta-impl
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-meta-impl
   avalon/trunk/central/system/dependencies/avalon-meta-spi
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-meta-spi
   avalon/trunk/central/system/dependencies/avalon-meta-tools
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-meta-tools
   avalon/trunk/central/system/dependencies/avalon-repository-cli
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-repository-cli
   avalon/trunk/central/system/dependencies/avalon-repository-impl
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-repository-impl
   avalon/trunk/central/system/dependencies/avalon-repository-main
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-repository-main
   avalon/trunk/central/system/dependencies/avalon-repository-spi
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-repository-spi
   avalon/trunk/central/system/dependencies/avalon-repository-test
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-repository-test
   avalon/trunk/central/system/dependencies/avalon-repository-util
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-repository-util
   avalon/trunk/central/system/dependencies/avalon-util-configuration
      - copied unchanged from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-util-configuration
   avalon/trunk/central/system/dependencies/avalon-util-defaults
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-util-defaults
   avalon/trunk/central/system/dependencies/avalon-util-extension-impl
      - copied, changed from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-util-extension-impl
   avalon/trunk/central/system/dependencies/merlin-plugin
   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/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/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/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/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
Removed:
   avalon/trunk/central/system/definitions/merlin-logging-api
   avalon/trunk/central/system/definitions/merlin-logging-impl
   avalon/trunk/central/system/definitions/merlin-logging-log4j
   avalon/trunk/central/system/definitions/merlin-logging-logkit-api
   avalon/trunk/central/system/definitions/merlin-logging-logkit-datagram
   avalon/trunk/central/system/definitions/merlin-logging-logkit-impl
   avalon/trunk/central/system/definitions/merlin-logging-logkit-socket
   avalon/trunk/central/system/definitions/merlin-logging-logkit-syslog
   avalon/trunk/central/system/definitions/merlin-logging-site
   avalon/trunk/central/system/definitions/merlin-logging-spi
   avalon/trunk/central/system/definitions/merlin-logging-test
   avalon/trunk/central/system/definitions/merlin-meta-api
   avalon/trunk/central/system/definitions/merlin-meta-impl
   avalon/trunk/central/system/definitions/merlin-meta-site
   avalon/trunk/central/system/definitions/merlin-meta-spi
   avalon/trunk/central/system/definitions/merlin-meta-tools
   avalon/trunk/central/system/definitions/merlin-repository-api
   avalon/trunk/central/system/definitions/merlin-repository-cli
   avalon/trunk/central/system/definitions/merlin-repository-impl
   avalon/trunk/central/system/definitions/merlin-repository-main
   avalon/trunk/central/system/definitions/merlin-repository-site
   avalon/trunk/central/system/definitions/merlin-repository-spi
   avalon/trunk/central/system/definitions/merlin-repository-test
   avalon/trunk/central/system/definitions/merlin-repository-util
   avalon/trunk/central/system/definitions/merlin-site
   avalon/trunk/central/system/definitions/merlin-util-configuration
   avalon/trunk/central/system/definitions/merlin-util-criteria
   avalon/trunk/central/system/definitions/merlin-util-defaults
   avalon/trunk/central/system/definitions/merlin-util-env
   avalon/trunk/central/system/definitions/merlin-util-exception
   avalon/trunk/central/system/definitions/merlin-util-extension-api
   avalon/trunk/central/system/definitions/merlin-util-extension-impl
   avalon/trunk/central/system/definitions/merlin-util-i18n
   avalon/trunk/central/system/definitions/merlin-util-site
   avalon/trunk/central/system/dependencies/avalon--logging-logkit-socket
   avalon/trunk/central/system/dependencies/merlin-logging-impl
   avalon/trunk/central/system/dependencies/merlin-logging-log4j
   avalon/trunk/central/system/dependencies/merlin-logging-logkit-api
   avalon/trunk/central/system/dependencies/merlin-logging-logkit-datagram
   avalon/trunk/central/system/dependencies/merlin-logging-logkit-impl
   avalon/trunk/central/system/dependencies/merlin-logging-logkit-socket
   avalon/trunk/central/system/dependencies/merlin-logging-logkit-syslog
   avalon/trunk/central/system/dependencies/merlin-logging-spi
   avalon/trunk/central/system/dependencies/merlin-logging-test
   avalon/trunk/central/system/dependencies/merlin-meta-api
   avalon/trunk/central/system/dependencies/merlin-meta-impl
   avalon/trunk/central/system/dependencies/merlin-meta-spi
   avalon/trunk/central/system/dependencies/merlin-meta-tools
   avalon/trunk/central/system/dependencies/merlin-repository-cli
   avalon/trunk/central/system/dependencies/merlin-repository-impl
   avalon/trunk/central/system/dependencies/merlin-repository-main
   avalon/trunk/central/system/dependencies/merlin-repository-spi
   avalon/trunk/central/system/dependencies/merlin-repository-test
   avalon/trunk/central/system/dependencies/merlin-repository-util
   avalon/trunk/central/system/dependencies/merlin-util-configuration
   avalon/trunk/central/system/dependencies/merlin-util-defaults
   avalon/trunk/central/system/dependencies/merlin-util-extension-impl
Modified:
   avalon/trunk/central/system/definitions/avalon-framework-impl
   avalon/trunk/central/system/definitions/avalon-logkit
   avalon/trunk/central/system/dependencies/merlin-activation-impl
   avalon/trunk/central/system/dependencies/merlin-api
   avalon/trunk/central/system/dependencies/merlin-cli
   avalon/trunk/central/system/dependencies/merlin-composition-api
   avalon/trunk/central/system/dependencies/merlin-composition-impl
   avalon/trunk/central/system/dependencies/merlin-composition-spi
   avalon/trunk/central/system/dependencies/merlin-impl
   avalon/trunk/central/system/dependencies/merlin-servlet
   avalon/trunk/central/system/dependencies/merlin-unit
Log:
Cast the Spell on the entire Avalon codebase.

Modified: avalon/trunk/central/system/definitions/avalon-framework-impl
==============================================================================
--- avalon/trunk/central/system/definitions/avalon-framework-impl       
(original)
+++ avalon/trunk/central/system/definitions/avalon-framework-impl       Sat Jun 
 5 11:18:50 2004
@@ -1,4 +1,4 @@
 
 artifact.group=avalon-framework
-artifact.version=4.1.5
+artifact.version=4.3.dev-0
 artifact.type=jar

Copied: avalon/trunk/central/system/definitions/avalon-logging-api (from rev 
20832, avalon/trunk/central/system/definitions/merlin-logging-api)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-logging-api  (original)
+++ avalon/trunk/central/system/definitions/avalon-logging-api  Sat Jun  5 
11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-logging
-artifact.version=1.0.dev-0
+artifact.group=avalon/logging
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-logging-impl (from rev 
20832, avalon/trunk/central/system/definitions/merlin-logging-impl)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-logging-impl (original)
+++ avalon/trunk/central/system/definitions/avalon-logging-impl Sat Jun  5 
11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-logging
-artifact.version=1.0.dev-0
+artifact.group=avalon/logging
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-logging-log4j (from rev 
20832, avalon/trunk/central/system/definitions/merlin-logging-log4j)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-logging-log4j        
(original)
+++ avalon/trunk/central/system/definitions/avalon-logging-log4j        Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-logging
-artifact.version=1.0.dev-0
+artifact.group=avalon/logging
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-logging-logkit-api (from 
rev 20832, avalon/trunk/central/system/definitions/merlin-logging-logkit-api)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-logging-logkit-api   
(original)
+++ avalon/trunk/central/system/definitions/avalon-logging-logkit-api   Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-logging
-artifact.version=1.0.dev-0
+artifact.group=avalon/logging
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-logging-logkit-datagram 
(from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-logkit-datagram)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-logging-logkit-datagram      
(original)
+++ avalon/trunk/central/system/definitions/avalon-logging-logkit-datagram      
Sat Jun  5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-logging
-artifact.version=1.0.dev-0
+artifact.group=avalon/logging
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-logging-logkit-impl 
(from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-logkit-impl)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-logging-logkit-impl  
(original)
+++ avalon/trunk/central/system/definitions/avalon-logging-logkit-impl  Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-logging
-artifact.version=1.0.dev-0
+artifact.group=avalon/logging
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-logging-logkit-socket 
(from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-logkit-socket)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-logging-logkit-socket        
(original)
+++ avalon/trunk/central/system/definitions/avalon-logging-logkit-socket        
Sat Jun  5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-logging
-artifact.version=1.0.dev-0
+artifact.group=avalon/logging
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-logging-logkit-syslog 
(from rev 20832, 
avalon/trunk/central/system/definitions/merlin-logging-logkit-syslog)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-logging-logkit-syslog        
(original)
+++ avalon/trunk/central/system/definitions/avalon-logging-logkit-syslog        
Sat Jun  5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-logging
-artifact.version=1.0.dev-0
+artifact.group=avalon/logging
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-logging-spi (from rev 
20832, avalon/trunk/central/system/definitions/merlin-logging-spi)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-logging-spi  (original)
+++ avalon/trunk/central/system/definitions/avalon-logging-spi  Sat Jun  5 
11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-logging
-artifact.version=1.0.dev-0
+artifact.group=avalon-logging
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-logging-test (from rev 
20832, avalon/trunk/central/system/definitions/merlin-logging-test)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-logging-test (original)
+++ avalon/trunk/central/system/definitions/avalon-logging-test Sat Jun  5 
11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-logging
-artifact.version=1.0.dev-0
+artifact.group=avalon/logging
+artifact.version=1.1.dev-0

Modified: avalon/trunk/central/system/definitions/avalon-logkit
==============================================================================
--- avalon/trunk/central/system/definitions/avalon-logkit       (original)
+++ avalon/trunk/central/system/definitions/avalon-logkit       Sat Jun  5 
11:18:50 2004
@@ -1,2 +1,4 @@
 
 artifact.version=2.0
+artifact.group=avalon-logkit
+artifact.type=jar
\ No newline at end of file

Copied: avalon/trunk/central/system/definitions/avalon-meta-api (from rev 
20832, avalon/trunk/central/system/definitions/merlin-meta-api)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-meta-api     (original)
+++ avalon/trunk/central/system/definitions/avalon-meta-api     Sat Jun  5 
11:18:50 2004
@@ -1,4 +1,4 @@
 
-artifact.group=merlin-meta
-artifact.version=1.5.dev-0
+artifact.group=avalon/meta
+artifact.version=1.6.dev-0
 

Copied: avalon/trunk/central/system/definitions/avalon-meta-impl (from rev 
20832, avalon/trunk/central/system/definitions/merlin-meta-impl)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-meta-impl    (original)
+++ avalon/trunk/central/system/definitions/avalon-meta-impl    Sat Jun  5 
11:18:50 2004
@@ -1,4 +1,4 @@
 
-artifact.group=merlin-meta
-artifact.version=1.5.dev-0
+artifact.group=avalon/meta
+artifact.version=1.6.dev-0
 

Added: avalon/trunk/central/system/definitions/avalon-meta-plugin
==============================================================================
--- (empty file)
+++ avalon/trunk/central/system/definitions/avalon-meta-plugin  Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,3 @@
+
+artifact.group=avalon/meta
+artifact.version=1.6.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-meta-spi (from rev 
20832, avalon/trunk/central/system/definitions/merlin-meta-spi)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-meta-spi     (original)
+++ avalon/trunk/central/system/definitions/avalon-meta-spi     Sat Jun  5 
11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-meta
-artifact.version=1.5.dev-0
+artifact.group=avalon/meta
+artifact.version=1.6.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-meta-tools (from rev 
20832, avalon/trunk/central/system/definitions/merlin-meta-tools)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-meta-tools   (original)
+++ avalon/trunk/central/system/definitions/avalon-meta-tools   Sat Jun  5 
11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-meta
-artifact.version=1.5.dev-0
+artifact.group=avalon/meta
+artifact.version=1.6.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-repository-api (from rev 
20832, avalon/trunk/central/system/definitions/merlin-repository-api)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-repository-api       
(original)
+++ avalon/trunk/central/system/definitions/avalon-repository-api       Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-repository
-artifact.version=1.0.dev-0
+artifact.group=avalon/repository
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-repository-cli (from rev 
20832, avalon/trunk/central/system/definitions/merlin-repository-cli)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-repository-cli       
(original)
+++ avalon/trunk/central/system/definitions/avalon-repository-cli       Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-repository
-artifact.version=1.0.dev-0
+artifact.group=avalon/repository
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-repository-impl (from 
rev 20832, avalon/trunk/central/system/definitions/merlin-repository-impl)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-repository-impl      
(original)
+++ avalon/trunk/central/system/definitions/avalon-repository-impl      Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-repository
-artifact.version=1.0.dev-0
+artifact.group=avalon/repository
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-repository-main (from 
rev 20832, avalon/trunk/central/system/definitions/merlin-repository-main)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-repository-main      
(original)
+++ avalon/trunk/central/system/definitions/avalon-repository-main      Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-repository
-artifact.version=1.0.dev-0
+artifact.group=avalon/repository
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-repository-spi (from rev 
20832, avalon/trunk/central/system/definitions/merlin-repository-spi)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-repository-spi       
(original)
+++ avalon/trunk/central/system/definitions/avalon-repository-spi       Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-repository
-artifact.version=1.0.dev-0
+artifact.group=avalon/repository
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-repository-test (from 
rev 20832, avalon/trunk/central/system/definitions/merlin-repository-test)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-repository-test      
(original)
+++ avalon/trunk/central/system/definitions/avalon-repository-test      Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-repository
-artifact.version=1.0.dev-0
+artifact.group=avalon/repository
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-repository-util (from 
rev 20832, avalon/trunk/central/system/definitions/merlin-repository-util)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-repository-util      
(original)
+++ avalon/trunk/central/system/definitions/avalon-repository-util      Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-repository
-artifact.version=1.0.dev-0
+artifact.group=avalon/repository
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-util-configuration (from 
rev 20832, avalon/trunk/central/system/definitions/merlin-util-configuration)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-util-configuration   
(original)
+++ avalon/trunk/central/system/definitions/avalon-util-configuration   Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-util
-artifact.version=1.0.dev-0
+artifact.group=avalon/util
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-util-criteria (from rev 
20832, avalon/trunk/central/system/definitions/merlin-util-criteria)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-util-criteria        
(original)
+++ avalon/trunk/central/system/definitions/avalon-util-criteria        Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-util
-artifact.version=1.0.dev-0
+artifact.group=avalon/util
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-util-defaults (from rev 
20832, avalon/trunk/central/system/definitions/merlin-util-defaults)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-util-defaults        
(original)
+++ avalon/trunk/central/system/definitions/avalon-util-defaults        Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-util
-artifact.version=1.0.dev-0
+artifact.group=avalon/util
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-util-env (from rev 
20832, avalon/trunk/central/system/definitions/merlin-util-env)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-util-env     (original)
+++ avalon/trunk/central/system/definitions/avalon-util-env     Sat Jun  5 
11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-util
-artifact.version=1.0.dev-0
+artifact.group=avalon/util
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-util-exception (from rev 
20832, avalon/trunk/central/system/definitions/merlin-util-exception)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-util-exception       
(original)
+++ avalon/trunk/central/system/definitions/avalon-util-exception       Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-util
-artifact.version=1.0.dev-0
+artifact.group=avalon/util
+artifact.version=1.1.dev-0

Added: avalon/trunk/central/system/definitions/avalon-util-extension-api
==============================================================================
--- (empty file)
+++ avalon/trunk/central/system/definitions/avalon-util-extension-api   Sat Jun 
 5 11:18:50 2004
@@ -0,0 +1,3 @@
+
+artifact.group=avalon/util
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-util-extension-impl 
(from rev 20832, 
avalon/trunk/central/system/definitions/merlin-util-extension-impl)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-util-extension-impl  
(original)
+++ avalon/trunk/central/system/definitions/avalon-util-extension-impl  Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-util
-artifact.version=1.0.dev-0
+artifact.group=avalon/util
+artifact.version=1.1.dev-0

Copied: avalon/trunk/central/system/definitions/avalon-util-i18n (from rev 
20832, avalon/trunk/central/system/definitions/merlin-util-i18n)
==============================================================================
--- avalon/trunk/central/system/definitions/merlin-util-i18n    (original)
+++ avalon/trunk/central/system/definitions/avalon-util-i18n    Sat Jun  5 
11:18:50 2004
@@ -1,3 +1,3 @@
 
-artifact.group=merlin-util
-artifact.version=1.0.dev-0
+artifact.group=avalon/util
+artifact.version=1.1.dev-0

Added: avalon/trunk/central/system/definitions/jms
==============================================================================
--- (empty file)
+++ avalon/trunk/central/system/definitions/jms Sat Jun  5 11:18:50 2004
@@ -0,0 +1,5 @@
+
+artifact.version=1.1
+artifact.group=jms
+artifact.type=jar
+ 
\ No newline at end of file

Added: avalon/trunk/central/system/definitions/mailapi
==============================================================================
--- (empty file)
+++ avalon/trunk/central/system/definitions/mailapi     Sat Jun  5 11:18:50 2004
@@ -0,0 +1,5 @@
+
+artifact.version=1.3.1
+artifact.group=javamail
+artifact.type=jar
+

Added: avalon/trunk/central/system/definitions/merlin-plugin
==============================================================================
--- (empty file)
+++ avalon/trunk/central/system/definitions/merlin-plugin       Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,5 @@
+
+artifact.group=merlin
+artifact.version=4.0.dev-0
+
+ 

Added: avalon/trunk/central/system/dependencies/avalon-framework-impl
==============================================================================
--- (empty file)
+++ avalon/trunk/central/system/dependencies/avalon-framework-impl      Sat Jun 
 5 11:18:50 2004
@@ -0,0 +1,4 @@
+ 
+avalon-logkit
+avalon-framework-api
+log4j

Copied: avalon/trunk/central/system/dependencies/avalon-logging-impl (from rev 
20832, avalon/trunk/central/system/dependencies/merlin-logging-impl)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-logging-impl        
(original)
+++ avalon/trunk/central/system/dependencies/avalon-logging-impl        Sat Jun 
 5 11:18:50 2004
@@ -1,9 +1,9 @@
 avalon-framework-api
-merlin-repository-api
-merlin-repository-spi
-merlin-logging-api
-merlin-logging-spi
-merlin-util-criteria
-merlin-util-defaults
-merlin-util-i18n
-merlin-util-configuration
+avalon-repository-api
+avalon-repository-spi
+avalon-logging-api
+avalon-logging-spi
+avalon-util-criteria
+avalon-util-defaults
+avalon-util-i18n
+excalibur-configuration

Copied: avalon/trunk/central/system/dependencies/avalon-logging-log4j (from rev 
20832, avalon/trunk/central/system/dependencies/merlin-logging-log4j)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-logging-log4j       
(original)
+++ avalon/trunk/central/system/dependencies/avalon-logging-log4j       Sat Jun 
 5 11:18:50 2004
@@ -1,10 +1,10 @@
 avalon-framework-api
 avalon-framework-impl
-merlin-repository-spi
-merlin-logging-api
-merlin-logging-spi
-merlin-logging-impl
-merlin-util-criteria
-merlin-util-i18n
-merlin-util-configuration
+avalon-repository-spi
+avalon-logging-api
+avalon-logging-spi
+avalon-logging-impl
+avalon-util-criteria
+avalon-util-i18n
+excalibur-configuration
 log4j

Copied: avalon/trunk/central/system/dependencies/avalon-logging-logkit-api 
(from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-logkit-api)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-logging-logkit-api  
(original)
+++ avalon/trunk/central/system/dependencies/avalon-logging-logkit-api  Sat Jun 
 5 11:18:50 2004
@@ -1,7 +1,7 @@
 avalon-framework-api
 avalon-logkit
-merlin-logging-api
-merlin-logging-spi
-merlin-repository-api
-merlin-repository-spi
+avalon-logging-api
+avalon-logging-spi
+avalon-repository-api
+avalon-repository-spi
 

Copied: avalon/trunk/central/system/dependencies/avalon-logging-logkit-datagram 
(from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-logkit-datagram)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-logging-logkit-datagram     
(original)
+++ avalon/trunk/central/system/dependencies/avalon-logging-logkit-datagram     
Sat Jun  5 11:18:50 2004
@@ -1,7 +1,7 @@
 avalon-framework-api
 avalon-logkit
-merlin-repository-main
-merlin-logging-api
-merlin-logging-spi
-merlin-logging-logkit-api
-merlin-util-i18n
+avalon-repository-main
+avalon-logging-api
+avalon-logging-spi
+avalon-logging-logkit-api
+avalon-util-i18n

Copied: avalon/trunk/central/system/dependencies/avalon-logging-logkit-impl 
(from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-logkit-impl)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-logging-logkit-impl 
(original)
+++ avalon/trunk/central/system/dependencies/avalon-logging-logkit-impl Sat Jun 
 5 11:18:50 2004
@@ -1,13 +1,13 @@
 avalon-framework-api
 avalon-framework-impl
 avalon-logkit
-merlin-repository-api
-merlin-repository-spi
-merlin-logging-api
-merlin-logging-spi
-merlin-logging-impl
-merlin-logging-logkit-api
-merlin-util-exception
-merlin-util-criteria
-merlin-util-i18n
-merlin-util-configuration
+avalon-repository-api
+avalon-repository-spi
+avalon-logging-api
+avalon-logging-spi
+avalon-logging-impl
+avalon-logging-logkit-api
+avalon-util-exception
+avalon-util-criteria
+avalon-util-i18n
+excalibur-configuration

Copied: avalon/trunk/central/system/dependencies/avalon-logging-logkit-socket 
(from rev 20834, 
avalon/trunk/central/system/dependencies/avalon--logging-logkit-socket)
==============================================================================
--- avalon/trunk/central/system/dependencies/avalon--logging-logkit-socket      
(original)
+++ avalon/trunk/central/system/dependencies/avalon-logging-logkit-socket       
Sat Jun  5 11:18:50 2004
@@ -1,7 +1,7 @@
 avalon-framework-api
 avalon-logkit
-merlin-repository-main
-merlin-logging-api
-merlin-logging-spi
-merlin-logging-logkit-api
-merlin-util-i18n
+avalon-repository-main
+avalon-logging-api
+avalon-logging-spi
+avalon-logging-logkit-api
+avalon-util-i18n

Copied: avalon/trunk/central/system/dependencies/avalon-logging-logkit-syslog 
(from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-logging-logkit-syslog)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-logging-logkit-syslog       
(original)
+++ avalon/trunk/central/system/dependencies/avalon-logging-logkit-syslog       
Sat Jun  5 11:18:50 2004
@@ -1,7 +1,7 @@
 avalon-framework-api
 avalon-logkit
-merlin-repository-main
-merlin-logging-api
-merlin-logging-spi
-merlin-logging-logkit-api
-merlin-util-i18n
+avalon-repository-main
+avalon-logging-api
+avalon-logging-spi
+avalon-logging-logkit-api
+avalon-util-i18n

Copied: avalon/trunk/central/system/dependencies/avalon-logging-spi (from rev 
20832, avalon/trunk/central/system/dependencies/merlin-logging-spi)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-logging-spi (original)
+++ avalon/trunk/central/system/dependencies/avalon-logging-spi Sat Jun  5 
11:18:50 2004
@@ -1,9 +1,9 @@
 avalon-framework-api
-merlin-repository-api
-merlin-repository-spi
-merlin-logging-api
-merlin-util-criteria
-merlin-util-defaults
-merlin-util-i18n
-merlin-util-configuration
+avalon-repository-api
+avalon-repository-spi
+avalon-logging-api
+avalon-util-criteria
+avalon-util-defaults
+avalon-util-i18n
+excalibur-configuration
  

Added: avalon/trunk/central/system/dependencies/avalon-logkit
==============================================================================
--- (empty file)
+++ avalon/trunk/central/system/dependencies/avalon-logkit      Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+mailapi
+jms
+servletapi 
+log4j
\ No newline at end of file

Copied: avalon/trunk/central/system/dependencies/avalon-meta-api (from rev 
20832, avalon/trunk/central/system/dependencies/merlin-meta-api)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-meta-api    (original)
+++ avalon/trunk/central/system/dependencies/avalon-meta-api    Sat Jun  5 
11:18:50 2004
@@ -1,2 +1,2 @@
 avalon-framework-api
-avalon-framework-impl test
+avalon-framework-impl

Copied: avalon/trunk/central/system/dependencies/avalon-meta-impl (from rev 
20832, avalon/trunk/central/system/dependencies/merlin-meta-impl)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-meta-impl   (original)
+++ avalon/trunk/central/system/dependencies/avalon-meta-impl   Sat Jun  5 
11:18:50 2004
@@ -1,7 +1,7 @@
 avalon-framework-api
 avalon-framework-impl
-merlin-meta-api
-merlin-meta-spi
-merlin-util-i18n
-merlin-util-configuration
+avalon-meta-api
+avalon-meta-spi
+avalon-util-i18n
+artifact:jar:excalibur-configuration/excalibur-configuration#1.2
  

Copied: avalon/trunk/central/system/dependencies/avalon-meta-spi (from rev 
20832, avalon/trunk/central/system/dependencies/merlin-meta-spi)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-meta-spi    (original)
+++ avalon/trunk/central/system/dependencies/avalon-meta-spi    Sat Jun  5 
11:18:50 2004
@@ -4,4 +4,4 @@
  
 
 avalon-framework-api
-merlin-meta-api
+avalon-meta-api

Copied: avalon/trunk/central/system/dependencies/avalon-meta-tools (from rev 
20832, avalon/trunk/central/system/dependencies/merlin-meta-tools)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-meta-tools  (original)
+++ avalon/trunk/central/system/dependencies/avalon-meta-tools  Sat Jun  5 
11:18:50 2004
@@ -1,8 +1,8 @@
 avalon-framework-api
 avalon-framework-impl
-merlin-meta-api
-merlin-meta-spi
-merlin-meta-impl 
-merlin-util-configuration 
+avalon-meta-api
+avalon-meta-spi
+avalon-meta-impl 
+excalibur-configuration 
 qdox
 ant

Copied: avalon/trunk/central/system/dependencies/avalon-repository-cli (from 
rev 20832, avalon/trunk/central/system/dependencies/merlin-repository-cli)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-repository-cli      
(original)
+++ avalon/trunk/central/system/dependencies/avalon-repository-cli      Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,8 @@
-merlin-repository-main
-merlin-util-i18n
+avalon-repository-api
+avalon-repository-spi
+avalon-repository-util
+avalon-repository-main
+avalon-util-i18n
+avalon-util-exception
+avalon-util-env
 commons-cli 

Copied: avalon/trunk/central/system/dependencies/avalon-repository-impl (from 
rev 20832, avalon/trunk/central/system/dependencies/merlin-repository-impl)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-repository-impl     
(original)
+++ avalon/trunk/central/system/dependencies/avalon-repository-impl     Sat Jun 
 5 11:18:50 2004
@@ -1,7 +1,7 @@
-merlin-repository-api
-merlin-repository-spi
-merlin-repository-util
-merlin-util-criteria
-merlin-util-defaults
-merlin-util-env
-merlin-util-i18n
+avalon-repository-api
+avalon-repository-spi
+avalon-repository-util
+avalon-util-criteria
+avalon-util-defaults
+avalon-util-env
+avalon-util-i18n

Copied: avalon/trunk/central/system/dependencies/avalon-repository-main (from 
rev 20832, avalon/trunk/central/system/dependencies/merlin-repository-main)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-repository-main     
(original)
+++ avalon/trunk/central/system/dependencies/avalon-repository-main     Sat Jun 
 5 11:18:50 2004
@@ -1,9 +1,9 @@
-merlin-repository-api
-merlin-repository-spi
-merlin-repository-util
-merlin-util-criteria
-merlin-util-defaults
-merlin-util-env
-merlin-util-exception
-merlin-util-i18n
+avalon-repository-api
+avalon-repository-spi
+avalon-repository-util
+avalon-util-criteria
+avalon-util-defaults
+avalon-util-env
+avalon-util-exception
+avalon-util-i18n
  

Copied: avalon/trunk/central/system/dependencies/avalon-repository-spi (from 
rev 20832, avalon/trunk/central/system/dependencies/merlin-repository-spi)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-repository-spi      
(original)
+++ avalon/trunk/central/system/dependencies/avalon-repository-spi      Sat Jun 
 5 11:18:50 2004
@@ -1,2 +1,2 @@
-merlin-repository-api
+avalon-repository-api
 

Copied: avalon/trunk/central/system/dependencies/avalon-repository-test (from 
rev 20832, avalon/trunk/central/system/dependencies/merlin-repository-test)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-repository-test     
(original)
+++ avalon/trunk/central/system/dependencies/avalon-repository-test     Sat Jun 
 5 11:18:50 2004
@@ -1,3 +1,3 @@
 avalon-framework-api
 avalon-framework-impl
-merlin-repository-api
+avalon-repository-api

Copied: avalon/trunk/central/system/dependencies/avalon-repository-util (from 
rev 20832, avalon/trunk/central/system/dependencies/merlin-repository-util)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-repository-util     
(original)
+++ avalon/trunk/central/system/dependencies/avalon-repository-util     Sat Jun 
 5 11:18:50 2004
@@ -1,2 +1,2 @@
-merlin-repository-api
+avalon-repository-api
 

Copied: avalon/trunk/central/system/dependencies/avalon-util-defaults (from rev 
20832, avalon/trunk/central/system/dependencies/merlin-util-defaults)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-util-defaults       
(original)
+++ avalon/trunk/central/system/dependencies/avalon-util-defaults       Sat Jun 
 5 11:18:50 2004
@@ -1,2 +1,2 @@
-merlin-util-env
+avalon-util-env
  

Copied: avalon/trunk/central/system/dependencies/avalon-util-extension-impl 
(from rev 20832, 
avalon/trunk/central/system/dependencies/merlin-util-extension-impl)
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-util-extension-impl 
(original)
+++ avalon/trunk/central/system/dependencies/avalon-util-extension-impl Sat Jun 
 5 11:18:50 2004
@@ -1,2 +1,2 @@
-merlin-util-extension-api
+avalon-util-extension-api
  

Modified: avalon/trunk/central/system/dependencies/merlin-activation-impl
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-activation-impl     
(original)
+++ avalon/trunk/central/system/dependencies/merlin-activation-impl     Sat Jun 
 5 11:18:50 2004
@@ -4,19 +4,20 @@
 merlin-composition-spi
 merlin-composition-impl
 merlin-activation-api
-merlin-meta-api
-merlin-meta-spi
-merlin-meta-impl
-merlin-repository-api
-merlin-repository-spi
-merlin-util-extension-api
-merlin-util-extension-impl
-merlin-util-i18n
+avalon-meta-api
+avalon-meta-spi
+avalon-meta-impl
+avalon-repository-api
+avalon-repository-spi
+avalon-util-extension-api
+avalon-util-extension-impl
+avalon-util-i18n
 excalibur-lifecycle-api
 
-
-merlin-logging-spi              test
-merlin-util-exception           test
-merlin-util-env                 test
-merlin-util-defaults            test
-merlin-repository-main          test
+# The following are unittesting dependencies...
+# Commented out, since Magic still doesn't support such feature.
+# avalon-logging-spi              test
+# avalon-util-exception           test
+# avalon-util-env                 test
+# avalon-util-defaults            test
+# avalon-repository-main          test

Modified: avalon/trunk/central/system/dependencies/merlin-api
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-api (original)
+++ avalon/trunk/central/system/dependencies/merlin-api Sat Jun  5 11:18:50 2004
@@ -1,4 +1,4 @@
 avalon-framework-api
 merlin-composition-api
-merlin-repository-api
+avalon-repository-api
  

Modified: avalon/trunk/central/system/dependencies/merlin-cli
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-cli (original)
+++ avalon/trunk/central/system/dependencies/merlin-cli Sat Jun  5 11:18:50 2004
@@ -1,9 +1,9 @@
-merlin-repository-api
-merlin-repository-spi
-merlin-repository-main
-merlin-repository-util
-merlin-util-env
-merlin-util-exception
-merlin-util-i18n
+avalon-repository-api
+avalon-repository-spi
+avalon-repository-main
+avalon-repository-util
+avalon-util-env
+avalon-util-exception
+avalon-util-i18n
 commons-cli
  

Modified: avalon/trunk/central/system/dependencies/merlin-composition-api
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-composition-api     
(original)
+++ avalon/trunk/central/system/dependencies/merlin-composition-api     Sat Jun 
 5 11:18:50 2004
@@ -1,6 +1,6 @@
 avalon-framework-api
-merlin-util-extension-api
-merlin-repository-api
-merlin-logging-api
-merlin-logging-spi
-merlin-meta-api 
+avalon-util-extension-api
+avalon-repository-api
+avalon-logging-api
+avalon-logging-spi
+avalon-meta-api 

Modified: avalon/trunk/central/system/dependencies/merlin-composition-impl
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-composition-impl    
(original)
+++ avalon/trunk/central/system/dependencies/merlin-composition-impl    Sat Jun 
 5 11:18:50 2004
@@ -1,20 +1,20 @@
 avalon-framework-api
 avalon-framework-impl
-merlin-meta-api
-merlin-meta-spi
-merlin-meta-impl
-merlin-util-criteria
-merlin-util-exception
-merlin-util-env
-merlin-util-i18n
-merlin-util-extension-api
-merlin-util-extension-impl
+avalon-meta-api
+avalon-meta-spi
+avalon-meta-impl
+avalon-util-criteria
+avalon-util-exception
+avalon-util-env
+avalon-util-i18n
+avalon-util-extension-api
+avalon-util-extension-impl
 merlin-composition-api
 merlin-composition-spi
-merlin-repository-api
-merlin-repository-spi
-merlin-logging-api
-merlin-logging-spi
-merlin-logging-impl
-merlin-util-configuration
-excalibur-lifecycle-api
\ No newline at end of file
+avalon-repository-api
+avalon-repository-spi
+avalon-logging-api
+avalon-logging-spi
+avalon-logging-impl
+excalibur-configuration
+excalibur-lifecycle-api

Modified: avalon/trunk/central/system/dependencies/merlin-composition-spi
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-composition-spi     
(original)
+++ avalon/trunk/central/system/dependencies/merlin-composition-spi     Sat Jun 
 5 11:18:50 2004
@@ -1,8 +1,8 @@
 avalon-framework-api
-merlin-meta-api
-merlin-util-extension-api
+avalon-meta-api
+avalon-util-extension-api
 merlin-composition-api
-merlin-repository-api
-merlin-logging-api
-merlin-logging-spi
+avalon-repository-api
+avalon-logging-api
+avalon-logging-spi
  

Modified: avalon/trunk/central/system/dependencies/merlin-impl
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-impl        (original)
+++ avalon/trunk/central/system/dependencies/merlin-impl        Sat Jun  5 
11:18:50 2004
@@ -1,22 +1,22 @@
 avalon-framework-api
 avalon-framework-impl
 merlin-api
-merlin-repository-api
-merlin-repository-spi
+avalon-repository-api
+avalon-repository-spi
 merlin-composition-api
 merlin-composition-spi
 merlin-composition-impl
-merlin-meta-api
-merlin-meta-spi
-merlin-meta-impl
-merlin-util-extension-api
-merlin-util-extension-impl
-merlin-util-i18n
-merlin-util-defaults
-merlin-util-env
-merlin-util-exception
-merlin-util-criteria
-merlin-logging-api
-merlin-logging-spi
+avalon-meta-api
+avalon-meta-spi
+avalon-meta-impl
+avalon-util-extension-api
+avalon-util-extension-impl
+avalon-util-i18n
+avalon-util-defaults
+avalon-util-env
+avalon-util-exception
+avalon-util-criteria
+avalon-logging-api
+avalon-logging-spi
 excalibur-lifecycle-api
-merlin-util-configuration
+excalibur-configuration

Added: avalon/trunk/central/system/dependencies/merlin-plugin
==============================================================================
--- (empty file)
+++ avalon/trunk/central/system/dependencies/merlin-plugin      Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,5 @@
+avalon-repository-api 
+avalon-repository-spi 
+avalon-repository-main
+avalon-util-env
+avalon-util-exception
\ No newline at end of file

Modified: avalon/trunk/central/system/dependencies/merlin-servlet
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-servlet     (original)
+++ avalon/trunk/central/system/dependencies/merlin-servlet     Sat Jun  5 
11:18:50 2004
@@ -1,11 +1,11 @@
 avalon-framework-api
-merlin-meta-api
+avalon-meta-api
 merlin-composition-api
 merlin-api
-merlin-repository-api
-merlin-repository-spi
-merlin-repository-main
-merlin-util-env
-merlin-util-exception
+avalon-repository-api
+avalon-repository-spi
+avalon-repository-main
+avalon-util-env
+avalon-util-exception
 servletapi
  

Modified: avalon/trunk/central/system/dependencies/merlin-unit
==============================================================================
--- avalon/trunk/central/system/dependencies/merlin-unit        (original)
+++ avalon/trunk/central/system/dependencies/merlin-unit        Sat Jun  5 
11:18:50 2004
@@ -1,7 +1,7 @@
-merlin-repository-api
-merlin-repository-spi
-merlin-repository-main
-merlin-util-env
-merlin-util-exception
+avalon-repository-api
+avalon-repository-spi
+avalon-repository-main
+avalon-util-env
+avalon-util-exception
 junit
  

Added: avalon/trunk/runtime/activation/api/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/activation/api/magic.properties        Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-activation-api
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/activation/api/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/activation/api/magic.sequence  Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/activation/impl/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/activation/impl/magic.properties       Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-activation-impl
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/activation/impl/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/activation/impl/magic.sequence Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/activation/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/activation/magic.properties    Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-activation
+
+project.system = ../../central/system

Added: avalon/trunk/runtime/activation/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/activation/magic.sequence      Sat Jun  5 11:18:50 2004
@@ -0,0 +1,2 @@
+api
+impl

Added: avalon/trunk/runtime/composition/api/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/composition/api/magic.properties       Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-composition-api
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/composition/api/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/composition/api/magic.sequence Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/composition/impl/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/composition/impl/magic.properties      Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-composition-impl
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/composition/impl/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/composition/impl/magic.sequence        Sat Jun  5 
11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/composition/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/composition/magic.properties   Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-composition
+
+project.system = ../../central/system

Added: avalon/trunk/runtime/composition/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/composition/magic.sequence     Sat Jun  5 11:18:50 2004
@@ -0,0 +1,3 @@
+api
+spi
+impl

Added: avalon/trunk/runtime/composition/spi/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/composition/spi/magic.properties       Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-composition-spi
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/composition/spi/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/composition/spi/magic.sequence Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/framework/impl/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/framework/impl/magic.properties        Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,5 @@
+
+project.name = avalon-framework-impl
+
+project.system = ../../../central/system
+ 

Added: avalon/trunk/runtime/framework/impl/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/framework/impl/magic.sequence  Sat Jun  5 11:18:50 2004
@@ -0,0 +1,2 @@
+. jar.install
+ 

Added: avalon/trunk/runtime/framework/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/framework/magic.properties     Sat Jun  5 11:18:50 2004
@@ -0,0 +1,5 @@
+
+project.name = avalon-framework
+
+project.system = ../../central/system
+ 

Added: avalon/trunk/runtime/framework/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/framework/magic.sequence       Sat Jun  5 11:18:50 2004
@@ -0,0 +1,2 @@
+api     
+impl    

Added: avalon/trunk/runtime/logging/api/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/api/magic.properties   Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging-api
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/logging/api/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/api/magic.sequence     Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/logging/impl/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/impl/magic.properties  Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging-impl
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/logging/impl/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/impl/magic.sequence    Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/logging/log4j/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/log4j/magic.properties Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging-log4j
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/logging/log4j/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/log4j/magic.sequence   Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/logging/logkit/api/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/api/magic.properties    Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging-logkit-api
+
+project.system = ../../../../central/system

Added: avalon/trunk/runtime/logging/logkit/api/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/api/magic.sequence      Sat Jun  5 
11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/logging/logkit/impl/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/impl/magic.properties   Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging-logkit-impl
+
+project.system = ../../../../central/system

Added: avalon/trunk/runtime/logging/logkit/impl/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/impl/magic.sequence     Sat Jun  5 
11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/logging/logkit/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/magic.properties        Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging-logkit
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/logging/logkit/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/magic.sequence  Sat Jun  5 11:18:50 2004
@@ -0,0 +1,3 @@
+api
+impl
+plugins
\ No newline at end of file

Added: avalon/trunk/runtime/logging/logkit/plugins/datagram/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/plugins/datagram/magic.properties       
Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging-logkit-datagram
+
+project.system = ../../../../../central/system

Added: avalon/trunk/runtime/logging/logkit/plugins/datagram/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/plugins/datagram/magic.sequence Sat Jun 
 5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/logging/logkit/plugins/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/plugins/magic.properties        Sat Jun 
 5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging-logkit-plugins
+
+project.system = ../../../../central/system

Added: avalon/trunk/runtime/logging/logkit/plugins/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/plugins/magic.sequence  Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,3 @@
+datagram
+socket
+syslog

Added: avalon/trunk/runtime/logging/logkit/plugins/socket/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/plugins/socket/magic.properties Sat Jun 
 5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging-logkit-socket
+
+project.system = ../../../../../central/system

Added: avalon/trunk/runtime/logging/logkit/plugins/socket/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/plugins/socket/magic.sequence   Sat Jun 
 5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/logging/logkit/plugins/syslog/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/plugins/syslog/magic.properties Sat Jun 
 5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging-logkit-syslog
+
+project.system = ../../../../../central/system

Added: avalon/trunk/runtime/logging/logkit/plugins/syslog/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/logkit/plugins/syslog/magic.sequence   Sat Jun 
 5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/logging/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/magic.properties       Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging
+
+project.system = ../../central/system

Added: avalon/trunk/runtime/logging/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/magic.sequence Sat Jun  5 11:18:50 2004
@@ -0,0 +1,6 @@
+api
+spi
+impl
+log4j
+logkit
+test

Added: avalon/trunk/runtime/logging/spi/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/spi/magic.properties   Sat Jun  5 11:18:50 2004
@@ -0,0 +1,5 @@
+
+project.name = avalon-logging-spi
+
+project.system = ../../../central/system
+

Added: avalon/trunk/runtime/logging/spi/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/spi/magic.sequence     Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/logging/test/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/test/magic.properties  Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logging-test
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/logging/test/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logging/test/magic.sequence    Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+# . test.
\ No newline at end of file

Added: avalon/trunk/runtime/logkit/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logkit/magic.properties        Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-logkit
+
+project.system = ../../central/system 

Added: avalon/trunk/runtime/logkit/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/logkit/magic.sequence  Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+.   jar.install 

Added: avalon/trunk/runtime/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/magic.properties       Sat Jun  5 11:18:50 2004
@@ -0,0 +1,5 @@
+
+project.name=avalon
+
+project.system=../central/system
+ 

Added: avalon/trunk/runtime/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/magic.sequence Sat Jun  5 11:18:50 2004
@@ -0,0 +1,9 @@
+logkit
+framework  
+util       
+meta
+repository 
+logging    
+composition
+activation 
+merlin     

Added: avalon/trunk/runtime/merlin/api/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/api/magic.properties    Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-api
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/merlin/api/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/api/magic.sequence      Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/merlin/cli/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/cli/magic.properties    Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-cli
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/merlin/cli/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/cli/magic.sequence      Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/merlin/impl/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/impl/magic.properties   Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-impl
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/merlin/impl/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/impl/magic.sequence     Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/merlin/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/magic.properties        Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin
+
+project.system = ../../central/system

Added: avalon/trunk/runtime/merlin/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/magic.sequence  Sat Jun  5 11:18:50 2004
@@ -0,0 +1,7 @@
+api
+impl
+cli
+plugin
+servlet
+unit
+jmx
\ No newline at end of file

Added: avalon/trunk/runtime/merlin/plugin/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/plugin/magic.properties Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-plugin
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/merlin/plugin/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/plugin/magic.sequence   Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/merlin/servlet/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/servlet/magic.properties        Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-servlet
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/merlin/servlet/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/servlet/magic.sequence  Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/merlin/unit/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/unit/magic.properties   Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = merlin-unit
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/merlin/unit/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/unit/magic.sequence     Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/meta/api/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/api/magic.properties      Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-meta-api
+
+project.system = ../../../central/system
\ No newline at end of file

Added: avalon/trunk/runtime/meta/api/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/api/magic.sequence        Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/meta/impl/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/impl/magic.properties     Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-meta-impl
+
+project.system = ../../../central/system
\ No newline at end of file

Added: avalon/trunk/runtime/meta/impl/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/impl/magic.sequence       Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/meta/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/magic.properties  Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-meta
+
+project.system = ../../central/system

Added: avalon/trunk/runtime/meta/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/magic.sequence    Sat Jun  5 11:18:50 2004
@@ -0,0 +1,5 @@
+api
+spi
+impl
+tools
+plugin

Added: avalon/trunk/runtime/meta/plugin/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/plugin/magic.properties   Sat Jun  5 11:18:50 2004
@@ -0,0 +1,5 @@
+
+project.name = avalon-meta-plugin
+
+project.system = ../../../central/system
+

Added: avalon/trunk/runtime/meta/plugin/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/plugin/magic.sequence     Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/meta/spi/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/spi/magic.properties      Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-meta-spi
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/meta/spi/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/spi/magic.sequence        Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/meta/tools/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/tools/magic.properties    Sat Jun  5 11:18:50 2004
@@ -0,0 +1,5 @@
+
+project.name = avalon-meta-tools
+
+project.system = ../../../central/system
+

Added: avalon/trunk/runtime/meta/tools/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/tools/magic.sequence      Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/repository/api/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/api/magic.properties        Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-repository-api
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/repository/api/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/api/magic.sequence  Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/repository/cli/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/cli/magic.properties        Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-repository-cli
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/repository/cli/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/cli/magic.sequence  Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/repository/impl/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/impl/magic.properties       Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-repository-impl
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/repository/impl/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/impl/magic.sequence Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/repository/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/magic.properties    Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-repository
+
+project.system = ../../central/system

Added: avalon/trunk/runtime/repository/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/magic.sequence      Sat Jun  5 11:18:50 2004
@@ -0,0 +1,7 @@
+api
+spi
+util
+impl
+main
+cli
+test

Added: avalon/trunk/runtime/repository/main/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/main/magic.properties       Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-repository-main
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/repository/main/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/main/magic.sequence Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/repository/spi/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/spi/magic.properties        Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-repository-spi
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/repository/spi/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/spi/magic.sequence  Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/repository/test/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/test/magic.properties       Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-repository-test
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/repository/test/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/test/magic.sequence Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+# . jar.install

Added: avalon/trunk/runtime/repository/util/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/util/magic.properties       Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-repository-util
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/repository/util/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/repository/util/magic.sequence Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/util/criteria/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/criteria/magic.properties Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-util-criteria
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/util/criteria/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/criteria/magic.sequence   Sat Jun  5 11:18:50 2004
@@ -0,0 +1,2 @@
+
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/util/defaults/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/defaults/magic.properties Sat Jun  5 11:18:50 2004
@@ -0,0 +1,5 @@
+
+project.name = avalon-util-defaults
+
+project.system = ../../../central/system
+

Added: avalon/trunk/runtime/util/defaults/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/defaults/magic.sequence   Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/util/env/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/env/magic.properties      Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-util-env
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/util/env/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/env/magic.sequence        Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/util/exception/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/exception/magic.properties        Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-util-exception
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/util/exception/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/exception/magic.sequence  Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/util/extension/api/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/extension/api/magic.properties    Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-util-extension-api
+
+project.system = ../../../../central/system

Added: avalon/trunk/runtime/util/extension/api/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/extension/api/magic.sequence      Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,2 @@
+
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/util/extension/impl/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/extension/impl/magic.properties   Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-util-extension-impl
+
+project.system = ../../../../central/system

Added: avalon/trunk/runtime/util/extension/impl/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/extension/impl/magic.sequence     Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,2 @@
+
+. jar.install
\ No newline at end of file

Added: avalon/trunk/runtime/util/extension/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/extension/magic.properties        Sat Jun  5 
11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-util-extension
+
+project.system = ../../../central/system

Added: avalon/trunk/runtime/util/extension/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/extension/magic.sequence  Sat Jun  5 11:18:50 2004
@@ -0,0 +1,3 @@
+
+api 
+impl
\ No newline at end of file

Added: avalon/trunk/runtime/util/i18n/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/i18n/magic.properties     Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-util-i18n
+
+project.system = ../../../central/system
\ No newline at end of file

Added: avalon/trunk/runtime/util/i18n/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/i18n/magic.sequence       Sat Jun  5 11:18:50 2004
@@ -0,0 +1 @@
+. jar.install

Added: avalon/trunk/runtime/util/magic.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/magic.properties  Sat Jun  5 11:18:50 2004
@@ -0,0 +1,4 @@
+
+project.name = avalon-util
+
+project.system = ../../central/system

Added: avalon/trunk/runtime/util/magic.sequence
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/magic.sequence    Sat Jun  5 11:18:50 2004
@@ -0,0 +1,6 @@
+criteria 
+env
+defaults
+exception
+extension
+i18n

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]