Skip to content

Commit 8825c89

Browse files
author
bwelling
committed
Change to the BSD license, update copyrights.
git-svn-id: http://svn.code.sf.net/p/dnsjava/code/trunk@1128 c76caeb1-94fd-44dd-870f-0c9d92034fc1
1 parent 37b05af commit 8825c89

63 files changed

Lines changed: 96 additions & 113 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Changelog‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
12/8/2003
2+
- Change to the BSD license.
3+
14
12/6/2003
25
- Make the J2SE javadoc link a property in build.xml. (Ville Skytt�)
36

‎README‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,39 @@ distributions, and can be built with 'make docs' or 'ant docs'.
7373

7474
License:
7575

76-
dnsjava is placed under the GNU Library General Public License (LGPL). However,
77-
usage under additional licenses may be granted by the author.
76+
dnsjava is placed under the BSD license. Several files are also under
77+
additional licenses; see the individual files for details.
78+
79+
Copyright (c) 1999-2003, Brian Wellington
80+
All rights reserved.
81+
82+
Redistribution and use in source and binary forms, with or without
83+
modification, are permitted provided that the following conditions are met:
84+
85+
* Redistributions of source code must retain the above copyright notice,
86+
this list of conditions and the following disclaimer.
87+
* Redistributions in binary form must reproduce the above copyright notice,
88+
this list of conditions and the following disclaimer in the documentation
89+
and/or other materials provided with the distribution.
90+
* Neither the name of the dnsjava project nor the names of its contributors
91+
may be used to endorse or promote products derived from this software
92+
without specific prior written permission.
93+
94+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
95+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
96+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
97+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
98+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
99+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
100+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
101+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
102+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
103+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
104+
105+
106+
Final notes:
107+
108+
- Thanks to Network Associates, Inc. for sponsoring some of the original
109+
dnsjava work in 1999-2000.
110+
111+
- Thanks to Nominum, Inc. for sponsoring some work on dnsjava from 2000-2003.

‎dig.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Copyright (c) 1999-2003 Brian Wellington (bwelling@xbill.org)
2-
// Portions Copyright (c) 1999 Network Associates, Inc.
32

43
import java.io.*;
54
import org.xbill.DNS.*;

‎org/xbill/DNS/A6Record.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright (c) 1999 Brian Wellington (bwelling@xbill.org)
2-
// Portions Copyright (c) 1999 Network Associates, Inc.
1+
// Copyright (c) 1999-2003 Brian Wellington (bwelling@xbill.org)
32

43
package org.xbill.DNS;
54

‎org/xbill/DNS/AAAARecord.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright (c) 1999 Brian Wellington (bwelling@xbill.org)
2-
// Portions Copyright (c) 1999 Network Associates, Inc.
1+
// Copyright (c) 1999-2003 Brian Wellington (bwelling@xbill.org)
32

43
package org.xbill.DNS;
54

‎org/xbill/DNS/ARecord.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright (c) 1999 Brian Wellington (bwelling@xbill.org)
2-
// Portions Copyright (c) 1999 Network Associates, Inc.
1+
// Copyright (c) 1999-2003 Brian Wellington (bwelling@xbill.org)
32

43
package org.xbill.DNS;
54

‎org/xbill/DNS/CERTRecord.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright (c) 1999 Brian Wellington (bwelling@xbill.org)
2-
// Portions Copyright (c) 1999 Network Associates, Inc.
1+
// Copyright (c) 1999-2003 Brian Wellington (bwelling@xbill.org)
32

43
package org.xbill.DNS;
54

‎org/xbill/DNS/CNAMERecord.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright (c) 1999 Brian Wellington (bwelling@xbill.org)
2-
// Portions Copyright (c) 1999 Network Associates, Inc.
1+
// Copyright (c) 1999-2003 Brian Wellington (bwelling@xbill.org)
32

43
package org.xbill.DNS;
54

‎org/xbill/DNS/Cache.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright (c) 1999 Brian Wellington (bwelling@xbill.org)
2-
// Portions Copyright (c) 1999 Network Associates, Inc.
1+
// Copyright (c) 1999-2003 Brian Wellington (bwelling@xbill.org)
32

43
package org.xbill.DNS;
54

‎org/xbill/DNS/Credibility.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 1999 Brian Wellington (bwelling@xbill.org)
1+
// Copyright (c) 1999-2003 Brian Wellington (bwelling@xbill.org)
22

33
package org.xbill.DNS;
44

0 commit comments

Comments
 (0)