avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: avalon-logkit/src/test/org/apache/log/format/test FormatterTestCase.java
Date Tue, 24 Feb 2004 19:13:29 GMT
cziegeler    2004/02/24 11:13:29

  Modified:    src/test/org/apache/log/output/test
                        TestRotatingFileOutputLogTarget.java
                        OutputTargetTestCase.java DatagramTest.java
                        RevolvingFileStrategyTestCase.java
                        DBTargetTestCase.java
               src/xdocs tabs.xml whitepaper.xml book.xml features.xml
                        index.xml
               .        forrest.properties project.xml check-targets.ent
                        build.xml project.properties ant.properties.sample
                        maven.xml check-targets.properties gump-build.xml
               src/test/org/apache/log/util/test UtilTestCase.java
               src/test/org/apache/log/test InheritanceTestCase.java
                        RecordingLoggerListener.java
                        LoggerListenerTestCase.java
                        WrappingTargetTestCase.java
               src/test/org/apache/log/format/test FormatterTestCase.java
  Log:
  Move to version 2.0:
  - remove dependency to Avalon Framework 
  - remove deprecated code
  Move to license 2.0
  
  Revision  Changes    Path
  1.7       +15 -53    avalon-logkit/src/test/org/apache/log/output/test/TestRotatingFileOutputLogTarget.java
  
  Index: TestRotatingFileOutputLogTarget.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/output/test/TestRotatingFileOutputLogTarget.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TestRotatingFileOutputLogTarget.java	9 Feb 2003 23:33:25 -0000	1.6
  +++ TestRotatingFileOutputLogTarget.java	24 Feb 2004 19:13:29 -0000	1.7
  @@ -1,56 +1,18 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-2003 The Apache Software Foundation. All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *    "This product includes software developed by the
  - *    Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software
  - *    itself, if and wherever such third-party acknowledgments
  - *    normally appear.
  - *
  - * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation. For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
    */
   package org.apache.log.output.test;
   
  
  
  
  1.7       +15 -53    avalon-logkit/src/test/org/apache/log/output/test/OutputTargetTestCase.java
  
  Index: OutputTargetTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/output/test/OutputTargetTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- OutputTargetTestCase.java	5 Dec 2003 15:14:12 -0000	1.6
  +++ OutputTargetTestCase.java	24 Feb 2004 19:13:29 -0000	1.7
  @@ -1,56 +1,18 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-2003 The Apache Software Foundation. All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *    "This product includes software developed by the
  - *    Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software
  - *    itself, if and wherever such third-party acknowledgments
  - *    normally appear.
  - *
  - * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation. For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
    */
   package org.apache.log.output.test;
   
  
  
  
  1.11      +15 -53    avalon-logkit/src/test/org/apache/log/output/test/DatagramTest.java
  
  Index: DatagramTest.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/output/test/DatagramTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DatagramTest.java	5 Dec 2003 15:14:12 -0000	1.10
  +++ DatagramTest.java	24 Feb 2004 19:13:29 -0000	1.11
  @@ -1,56 +1,18 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-2003 The Apache Software Foundation. All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *    "This product includes software developed by the
  - *    Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software
  - *    itself, if and wherever such third-party acknowledgments
  - *    normally appear.
  - *
  - * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation. For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
    */
   package org.apache.log.output.test;
   
  
  
  
  1.6       +15 -53    avalon-logkit/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java
  
  Index: RevolvingFileStrategyTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RevolvingFileStrategyTestCase.java	5 Dec 2003 15:14:12 -0000	1.5
  +++ RevolvingFileStrategyTestCase.java	24 Feb 2004 19:13:29 -0000	1.6
  @@ -1,56 +1,18 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-2003 The Apache Software Foundation. All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *    "This product includes software developed by the
  - *    Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software
  - *    itself, if and wherever such third-party acknowledgments
  - *    normally appear.
  - *
  - * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation. For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
    */
   package org.apache.log.output.test;
   
  
  
  
  1.8       +15 -53    avalon-logkit/src/test/org/apache/log/output/test/DBTargetTestCase.java
  
  Index: DBTargetTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/output/test/DBTargetTestCase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DBTargetTestCase.java	5 Dec 2003 15:14:12 -0000	1.7
  +++ DBTargetTestCase.java	24 Feb 2004 19:13:29 -0000	1.8
  @@ -1,56 +1,18 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-2003 The Apache Software Foundation. All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *    "This product includes software developed by the
  - *    Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software
  - *    itself, if and wherever such third-party acknowledgments
  - *    normally appear.
  - *
  - * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation. For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
    */
   package org.apache.log.output.test;
   
  
  
  
  1.2       +31 -15    avalon-logkit/src/xdocs/tabs.xml
  
  Index: tabs.xml
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/xdocs/tabs.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tabs.xml	19 Jun 2003 20:31:59 -0000	1.1
  +++ tabs.xml	24 Feb 2004 19:13:29 -0000	1.2
  @@ -1,15 +1,31 @@
  -<?xml version="1.0" encoding="UTF-8"?>
  -<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" "tab-cocoon-v10.dtd">
  -
  -<tabs    software="Avalon-Fortress-Documentation"
  -         title="Avalon-Fortress-Documentation"
  -         copyright="Copyright (C) 2003 Apache Software Foundation">
  -
  -    <tab label="Home" href="http://avalon.apache.org/"/>
  -    <tab label="Framework" href="http://avalon.apache.org/framework/"/>
  -    <tab label="Components" href="http://avalon.apache.org/components/"/>
  -    <tab label="Containers" href="http://avalon.apache.org/containers/"/>
  -    <tab label="Apps" href="http://avalon.apache.org/apps/"/>
  -    <tab label="Sandbox" href="http://avalon.apache.org/sandbox/"/>
  -
  -</tabs>
  +<?xml version="1.0" encoding="UTF-8"?>
  +<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" "tab-cocoon-v10.dtd">
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
  +
  +<tabs    software="Avalon-Fortress-Documentation"
  +         title="Avalon-Fortress-Documentation"
  +         copyright="Copyright (C) 2003 Apache Software Foundation">
  +
  +    <tab label="Home" href="http://avalon.apache.org/"/>
  +    <tab label="Framework" href="http://avalon.apache.org/framework/"/>
  +    <tab label="Components" href="http://avalon.apache.org/components/"/>
  +    <tab label="Containers" href="http://avalon.apache.org/containers/"/>
  +    <tab label="Apps" href="http://avalon.apache.org/apps/"/>
  +    <tab label="Sandbox" href="http://avalon.apache.org/sandbox/"/>
  +
  +</tabs>
  
  
  
  1.12      +16 -0     avalon-logkit/src/xdocs/whitepaper.xml
  
  Index: whitepaper.xml
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/xdocs/whitepaper.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- whitepaper.xml	19 Jun 2003 20:31:59 -0000	1.11
  +++ whitepaper.xml	24 Feb 2004 19:13:29 -0000	1.12
  @@ -1,5 +1,21 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   
   <document>
   
  
  
  
  1.8       +16 -0     avalon-logkit/src/xdocs/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/xdocs/book.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- book.xml	19 Jun 2003 20:31:59 -0000	1.7
  +++ book.xml	24 Feb 2004 19:13:29 -0000	1.8
  @@ -1,5 +1,21 @@
   <?xml version="1.0" encoding="UTF-8"?>
         <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "book-cocoon-v10.dtd">
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   
   <book software="Avalon-Framework"
       title="Avalon-Framework"
  
  
  
  1.11      +16 -0     avalon-logkit/src/xdocs/features.xml
  
  Index: features.xml
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/xdocs/features.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- features.xml	19 Jun 2003 20:31:59 -0000	1.10
  +++ features.xml	24 Feb 2004 19:13:29 -0000	1.11
  @@ -1,5 +1,21 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   
   <document>
   
  
  
  
  1.11      +16 -0     avalon-logkit/src/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/xdocs/index.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- index.xml	19 Jun 2003 20:31:59 -0000	1.10
  +++ index.xml	24 Feb 2004 19:13:29 -0000	1.11
  @@ -1,5 +1,21 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   
   <document>
   
  
  
  
  1.3       +17 -0     avalon-logkit/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/forrest.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- forrest.properties	19 Jun 2003 19:44:39 -0000	1.2
  +++ forrest.properties	24 Feb 2004 19:13:29 -0000	1.3
  @@ -1,3 +1,20 @@
  +# 
  +# Copyright 2004 Apache Software Foundation
  +# Licensed  under the  Apache License,  Version 2.0  (the "License");
  +# you may not use  this file  except in  compliance with the License.
  +# You may obtain a copy of the License at 
  +# 
  +#   http://www.apache.org/licenses/LICENSE-2.0
  +# 
  +# Unless required by applicable law or agreed to in writing, software
  +# distributed  under the  License is distributed on an "AS IS" BASIS,
  +# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  +# implied.
  +#  
  +# See the License for the specific language governing permissions and
  +# limitations under the License.
  +#
  +#
   project.skin=avalon-tigris
   project.content-dir=../avalon/buildsystem/documentation
   
  
  
  
  1.6       +17 -7     avalon-logkit/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	19 Jun 2003 19:23:17 -0000	1.5
  +++ project.xml	24 Feb 2004 19:13:29 -0000	1.6
  @@ -1,12 +1,27 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   <project>
       <extend>${avalon.buildsystem}/project-common.xml</extend>
   
       <name>Avalon-LogKit</name>
       <id>logkit</id>
       <groupId>logkit</groupId>
  -    <currentVersion>1.2.2-dev</currentVersion>
  +    <currentVersion>2.0-dev</currentVersion>
       <inceptionYear>2003</inceptionYear>
       <shortDescription>The Avalon-LogKit logging utility</shortDescription>
       <description>
  @@ -16,11 +31,6 @@
       <package>org.apache.log</package>
   
       <dependencies>
  -      <dependency>
  -        <id>avalon-framework</id>
  -        <version>4.1.4</version>
  -        <groupId>framework</groupId>
  -      </dependency>
         <dependency>
           <id>log4j</id>
           <version>1.2.8</version>
  
  
  
  1.6       +16 -0     avalon-logkit/check-targets.ent
  
  Index: check-targets.ent
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/check-targets.ent,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- check-targets.ent	4 Jun 2003 08:12:34 -0000	1.5
  +++ check-targets.ent	24 Feb 2004 19:13:29 -0000	1.6
  @@ -1,3 +1,19 @@
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   <!--
   This build.xml snippet contains targets for ant 1.5 that check whether
   a specific libary is present, and offers targets for downloading them
  
  
  
  1.105     +15 -13    avalon-logkit/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/build.xml,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- build.xml	20 Jun 2003 15:52:19 -0000	1.104
  +++ build.xml	24 Feb 2004 19:13:29 -0000	1.105
  @@ -3,19 +3,21 @@
       <!ENTITY check-targets SYSTEM "file:check-targets.ent">
     ]>
   
  -
  -<!--
  -==============================================================================
  -
  - LogKit build file
  -
  -Authors:
  - Peter Donald <peter at apache.org>
  -
  -Legal:
  -  Copyright (c) 2001-2002 The Apache Software Foundation. All Rights Reserved.
  -
  -==============================================================================
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
   -->
   
   <project name="Avalon Logkit" default="main" basedir=".">
  
  
  
  1.3       +17 -0     avalon-logkit/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	19 Jun 2003 19:44:39 -0000	1.2
  +++ project.properties	24 Feb 2004 19:13:29 -0000	1.3
  @@ -1,3 +1,20 @@
  +# 
  +# Copyright 2004 Apache Software Foundation
  +# Licensed  under the  Apache License,  Version 2.0  (the "License");
  +# you may not use  this file  except in  compliance with the License.
  +# You may obtain a copy of the License at 
  +# 
  +#   http://www.apache.org/licenses/LICENSE-2.0
  +# 
  +# Unless required by applicable law or agreed to in writing, software
  +# distributed  under the  License is distributed on an "AS IS" BASIS,
  +# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  +# implied.
  +#  
  +# See the License for the specific language governing permissions and
  +# limitations under the License.
  +#
  +#
   
   # -------------------------------------------------------------------
   # P R O J E C T  P R O P E R T I E S
  
  
  
  1.3       +17 -0     avalon-logkit/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	21 Feb 2003 05:52:02 -0000	1.2
  +++ ant.properties.sample	24 Feb 2004 19:13:29 -0000	1.3
  @@ -1,3 +1,20 @@
  +# 
  +# Copyright 2004 Apache Software Foundation
  +# Licensed  under the  Apache License,  Version 2.0  (the "License");
  +# you may not use  this file  except in  compliance with the License.
  +# You may obtain a copy of the License at 
  +# 
  +#   http://www.apache.org/licenses/LICENSE-2.0
  +# 
  +# Unless required by applicable law or agreed to in writing, software
  +# distributed  under the  License is distributed on an "AS IS" BASIS,
  +# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  +# implied.
  +#  
  +# See the License for the specific language governing permissions and
  +# limitations under the License.
  +#
  +#
   # This file is a sample ant.properties file used for building Avalon-LogKit. It
   # allows variables defined in build.xml to be overridden according to users'
   # specific needs. 
  
  
  
  1.5       +16 -1     avalon-logkit/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/maven.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- maven.xml	8 Jul 2003 12:06:56 -0000	1.4
  +++ maven.xml	24 Feb 2004 19:13:29 -0000	1.5
  @@ -1,5 +1,20 @@
   <?xml version="1.0"?>
  -
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   <project default="check"
       xmlns:j="jelly:core"
       xmlns:ant="jelly:ant"
  
  
  
  1.4       +17 -0     avalon-logkit/check-targets.properties
  
  Index: check-targets.properties
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/check-targets.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- check-targets.properties	16 Apr 2003 23:03:52 -0000	1.3
  +++ check-targets.properties	24 Feb 2004 19:13:29 -0000	1.4
  @@ -1,3 +1,20 @@
  +# 
  +# Copyright 2004 Apache Software Foundation
  +# Licensed  under the  Apache License,  Version 2.0  (the "License");
  +# you may not use  this file  except in  compliance with the License.
  +# You may obtain a copy of the License at 
  +# 
  +#   http://www.apache.org/licenses/LICENSE-2.0
  +# 
  +# Unless required by applicable law or agreed to in writing, software
  +# distributed  under the  License is distributed on an "AS IS" BASIS,
  +# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  +# implied.
  +#  
  +# See the License for the specific language governing permissions and
  +# limitations under the License.
  +#
  +#
   # sets up properties for the dependency download mechanism
   
   jar.repository=http://www.ibiblio.org/maven
  
  
  
  1.2       +16 -2     avalon-logkit/gump-build.xml
  
  Index: gump-build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/gump-build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gump-build.xml	17 Jun 2003 16:23:06 -0000	1.1
  +++ gump-build.xml	24 Feb 2004 19:13:29 -0000	1.2
  @@ -1,6 +1,20 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -
  -
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   <project default="warning" name="Gump Build Support - DO NOT HAND-EDIT!!!" basedir=".">
   
       <property file="${basedir}/project.properties"></property>
  
  
  
  1.10      +15 -53    avalon-logkit/src/test/org/apache/log/util/test/UtilTestCase.java
  
  Index: UtilTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/util/test/UtilTestCase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- UtilTestCase.java	5 Dec 2003 15:14:12 -0000	1.9
  +++ UtilTestCase.java	24 Feb 2004 19:13:29 -0000	1.10
  @@ -1,56 +1,18 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-2003 The Apache Software Foundation. All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *    "This product includes software developed by the
  - *    Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software
  - *    itself, if and wherever such third-party acknowledgments
  - *    normally appear.
  - *
  - * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation. For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
    */
   package org.apache.log.util.test;
   
  
  
  
  1.10      +15 -53    avalon-logkit/src/test/org/apache/log/test/InheritanceTestCase.java
  
  Index: InheritanceTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/test/InheritanceTestCase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- InheritanceTestCase.java	5 Dec 2003 15:14:12 -0000	1.9
  +++ InheritanceTestCase.java	24 Feb 2004 19:13:29 -0000	1.10
  @@ -1,56 +1,18 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-2003 The Apache Software Foundation. All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *    "This product includes software developed by the
  - *    Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software
  - *    itself, if and wherever such third-party acknowledgments
  - *    normally appear.
  - *
  - * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation. For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
    */
   package org.apache.log.test;
   
  
  
  
  1.5       +47 -85    avalon-logkit/src/test/org/apache/log/test/RecordingLoggerListener.java
  
  Index: RecordingLoggerListener.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/test/RecordingLoggerListener.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RecordingLoggerListener.java	5 Dec 2003 15:14:12 -0000	1.4
  +++ RecordingLoggerListener.java	24 Feb 2004 19:13:29 -0000	1.5
  @@ -1,85 +1,47 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-2003 The Apache Software Foundation. All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *    "This product includes software developed by the
  - *    Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software
  - *    itself, if and wherever such third-party acknowledgments
  - *    normally appear.
  - *
  - * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation. For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
  -package org.apache.log.test;
  -
  -import java.util.ArrayList;
  -import java.util.List;
  -import org.apache.log.Logger;
  -import org.apache.log.util.LoggerListener;
  -
  -/**
  - * A logger listener that records the log messages it receives.
  - *
  - * @author Peter Donald
  - * @version $Revision$ $Date$
  - */
  -class RecordingLoggerListener
  -    extends LoggerListener
  -{
  -    //The listeners that have been created
  -    private final List m_loggers = new ArrayList();
  -
  -    public void loggerCreated( final String category,
  -                               final Logger logger )
  -    {
  -        m_loggers.add( logger );
  -    }
  -
  -    public Logger[] getLoggers()
  -    {
  -        return (Logger[])m_loggers.toArray( new Logger[ m_loggers.size() ] );
  -    }
  -}
  -
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + */
  +package org.apache.log.test;
  +
  +import java.util.ArrayList;
  +import java.util.List;
  +import org.apache.log.Logger;
  +import org.apache.log.util.LoggerListener;
  +
  +/**
  + * A logger listener that records the log messages it receives.
  + *
  + * @author Peter Donald
  + * @version $Revision$ $Date$
  + */
  +class RecordingLoggerListener
  +    extends LoggerListener
  +{
  +    //The listeners that have been created
  +    private final List m_loggers = new ArrayList();
  +
  +    public void loggerCreated( final String category,
  +                               final Logger logger )
  +    {
  +        m_loggers.add( logger );
  +    }
  +
  +    public Logger[] getLoggers()
  +    {
  +        return (Logger[])m_loggers.toArray( new Logger[ m_loggers.size() ] );
  +    }
  +}
  +
  
  
  
  1.7       +88 -126   avalon-logkit/src/test/org/apache/log/test/LoggerListenerTestCase.java
  
  Index: LoggerListenerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/test/LoggerListenerTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LoggerListenerTestCase.java	5 Dec 2003 15:14:12 -0000	1.6
  +++ LoggerListenerTestCase.java	24 Feb 2004 19:13:29 -0000	1.7
  @@ -1,126 +1,88 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-2003 The Apache Software Foundation. All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *    "This product includes software developed by the
  - *    Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software
  - *    itself, if and wherever such third-party acknowledgments
  - *    normally appear.
  - *
  - * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation. For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
  -package org.apache.log.test;
  -
  -import junit.framework.TestCase;
  -import org.apache.log.Hierarchy;
  -import org.apache.log.Logger;
  -
  -/**
  - * Test suite for logger listener features of Logger.
  - *
  - * @author Peter Donald
  - */
  -public final class LoggerListenerTestCase
  -    extends TestCase
  -{
  -    public LoggerListenerTestCase( final String name )
  -    {
  -        super( name );
  -    }
  -
  -    public void testUnicastLoggerListener()
  -    {
  -        final Hierarchy hierarchy = new Hierarchy();
  -        final RecordingLoggerListener listener = new RecordingLoggerListener();
  -
  -        try
  -        {
  -            hierarchy.addLoggerListener( listener );
  -            hierarchy.addLoggerListener( listener );
  -
  -            fail( "You should only be able to add one listener." );
  -        }
  -        catch (UnsupportedOperationException uoe)
  -        {
  -            // It passed, yay!
  -        }
  -    }
  -
  -    public void testRemoveLoggerListener()
  -    {
  -        final Hierarchy hierarchy = new Hierarchy();
  -        final RecordingLoggerListener listener = new RecordingLoggerListener();
  -
  -        hierarchy.addLoggerListener( listener );
  -        hierarchy.removeLoggerListener( listener );
  -        hierarchy.addLoggerListener( listener );
  -
  -        // If no exceptions have been thrown, we are in business!
  -    }
  -
  -    public void testPriorityInheritance()
  -        throws Exception
  -    {
  -        final RecordingLoggerListener listener = new RecordingLoggerListener();
  -        final Hierarchy hierarchy = new Hierarchy();
  -        hierarchy.addLoggerListener( listener );
  -
  -        final Logger root = hierarchy.getRootLogger();
  -        final Logger l1 = root.getChildLogger( "logger1" );
  -        final Logger l2 = root.getChildLogger( "logger2" );
  -        final Logger l3 = root.getChildLogger( "logger1.logger3" );
  -        final Logger l4 = root.getChildLogger( "logger5.logger4" );
  -        final Logger l5 = root.getChildLogger( "logger5" );
  -
  -        final Logger[] loggers = listener.getLoggers();
  -        assertEquals( "Logger Count", 5, loggers.length );
  -        assertEquals( "Logger[0]", l1, loggers[ 0 ] );
  -        assertEquals( "Logger[1]", l2, loggers[ 1 ] );
  -        assertEquals( "Logger[2]", l3, loggers[ 2 ] );
  -        assertEquals( "Logger[3]", l5, loggers[ 3 ] );
  -        assertEquals( "Logger[4]", l4, loggers[ 4 ] );
  -    }
  -}
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + */
  +package org.apache.log.test;
  +
  +import junit.framework.TestCase;
  +import org.apache.log.Hierarchy;
  +import org.apache.log.Logger;
  +
  +/**
  + * Test suite for logger listener features of Logger.
  + *
  + * @author Peter Donald
  + */
  +public final class LoggerListenerTestCase
  +    extends TestCase
  +{
  +    public LoggerListenerTestCase( final String name )
  +    {
  +        super( name );
  +    }
  +
  +    public void testUnicastLoggerListener()
  +    {
  +        final Hierarchy hierarchy = new Hierarchy();
  +        final RecordingLoggerListener listener = new RecordingLoggerListener();
  +
  +        try
  +        {
  +            hierarchy.addLoggerListener( listener );
  +            hierarchy.addLoggerListener( listener );
  +
  +            fail( "You should only be able to add one listener." );
  +        }
  +        catch (UnsupportedOperationException uoe)
  +        {
  +            // It passed, yay!
  +        }
  +    }
  +
  +    public void testRemoveLoggerListener()
  +    {
  +        final Hierarchy hierarchy = new Hierarchy();
  +        final RecordingLoggerListener listener = new RecordingLoggerListener();
  +
  +        hierarchy.addLoggerListener( listener );
  +        hierarchy.removeLoggerListener( listener );
  +        hierarchy.addLoggerListener( listener );
  +
  +        // If no exceptions have been thrown, we are in business!
  +    }
  +
  +    public void testPriorityInheritance()
  +        throws Exception
  +    {
  +        final RecordingLoggerListener listener = new RecordingLoggerListener();
  +        final Hierarchy hierarchy = new Hierarchy();
  +        hierarchy.addLoggerListener( listener );
  +
  +        final Logger root = hierarchy.getRootLogger();
  +        final Logger l1 = root.getChildLogger( "logger1" );
  +        final Logger l2 = root.getChildLogger( "logger2" );
  +        final Logger l3 = root.getChildLogger( "logger1.logger3" );
  +        final Logger l4 = root.getChildLogger( "logger5.logger4" );
  +        final Logger l5 = root.getChildLogger( "logger5" );
  +
  +        final Logger[] loggers = listener.getLoggers();
  +        assertEquals( "Logger Count", 5, loggers.length );
  +        assertEquals( "Logger[0]", l1, loggers[ 0 ] );
  +        assertEquals( "Logger[1]", l2, loggers[ 1 ] );
  +        assertEquals( "Logger[2]", l3, loggers[ 2 ] );
  +        assertEquals( "Logger[3]", l5, loggers[ 3 ] );
  +        assertEquals( "Logger[4]", l4, loggers[ 4 ] );
  +    }
  +}
  
  
  
  1.3       +15 -53    avalon-logkit/src/test/org/apache/log/test/WrappingTargetTestCase.java
  
  Index: WrappingTargetTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/test/WrappingTargetTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WrappingTargetTestCase.java	4 Mar 2003 18:35:52 -0000	1.2
  +++ WrappingTargetTestCase.java	24 Feb 2004 19:13:29 -0000	1.3
  @@ -1,56 +1,18 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-2003 The Apache Software Foundation. All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *    "This product includes software developed by the
  - *    Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software
  - *    itself, if and wherever such third-party acknowledgments
  - *    normally appear.
  - *
  - * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation. For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
    */
   package org.apache.log.test;
   
  
  
  
  1.9       +19 -60    avalon-logkit/src/test/org/apache/log/format/test/FormatterTestCase.java
  
  Index: FormatterTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/format/test/FormatterTestCase.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FormatterTestCase.java	5 Dec 2003 15:14:12 -0000	1.8
  +++ FormatterTestCase.java	24 Feb 2004 19:13:29 -0000	1.9
  @@ -1,62 +1,23 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-2003 The Apache Software Foundation. All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *    "This product includes software developed by the
  - *    Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software
  - *    itself, if and wherever such third-party acknowledgments
  - *    normally appear.
  - *
  - * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation. For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
    */
   package org.apache.log.format.test;
   
   import junit.framework.TestCase;
   import org.apache.log.ContextMap;
  -import org.apache.log.ContextStack;
   import org.apache.log.LogEvent;
   import org.apache.log.Priority;
   import org.apache.log.format.Formatter;
  @@ -67,7 +28,7 @@
   
   /**
    * Test suite for the formatters.
  - * TODO: Incorporate testing for ContextStack and ContextMap
  + * TODO: Incorporate testing for ContextMap
    *
    * @author Peter Donald
    */
  @@ -96,9 +57,9 @@
       private static ContextMap CM1 = new ContextMap();
       private static ContextMap CM2 = new ContextMap();
   
  -    private static LogEvent E1 = createEvent( C1, M1, null, T1, P1, null, CM1 );
  -    private static LogEvent E2 = createEvent( C2, M2, null, T2, P2, null, CM2 );
  -    private static LogEvent E3 = createEvent( C3, M3, null, T3, P3, null, null );
  +    private static LogEvent E1 = createEvent( C1, M1, null, T1, P1, CM1 );
  +    private static LogEvent E2 = createEvent( C2, M2, null, T2, P2, CM2 );
  +    private static LogEvent E3 = createEvent( C3, M3, null, T3, P3, null );
   
       private static String E1_XML = "<log-entry>" + EOL +
           "  <time>" + T1 + "</time>" + EOL +
  @@ -196,7 +157,6 @@
                                            final Throwable throwable,
                                            final long time,
                                            final Priority priority,
  -                                         final ContextStack contextStack,
                                            final ContextMap contextMap )
       {
           setupContext();
  @@ -207,7 +167,6 @@
           event.setThrowable( throwable );
           event.setTime( time );
           event.setPriority( priority );
  -        event.setContextStack( contextStack );
           event.setContextMap( contextMap );
           return event;
       }
  
  
  

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


Mime
View raw message