Skip to content

Commit c07811a

Browse files
author
mgricken
committed
Change of DrJava License to BSD
git-svn-id: file:///tmp/test-svn/trunk@4255 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent 2f9b269 commit c07811a

701 files changed

Lines changed: 61977 additions & 60247 deletions

File tree

Some content is hidden

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

‎docs/src/user/userdoc.docbook‎

Lines changed: 33 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -76,72 +76,65 @@
7676
<section id="gs-license">
7777
<title>License</title>
7878
<para>
79-
DrJava Open Source License
80-
</para>
81-
82-
<para>
83-
Copyright (C) 2001-2005 JavaPLT group at Rice University (javaplt@rice.edu)
79+
Copyright (c) 2001-2007, JavaPLT group at Rice University (javaplt@rice.edu)
8480
All rights reserved.
8581
</para>
8682

8783
<para>
88-
<literallayout>
89-
Developed by: Java Programming Languages Team
90-
Rice University
91-
http://www.cs.rice.edu/~javaplt/
92-
</literallayout>
93-
</para>
94-
95-
<para>
96-
Permission is hereby granted, free of charge, to any person obtaining a
97-
copy of this software and associated documentation files (the "Software"),
98-
to deal with the Software without restriction, including without
99-
limitation the rights to use, copy, modify, merge, publish, distribute,
100-
sublicense, and/or sell copies of the Software, and to permit persons to
101-
whom the Software is furnished to do so, subject to the following
102-
conditions:
84+
Redistribution and use in source and binary forms, with or without
85+
modification, are permitted provided that the following conditions are met:
10386
</para>
10487

10588
<itemizedlist mark=opencircle>
10689
<listitem>
10790
<para>
108-
Redistributions of source code must retain the above copyright
109-
notice, this list of conditions and the following disclaimers.
91+
Redistributions of source code must retain the above copyright
92+
notice, this list of conditions and the following disclaimer.
11093
</para>
11194
</listitem>
11295
<listitem>
11396
<para>
114-
Redistributions in binary form must reproduce the above copyright
115-
notice, this list of conditions and the following disclaimers in the
97+
Redistributions in binary form must reproduce the above copyright
98+
notice, this list of conditions and the following disclaimer in the
11699
documentation and/or other materials provided with the distribution.
117100
</para>
118101
</listitem>
119102
<listitem>
120103
<para>
121-
Neither the names of DrJava, the JavaPLT, Rice University, nor the
104+
Neither the names of DrJava, the JavaPLT group, Rice University, nor the
122105
names of its contributors may be used to endorse or promote products
123-
derived from this Software without specific prior written permission.
106+
derived from this software without specific prior written permission.
124107
</para>
125108
</listitem>
126-
<listitem>
109+
</itemizedlist>
110+
127111
<para>
128-
Products derived from this software may not be called "DrJava" nor
129-
use the term "DrJava" as part of their names without prior written
130-
permission from the JavaPLT group. For permission, write to
131-
javaplt@rice.edu.
112+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
113+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
114+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
115+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
116+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
117+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
118+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
119+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
120+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
121+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
122+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
123+
</para>
124+
125+
<para>
126+
This software is Open Source Initiative approved Open Source Software.
127+
Open Source Initative Approved is a trademark of the Open Source Initiative.
132128
</para>
133-
</listitem>
134-
</itemizedlist>
135129

136130
<para>
137-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
138-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
139-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
140-
THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
141-
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
142-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
143-
OTHER DEALINGS WITH THE SOFTWARE.
131+
<literallayout>
132+
Developed by: Java Programming Languages Team
133+
Rice University
134+
http://www.cs.rice.edu/~javaplt/
135+
</literallayout>
144136
</para>
137+
145138
<para>DynamicJava - Copyright (c) 1999 Dyade</para>
146139
<para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para>
147140
<para>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</para>

‎drjava/COPYRIGHT‎

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,36 @@
11
/*BEGIN_COPYRIGHT_BLOCK
22
*
3-
* This file is part of DrJava. Download the current version of this project:
4-
* http://sourceforge.net/projects/drjava/ or http://www.drjava.org/
5-
*
6-
* DrJava Open Source License
7-
*
8-
* Copyright (C) 2001-2007 JavaPLT group at Rice University (javaplt@rice.edu)
3+
* Copyright (c) 2001-2007, JavaPLT group at Rice University (javaplt@rice.edu)
94
* All rights reserved.
10-
*
11-
* Developed by: Java Programming Languages Team
12-
* Rice University
13-
* http://www.cs.rice.edu/~javaplt/
145
*
15-
* Permission is hereby granted, free of charge, to any person obtaining a
16-
* copy of this software and associated documentation files (the "Software"),
17-
* to deal with the Software without restriction, including without
18-
* limitation the rights to use, copy, modify, merge, publish, distribute,
19-
* sublicense, and/or sell copies of the Software, and to permit persons to
20-
* whom the Software is furnished to do so, subject to the following
21-
* conditions:
6+
* Redistribution and use in source and binary forms, with or without
7+
* modification, are permitted provided that the following conditions are met:
8+
* * Redistributions of source code must retain the above copyright
9+
* notice, this list of conditions and the following disclaimer.
10+
* * Redistributions in binary form must reproduce the above copyright
11+
* notice, this list of conditions and the following disclaimer in the
12+
* documentation and/or other materials provided with the distribution.
13+
* * Neither the names of DrJava, the JavaPLT group, Rice University, nor the
14+
* names of its contributors may be used to endorse or promote products
15+
* derived from this software without specific prior written permission.
2216
*
23-
* - Redistributions of source code must retain the above copyright
24-
* notice, this list of conditions and the following disclaimers.
25-
* - Redistributions in binary form must reproduce the above copyright
26-
* notice, this list of conditions and the following disclaimers in the
27-
* documentation and/or other materials provided with the distribution.
28-
* - Neither the names of DrJava, the JavaPLT, Rice University, nor the
29-
* names of its contributors may be used to endorse or promote products
30-
* derived from this Software without specific prior written permission.
31-
* - Products derived from this software may not be called "DrJava" nor
32-
* use the term "DrJava" as part of their names without prior written
33-
* permission from the JavaPLT group. For permission, write to
34-
* javaplt@rice.edu.
17+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20+
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
21+
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
22+
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
23+
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
24+
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
25+
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
26+
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28+
*
29+
* This software is Open Source Initiative approved Open Source Software.
30+
* Open Source Initative Approved is a trademark of the Open Source Initiative.
3531
*
36-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
37-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
38-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
39-
* THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
40-
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
41-
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
42-
* OTHER DEALINGS WITH THE SOFTWARE.
32+
* This file is part of DrJava. Download the current version of this project
33+
* from http://www.drjava.org/ or http://sourceforge.net/projects/drjava/
4334
*
44-
END_COPYRIGHT_BLOCK*/
35+
* END_COPYRIGHT_BLOCK*/
4536

‎drjava/LICENSE‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,31 @@
1-
DrJava Open Source License
2-
3-
Copyright (C) 2001-2003 JavaPLT group at Rice University (javaplt@rice.edu)
1+
Copyright (c) 2001-2007, JavaPLT group at Rice University (javaplt@rice.edu)
42
All rights reserved.
53

6-
Developed by: Java Programming Languages Team
7-
Rice University
8-
http://www.cs.rice.edu/~javaplt/
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
6+
* Redistributions of source code must retain the above copyright
7+
notice, this list of conditions and the following disclaimer.
8+
* Redistributions in binary form must reproduce the above copyright
9+
notice, this list of conditions and the following disclaimer in the
10+
documentation and/or other materials provided with the distribution.
11+
* Neither the names of DrJava, the JavaPLT group, Rice University, nor the
12+
names of its contributors may be used to endorse or promote products
13+
derived from this software without specific prior written permission.
914

10-
Permission is hereby granted, free of charge, to any person obtaining a
11-
copy of this software and associated documentation files (the "Software"),
12-
to deal with the Software without restriction, including without
13-
limitation the rights to use, copy, modify, merge, publish, distribute,
14-
sublicense, and/or sell copies of the Software, and to permit persons to
15-
whom the Software is furnished to do so, subject to the following
16-
conditions:
15+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
16+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
17+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
18+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
19+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
20+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
22+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
23+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
24+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1726

18-
- Redistributions of source code must retain the above copyright
19-
notice, this list of conditions and the following disclaimers.
20-
- Redistributions in binary form must reproduce the above copyright
21-
notice, this list of conditions and the following disclaimers in the
22-
documentation and/or other materials provided with the distribution.
23-
- Neither the names of DrJava, the JavaPLT, Rice University, nor the
24-
names of its contributors may be used to endorse or promote products
25-
derived from this Software without specific prior written permission.
26-
- Products derived from this software may not be called "DrJava" nor
27-
use the term "DrJava" as part of their names without prior written
28-
permission from the JavaPLT group. For permission, write to
29-
javaplt@rice.edu.
27+
This software is Open Source Initiative approved Open Source Software.
28+
Open Source Initative Approved is a trademark of the Open Source Initiative.
3029

31-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
32-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
33-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
34-
THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
35-
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
36-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
37-
OTHER DEALINGS WITH THE SOFTWARE.
30+
This file is part of DrJava. Download the current version of this project
31+
from http://www.drjava.org/ or http://sourceforge.net/projects/drjava/

‎drjava/lib/docs.jar‎

-96 Bytes
Binary file not shown.

‎drjava/lib/dynamicjava.jar‎

531 Bytes
Binary file not shown.

‎drjava/src/edu/rice/cs/drjava/CodeStatus.orig‎

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,38 @@
11
/*BEGIN_COPYRIGHT_BLOCK
22
*
3-
* This file is part of DrJava. Download the current version of this project:
4-
* http://sourceforge.net/projects/drjava/ or http://www.drjava.org/
5-
*
6-
* DrJava Open Source License
7-
*
8-
* Copyright (C) 2001-2003 JavaPLT group at Rice University (javaplt@rice.edu)
3+
* Copyright (c) 2001-2007, JavaPLT group at Rice University (javaplt@rice.edu)
94
* All rights reserved.
10-
*
11-
* Developed by: Java Programming Languages Team
12-
* Rice University
13-
* http://www.cs.rice.edu/~javaplt/
145
*
15-
* Permission is hereby granted, free of charge, to any person obtaining a
16-
* copy of this software and associated documentation files (the "Software"),
17-
* to deal with the Software without restriction, including without
18-
* limitation the rights to use, copy, modify, merge, publish, distribute,
19-
* sublicense, and/or sell copies of the Software, and to permit persons to
20-
* whom the Software is furnished to do so, subject to the following
21-
* conditions:
6+
* Redistribution and use in source and binary forms, with or without
7+
* modification, are permitted provided that the following conditions are met:
8+
* * Redistributions of source code must retain the above copyright
9+
* notice, this list of conditions and the following disclaimer.
10+
* * Redistributions in binary form must reproduce the above copyright
11+
* notice, this list of conditions and the following disclaimer in the
12+
* documentation and/or other materials provided with the distribution.
13+
* * Neither the names of DrJava, the JavaPLT group, Rice University, nor the
14+
* names of its contributors may be used to endorse or promote products
15+
* derived from this software without specific prior written permission.
2216
*
23-
* - Redistributions of source code must retain the above copyright
24-
* notice, this list of conditions and the following disclaimers.
25-
* - Redistributions in binary form must reproduce the above copyright
26-
* notice, this list of conditions and the following disclaimers in the
27-
* documentation and/or other materials provided with the distribution.
28-
* - Neither the names of DrJava, the JavaPLT, Rice University, nor the
29-
* names of its contributors may be used to endorse or promote products
30-
* derived from this Software without specific prior written permission.
31-
* - Products derived from this software may not be called "DrJava" nor
32-
* use the term "DrJava" as part of their names without prior written
33-
* permission from the JavaPLT group. For permission, write to
34-
* javaplt@rice.edu.
17+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20+
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
21+
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
22+
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
23+
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
24+
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
25+
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
26+
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28+
*
29+
* This software is Open Source Initiative approved Open Source Software.
30+
* Open Source Initative Approved is a trademark of the Open Source Initiative.
3531
*
36-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
37-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
38-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
39-
* THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
40-
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
41-
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
42-
* OTHER DEALINGS WITH THE SOFTWARE.
32+
* This file is part of DrJava. Download the current version of this project
33+
* from http://www.drjava.org/ or http://sourceforge.net/projects/drjava/
4334
*
44-
END_COPYRIGHT_BLOCK*/
35+
* END_COPYRIGHT_BLOCK*/
4536

4637
package edu.rice.cs.drjava;
4738

0 commit comments

Comments
 (0)