Skip to content

Commit 41b87ef

Browse files
committed
moved to v2.0 of the licence
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@140523 13f79535-47bb-0310-9956-ffa450edef68
1 parent 12a8182 commit 41b87ef

21 files changed

Lines changed: 287 additions & 1198 deletions

src/test/org/apache/commons/io/CopyUtilsTest.java

Lines changed: 15 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,17 @@
1-
/* ====================================================================
2-
* The Apache Software License, Version 1.1
3-
*
4-
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
5-
* reserved.
6-
*
7-
* Redistribution and use in source and binary forms, with or without
8-
* modification, are permitted provided that the following conditions
9-
* are met:
10-
*
11-
* 1. Redistributions of source code must retain the above copyright
12-
* notice, this list of conditions and the following disclaimer.
13-
*
14-
* 2. Redistributions in binary form must reproduce the above copyright
15-
* notice, this list of conditions and the following disclaimer in
16-
* the documentation and/or other materials provided with the
17-
* distribution.
18-
*
19-
* 3. The end-user documentation included with the redistribution, if
20-
* any, must include the following acknowledgement:
21-
* "This product includes software developed by the
22-
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgement may appear in the software itself,
24-
* if and wherever such third-party acknowledgements normally appear.
25-
*
26-
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
27-
* Foundation" must not be used to endorse or promote products derived
28-
* from this software without prior written permission. For written
29-
* permission, please contact apache@apache.org.
30-
*
31-
* 5. Products derived from this software may not be called "Apache"
32-
* nor may "Apache" appear in their names without prior written
33-
* permission of the Apache Software Foundation.
34-
*
35-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
36-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
37-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
38-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
39-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
40-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
41-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
42-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
43-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
44-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
45-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
46-
* SUCH DAMAGE.
47-
* ====================================================================
48-
*
49-
* This software consists of voluntary contributions made by many
50-
* individuals on behalf of the Apache Software Foundation. For more
51-
* information on the Apache Software Foundation, please see
52-
* <http://www.apache.org/>.
1+
/*
2+
* Copyright 2001-2004 The Apache Software Foundation.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
5315
*/
5416
package org.apache.commons.io;
5517

@@ -75,7 +37,7 @@
7537
* @author Jeff Turner
7638
* @author Matthew Hawthorne
7739
* @author <a href="mailto:jeremias@apache.org">Jeremias Maerki</a>
78-
* @version $Id: CopyUtilsTest.java,v 1.5 2003/12/30 15:26:59 jeremias Exp $
40+
* @version $Id: CopyUtilsTest.java,v 1.6 2004/02/23 05:02:25 bayard Exp $
7941
* @see CopyUtils
8042
*/
8143
public class CopyUtilsTest extends FileBasedTestCase {

src/test/org/apache/commons/io/DemuxTestCase.java

Lines changed: 13 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,17 @@
11
/*
2-
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//io/src/test/org/apache/commons/io/DemuxTestCase.java,v 1.9 2003/12/30 15:26:59 jeremias Exp $
3-
* $Revision: 1.9 $
4-
* $Date: 2003/12/30 15:26:59 $
5-
*
6-
* ====================================================================
7-
*
8-
* The Apache Software License, Version 1.1
9-
*
10-
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
11-
* reserved.
12-
*
13-
* Redistribution and use in source and binary forms, with or without
14-
* modification, are permitted provided that the following conditions
15-
* are met:
16-
*
17-
* 1. Redistributions of source code must retain the above copyright
18-
* notice, this list of conditions and the following disclaimer.
19-
*
20-
* 2. Redistributions in binary form must reproduce the above copyright
21-
* notice, this list of conditions and the following disclaimer in
22-
* the documentation and/or other materials provided with the
23-
* distribution.
24-
*
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
28-
* Apache Software Foundation (http://www.apache.org/)."
29-
* Alternately, this acknowledgement may appear in the software itself,
30-
* if and wherever such third-party acknowledgements normally appear.
31-
*
32-
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
33-
* Foundation" must not be used to endorse or promote products derived
34-
* from this software without prior written permission. For written
35-
* permission, please contact apache@apache.org.
36-
*
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 Software Foundation.
40-
*
41-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
42-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
43-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
44-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
45-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
46-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
47-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
48-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
49-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
50-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
51-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
52-
* SUCH DAMAGE.
53-
* ====================================================================
54-
*
55-
* This software consists of voluntary contributions made by many
56-
* individuals on behalf of the Apache Software Foundation. For more
57-
* information on the Apache Software Foundation, please see
58-
* <http://www.apache.org/>.
59-
*
2+
* Copyright 1999-2004 The Apache Software Foundation.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
6015
*/
6116

6217
package org.apache.commons.io;

src/test/org/apache/commons/io/EndianUtilsTest.java

Lines changed: 14 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,25 @@
11
/*
2-
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//io/src/test/org/apache/commons/io/EndianUtilsTest.java,v 1.9 2004/01/02 06:44:54 bayard Exp $
3-
* $Revision: 1.9 $
4-
* $Date: 2004/01/02 06:44:54 $
5-
*
6-
* ====================================================================
7-
*
8-
* The Apache Software License, Version 1.1
9-
*
10-
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
11-
* reserved.
12-
*
13-
* Redistribution and use in source and binary forms, with or without
14-
* modification, are permitted provided that the following conditions
15-
* are met:
16-
*
17-
* 1. Redistributions of source code must retain the above copyright
18-
* notice, this list of conditions and the following disclaimer.
19-
*
20-
* 2. Redistributions in binary form must reproduce the above copyright
21-
* notice, this list of conditions and the following disclaimer in
22-
* the documentation and/or other materials provided with the
23-
* distribution.
24-
*
25-
* 3. The end-user documentation included with the redistribution, if
26-
* any, must include the following acknowlegement:
27-
* "This product includes software developed by the
28-
* Apache Software Foundation (http://www.apache.org/)."
29-
* Alternately, this acknowlegement may appear in the software itself,
30-
* if and wherever such third-party acknowlegements normally appear.
31-
*
32-
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
33-
* Foundation" must not be used to endorse or promote products derived
34-
* from this software without prior written permission. For written
35-
* permission, please contact apache@apache.org.
36-
*
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.
40-
*
41-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
42-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
43-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
44-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
45-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
46-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
47-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
48-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
49-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
50-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
51-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
52-
* SUCH DAMAGE.
53-
* ====================================================================
54-
*
55-
* This software consists of voluntary contributions made by many
56-
* individuals on behalf of the Apache Software Foundation. For more
57-
* information on the Apache Software Foundation, please see
58-
* <http://www.apache.org/>.
59-
*
2+
* Copyright 1999-2004 The Apache Software Foundation.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
6015
*/
6116
package org.apache.commons.io;
6217

6318
import junit.framework.TestCase;
6419

6520
/**
6621
* @author Henri Yandell (bayard at apache dot org)
67-
* @version $Revision: 1.9 $ $Date: 2004/01/02 06:44:54 $
22+
* @version $Revision: 1.10 $ $Date: 2004/02/23 05:02:25 $
6823
*/
6924
public class EndianUtilsTest extends TestCase {
7025

src/test/org/apache/commons/io/FileUtilsFileNewerTestCase.java

Lines changed: 13 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,17 @@
11
/*
2-
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//io/src/test/org/apache/commons/io/FileUtilsFileNewerTestCase.java,v 1.4 2003/12/30 15:26:59 jeremias Exp $
3-
* $Revision: 1.4 $
4-
* $Date: 2003/12/30 15:26:59 $
5-
*
6-
* ====================================================================
7-
*
8-
* The Apache Software License, Version 1.1
9-
*
10-
* Copyright (c) 2003 The Apache Software Foundation. All rights
11-
* reserved.
12-
*
13-
* Redistribution and use in source and binary forms, with or without
14-
* modification, are permitted provided that the following conditions
15-
* are met:
16-
*
17-
* 1. Redistributions of source code must retain the above copyright
18-
* notice, this list of conditions and the following disclaimer.
19-
*
20-
* 2. Redistributions in binary form must reproduce the above copyright
21-
* notice, this list of conditions and the following disclaimer in
22-
* the documentation and/or other materials provided with the
23-
* distribution.
24-
*
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
28-
* Apache Software Foundation (http://www.apache.org/)."
29-
* Alternately, this acknowledgement may appear in the software itself,
30-
* if and wherever such third-party acknowledgements normally appear.
31-
*
32-
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
33-
* Foundation" must not be used to endorse or promote products derived
34-
* from this software without prior written permission. For written
35-
* permission, please contact apache@apache.org.
36-
*
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 Software Foundation.
40-
*
41-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
42-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
43-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
44-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
45-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
46-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
47-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
48-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
49-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
50-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
51-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
52-
* SUCH DAMAGE.
53-
* ====================================================================
54-
*
55-
* This software consists of voluntary contributions made by many
56-
* individuals on behalf of the Apache Software Foundation. For more
57-
* information on the Apache Software Foundation, please see
58-
* <http://www.apache.org/>.
2+
* Copyright 2003,2004 The Apache Software Foundation.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
5915
*/
6016

6117
package org.apache.commons.io;

src/test/org/apache/commons/io/FileUtilsListFilesTestCase.java

Lines changed: 13 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,17 @@
11
/*
2-
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//io/src/test/org/apache/commons/io/FileUtilsListFilesTestCase.java,v 1.4 2003/12/30 15:26:16 jeremias Exp $
3-
* $Revision: 1.4 $
4-
* $Date: 2003/12/30 15:26:16 $
5-
*
6-
* ====================================================================
7-
*
8-
* The Apache Software License, Version 1.1
9-
*
10-
* Copyright (c) 2003 The Apache Software Foundation. All rights
11-
* reserved.
12-
*
13-
* Redistribution and use in source and binary forms, with or without
14-
* modification, are permitted provided that the following conditions
15-
* are met:
16-
*
17-
* 1. Redistributions of source code must retain the above copyright
18-
* notice, this list of conditions and the following disclaimer.
19-
*
20-
* 2. Redistributions in binary form must reproduce the above copyright
21-
* notice, this list of conditions and the following disclaimer in
22-
* the documentation and/or other materials provided with the
23-
* distribution.
24-
*
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
28-
* Apache Software Foundation (http://www.apache.org/)."
29-
* Alternately, this acknowledgement may appear in the software itself,
30-
* if and wherever such third-party acknowledgements normally appear.
31-
*
32-
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
33-
* Foundation" must not be used to endorse or promote products derived
34-
* from this software without prior written permission. For written
35-
* permission, please contact apache@apache.org.
36-
*
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 Software Foundation.
40-
*
41-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
42-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
43-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
44-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
45-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
46-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
47-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
48-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
49-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
50-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
51-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
52-
* SUCH DAMAGE.
53-
* ====================================================================
54-
*
55-
* This software consists of voluntary contributions made by many
56-
* individuals on behalf of the Apache Software Foundation. For more
57-
* information on the Apache Software Foundation, please see
58-
* <http://www.apache.org/>.
2+
* Copyright 2003,2004 The Apache Software Foundation.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
5915
*/
6016
package org.apache.commons.io;
6117

0 commit comments

Comments
 (0)