Peter, I think it's a bit premature to apply the 2.0 licence already. The board has announced additional information on how the licence should be applied. This is not a veto, I just want to avoid you having to do the whole thing twice.
Another thing: Please pay attention to the copyright years. You have to take them over from the old licence. On 27.01.2004 00:07:11 pbwest wrote: > pbwest 2004/01/26 15:07:11 > > Modified: src/java/org/apache/fop/datastructs Tag: > FOP_0-20-0_Alt-Design Tree.java > Log: > Removed references to modCount, used for > ConcurrentModificationException detection. Removed > references to the setting of the containing Tree instance in > Nodes. > Updated license to 2.0. > > Revision Changes Path > No revision > No revision > 220.127.116.11 +16 -106 xml-fop/src/java/org/apache/fop/datastructs/Attic/Tree.java > > Index: Tree.java > =================================================================== > RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datastructs/Attic/Tree.java,v > retrieving revision 18.104.22.168 > retrieving revision 22.214.171.124 > diff -u -r126.96.36.199 -r188.8.131.52 > --- Tree.java 5 Jul 2003 19:06:35 -0000 184.108.40.206 > +++ Tree.java 26 Jan 2004 23:07:11 -0000 220.127.116.11 > @@ -1,55 +1,19 @@ > /* > + Copyright 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$ > - * > - * > - * ============================================================================ > - * The Apache Software License, Version 1.1 > - * ============================================================================ > - * > - * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. > - * <snip/> Jeremias Maerki