avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/logging/test/src/test/org/apache/avalon/logging/logkit/test DefaultLoggingManagerTestCase.java
Date Fri, 09 Apr 2004 09:37:10 GMT
mcconnell    2004/04/09 02:37:10

  Modified:    logging/api project.xml
               logging/impl project.xml
               logging/log4j project.xml
               logging/logkit/api project.xml
               logging/logkit/impl project.xml
               logging/logkit/plugins/datagram project.xml
               logging/logkit/plugins/socket project.xml
               logging/logkit/plugins/syslog project.xml
               logging  maven.xml project.xml
               logging/spi project.xml
               logging/test/conf system.xml
               logging/test maven.xml project.xml
               logging/test/src/test/org/apache/avalon/logging
                        LoggingManagerHelper.java
               logging/test/src/test/org/apache/avalon/logging/log4j/test
                        AlternateLoggingManagerTestCase.java
                        DefaultLoggingManagerTestCase.java
               logging/test/src/test/org/apache/avalon/logging/logkit/test
                        DefaultLoggingManagerTestCase.java
  Added:       logging/api index.ent
               logging/impl index.ent
               logging/log4j index.ent
               logging/logkit/api index.ent
               logging/logkit/impl index.ent
               logging/logkit/plugins/datagram index.ent
               logging/logkit/plugins/socket index.ent
               logging/logkit/plugins/syslog index.ent
               logging  index.ent
               logging/spi index.ent
               logging/test index.ent
  Log:
  Update versions.
  
  Revision  Changes    Path
  1.5       +7 -4      avalon/logging/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/api/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	1 Mar 2004 13:39:28 -0000	1.4
  +++ project.xml	9 Apr 2004 09:37:09 -0000	1.5
  @@ -1,15 +1,18 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
     <extend>${basedir}/../project.xml</extend>
   
  -  <groupId>avalon-logging</groupId>
  -  <id>avalon-logging-api</id>
  +  <groupId>&avalon-logging-id;</groupId>
  +  <id>&avalon-logging-api-id;</id>
  +  <currentVersion>&avalon-logging-api-version;</currentVersion>
  +
     <name>Avalon Logging API</name>
     <package>org.apache.avalon.logging</package>
  -  <currentVersion>1.0-SNAPSHOT</currentVersion>
  -
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Logging API</shortDescription>
   
  
  
  
  1.1                  avalon/logging/api/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent"> %framework-entities;
  <!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repository-entities;
  <!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  <!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  
  
  
  1.4       +35 -30    avalon/logging/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	31 Mar 2004 16:57:19 -0000	1.3
  +++ project.xml	9 Apr 2004 09:37:09 -0000	1.4
  @@ -1,15 +1,18 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
     <extend>${basedir}/../project.xml</extend>
   
  -  <groupId>avalon-logging</groupId>
  -  <id>avalon-logging-impl</id>
  +  <groupId>&avalon-logging-id;</groupId>
  +  <id>&avalon-logging-impl-id;</id>
  +  <currentVersion>&avalon-logging-impl-version;</currentVersion>
  +
     <name>Avalon Logging Common Implementation</name>
     <package>org.apache.avalon.logging.provider</package>
  -  <currentVersion>1.0-SNAPSHOT</currentVersion>
  -
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Logging SPCommon Implementation</shortDescription>
   
  @@ -19,49 +22,51 @@
     
     <dependencies>
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-api-id;</artifactId>
  +      <version>&avalon-framework-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-api</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-api-id;</artifactId>
  +      <version>&avalon-repository-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-spi</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-spi-id;</artifactId>
  +      <version>&avalon-repository-spi-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-api-id;</artifactId>
  +      <version>&avalon-logging-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-spi</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-spi-id;</artifactId>
  +      <version>&avalon-logging-spi-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-criteria</artifactId>
  -      <version>1.1-SNAPSHOT</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-criteria-id;</artifactId>
  +      <version>&avalon-util-criteria-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-i18n</artifactId>
  -      <version>1.0</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-i18n-id;</artifactId>
  +      <version>&avalon-util-i18n-version;</version>
       </dependency>
       <dependency>
  -      <id>excalibur-configuration</id>
  -      <version>1.2</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-defaults-id;</artifactId>
  +      <version>&avalon-util-defaults-version;</version>
       </dependency>
  +
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-defaults</artifactId>
  -      <version>1.2-SNAPSHOT</version>
  +      <id>excalibur-configuration</id>
  +      <version>1.2</version>
       </dependency>
  +
     </dependencies>
   
   </project>
  
  
  
  1.1                  avalon/logging/impl/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent"> %framework-entities;
  <!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repository-entities;
  <!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  <!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  
  
  
  1.7       +29 -26    avalon/logging/log4j/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/log4j/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	31 Mar 2004 16:57:19 -0000	1.6
  +++ project.xml	9 Apr 2004 09:37:09 -0000	1.7
  @@ -1,15 +1,18 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
     <extend>${basedir}/../project.xml</extend>
   
  -  <groupId>avalon-logging</groupId>
  -  <id>avalon-log4j-impl</id>
  +  <groupId>&avalon-logging-id;</groupId>
  +  <id>&avalon-logging-log4j-id;</id>
  +  <currentVersion>&avalon-logging-log4j-version;</currentVersion>
  +
     <name>Avalon Logging Log4J Plugin</name>
     <package>org.apache.avalon.logging.log4j</package>
  -  <currentVersion>1.0-SNAPSHOT</currentVersion>
  -
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Logging Log4J Plugin</shortDescription>
   
  @@ -18,43 +21,43 @@
       <!-- avalon dependecies -->
   
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-main</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-main-id;</artifactId>
  +      <version>&avalon-repository-main-version;</version>
       </dependency>
  -
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-api-id;</artifactId>
  +      <version>&avalon-logging-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-spi</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-spi-id;</artifactId>
  +      <version>&avalon-logging-spi-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-impl</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-impl-id;</artifactId>
  +      <version>&avalon-logging-impl-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-api-id;</artifactId>
  +      <version>&avalon-framework-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-impl-id;</artifactId>
  +      <version>&avalon-framework-impl-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-i18n</artifactId>
  -      <version>1.0</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-i18n-id;</artifactId>
  +      <version>&avalon-util-i18n-version;</version>
       </dependency>
  +
       <dependency>
         <id>excalibur-configuration</id>
         <version>1.2</version>
  
  
  
  1.1                  avalon/logging/log4j/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent"> %framework-entities;
  <!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repository-entities;
  <!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  <!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  <!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  
  
  
  1.7       +25 -22    avalon/logging/logkit/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/api/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	13 Mar 2004 04:11:03 -0000	1.6
  +++ project.xml	9 Apr 2004 09:37:09 -0000	1.7
  @@ -1,48 +1,51 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
     <extend>${basedir}/../../project.xml</extend>
   
  -  <groupId>avalon-logging</groupId>
  -  <id>avalon-logkit-api</id>
  +  <groupId>&avalon-logging-id;</groupId>
  +  <id>&avalon-logging-logkit-api-id;</id>
  +  <currentVersion>&avalon-logging-logkit-api-version;</currentVersion>
  +
     <name>Avalon Logging Logkit Plugin API</name>
     <package>org.apache.avalon.logging.logkit</package>
  -  <currentVersion>1.0-SNAPSHOT</currentVersion>
  -
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Logging LogKit Plugin API</shortDescription>
   
     <dependencies>
       <dependency>
  -      <groupId>logkit</groupId>
  -      <artifactId>logkit</artifactId>
  -      <version>2.0</version>
  +      <groupId>&avalon-logkit-group;</groupId>
  +      <artifactId>&avalon-logkit-id;</artifactId>
  +      <version>&avalon-logkit-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-api-id;</artifactId>
  +      <version>&avalon-logging-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-spi</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-spi-id;</artifactId>
  +      <version>&avalon-logging-spi-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-api-id;</artifactId>
  +      <version>&avalon-framework-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-api</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-api-id;</artifactId>
  +      <version>&avalon-repository-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-spi</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-spi-id;</artifactId>
  +      <version>&avalon-repository-spi-version;</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.1                  avalon/logging/logkit/api/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % framework-entities SYSTEM "file:../../../versioning/avalon-framework.ent"> %framework-entities;
  <!ENTITY % repository-entities SYSTEM "file:../../../versioning/avalon-repository.ent"> %repository-entities;
  <!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent"> %util-entities;
  <!ENTITY % logkit-entities SYSTEM "file:../../../versioning/avalon-logkit.ent"> %logkit-entities;
  <!ENTITY % logging-entities SYSTEM "file:../../../versioning/avalon-logging.ent"> %logging-entities;
  
  
  
  1.10      +35 -31    avalon/logging/logkit/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/impl/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	31 Mar 2004 16:57:19 -0000	1.9
  +++ project.xml	9 Apr 2004 09:37:09 -0000	1.10
  @@ -1,15 +1,18 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
     <extend>${basedir}/../../project.xml</extend>
   
  -  <groupId>avalon-logging</groupId>
  -  <id>avalon-logkit-impl</id>
  +  <groupId>&avalon-logging-id;</groupId>
  +  <id>&avalon-logging-logkit-impl-id;</id>
  +  <currentVersion>&avalon-logging-logkit-impl-version;</currentVersion>
  +
     <name>Avalon Logging Logkit Plugin</name>
     <package>org.apache.avalon.logging.logkit</package>
  -  <currentVersion>1.0-SNAPSHOT</currentVersion>
  -
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Logging LogKit Plugin</shortDescription>
   
  @@ -18,57 +21,58 @@
       <!-- avalon dependecies -->
   
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-main</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-main-id;</artifactId>
  +      <version>&avalon-repository-main-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-api-id;</artifactId>
  +      <version>&avalon-logging-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-spi</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-spi-id;</artifactId>
  +      <version>&avalon-logging-spi-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-impl</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-impl-id;</artifactId>
  +      <version>&avalon-logging-impl-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logkit-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-logkit-api-id;</artifactId>
  +      <version>&avalon-logging-logkit-api-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-api-id;</artifactId>
  +      <version>&avalon-framework-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-impl-id;</artifactId>
  +      <version>&avalon-framework-impl-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-i18n</artifactId>
  -      <version>1.0</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-i18n-id;</artifactId>
  +      <version>&avalon-util-i18n-version;</version>
       </dependency>
  +
       <dependency>
         <id>excalibur-configuration</id>
         <version>1.2</version>
       </dependency>
   
       <dependency>
  -      <groupId>logkit</groupId>
  -      <artifactId>logkit</artifactId>
  -      <version>2.0</version>
  +      <groupId>&avalon-logkit-group;</groupId>
  +      <artifactId>&avalon-logkit-id;</artifactId>
  +      <version>&avalon-logkit-version;</version>
       </dependency>
   
       <!-- pre JDK 1.4 dependencies -->
  
  
  
  1.1                  avalon/logging/logkit/impl/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % framework-entities SYSTEM "file:../../../versioning/avalon-framework.ent"> %framework-entities;
  <!ENTITY % repository-entities SYSTEM "file:../../../versioning/avalon-repository.ent"> %repository-entities;
  <!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent"> %util-entities;
  <!ENTITY % logkit-entities SYSTEM "file:../../../versioning/avalon-logkit.ent"> %logkit-entities;
  <!ENTITY % logging-entities SYSTEM "file:../../../versioning/avalon-logging.ent"> %logging-entities;
  
  
  
  1.8       +28 -25    avalon/logging/logkit/plugins/datagram/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/plugins/datagram/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	13 Mar 2004 04:11:04 -0000	1.7
  +++ project.xml	9 Apr 2004 09:37:09 -0000	1.8
  @@ -1,15 +1,18 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
     <extend>${basedir}/../../../project.xml</extend>
   
  -  <groupId>avalon-logging</groupId>
  -  <id>avalon-logkit-datagram</id>
  +  <groupId>&avalon-logging-id;</groupId>
  +  <id>&avalon-logging-logkit-datagram-id;</id>
  +  <currentVersion>&avalon-logging-logkit-datagram-version;</currentVersion>
  +
     <name>Avalon Logging Logkit Datagram Target Plugin</name>
     <package>org.apache.avalon.logging.logkit</package>
  -  <currentVersion>1.0-SNAPSHOT</currentVersion>
  -
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Logging Logkit Datagram Target Plugin</shortDescription>
   
  @@ -18,43 +21,43 @@
       <!-- avalon dependecies -->
   
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-main</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-main-id;</artifactId>
  +      <version>&avalon-repository-main-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-api-id;</artifactId>
  +      <version>&avalon-logging-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-spi</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-spi-id;</artifactId>
  +      <version>&avalon-logging-spi-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logkit-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-logkit-api-id;</artifactId>
  +      <version>&avalon-logging-logkit-api-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-api-id;</artifactId>
  +      <version>&avalon-framework-api-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-i18n</artifactId>
  -      <version>1.0</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-i18n-id;</artifactId>
  +      <version>&avalon-util-i18n-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>logkit</groupId>
  -      <artifactId>logkit</artifactId>
  -      <version>2.0</version>
  +      <groupId>&avalon-logkit-group;</groupId>
  +      <artifactId>&avalon-logkit-id;</artifactId>
  +      <version>&avalon-logkit-version;</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.1                  avalon/logging/logkit/plugins/datagram/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % framework-entities SYSTEM "file:../../../../versioning/avalon-framework.ent"> %framework-entities;
  <!ENTITY % repository-entities SYSTEM "file:../../../../versioning/avalon-repository.ent"> %repository-entities;
  <!ENTITY % util-entities SYSTEM "file:../../../../versioning/avalon-util.ent"> %util-entities;
  <!ENTITY % logkit-entities SYSTEM "file:../../../../versioning/avalon-logkit.ent"> %logkit-entities;
  <!ENTITY % logging-entities SYSTEM "file:../../../../versioning/avalon-logging.ent"> %logging-entities;
  
  
  
  1.8       +28 -25    avalon/logging/logkit/plugins/socket/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/plugins/socket/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	13 Mar 2004 04:11:04 -0000	1.7
  +++ project.xml	9 Apr 2004 09:37:10 -0000	1.8
  @@ -1,15 +1,18 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
     <extend>${basedir}/../../../project.xml</extend>
   
  -  <groupId>avalon-logging</groupId>
  -  <id>avalon-logkit-socket</id>
  +  <groupId>&avalon-logging-id;</groupId>
  +  <id>&avalon-logging-logkit-socket-id;</id>
  +  <currentVersion>&avalon-logging-logkit-socket-version;</currentVersion>
  +
     <name>Avalon Logging Logkit Socket Target Plugin</name>
     <package>org.apache.avalon.logging.logkit</package>
  -  <currentVersion>1.0-SNAPSHOT</currentVersion>
  -
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Logging Logkit Socket Target Plugin</shortDescription>
   
  @@ -18,43 +21,43 @@
       <!-- avalon dependecies -->
   
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-main</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-main-id;</artifactId>
  +      <version>&avalon-repository-main-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-api-id;</artifactId>
  +      <version>&avalon-logging-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-spi</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-spi-id;</artifactId>
  +      <version>&avalon-logging-spi-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logkit-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-logkit-api-id;</artifactId>
  +      <version>&avalon-logging-logkit-api-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-api-id;</artifactId>
  +      <version>&avalon-framework-api-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-i18n</artifactId>
  -      <version>1.0</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-i18n-id;</artifactId>
  +      <version>&avalon-util-i18n-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>logkit</groupId>
  -      <artifactId>logkit</artifactId>
  -      <version>2.0</version>
  +      <groupId>&avalon-logkit-group;</groupId>
  +      <artifactId>&avalon-logkit-id;</artifactId>
  +      <version>&avalon-logkit-version;</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.1                  avalon/logging/logkit/plugins/socket/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % framework-entities SYSTEM "file:../../../../versioning/avalon-framework.ent"> %framework-entities;
  <!ENTITY % repository-entities SYSTEM "file:../../../../versioning/avalon-repository.ent"> %repository-entities;
  <!ENTITY % util-entities SYSTEM "file:../../../../versioning/avalon-util.ent"> %util-entities;
  <!ENTITY % logkit-entities SYSTEM "file:../../../../versioning/avalon-logkit.ent"> %logkit-entities;
  <!ENTITY % logging-entities SYSTEM "file:../../../../versioning/avalon-logging.ent"> %logging-entities;
  
  
  
  1.8       +29 -25    avalon/logging/logkit/plugins/syslog/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/plugins/syslog/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	13 Mar 2004 04:11:04 -0000	1.7
  +++ project.xml	9 Apr 2004 09:37:10 -0000	1.8
  @@ -1,15 +1,18 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
     <extend>${basedir}/../../../project.xml</extend>
   
  -  <groupId>avalon-logging</groupId>
  -  <id>avalon-logkit-syslog</id>
  +  <groupId>&avalon-logging-id;</groupId>
  +  <id>&avalon-logging-logkit-syslog-id;</id>
  +  <currentVersion>&avalon-logging-logkit-syslog-version;</currentVersion>
  +
     <name>Avalon Logging Logkit Syslog Target Plugin</name>
     <package>org.apache.avalon.logging.logkit</package>
  -  <currentVersion>1.0-SNAPSHOT</currentVersion>
  -
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Logging Logkit Syslog Target Plugin</shortDescription>
   
  @@ -18,44 +21,45 @@
       <!-- avalon dependecies -->
   
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-main</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-main-id;</artifactId>
  +      <version>&avalon-repository-main-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-api-id;</artifactId>
  +      <version>&avalon-logging-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-spi</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-spi-id;</artifactId>
  +      <version>&avalon-logging-spi-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logkit-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-logkit-api-id;</artifactId>
  +      <version>&avalon-logging-logkit-api-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-api-id;</artifactId>
  +      <version>&avalon-framework-api-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-i18n</artifactId>
  -      <version>1.0</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-i18n-id;</artifactId>
  +      <version>&avalon-util-i18n-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>logkit</groupId>
  -      <artifactId>logkit</artifactId>
  -      <version>2.0</version>
  +      <groupId>&avalon-logkit-group;</groupId>
  +      <artifactId>&avalon-logkit-id;</artifactId>
  +      <version>&avalon-logkit-version;</version>
       </dependency>
   
     </dependencies>
  +
   </project>
  
  
  
  1.1                  avalon/logging/logkit/plugins/syslog/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % framework-entities SYSTEM "file:../../../../versioning/avalon-framework.ent"> %framework-entities;
  <!ENTITY % repository-entities SYSTEM "file:../../../../versioning/avalon-repository.ent"> %repository-entities;
  <!ENTITY % util-entities SYSTEM "file:../../../../versioning/avalon-util.ent"> %util-entities;
  <!ENTITY % logkit-entities SYSTEM "file:../../../../versioning/avalon-logkit.ent"> %logkit-entities;
  <!ENTITY % logging-entities SYSTEM "file:../../../../versioning/avalon-logging.ent"> %logging-entities;
  
  
  
  1.7       +25 -0     avalon/logging/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/maven.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- maven.xml	4 Apr 2004 15:39:03 -0000	1.6
  +++ maven.xml	9 Apr 2004 09:37:10 -0000	1.7
  @@ -1,3 +1,8 @@
  +<?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
  +
   <project default="avalon:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
   
     <!--
  @@ -55,6 +60,14 @@
     ==============================================================================
     -->
   
  +
  +  <preGoal name="java:jar-resources">
  +    <ant:filter token="AVALON-LOGGING-LOGKIT-SPEC" 
  +        value="&avalon-logging-logkit-artifact-spec;"/>
  +    <ant:filter token="AVALON-LOGGING-LOG4J-SPEC" 
  +        value="&avalon-logging-log4j-artifact-spec;"/>
  +  </preGoal>
  +
     <goal name="avalon:build" description="Build the Logging system.">
   
       <maven:reactor basedir="${basedir}"
  @@ -78,6 +91,8 @@
         <util:file var="jarFile" name="${maven.build.dir}/jars/${path}.jar"/>
         <j:if test="${jarFile.exists()}">
           <checksum file="${jarFile}"/>
  +        <move file="${jarFile}.md5" toFile="temp"/>
  +        <move file="temp" toFile="${jarFile}.md5"/>
           <j:if test="${maven_gpg_exe != null}">
             <ant:exec executable="${maven_gpg_exe}">
               <ant:arg value="-a"/>
  @@ -90,6 +105,8 @@
         <util:file var="metaFile" name="${maven.build.dir}/jars/${path}.jar.meta"/>
         <j:if test="${metaFile.exists()}">
           <checksum file="${metaFile}"/>
  +        <move file="${metaFile}.md5" toFile="temp"/>
  +        <move file="temp" toFile="${metaFile}.md5"/>
           <j:if test="${maven_gpg_exe != null}">
             <ant:exec executable="${maven_gpg_exe}">
               <ant:arg value="-a"/>
  @@ -202,6 +219,8 @@
       />
       <ant:delete file="${maven.dist.dir}/${binary.name}.tar"/>
       <checksum file="${maven.dist.dir}/${binary.name}.tar.gz"/>
  +    <move file="${metaFile}.md5" toFile="temp"/>
  +    <move file="temp" toFile="${metaFile}.md5"/>
       <j:if test="${maven_gpg_exe != null}">
         <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
  @@ -215,6 +234,8 @@
         <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
       </ant:zip>
       <checksum file="${maven.dist.dir}/${binary.name}.zip"/>
  +    <move file="${maven.dist.dir}/${binary.name}.zip.md5" toFile="temp"/>
  +    <move file="temp" toFile="${maven.dist.dir}/${binary.name}.zip.md5"/>
       <j:if test="${maven_gpg_exe != null}">
         <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
  @@ -239,6 +260,8 @@
       />
       <ant:delete file="${maven.dist.dir}/${source.name}.tar"/>
       <checksum file="${maven.dist.dir}/${source.name}.tar.gz"/>
  +    <move file="${maven.dist.dir}/${source.name}.tar.gz.md5" toFile="temp"/>
  +    <move file="temp" toFile="${maven.dist.dir}/${source.name}.tar.gz.md5"/>
       <j:if test="${maven_gpg_exe != null}">
         <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
  @@ -252,6 +275,8 @@
         <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
       </ant:zip>
       <checksum file="${maven.dist.dir}/${source.name}.zip"/>
  +    <move file="${maven.dist.dir}/${source.name}.zip.md5" toFile="temp"/>
  +    <move file="temp" toFile="${maven.dist.dir}/${source.name}.zip.md5"/>
       <j:if test="${maven_gpg_exe != null}">
         <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
  
  
  
  1.6       +7 -0      avalon/logging/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	28 Feb 2004 14:10:18 -0000	1.5
  +++ project.xml	9 Apr 2004 09:37:10 -0000	1.6
  @@ -138,6 +138,13 @@
               <include>**/*</include>
             </includes>
           </resource>
  +        <resource>
  +          <filtering>true</filtering>
  +          <directory>${basedir}/conf</directory>
  +          <includes>
  +            <include>system.xml</include>
  +          </includes>
  +        </resource>
         </resources>
       </unitTest>
   
  
  
  
  1.1                  avalon/logging/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % framework-entities SYSTEM "file:../versioning/avalon-framework.ent"> %framework-entities;
  <!ENTITY % repository-entities SYSTEM "file:../versioning/avalon-repository.ent"> %repository-entities;
  <!ENTITY % util-entities SYSTEM "file:../versioning/avalon-util.ent"> %util-entities;
  <!ENTITY % logkit-entities SYSTEM "file:../versioning/avalon-logkit.ent"> %logkit-entities;
  <!ENTITY % logging-entities SYSTEM "file:../versioning/avalon-logging.ent"> %logging-entities;
  <!ENTITY % meta-entities SYSTEM "file:../versioning/avalon-meta.ent"> %meta-entities;
  
  
  
  1.5       +35 -30    avalon/logging/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/spi/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	31 Mar 2004 16:57:20 -0000	1.4
  +++ project.xml	9 Apr 2004 09:37:10 -0000	1.5
  @@ -1,15 +1,18 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
     <extend>${basedir}/../project.xml</extend>
   
  -  <groupId>avalon-logging</groupId>
  -  <id>avalon-logging-spi</id>
  +  <groupId>&avalon-logging-id;</groupId>
  +  <id>&avalon-logging-spi-id;</id>
  +  <currentVersion>&avalon-logging-spi-version;</currentVersion>
  +
     <name>Avalon Logging SPI</name>
     <package>org.apache.avalon.logging.provider</package>
  -  <currentVersion>1.0-SNAPSHOT</currentVersion>
  -
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Logging SPI</shortDescription>
   
  @@ -19,49 +22,51 @@
     
     <dependencies>
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-api-id;</artifactId>
  +      <version>&avalon-framework-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-api</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-api-id;</artifactId>
  +      <version>&avalon-repository-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-main</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-main-id;</artifactId>
  +      <version>&avalon-repository-main-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-spi</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-spi-id;</artifactId>
  +      <version>&avalon-repository-spi-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-api-id;</artifactId>
  +      <version>&avalon-logging-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-criteria</artifactId>
  -      <version>1.1-SNAPSHOT</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-criteria-id;</artifactId>
  +      <version>&avalon-util-criteria-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-i18n</artifactId>
  -      <version>1.0</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-i18n-id;</artifactId>
  +      <version>&avalon-util-i18n-version;</version>
       </dependency>
       <dependency>
  -      <id>excalibur-configuration</id>
  -      <version>1.2</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-defaults-id;</artifactId>
  +      <version>&avalon-util-defaults-version;</version>
       </dependency>
  +
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-defaults</artifactId>
  -      <version>1.2-SNAPSHOT</version>
  +      <id>excalibur-configuration</id>
  +      <version>1.2</version>
       </dependency>
  +
     </dependencies>
   
   </project>
  
  
  
  1.1                  avalon/logging/spi/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent"> %framework-entities;
  <!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repository-entities;
  <!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  <!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  
  
  
  1.2       +2 -2      avalon/logging/test/conf/system.xml
  
  Index: system.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/test/conf/system.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- system.xml	27 Feb 2004 22:39:35 -0000	1.1
  +++ system.xml	9 Apr 2004 09:37:10 -0000	1.2
  @@ -4,6 +4,6 @@
   -->
   
   <system>
  -  <artifact spec="avalon-logging/avalon-logkit-impl#1.0-SNAPSHOT"/>
  -  <artifact spec="avalon-logging/avalon-log4j-impl#1.0-SNAPSHOT"/>
  +  <artifact spec="@AVALON-LOGGING-LOGKIT-SPEC@"/>
  +  <artifact spec="@AVALON-LOGGING-LOG4J-SPEC@"/>
   </system>
  
  
  
  1.2       +1 -0      avalon/logging/test/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/test/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	25 Feb 2004 11:28:04 -0000	1.1
  +++ maven.xml	9 Apr 2004 09:37:10 -0000	1.2
  @@ -1,2 +1,3 @@
   <project default="test:test">
  +
   </project>
  
  
  
  1.5       +26 -23    avalon/logging/test/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/test/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	8 Mar 2004 11:32:02 -0000	1.4
  +++ project.xml	9 Apr 2004 09:37:10 -0000	1.5
  @@ -1,48 +1,51 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../project.xml</extend>
  +
  +  <groupId>&avalon-logging-id;</groupId>
  +  <id>&avalon-logging-test-id;</id>
  +  <currentVersion>&avalon-logging-test-version;</currentVersion>
   
  -  <groupId>avalon-logging</groupId>
  -  <id>avalon-logkit-test</id>
     <name>Avalon Logging Test</name>
     <package>org.apache.avalon.logging</package>
  -  <currentVersion>1.0-SNAPSHOT</currentVersion>
  -
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Logging Test.</shortDescription>
   
     <dependencies>
       <dependency>
  -      <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-main</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  +      <groupId>&avalon-repository-id;</groupId>
  +      <artifactId>&avalon-repository-main-id;</artifactId>
  +      <version>&avalon-repository-main-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-framework</groupId> 
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-api-id;</artifactId>
  +      <version>&avalon-framework-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <groupId>&avalon-framework-id;</groupId>
  +      <artifactId>&avalon-framework-impl-id;</artifactId>
  +      <version>&avalon-framework-impl-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-api</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-api-id;</artifactId>
  +      <version>&avalon-logging-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-logging</groupId>
  -      <artifactId>avalon-logging-spi</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  +      <groupId>&avalon-logging-id;</groupId>
  +      <artifactId>&avalon-logging-spi-id;</artifactId>
  +      <version>&avalon-logging-spi-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-util</groupId>
  -      <artifactId>avalon-util-i18n</artifactId>
  -      <version>1.0</version>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-i18n-id;</artifactId>
  +      <version>&avalon-util-i18n-version;</version>
       </dependency>
     </dependencies>
   </project>
  
  
  
  1.1                  avalon/logging/test/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent"> %framework-entities;
  <!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repository-entities;
  <!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  <!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  
  
  
  1.4       +2 -2      avalon/logging/test/src/test/org/apache/avalon/logging/LoggingManagerHelper.java
  
  Index: LoggingManagerHelper.java
  ===================================================================
  RCS file: /home/cvs/avalon/logging/test/src/test/org/apache/avalon/logging/LoggingManagerHelper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LoggingManagerHelper.java	17 Mar 2004 10:30:09 -0000	1.3
  +++ LoggingManagerHelper.java	9 Apr 2004 09:37:10 -0000	1.4
  @@ -56,7 +56,7 @@
       public static LoggingManager setUpLoggingManager( 
         String id, String filename ) throws Exception
       {
  -        InitialContext context = setUpInitialContext( "conf/system.xml" );
  +        InitialContext context = setUpInitialContext( "target/test-classes/system.xml" );
           Artifact[] candidates = 
             context.getRepository().getCandidates( LoggingManager.class );
           Artifact artifact = selectArtifact( candidates, id );
  
  
  
  1.4       +2 -2      avalon/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java
  
  Index: AlternateLoggingManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AlternateLoggingManagerTestCase.java	17 Mar 2004 10:30:08 -0000	1.3
  +++ AlternateLoggingManagerTestCase.java	9 Apr 2004 09:37:10 -0000	1.4
  @@ -60,7 +60,7 @@
       {
           m_manager = 
             LoggingManagerHelper.setUpLoggingManager( 
  -            "avalon-log4j-impl", "log4j/log4j.properties" );
  +            "avalon-logging-log4j", "log4j/log4j.properties" );
       }
   
       public void testKernelLogging() throws Exception
  
  
  
  1.5       +2 -2      avalon/logging/test/src/test/org/apache/avalon/logging/log4j/test/DefaultLoggingManagerTestCase.java
  
  Index: DefaultLoggingManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon/logging/test/src/test/org/apache/avalon/logging/log4j/test/DefaultLoggingManagerTestCase.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultLoggingManagerTestCase.java	17 Mar 2004 10:30:08 -0000	1.4
  +++ DefaultLoggingManagerTestCase.java	9 Apr 2004 09:37:10 -0000	1.5
  @@ -60,7 +60,7 @@
       {
           m_manager = 
             LoggingManagerHelper.setUpLoggingManager( 
  -            "avalon-log4j-impl", "log4j/log4j.xml" );
  +            "avalon-logging-log4j", "log4j/log4j.xml" );
       }
   
       public void testKernelLogging() throws Exception
  
  
  
  1.4       +2 -2      avalon/logging/test/src/test/org/apache/avalon/logging/logkit/test/DefaultLoggingManagerTestCase.java
  
  Index: DefaultLoggingManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon/logging/test/src/test/org/apache/avalon/logging/logkit/test/DefaultLoggingManagerTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultLoggingManagerTestCase.java	17 Mar 2004 10:30:08 -0000	1.3
  +++ DefaultLoggingManagerTestCase.java	9 Apr 2004 09:37:10 -0000	1.4
  @@ -60,7 +60,7 @@
       {
           m_manager = 
             LoggingManagerHelper.setUpLoggingManager( 
  -            "avalon-logkit-impl", "logkit/logging.xml" );
  +            "avalon-logging-logkit-impl", "logkit/logging.xml" );
       }
   
       public void testKernelLogging() throws Exception
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message