Skip to content

Commit 2180420

Browse files
author
Timothy O'Brien
committed
Fixed a number of broken Apache License 1.1 issues.
Included the license verbatim from /commons/license (fixed the "acknowledgement" spelling bugs). git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/codec/trunk@130204 13f79535-47bb-0310-9956-ffa450edef68
1 parent ce78867 commit 2180420

31 files changed

Lines changed: 677 additions & 666 deletions

‎LICENSE.txt‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,38 @@
11
/*
2-
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//codec/LICENSE.txt,v 1.2 2003/08/18 01:47:51 ggregory Exp $
3-
* $Revision: 1.2 $
4-
* $Date: 2003/08/18 01:47:51 $
5-
*
62
* ====================================================================
7-
*
3+
*
84
* The Apache Software License, Version 1.1
95
*
10-
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
6+
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
117
* reserved.
128
*
139
* Redistribution and use in source and binary forms, with or without
1410
* modification, are permitted provided that the following conditions
1511
* are met:
1612
*
1713
* 1. Redistributions of source code must retain the above copyright
18-
* notice, this list of conditions and the following disclaimer.
14+
* notice, this list of conditions and the following disclaimer.
1915
*
2016
* 2. Redistributions in binary form must reproduce the above copyright
2117
* notice, this list of conditions and the following disclaimer in
2218
* the documentation and/or other materials provided with the
2319
* distribution.
2420
*
25-
* 3. The end-user documentation included with the redistribution, if
26-
* any, must include the following acknowledgement:
27-
* "This product includes software developed by the
21+
* 3. The end-user documentation included with the redistribution,
22+
* if any, must include the following acknowledgement:
23+
* "This product includes software developed by the
2824
* Apache Software Foundation (http://www.apache.org/)."
2925
* Alternately, this acknowledgement may appear in the software itself,
3026
* if and wherever such third-party acknowledgements normally appear.
3127
*
32-
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
28+
* 4. The names "Apache", "The Jakarta Project", "Commons", and "Apache Software
3329
* Foundation" must not be used to endorse or promote products derived
34-
* from this software without prior written permission. For written
30+
* from this software without prior written permission. For written
3531
* permission, please contact apache@apache.org.
3632
*
37-
* 5. Products derived from this software may not be called "Apache"
38-
* nor may "Apache" appear in their names without prior written
39-
* permission of the Apache Group.
33+
* 5. Products derived from this software may not be called "Apache",
34+
* "Apache" nor may "Apache" appear in their names without prior
35+
* written permission of the Apache Software Foundation.
4036
*
4137
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
4238
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -57,4 +53,4 @@
5753
* information on the Apache Software Foundation, please see
5854
* <http://www.apache.org/>.
5955
*
60-
*/
56+
*/

‎src/java/org/apache/commons/codec/BinaryDecoder.java‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
1-
/* ====================================================================
1+
/*
2+
* ====================================================================
3+
*
24
* The Apache Software License, Version 1.1
35
*
4-
* Copyright (c) 2003 The Apache Software Foundation. All rights
6+
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
57
* reserved.
68
*
79
* Redistribution and use in source and binary forms, with or without
810
* modification, are permitted provided that the following conditions
911
* are met:
1012
*
1113
* 1. Redistributions of source code must retain the above copyright
12-
* notice, this list of conditions and the following disclaimer.
14+
* notice, this list of conditions and the following disclaimer.
1315
*
1416
* 2. Redistributions in binary form must reproduce the above copyright
1517
* notice, this list of conditions and the following disclaimer in
1618
* the documentation and/or other materials provided with the
1719
* distribution.
1820
*
1921
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
21-
* "This product includes software developed by the
22+
* if any, must include the following acknowledgement:
23+
* "This product includes software developed by the
2224
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
25+
* Alternately, this acknowledgement may appear in the software itself,
26+
* if and wherever such third-party acknowledgements normally appear.
2527
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Commons" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
28+
* 4. The names "Apache", "The Jakarta Project", "Commons", and "Apache Software
29+
* Foundation" must not be used to endorse or promote products derived
30+
* from this software without prior written permission. For written
31+
* permission, please contact apache@apache.org.
3032
*
3133
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Commons", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
34+
* "Apache" nor may "Apache" appear in their names without prior
35+
* written permission of the Apache Software Foundation.
3436
*
3537
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3638
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -50,15 +52,17 @@
5052
* individuals on behalf of the Apache Software Foundation. For more
5153
* information on the Apache Software Foundation, please see
5254
* <http://www.apache.org/>.
53-
*/
55+
*
56+
*/
57+
5458
package org.apache.commons.codec;
5559

5660
/**
5761
* Defines common decoding methods for byte arrays decoders.
5862
*
5963
* @author Tim O'Brien
6064
* @author Gary Gregory
61-
* @version $Id: BinaryDecoder.java,v 1.4 2003/08/14 07:40:17 ggregory Exp $
65+
* @version $Id: BinaryDecoder.java,v 1.5 2003/10/05 21:34:21 tobrien Exp $
6266
*/
6367
public interface BinaryDecoder extends Decoder {
6468

‎src/java/org/apache/commons/codec/BinaryEncoder.java‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
1-
/* ====================================================================
1+
/*
2+
* ====================================================================
3+
*
24
* The Apache Software License, Version 1.1
35
*
4-
* Copyright (c) 2003 The Apache Software Foundation. All rights
6+
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
57
* reserved.
68
*
79
* Redistribution and use in source and binary forms, with or without
810
* modification, are permitted provided that the following conditions
911
* are met:
1012
*
1113
* 1. Redistributions of source code must retain the above copyright
12-
* notice, this list of conditions and the following disclaimer.
14+
* notice, this list of conditions and the following disclaimer.
1315
*
1416
* 2. Redistributions in binary form must reproduce the above copyright
1517
* notice, this list of conditions and the following disclaimer in
1618
* the documentation and/or other materials provided with the
1719
* distribution.
1820
*
1921
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
21-
* "This product includes software developed by the
22+
* if any, must include the following acknowledgement:
23+
* "This product includes software developed by the
2224
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
25+
* Alternately, this acknowledgement may appear in the software itself,
26+
* if and wherever such third-party acknowledgements normally appear.
2527
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Commons" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
28+
* 4. The names "Apache", "The Jakarta Project", "Commons", and "Apache Software
29+
* Foundation" must not be used to endorse or promote products derived
30+
* from this software without prior written permission. For written
31+
* permission, please contact apache@apache.org.
3032
*
3133
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Commons", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
34+
* "Apache" nor may "Apache" appear in their names without prior
35+
* written permission of the Apache Software Foundation.
3436
*
3537
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3638
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -50,15 +52,17 @@
5052
* individuals on behalf of the Apache Software Foundation. For more
5153
* information on the Apache Software Foundation, please see
5254
* <http://www.apache.org/>.
53-
*/
55+
*
56+
*/
57+
5458
package org.apache.commons.codec;
5559

5660
/**
5761
* Defines common encoding methods for byte arrays encoders.
5862
*
5963
* @author Tim O'Brien
6064
* @author Gary Gregory
61-
* @version $Id: BinaryEncoder.java,v 1.4 2003/08/14 07:40:17 ggregory Exp $
65+
* @version $Id: BinaryEncoder.java,v 1.5 2003/10/05 21:34:21 tobrien Exp $
6266
*/
6367
public interface BinaryEncoder extends Encoder {
6468

‎src/java/org/apache/commons/codec/Decoder.java‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
1-
/* ====================================================================
1+
/*
2+
* ====================================================================
3+
*
24
* The Apache Software License, Version 1.1
35
*
4-
* Copyright (c) 2003 The Apache Software Foundation. All rights
6+
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
57
* reserved.
68
*
79
* Redistribution and use in source and binary forms, with or without
810
* modification, are permitted provided that the following conditions
911
* are met:
1012
*
1113
* 1. Redistributions of source code must retain the above copyright
12-
* notice, this list of conditions and the following disclaimer.
14+
* notice, this list of conditions and the following disclaimer.
1315
*
1416
* 2. Redistributions in binary form must reproduce the above copyright
1517
* notice, this list of conditions and the following disclaimer in
1618
* the documentation and/or other materials provided with the
1719
* distribution.
1820
*
1921
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
21-
* "This product includes software developed by the
22+
* if any, must include the following acknowledgement:
23+
* "This product includes software developed by the
2224
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
25+
* Alternately, this acknowledgement may appear in the software itself,
26+
* if and wherever such third-party acknowledgements normally appear.
2527
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Commons" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
28+
* 4. The names "Apache", "The Jakarta Project", "Commons", and "Apache Software
29+
* Foundation" must not be used to endorse or promote products derived
30+
* from this software without prior written permission. For written
31+
* permission, please contact apache@apache.org.
3032
*
3133
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Commons", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
34+
* "Apache" nor may "Apache" appear in their names without prior
35+
* written permission of the Apache Software Foundation.
3436
*
3537
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3638
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -50,7 +52,9 @@
5052
* individuals on behalf of the Apache Software Foundation. For more
5153
* information on the Apache Software Foundation, please see
5254
* <http://www.apache.org/>.
53-
*/
55+
*
56+
*/
57+
5458
package org.apache.commons.codec;
5559

5660
/**
@@ -65,7 +69,7 @@
6569
*
6670
* @author Tim O'Brien
6771
* @author Gary Gregory
68-
* @version $Id: Decoder.java,v 1.4 2003/08/14 07:40:17 ggregory Exp $
72+
* @version $Id: Decoder.java,v 1.5 2003/10/05 21:34:21 tobrien Exp $
6973
*/
7074
public interface Decoder {
7175

‎src/java/org/apache/commons/codec/DecoderException.java‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
1-
/* ====================================================================
1+
/*
2+
* ====================================================================
3+
*
24
* The Apache Software License, Version 1.1
35
*
4-
* Copyright (c) 2003 The Apache Software Foundation. All rights
6+
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
57
* reserved.
68
*
79
* Redistribution and use in source and binary forms, with or without
810
* modification, are permitted provided that the following conditions
911
* are met:
1012
*
1113
* 1. Redistributions of source code must retain the above copyright
12-
* notice, this list of conditions and the following disclaimer.
14+
* notice, this list of conditions and the following disclaimer.
1315
*
1416
* 2. Redistributions in binary form must reproduce the above copyright
1517
* notice, this list of conditions and the following disclaimer in
1618
* the documentation and/or other materials provided with the
1719
* distribution.
1820
*
1921
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
21-
* "This product includes software developed by the
22+
* if any, must include the following acknowledgement:
23+
* "This product includes software developed by the
2224
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
25+
* Alternately, this acknowledgement may appear in the software itself,
26+
* if and wherever such third-party acknowledgements normally appear.
2527
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Commons" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
28+
* 4. The names "Apache", "The Jakarta Project", "Commons", and "Apache Software
29+
* Foundation" must not be used to endorse or promote products derived
30+
* from this software without prior written permission. For written
31+
* permission, please contact apache@apache.org.
3032
*
3133
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Commons", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
34+
* "Apache" nor may "Apache" appear in their names without prior
35+
* written permission of the Apache Software Foundation.
3436
*
3537
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3638
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -50,15 +52,17 @@
5052
* individuals on behalf of the Apache Software Foundation. For more
5153
* information on the Apache Software Foundation, please see
5254
* <http://www.apache.org/>.
53-
*/
55+
*
56+
*/
57+
5458
package org.apache.commons.codec;
5559

5660
/**
5761
* Thrown when a Decoder has encountered a failure condition during a decode.
5862
*
5963
* @author Tim O'Brien
6064
* @author Gary Gregory
61-
* @version $Id: DecoderException.java,v 1.4 2003/08/14 07:40:17 ggregory Exp $
65+
* @version $Id: DecoderException.java,v 1.5 2003/10/05 21:34:21 tobrien Exp $
6266
*/
6367
public class DecoderException extends Exception {
6468

0 commit comments

Comments
 (0)