Skip to content

Commit 2e3c302

Browse files
committed
dos2unix
1 parent 93afe26 commit 2e3c302

File tree

7 files changed

+768
-768
lines changed

7 files changed

+768
-768
lines changed

EXCEPTIONS

Lines changed: 104 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,104 @@
1-
Hyperic FLOSS License Exception
2-
3-
The Hyperic Exception for Free/Libre and Open Source
4-
Software-only Applications Using Hyperic SIGAR Libraries (the
5-
"FLOSS Exception").
6-
7-
Version 0.1, September 6, 2008
8-
9-
Exception Intent
10-
11-
We want specified Free/Libre and Open Source Software (``FLOSS'')
12-
applications to be able to use specified GPL-licensed Hyperic SIGAR
13-
libraries (the ``Program'') despite the fact that not all FLOSS
14-
licenses are compatible with version 2 of the GNU General Public
15-
License (the ``GPL'').
16-
17-
Legal Terms and Conditions
18-
19-
As a special exception to the terms and conditions of version 2.0
20-
of the GPL:
21-
22-
1. You are free to distribute a Derivative Work that is formed
23-
entirely from the Program and one or more works (each, a
24-
"FLOSS Work") licensed under one or more of the licenses
25-
listed below in section 1, as long as:
26-
a. You obey the GPL in all respects for the Program and the
27-
Derivative Work, except for identifiable sections of the
28-
Derivative Work which are not derived from the Program,
29-
and which can reasonably be considered independent and
30-
separate works in themselves,
31-
b. all identifiable sections of the Derivative Work which
32-
are not derived from the Program, and which can
33-
reasonably be considered independent and separate works
34-
in themselves,
35-
i. are distributed subject to one of the FLOSS licenses
36-
listed below, and
37-
ii. the object code or executable form of those sections
38-
are accompanied by the complete corresponding
39-
machine-readable source code for those sections on
40-
the same medium and under the same FLOSS license as
41-
the corresponding object code or executable forms of
42-
those sections, and
43-
c. any works which are aggregated with the Program or with a
44-
Derivative Work on a volume of a storage or distribution
45-
medium in accordance with the GPL, can reasonably be
46-
considered independent and separate works in themselves
47-
which are not derivatives of either the Program, a
48-
Derivative Work or a FLOSS Work.
49-
If the above conditions are not met, then the Program may only
50-
be copied, modified, distributed or used under the terms and
51-
conditions of the GPL or another valid licensing option from
52-
Hyperic, Inc.
53-
54-
2. FLOSS License List
55-
56-
License name Version(s)/Copyright Date
57-
Apache Software License 1.0/1.1/2.0
58-
Artistic license From Perl 5.8.0
59-
BSD license "July 22 1999"
60-
Eclipse Public License 1.0
61-
Mozilla Public License (MPL) 1.0/1.1
62-
Open Software License 2.0
63-
PHP License 3.0
64-
Python Software Foundation License 2.1.1
65-
66-
Due to the many variants of some of the above licenses, we
67-
require that any version follow the 2003 version of the Free
68-
Software Foundation's Free Software Definition
69-
(http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of
70-
the Open Source Definition by the Open Source Initiative
71-
(http://www.opensource.org/docs/definition.php).
72-
73-
3. Definitions
74-
75-
a. Terms used, but not defined, herein shall have the
76-
meaning provided in the GPL.
77-
b. Derivative Work means a derivative work under copyright
78-
law.
79-
80-
4. Applicability: This FLOSS Exception applies to all Programs
81-
that contain a notice placed by Hyperic, Inc. saying that the
82-
Program may be distributed under the terms of this FLOSS
83-
Exception. If you create or distribute a work which is a
84-
Derivative Work of both the Program and any other work
85-
licensed under the GPL, then this FLOSS Exception is not
86-
available for that work; thus, you must remove the FLOSS
87-
Exception notice from that work and comply with the GPL in all
88-
respects, including by retaining all GPL notices. You may
89-
choose to redistribute a copy of the Program exclusively under
90-
the terms of the GPL by removing the FLOSS Exception notice
91-
from that copy of the Program, provided that the copy has
92-
never been modified by you or any third party.
93-
94-
Appendix A. Qualified Libraries and Packages
95-
96-
The following is a non-exhaustive list of libraries and packages
97-
which are covered by the FLOSS License Exception. Please note that
98-
this appendix is provided merely as an additional service to
99-
specific FLOSS projects wishing to simplify licensing information
100-
for their users. Compliance with one of the licenses noted under
101-
the "FLOSS license list" section remains a prerequisite.
102-
103-
Package Name Qualifying License and Version
104-
Apache Portable Runtime (APR) Apache Software License 2.0
1+
Hyperic FLOSS License Exception
2+
3+
The Hyperic Exception for Free/Libre and Open Source
4+
Software-only Applications Using Hyperic SIGAR Libraries (the
5+
"FLOSS Exception").
6+
7+
Version 0.1, September 6, 2008
8+
9+
Exception Intent
10+
11+
We want specified Free/Libre and Open Source Software (``FLOSS'')
12+
applications to be able to use specified GPL-licensed Hyperic SIGAR
13+
libraries (the ``Program'') despite the fact that not all FLOSS
14+
licenses are compatible with version 2 of the GNU General Public
15+
License (the ``GPL'').
16+
17+
Legal Terms and Conditions
18+
19+
As a special exception to the terms and conditions of version 2.0
20+
of the GPL:
21+
22+
1. You are free to distribute a Derivative Work that is formed
23+
entirely from the Program and one or more works (each, a
24+
"FLOSS Work") licensed under one or more of the licenses
25+
listed below in section 1, as long as:
26+
a. You obey the GPL in all respects for the Program and the
27+
Derivative Work, except for identifiable sections of the
28+
Derivative Work which are not derived from the Program,
29+
and which can reasonably be considered independent and
30+
separate works in themselves,
31+
b. all identifiable sections of the Derivative Work which
32+
are not derived from the Program, and which can
33+
reasonably be considered independent and separate works
34+
in themselves,
35+
i. are distributed subject to one of the FLOSS licenses
36+
listed below, and
37+
ii. the object code or executable form of those sections
38+
are accompanied by the complete corresponding
39+
machine-readable source code for those sections on
40+
the same medium and under the same FLOSS license as
41+
the corresponding object code or executable forms of
42+
those sections, and
43+
c. any works which are aggregated with the Program or with a
44+
Derivative Work on a volume of a storage or distribution
45+
medium in accordance with the GPL, can reasonably be
46+
considered independent and separate works in themselves
47+
which are not derivatives of either the Program, a
48+
Derivative Work or a FLOSS Work.
49+
If the above conditions are not met, then the Program may only
50+
be copied, modified, distributed or used under the terms and
51+
conditions of the GPL or another valid licensing option from
52+
Hyperic, Inc.
53+
54+
2. FLOSS License List
55+
56+
License name Version(s)/Copyright Date
57+
Apache Software License 1.0/1.1/2.0
58+
Artistic license From Perl 5.8.0
59+
BSD license "July 22 1999"
60+
Eclipse Public License 1.0
61+
Mozilla Public License (MPL) 1.0/1.1
62+
Open Software License 2.0
63+
PHP License 3.0
64+
Python Software Foundation License 2.1.1
65+
66+
Due to the many variants of some of the above licenses, we
67+
require that any version follow the 2003 version of the Free
68+
Software Foundation's Free Software Definition
69+
(http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of
70+
the Open Source Definition by the Open Source Initiative
71+
(http://www.opensource.org/docs/definition.php).
72+
73+
3. Definitions
74+
75+
a. Terms used, but not defined, herein shall have the
76+
meaning provided in the GPL.
77+
b. Derivative Work means a derivative work under copyright
78+
law.
79+
80+
4. Applicability: This FLOSS Exception applies to all Programs
81+
that contain a notice placed by Hyperic, Inc. saying that the
82+
Program may be distributed under the terms of this FLOSS
83+
Exception. If you create or distribute a work which is a
84+
Derivative Work of both the Program and any other work
85+
licensed under the GPL, then this FLOSS Exception is not
86+
available for that work; thus, you must remove the FLOSS
87+
Exception notice from that work and comply with the GPL in all
88+
respects, including by retaining all GPL notices. You may
89+
choose to redistribute a copy of the Program exclusively under
90+
the terms of the GPL by removing the FLOSS Exception notice
91+
from that copy of the Program, provided that the copy has
92+
never been modified by you or any third party.
93+
94+
Appendix A. Qualified Libraries and Packages
95+
96+
The following is a non-exhaustive list of libraries and packages
97+
which are covered by the FLOSS License Exception. Please note that
98+
this appendix is provided merely as an additional service to
99+
specific FLOSS projects wishing to simplify licensing information
100+
for their users. Compliance with one of the licenses noted under
101+
the "FLOSS license list" section remains a prerequisite.
102+
103+
Package Name Qualifying License and Version
104+
Apache Portable Runtime (APR) Apache Software License 2.0

bindings/java/hyperic_jni/src/org/hyperic/jni/CopyDependsTask.java

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -16,54 +16,54 @@
1616
* USA.
1717
*/
1818

19-
package org.hyperic.jni;
20-
21-
import java.io.File;
22-
23-
import org.apache.tools.ant.BuildException;
24-
import org.apache.tools.ant.taskdefs.Copy;
25-
26-
public class CopyDependsTask extends Copy {
27-
28-
private File depends;
29-
30-
protected void validateAttributes()
31-
throws BuildException {
32-
33-
super.validateAttributes();
34-
if (this.depends == null) {
35-
throw new BuildException("missing depends attribute");
36-
}
37-
}
38-
39-
public void execute()
40-
throws BuildException {
41-
42-
if (this.destFile.exists()) {
43-
String state;
44-
if (this.depends.lastModified() >
45-
this.destFile.lastModified())
46-
{
47-
this.setOverwrite(true);
48-
state = "out of date";
49-
}
50-
else {
51-
state = "up to date";
52-
}
53-
54-
log(this.destFile +
55-
" " + state + " with " +
56-
this.depends);
57-
}
58-
59-
super.execute();
60-
}
61-
62-
public File getDepends() {
63-
return this.depends;
64-
}
65-
66-
public void setDepends(String depends) {
67-
this.depends = new File(depends);
68-
}
69-
}
19+
package org.hyperic.jni;
20+
21+
import java.io.File;
22+
23+
import org.apache.tools.ant.BuildException;
24+
import org.apache.tools.ant.taskdefs.Copy;
25+
26+
public class CopyDependsTask extends Copy {
27+
28+
private File depends;
29+
30+
protected void validateAttributes()
31+
throws BuildException {
32+
33+
super.validateAttributes();
34+
if (this.depends == null) {
35+
throw new BuildException("missing depends attribute");
36+
}
37+
}
38+
39+
public void execute()
40+
throws BuildException {
41+
42+
if (this.destFile.exists()) {
43+
String state;
44+
if (this.depends.lastModified() >
45+
this.destFile.lastModified())
46+
{
47+
this.setOverwrite(true);
48+
state = "out of date";
49+
}
50+
else {
51+
state = "up to date";
52+
}
53+
54+
log(this.destFile +
55+
" " + state + " with " +
56+
this.depends);
57+
}
58+
59+
super.execute();
60+
}
61+
62+
public File getDepends() {
63+
return this.depends;
64+
}
65+
66+
public void setDepends(String depends) {
67+
this.depends = new File(depends);
68+
}
69+
}

0 commit comments

Comments
 (0)