You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@xalan.apache.org by Brian Minchau <mi...@ca.ibm.com> on 2004/02/09 19:17:17 UTC

Mutilple file updates for new 2.0 license




Just to give you the "heads up" on:
  - multiple file changes related to conform to the new Apache 2.0 license,
  - the removal of the copyright statement of entities other than the
Apache Software Foundation from the source code.

I'm planning to change multiple  .java files on the HEAD branch when
putting the new Apache 2.0 license in place.

Here is how the parts will change:

1 - The old copyright, in a comment, will be replaced with the new one,
with the copyright date range being the oldest year to 2004 as the newest.
2 - If there is a $Id$ CVS teg it wil move into a separate comment after
the copyright.
3 - Any @author tags will move into the Javadoc before the class or
interface.  If there was no such Javadoc a minimal Javadoc will be created.
4 - Any copyrights by other comanies will be removed from the source code
and in their place a generic statement will be put in the NOTICE file of
the distribution, but NOT listing any particular files or packages as being
contributed.

Here is an example for the IntegerArray.java file which currently looks
like this:

/*
 * @(#)$Id: IntegerArray.java,v 1.7 2003/07/10 15:02:13 mkwan Exp $
 *
 * The Apache Software License, Version 1.1
 *
 *
 * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
 * reserved.
... cut some out here ...
...
 *
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation and was
 * originally based on software copyright (c) 2001, Sun
 * Microsystems., http://www.sun.com.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 *
 * @author Jacek Ambroziak
 *
 */

package org.apache.xalan.xsltc.util;

public final class IntegerArray {
...
...

When the 2.0 license is in place the file will look like this:

/*
 * Copyright 2001-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.
 */

/*
 * $Id$
 */

package org.apache.xalan.xsltc.util;

/**
 * @author Jacek Ambroziak
 */
public final class IntegerArray {
...
...

The page http://www.apache.org/dev/apply-license.html  indicates that there
should be a LICENSE file in the top level of the distribution ( it uses the
article "the" so I think there is only one such file).  This page also
allows for "the" NOTICE file. In the above sample the Sun Microsystems
copyright would be removed and only a blanket statement would be in this
NOTICE file.  Other companies copyrights would be treated the same way.  So
the generic NOTICE file will look something like this:
==============================================================
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).

Portions of this software were developed and contributed by:
- Sun Microsystems
- IBM Corporation
- Lotus Corporation
==============================================================


----------
Brian Minchau
XSLT Development, IBM Toronto
e-mail:        minchau@ca.ibm.com