logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Paul Smith <paul.sm...@lawlex.com.au>
Subject Re: cvs commit: logging-log4j/src/java/org/apache/log4j/varia LogFilePatternReceiverBeanInfo.java LogFilePatternReceiver.java
Date Sun, 29 Feb 2004 21:15:05 GMT
Hey Scott, did you update a local Jalopy Syntax file or do this
manually?  I think there is a "log4j-coding-conventions.xml" file in the
repository, and I am wondering whether we can update it so that Jalopy
can remove any old license file that might creep in, and automatically
add the new file (even if no license file is there).

cheers,

Paul
On Mon, 2004-03-01 at 08:06, sdeboy@apache.org wrote:
> sdeboy      2004/02/29 13:06:10
> 
>   Modified:    src/java/org/apache/log4j/varia
>                         LogFilePatternReceiverBeanInfo.java
>                         LogFilePatternReceiver.java
>   Log:
>   Updated with latest license.
>   
>   Revision  Changes    Path
>   1.2       +14 -46    logging-log4j/src/java/org/apache/log4j/varia/LogFilePatternReceiverBeanInfo.java
>   
>   Index: LogFilePatternReceiverBeanInfo.java
>   ===================================================================
>   RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/varia/LogFilePatternReceiverBeanInfo.java,v
>   retrieving revision 1.1
>   retrieving revision 1.2
>   diff -u -r1.1 -r1.2
>   --- LogFilePatternReceiverBeanInfo.java	29 Feb 2004 20:23:40 -0000	1.1
>   +++ LogFilePatternReceiverBeanInfo.java	29 Feb 2004 21:06:10 -0000	1.2
>   @@ -1,51 +1,19 @@
>    /*
>   - * ============================================================================
>   - *                   The Apache Software License, Version 1.1
>   - * ============================================================================
>   - *
>   - *    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
>   - *
>   - * Redistribution and use in source and binary forms, with or without modifica-
>   - * tion, 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 "log4j" 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 (INCLU-
>   - * DING, 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 The 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.log4j.varia;
>    
>    import java.beans.PropertyDescriptor;
>   
>   
>   
>   1.2       +14 -47    logging-log4j/src/java/org/apache/log4j/varia/LogFilePatternReceiver.java
>   
>   Index: LogFilePatternReceiver.java
>   ===================================================================
>   RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/varia/LogFilePatternReceiver.java,v
>   retrieving revision 1.1
>   retrieving revision 1.2
>   diff -u -r1.1 -r1.2
>   --- LogFilePatternReceiver.java	29 Feb 2004 20:23:40 -0000	1.1
>   +++ LogFilePatternReceiver.java	29 Feb 2004 21:06:10 -0000	1.2
>   @@ -1,52 +1,19 @@
>    /*
>   - * ============================================================================
>   - *                   The Apache Software License, Version 1.1
>   - * ============================================================================
>   - *
>   - *    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
>   - *
>   - * Redistribution and use in source and binary forms, with or without modifica-
>   - * tion, 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 "log4j" 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 (INCLU-
>   - * DING, 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 The 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.log4j.varia;
>    
>    import org.apache.log4j.Level;
>   
>   
>   
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
> For additional commands, e-mail: log4j-dev-help@logging.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Mime
View raw message