Skip to content

Commit

Permalink
Merge branch 'license' into testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@gholms
gholms committed Jul 23, 2012
2 parents d4581c3 + 8fbab4e commit 99c3ba7
Show file tree
Hide file tree
Showing 1,638 changed files with 55,628 additions and 49,341 deletions.
45 changes: 35 additions & 10 deletions LICENSE
View file
@@ -1,12 +1,38 @@

Copyright 2009-2012 Eucalyptus Systems, Inc.
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 3 of the License.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

In addition, as a special exception, Eucalyptus Systems, Inc. gives
permission to link the code of the Eucalyptus components: Eucalyptus Node
Controller (eucalyptus-nc), Eucalyptus Cluster Controller (eucalyptus-cc),
Eucalyptus gatherlog (eucalyptus-gl) with the OpenSSL project's "OpenSSL"
library (or with modified versions of it that use the same license as
the "OpenSSL" library), and distribute the linked executables. You must
obey the GNU General Public License in all respects for all of the code
used other than "OpenSSL". If you modify this file, you may extend this
exception to your version of the file, but you are not obligated to do
so. If you do not wish to do so, delete this exception statement from
your version.

Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta
CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need
additional information or have any questions.

GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007


Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.


Preamble Preamble


The GNU General Public License is a free, copyleft license for The GNU General Public License is a free, copyleft license for
software and other kinds of works. software and other kinds of works.
Expand Down Expand Up @@ -69,15 +95,15 @@ patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and The precise terms and conditions for copying, distribution and
modification follow. modification follow.


TERMS AND CONDITIONS TERMS AND CONDITIONS


0. Definitions. 0. Definitions.


"This License" refers to version 3 of the GNU General Public License. "This License" refers to version 3 of the GNU General Public License.


"Copyright" also means copyright-like laws that apply to other kinds of "Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks. works, such as semiconductor masks.

"The Program" refers to any copyrightable work licensed under this "The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations. "recipients" may be individuals or organizations.
Expand Down Expand Up @@ -510,7 +536,7 @@ actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid. country that you have reason to believe are valid.

If, pursuant to or in connection with a single transaction or If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties covered work, and grant a patent license to some of the parties
Expand Down Expand Up @@ -619,9 +645,9 @@ an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee. copy of the Program in return for a fee.


END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS


How to Apply These Terms to Your New Programs How to Apply These Terms to Your New Programs


If you develop a new program, and you want it to be of the greatest If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it possible use to the public, the best way to achieve this is to make it
Expand Down Expand Up @@ -673,4 +699,3 @@ may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>. <http://www.gnu.org/philosophy/why-not-lgpl.html>.

20 changes: 20 additions & 0 deletions clc/.classpath
View file
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009-2012 Eucalyptus Systems, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta
CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need
additional information or have any questions.
-->

<classpath> <classpath>
<classpathentry kind="src" output="modules/authentication/build" path="modules/authentication/src/main/java"/> <classpathentry kind="src" output="modules/authentication/build" path="modules/authentication/src/main/java"/>
<classpathentry kind="src" output="modules/cloud/build" path="modules/cloud/src/main/java"/> <classpathentry kind="src" output="modules/cloud/build" path="modules/cloud/src/main/java"/>
Expand Down
20 changes: 20 additions & 0 deletions clc/.project
View file
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009-2012 Eucalyptus Systems, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta
CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need
additional information or have any questions.
-->

<projectDescription> <projectDescription>
<name>eucalyptus:clc</name> <name>eucalyptus:clc</name>
<comment></comment> <comment></comment>
Expand Down
61 changes: 61 additions & 0 deletions clc/Makefile
View file
@@ -1,4 +1,65 @@
# Makefile wrapper around ant # Makefile wrapper around ant
#
# Copyright 2009-2012 Eucalyptus Systems, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 3 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
#
# Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta
# CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need
# additional information or have any questions.
#
# This file may incorporate work covered under the following copyright
# and permission notice:
#
# Software License Agreement (BSD License)
#
# Copyright (c) 2008, Regents of the University of California
# All rights reserved.
#
# Redistribution and use of this software in source and binary forms,
# with or without modification, are permitted provided that the
# following conditions are met:
#
# Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE
# THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL,
# COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE,
# AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
# IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA,
# SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY,
# WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION,
# REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO
# IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT
# NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS.

include ../Makedefs include ../Makedefs


theme_dir = ${TOP}/clc/modules/www/src/main/java/com/eucalyptus/webui/public/themes theme_dir = ${TOP}/clc/modules/www/src/main/java/com/eucalyptus/webui/public/themes
Expand Down
121 changes: 60 additions & 61 deletions clc/build.xml
View file
@@ -1,64 +1,63 @@
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ <!--
~ Copyright (c) 2009 Eucalyptus Systems, Inc. Copyright 2009-2012 Eucalyptus Systems, Inc.
~
~ This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, only version 3 of the License. the Free Software Foundation; version 3 of the License.
~
~ This program is distributed in the hope that it will be useful,
~ This file is distributed in the hope that it will be useful, but WITHOUT but WITHOUT ANY WARRANTY; without even the implied warranty of
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License GNU General Public License for more details.
~ for more details.
~ You should have received a copy of the GNU General Public License
~ You should have received a copy of the GNU General Public License along along with this program. If not, see http://www.gnu.org/licenses/.
~ with this program. If not, see http://www.gnu.org/licenses/.
~ Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta
~ Please contact Eucalyptus Systems, Inc., 130 Castilian CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need
~ Dr., Goleta, CA 93101 USA or visit http://www.eucalyptus.com/licenses/ additional information or have any questions.
~ if you need additional information or have any questions.
~ This file may incorporate work covered under the following copyright
~ This file may incorporate work covered under the following copyright and and permission notice:
~ permission notice:
~ Software License Agreement (BSD License)
~ Software License Agreement (BSD License)
~ Copyright (c) 2008, Regents of the University of California
~ Copyright (c) 2008, Regents of the University of California All rights reserved.
~ All rights reserved.
~ Redistribution and use of this software in source and binary forms,
~ Redistribution and use of this software in source and binary forms, with with or without modification, are permitted provided that the
~ or without modification, are permitted provided that the following following conditions are met:
~ conditions are met:
~ Redistributions of source code must retain the above copyright
~ Redistributions of source code must retain the above copyright notice, notice, this list of conditions and the following disclaimer.
~ this list of conditions and the following disclaimer.
~ Redistributions in binary form must reproduce the above copyright
~ Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
~ notice, this list of conditions and the following disclaimer in the in the documentation and/or other materials provided with the
~ documentation and/or other materials provided with the distribution. distribution.
~
~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
~ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
~ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
~ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
~ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
~ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
~ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
~ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
~ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
~ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
~ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
~ THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE
~ LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL,
~ SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE,
~ IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
~ BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA,
~ THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY,
~ OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION,
~ WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO
~ ANY SUCH LICENSES OR RIGHTS. IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS.
~ Author: chris grzegorczyk grze@eucalyptus.com
--> -->


<project name="eucalyptus" basedir="."> <project name="eucalyptus" basedir=".">
Expand Down
38 changes: 21 additions & 17 deletions clc/eucadmin/Makefile
View file
@@ -1,24 +1,28 @@
############################################################################### # Copyright 2011-2012 Eucalyptus Systems, Inc.
# Copyright (c) 2009 Eucalyptus Systems, Inc.
# #
# This program is free software: you can redistribute it and/or modify # Redistribution and use of this software in source and binary forms,
# it under the terms of the GNU General Public License as published by # with or without modification, are permitted provided that the following
# the Free Software Foundation, only version 3 of the License. # conditions are met:
# #
# Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# #
# This file is distributed in the hope that it will be useful, but WITHOUT # Redistributions in binary form must reproduce the above copyright
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # notice, this list of conditions and the following disclaimer in the
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # documentation and/or other materials provided with the distribution.
# for more details.
# #
# You should have received a copy of the GNU General Public License along # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# with this program. If not, see <http://www.gnu.org/licenses/>. # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# Please contact Eucalyptus Systems, Inc., 130 Castilian # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/> # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# if you need additional information or have any questions. # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
############################################################################### # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

include ../../Makedefs include ../../Makedefs


ifndef DESTDIR ifndef DESTDIR
Expand Down

0 comments on commit 99c3ba7

Please sign in to comment.