From 50c7d69d00af29aaabba349a45d9caa83266937c Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Mon, 28 Feb 2011 15:51:00 +0100 Subject: [PATCH 1/3] Bug getting network use in ganglia drivers (cherry picked from commit 333067cc603382f078389b6944e801d60eb117f5) --- src/im_mad/remotes/ganglia.d/ganglia_probe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/im_mad/remotes/ganglia.d/ganglia_probe b/src/im_mad/remotes/ganglia.d/ganglia_probe index 51bab34db8..7d834e2155 100755 --- a/src/im_mad/remotes/ganglia.d/ganglia_probe +++ b/src/im_mad/remotes/ganglia.d/ganglia_probe @@ -68,8 +68,8 @@ free_cpu=(data['cpu_idle'].to_f/100.0) * total_cpu info["FREECPU"]=free_cpu info["USEDCPU"]=total_cpu - free_cpu -info["NETRX"]=data['bytes_out'] -info["NETTX"]=data['bytes_in'] +info["NETTX"]=data['bytes_out'] +info["NETRX"]=data['bytes_in'] info["KVM_VERSION"]=data['KVM_VERSION'] info["XEN_VERSION"]=data['XEN_VERSION'] From 022b5cbece28284446c28458db695a92d04315b7 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Mon, 28 Feb 2011 16:37:42 +0100 Subject: [PATCH 2/3] Feature #495: Rearranged vendor libraries and added NOTICE and licensing information (cherry picked from commit 1ab98ed48df7f95f8489191f538f16ba9266bac1) --- NOTICE | 23 ++++ install.sh | 83 ++++++++----- src/sunstone/public/js/opennebula.js | 2 +- src/sunstone/public/js/vendor/base64.js | 113 ------------------ .../public/vendor/dataTables/BSD-LICENSE.txt | 25 ++++ src/sunstone/public/vendor/dataTables/NOTICE | 6 + .../dataTables}/demo_table_jui.css | 0 .../dataTables}/jquery.dataTables.min.js | 0 src/sunstone/public/vendor/jGrowl/NOTICE | 5 + .../{css => vendor/jGrowl}/jquery.jgrowl.css | 1 + .../jGrowl}/jquery.jgrowl_minimized.js | 3 +- .../public/vendor/jQuery/MIT-LICENSE.txt | 20 ++++ src/sunstone/public/vendor/jQuery/NOTICE | 6 + .../jQuery}/jquery-1.4.4.min.js | 0 .../public/vendor/jQueryLayout/NOTICE | 9 ++ .../jQueryLayout}/jquery.layout.min-1.2.0.js | 0 .../jQueryLayout}/layout-default-latest.css | 0 .../public/vendor/jQueryUI/MIT-LICENSE.txt | 20 ++++ src/sunstone/public/vendor/jQueryUI/NOTICE | 6 + .../jQueryUI}/jquery-ui-1.8.7.custom.css | 0 .../jQueryUI}/jquery-ui-1.8.7.custom.min.js | 0 .../jQueryUI}/ui-bg_flat_0_575c5b_40x100.png | Bin .../jQueryUI}/ui-bg_flat_0_8f9392_40x100.png | Bin .../jQueryUI}/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../jQueryUI}/ui-bg_flat_75_ffffff_40x100.png | Bin .../jQueryUI}/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../jQueryUI}/ui-bg_glass_65_ffffff_1x400.png | Bin .../jQueryUI}/ui-bg_glass_75_dadada_1x400.png | Bin .../jQueryUI}/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../jQueryUI}/ui-bg_glass_95_fef1ec_1x400.png | Bin .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../jQueryUI}/ui-icons_222222_256x240.png | Bin .../jQueryUI}/ui-icons_2e83ff_256x240.png | Bin .../jQueryUI}/ui-icons_454545_256x240.png | Bin .../jQueryUI}/ui-icons_888888_256x240.png | Bin .../jQueryUI}/ui-icons_cd0a0a_256x240.png | Bin src/sunstone/templates/index.html | 36 +++--- src/sunstone/templates/login.html | 4 +- 38 files changed, 197 insertions(+), 165 deletions(-) delete mode 100644 src/sunstone/public/js/vendor/base64.js create mode 100644 src/sunstone/public/vendor/dataTables/BSD-LICENSE.txt create mode 100644 src/sunstone/public/vendor/dataTables/NOTICE rename src/sunstone/public/{css => vendor/dataTables}/demo_table_jui.css (100%) rename src/sunstone/public/{js/vendor => vendor/dataTables}/jquery.dataTables.min.js (100%) create mode 100644 src/sunstone/public/vendor/jGrowl/NOTICE rename src/sunstone/public/{css => vendor/jGrowl}/jquery.jgrowl.css (97%) rename src/sunstone/public/{js/vendor => vendor/jGrowl}/jquery.jgrowl_minimized.js (98%) create mode 100644 src/sunstone/public/vendor/jQuery/MIT-LICENSE.txt create mode 100644 src/sunstone/public/vendor/jQuery/NOTICE rename src/sunstone/public/{js/vendor => vendor/jQuery}/jquery-1.4.4.min.js (100%) create mode 100644 src/sunstone/public/vendor/jQueryLayout/NOTICE rename src/sunstone/public/{js/vendor => vendor/jQueryLayout}/jquery.layout.min-1.2.0.js (100%) rename src/sunstone/public/{css => vendor/jQueryLayout}/layout-default-latest.css (100%) create mode 100644 src/sunstone/public/vendor/jQueryUI/MIT-LICENSE.txt create mode 100644 src/sunstone/public/vendor/jQueryUI/NOTICE rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/jquery-ui-1.8.7.custom.css (100%) rename src/sunstone/public/{js/vendor => vendor/jQueryUI}/jquery-ui-1.8.7.custom.min.js (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-bg_flat_0_575c5b_40x100.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-bg_flat_0_8f9392_40x100.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-bg_flat_75_ffffff_40x100.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-bg_glass_65_ffffff_1x400.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-bg_glass_75_dadada_1x400.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-bg_glass_95_fef1ec_1x400.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-icons_222222_256x240.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-icons_2e83ff_256x240.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-icons_454545_256x240.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-icons_888888_256x240.png (100%) rename src/sunstone/public/{css/vendor => vendor/jQueryUI}/ui-icons_cd0a0a_256x240.png (100%) diff --git a/NOTICE b/NOTICE index 443c4c1a02..49f4ba2871 100644 --- a/NOTICE +++ b/NOTICE @@ -19,3 +19,26 @@ The following people have contributed to the development of the technology - Carlos Martin Sanchez (cmartin@opennebula.org) - Daniel Molina Aranda (dmolina@opennebula.org) - Hector Sanjuan Redondo (hsanjuan@opennebula.org) + +LICENSE + +OpenNebula is licensed under the Apache License, Version 2.0 (the +"License"); you may not use this software except in compliance with the +License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied +See the License for the specific language governing permissions and +limitations under the Apache License. + +THIRD-PARTY SOFTWARE + +OpenNebula distribution includes third-party software under fully compatible +open-source licenses. See the following directories and the NOTICE files +they contain for more information: + +- src/sunstone/public/vendor +- src/oca/java/lib diff --git a/install.sh b/install.sh index f74a0c72d0..1bcd20fc66 100755 --- a/install.sh +++ b/install.sh @@ -207,9 +207,13 @@ SUNSTONE_DIRS="$SUNSTONE_LOCATION/models \ $SUNSTONE_LOCATION/models/OpenNebulaJSON \ $SUNSTONE_LOCATION/public \ $SUNSTONE_LOCATION/public/js \ - $SUNSTONE_LOCATION/public/js/vendor \ $SUNSTONE_LOCATION/public/css \ - $SUNSTONE_LOCATION/public/css/vendor \ + $SUNSTONE_LOCATION/public/vendor \ + $SUNSTONE_LOCATION/public/vendor/jQueryLayout \ + $SUNSTONE_LOCATION/public/vendor/dataTables \ + $SUNSTONE_LOCATION/public/vendor/jQueryUI \ + $SUNSTONE_LOCATION/public/vendor/jQuery \ + $SUNSTONE_LOCATION/public/vendor/jGrowl \ $SUNSTONE_LOCATION/public/images \ $SUNSTONE_LOCATION/templates" @@ -309,9 +313,12 @@ INSTALL_SUNSTONE_FILES=( SUNSTONE_MODELS_JSON_FILES:$SUNSTONE_LOCATION/models/OpenNebulaJSON SUNSTONE_TEMPLATE_FILES:$SUNSTONE_LOCATION/templates SUNSTONE_PUBLIC_JS_FILES:$SUNSTONE_LOCATION/public/js - SUNSTONE_PUBLIC_JS_VENDOR_FILES:$SUNSTONE_LOCATION/public/js/vendor SUNSTONE_PUBLIC_CSS_FILES:$SUNSTONE_LOCATION/public/css - SUNSTONE_PUBLIC_CSS_VENDOR_FILES:$SUNSTONE_LOCATION/public/css/vendor + SUNSTONE_PUBLIC_VENDOR_DATATABLES:$SUNSTONE_LOCATION/public/vendor/dataTables + SUNSTONE_PUBLIC_VENDOR_JGROWL:$SUNSTONE_LOCATION/public/vendor/jGrowl + SUNSTONE_PUBLIC_VENDOR_JQUERY:$SUNSTONE_LOCATION/public/vendor/jQuery + SUNSTONE_PUBLIC_VENDOR_JQUERYUI:$SUNSTONE_LOCATION/public/vendor/jQueryUI + SUNSTONE_PUBLIC_VENDOR_JQUERYLAYOUT:$SUNSTONE_LOCATION/public/vendor/jQueryLayout SUNSTONE_PUBLIC_IMAGES_FILES:$SUNSTONE_LOCATION/public/images ) @@ -724,37 +731,51 @@ SUNSTONE_PUBLIC_JS_FILES="src/sunstone/public/js/layout.js \ src/sunstone/public/js/one-ui_views.templates.js \ src/sunstone/public/js/opennebula.js" -SUNSTONE_PUBLIC_JS_VENDOR_FILES="src/sunstone/public/js/vendor/base64.js \ - src/sunstone/public/js/vendor/jquery-1.4.4.min.js \ - src/sunstone/public/js/vendor/jquery.dataTables.min.js \ - src/sunstone/public/js/vendor/jquery.jgrowl_minimized.js \ - src/sunstone/public/js/vendor/jquery.layout.min-1.2.0.js \ - src/sunstone/public/js/vendor/jquery-ui-1.8.7.custom.min.js" - SUNSTONE_PUBLIC_CSS_FILES="src/sunstone/public/css/application.css \ - src/sunstone/public/css/demo_table_jui.css \ - src/sunstone/public/css/jquery.jgrowl.css \ src/sunstone/public/css/layout.css \ - src/sunstone/public/css/layout-default-latest.css \ src/sunstone/public/css/login.css" -SUNSTONE_PUBLIC_CSS_VENDOR_FILES="\ - src/sunstone/public/css/vendor/jquery-ui-1.8.7.custom.css \ - src/sunstone/public/css/vendor/ui-bg_flat_0_575c5b_40x100.png \ - src/sunstone/public/css/vendor/ui-bg_flat_0_8f9392_40x100.png \ - src/sunstone/public/css/vendor/ui-bg_flat_0_aaaaaa_40x100.png \ - src/sunstone/public/css/vendor/ui-bg_flat_75_ffffff_40x100.png \ - src/sunstone/public/css/vendor/ui-bg_glass_55_fbf9ee_1x400.png \ - src/sunstone/public/css/vendor/ui-bg_glass_65_ffffff_1x400.png \ - src/sunstone/public/css/vendor/ui-bg_glass_75_dadada_1x400.png \ - src/sunstone/public/css/vendor/ui-bg_glass_75_e6e6e6_1x400.png \ - src/sunstone/public/css/vendor/ui-bg_glass_95_fef1ec_1x400.png \ - src/sunstone/public/css/vendor/ui-bg_highlight-soft_75_cccccc_1x100.png \ - src/sunstone/public/css/vendor/ui-icons_222222_256x240.png \ - src/sunstone/public/css/vendor/ui-icons_2e83ff_256x240.png \ - src/sunstone/public/css/vendor/ui-icons_454545_256x240.png \ - src/sunstone/public/css/vendor/ui-icons_888888_256x240.png \ - src/sunstone/public/css/vendor/ui-icons_cd0a0a_256x240.png" +SUNSTONE_PUBLIC_VENDOR_DATATABLES="\ + src/sunstone/public/vendor/dataTables/jquery.dataTables.min.js \ + src/sunstone/public/vendor/dataTables/demo_table_jui.css \ + src/sunstone/public/vendor/dataTables/BSD-LICENSE.txt \ + src/sunstone/public/vendor/dataTables/NOTICE" + +SUNSTONE_PUBLIC_VENDOR_JGROWL="\ + src/sunstone/public/vendor/jGrowl/jquery.jgrowl_minimized.js \ + src/sunstone/public/vendor/jGrowl/jquery.jgrowl.css \ + src/sunstone/public/vendor/jGrowl/NOTICE" + +SUNSTONE_PUBLIC_VENDOR_JQUERY="\ + src/sunstone/public/vendor/jQuery/jquery-1.4.4.min.js \ + src/sunstone/public/vendor/jQuery/MIT-LICENSE.txt \ + src/sunstone/public/vendor/jQuery/NOTICE" + +SUNSTONE_PUBLIC_VENDOR_JQUERYUI="\ +src/sunstone/public/vendor/jQueryUI/ui-bg_glass_75_dadada_1x400.png \ +src/sunstone/public/vendor/jQueryUI/ui-icons_cd0a0a_256x240.png \ +src/sunstone/public/vendor/jQueryUI/jquery-ui-1.8.7.custom.css \ +src/sunstone/public/vendor/jQueryUI/ui-bg_flat_0_aaaaaa_40x100.png \ +src/sunstone/public/vendor/jQueryUI/ui-bg_flat_0_8f9392_40x100.png \ +src/sunstone/public/vendor/jQueryUI/MIT-LICENSE.txt \ +src/sunstone/public/vendor/jQueryUI/jquery-ui-1.8.7.custom.min.js \ +src/sunstone/public/vendor/jQueryUI/ui-bg_highlight-soft_75_cccccc_1x100.png \ +src/sunstone/public/vendor/jQueryUI/ui-bg_glass_95_fef1ec_1x400.png \ +src/sunstone/public/vendor/jQueryUI/ui-bg_glass_55_fbf9ee_1x400.png \ +src/sunstone/public/vendor/jQueryUI/ui-icons_888888_256x240.png \ +src/sunstone/public/vendor/jQueryUI/ui-bg_glass_75_e6e6e6_1x400.png \ +src/sunstone/public/vendor/jQueryUI/ui-bg_flat_0_575c5b_40x100.png \ +src/sunstone/public/vendor/jQueryUI/ui-bg_glass_65_ffffff_1x400.png \ +src/sunstone/public/vendor/jQueryUI/ui-bg_flat_75_ffffff_40x100.png \ +src/sunstone/public/vendor/jQueryUI/ui-icons_2e83ff_256x240.png \ +src/sunstone/public/vendor/jQueryUI/ui-icons_454545_256x240.png \ +src/sunstone/public/vendor/jQueryUI/NOTICE \ +src/sunstone/public/vendor/jQueryUI/ui-icons_222222_256x240.png \ +" +SUNSTONE_PUBLIC_VENDOR_JQUERYLAYOUT="\ + src/sunstone/public/vendor/jQueryLayout/layout-default-latest.css \ + src/sunstone/public/vendor/jQueryLayout/jquery.layout.min-1.2.0.js \ + src/sunstone/public/vendor/jQueryLayout/NOTICE" SUNSTONE_PUBLIC_IMAGES_FILES="src/sunstone/public/images/ajax-loader.gif \ src/sunstone/public/images/login_over.png \ diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 310e88a7d3..d47c582ca8 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -191,7 +191,7 @@ var OpenNebula = { data: {remember: remember}, beforeSend : function(req) { req.setRequestHeader( "Authorization", - "Basic " + base64.encode(username + ":" + password) + "Basic " + btoa(username + ":" + password) ) }, success: function(response) diff --git a/src/sunstone/public/js/vendor/base64.js b/src/sunstone/public/js/vendor/base64.js deleted file mode 100644 index 54c86951c6..0000000000 --- a/src/sunstone/public/js/vendor/base64.js +++ /dev/null @@ -1,113 +0,0 @@ -// adapted from here: http://ostermiller.org/calc/encode.html -var base64 = {}; - -(function () { - var END_OF_INPUT = -1, - base64Chars = new Array( - 'A','B','C','D','E','F','G','H', - 'I','J','K','L','M','N','O','P', - 'Q','R','S','T','U','V','W','X', - 'Y','Z','a','b','c','d','e','f', - 'g','h','i','j','k','l','m','n', - 'o','p','q','r','s','t','u','v', - 'w','x','y','z','0','1','2','3', - '4','5','6','7','8','9','+','/'), - reverseBase64Chars = new Array(), - base64Str, - base64Count; - - for (var i=0; i < base64Chars.length; i++){ - reverseBase64Chars[base64Chars[i]] = i; - } - - function setBase64Str(str){ - base64Str = str; - base64Count = 0; - } - function readBase64(){ - if (!base64Str) return END_OF_INPUT; - if (base64Count >= base64Str.length) return END_OF_INPUT; - var c = base64Str.charCodeAt(base64Count) & 0xff; - base64Count++; - return c; - } - function readReverseBase64(){ - if (!base64Str) return END_OF_INPUT; - while (true){ - if (base64Count >= base64Str.length) return END_OF_INPUT; - var nextCharacter = base64Str.charAt(base64Count); - base64Count++; - if (reverseBase64Chars[nextCharacter]){ - return reverseBase64Chars[nextCharacter]; - } - if (nextCharacter == 'A') return 0; - } - return END_OF_INPUT; - } - - function ntos(n){ - n=n.toString(16); - if (n.length == 1) n="0"+n; - n="%"+n; - return unescape(n); - } - - base64.encode = function(str){ - setBase64Str(str); - var result = ''; - var inBuffer = new Array(3); - var lineCount = 0; - var done = false; - while (!done && (inBuffer[0] = readBase64()) != END_OF_INPUT){ - inBuffer[1] = readBase64(); - inBuffer[2] = readBase64(); - result += (base64Chars[ inBuffer[0] >> 2 ]); - if (inBuffer[1] != END_OF_INPUT){ - result += (base64Chars [(( inBuffer[0] << 4 ) & 0x30) | (inBuffer[1] >> 4) ]); - if (inBuffer[2] != END_OF_INPUT){ - result += (base64Chars [((inBuffer[1] << 2) & 0x3c) | (inBuffer[2] >> 6) ]); - result += (base64Chars [inBuffer[2] & 0x3F]); - } else { - result += (base64Chars [((inBuffer[1] << 2) & 0x3c)]); - result += ('='); - done = true; - } - } else { - result += (base64Chars [(( inBuffer[0] << 4 ) & 0x30)]); - result += ('='); - result += ('='); - done = true; - } - lineCount += 4; - if (lineCount >= 76){ - result += ('\n'); - lineCount = 0; - } - } - return result; - } - - base64.decode = function(str){ - setBase64Str(str); - var result = ""; - var inBuffer = new Array(4); - var done = false; - while (!done && (inBuffer[0] = readReverseBase64()) != END_OF_INPUT - && (inBuffer[1] = readReverseBase64()) != END_OF_INPUT){ - inBuffer[2] = readReverseBase64(); - inBuffer[3] = readReverseBase64(); - result += ntos((((inBuffer[0] << 2) & 0xff)| inBuffer[1] >> 4)); - if (inBuffer[2] != END_OF_INPUT){ - result += ntos((((inBuffer[1] << 4) & 0xff)| inBuffer[2] >> 2)); - if (inBuffer[3] != END_OF_INPUT){ - result += ntos((((inBuffer[2] << 6) & 0xff) | inBuffer[3])); - } else { - done = true; - } - } else { - done = true; - } - } - return result; - } -})() \ No newline at end of file diff --git a/src/sunstone/public/vendor/dataTables/BSD-LICENSE.txt b/src/sunstone/public/vendor/dataTables/BSD-LICENSE.txt new file mode 100644 index 0000000000..795d504740 --- /dev/null +++ b/src/sunstone/public/vendor/dataTables/BSD-LICENSE.txt @@ -0,0 +1,25 @@ +Copyright (c) 2008-2010, Allan Jardine +All rights reserved. + +Redistribution and use 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. +- Neither the name of Allan Jardine nor SpryMedia UK may be used to endorse or +promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "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 HOLDERS 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. diff --git a/src/sunstone/public/vendor/dataTables/NOTICE b/src/sunstone/public/vendor/dataTables/NOTICE new file mode 100644 index 0000000000..3297dd4548 --- /dev/null +++ b/src/sunstone/public/vendor/dataTables/NOTICE @@ -0,0 +1,6 @@ +THIRD-PARTY SOFTWARE + + * Author: Allan Jardine (www.sprymedia.co.uk) + * Info: www.datatables.net + * Copyright: Copyright 2008-2010 Allan Jardine, all rights reserved. + * License: BSD License. See BSD-LICENSE.txt diff --git a/src/sunstone/public/css/demo_table_jui.css b/src/sunstone/public/vendor/dataTables/demo_table_jui.css similarity index 100% rename from src/sunstone/public/css/demo_table_jui.css rename to src/sunstone/public/vendor/dataTables/demo_table_jui.css diff --git a/src/sunstone/public/js/vendor/jquery.dataTables.min.js b/src/sunstone/public/vendor/dataTables/jquery.dataTables.min.js similarity index 100% rename from src/sunstone/public/js/vendor/jquery.dataTables.min.js rename to src/sunstone/public/vendor/dataTables/jquery.dataTables.min.js diff --git a/src/sunstone/public/vendor/jGrowl/NOTICE b/src/sunstone/public/vendor/jGrowl/NOTICE new file mode 100644 index 0000000000..d1253027d7 --- /dev/null +++ b/src/sunstone/public/vendor/jGrowl/NOTICE @@ -0,0 +1,5 @@ +THIRD-PARTY SOFTWARE + + * Author: Stan Lemon (http://stanlemon.net/) + * Info: http://stanlemon.net/ + * License: MIT License: http://www.opensource.org/licenses/mit-license.php diff --git a/src/sunstone/public/css/jquery.jgrowl.css b/src/sunstone/public/vendor/jGrowl/jquery.jgrowl.css similarity index 97% rename from src/sunstone/public/css/jquery.jgrowl.css rename to src/sunstone/public/vendor/jGrowl/jquery.jgrowl.css index a735d2fbd8..004457d0f1 100644 --- a/src/sunstone/public/css/jquery.jgrowl.css +++ b/src/sunstone/public/vendor/jGrowl/jquery.jgrowl.css @@ -1,3 +1,4 @@ +/* Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php). */ div.jGrowl { padding: 10px; diff --git a/src/sunstone/public/js/vendor/jquery.jgrowl_minimized.js b/src/sunstone/public/vendor/jGrowl/jquery.jgrowl_minimized.js similarity index 98% rename from src/sunstone/public/js/vendor/jquery.jgrowl_minimized.js rename to src/sunstone/public/vendor/jGrowl/jquery.jgrowl_minimized.js index aa70dfbdbc..15fe5503a4 100644 --- a/src/sunstone/public/js/vendor/jquery.jgrowl_minimized.js +++ b/src/sunstone/public/vendor/jGrowl/jquery.jgrowl_minimized.js @@ -1,3 +1,4 @@ +/* Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php). */ (function($){$.jGrowl=function(m,o){if($('#jGrowl').size()==0) $('
').addClass((o&&o.position)?o.position:$.jGrowl.defaults.position).appendTo('body');$('#jGrowl').jGrowl(m,o);};$.fn.jGrowl=function(m,o){if($.isFunction(this.each)){var args=arguments;return this.each(function(){var self=this;if($(this).data('jGrowl.instance')==undefined){$(this).data('jGrowl.instance',$.extend(new $.fn.jGrowl(),{notifications:[],element:null,interval:null}));$(this).data('jGrowl.instance').startup(this);} @@ -8,4 +9,4 @@ $(this).animate(o.animateOpen,o.openDuration,o.easing,function(){if($.browser.ms this.style.removeAttribute('filter');$(this).data("jGrowl").created=new Date();$(this).trigger('jGrowl.afterOpen');});}}).bind('jGrowl.afterOpen',function(){o.afterOpen.apply(notification,[notification,message,o,self.element]);}).bind('jGrowl.beforeClose',function(){if(o.beforeClose.apply(notification,[notification,message,o,self.element])!=false) $(this).trigger('jGrowl.close');}).bind('jGrowl.close',function(){$(this).data('jGrowl.pause',true);$(this).animate(o.animateClose,o.closeDuration,o.easing,function(){$(this).remove();var close=o.close.apply(notification,[notification,message,o,self.element]);if($.isFunction(close)) close.apply(notification,[notification,message,o,self.element]);});}).trigger('jGrowl.beforeOpen');if(o.corners!=''&&$.fn.corner!=undefined)$(notification).corner(o.corners);if($('div.jGrowl-notification:parent',self.element).size()>1&&$('div.jGrowl-closer',self.element).size()==0&&this.defaults.closer!=false){$(this.defaults.closerTemplate).addClass('jGrowl-closer ui-state-highlight ui-corner-all').addClass(this.defaults.theme).appendTo(self.element).animate(this.defaults.animateOpen,this.defaults.speed,this.defaults.easing).bind("click.jGrowl",function(){$(this).siblings().trigger("jGrowl.beforeClose");if($.isFunction(self.defaults.closer)){self.defaults.closer.apply($(this).parent()[0],[$(this).parent()[0]]);}});};},update:function(){$(this.element).find('div.jGrowl-notification:parent').each(function(){if($(this).data("jGrowl")!=undefined&&$(this).data("jGrowl").created!=undefined&&($(this).data("jGrowl").created.getTime()+parseInt($(this).data("jGrowl").life))<(new Date()).getTime()&&$(this).data("jGrowl").sticky!=true&&($(this).data("jGrowl.pause")==undefined||$(this).data("jGrowl.pause")!=true)){$(this).trigger('jGrowl.beforeClose');}});if(this.notifications.length>0&&(this.defaults.pool==0||$(this.element).find('div.jGrowl-notification:parent').size()');this.interval=setInterval(function(){$(e).data('jGrowl.instance').update();},parseInt(this.defaults.check));if($.browser.msie&&parseInt($.browser.version)<7&&!window["XMLHttpRequest"]){$(this.element).addClass('ie6');}},shutdown:function(){$(this.element).removeClass('jGrowl').find('div.jGrowl-notification').remove();clearInterval(this.interval);},close:function(){$(this.element).find('div.jGrowl-notification').each(function(){$(this).trigger('jGrowl.beforeClose');});}});$.jGrowl.defaults=$.fn.jGrowl.prototype.defaults;})(jQuery); \ No newline at end of file +this.render(this.notifications.shift());if($(this.element).find('div.jGrowl-notification:parent').size()<2){$(this.element).find('div.jGrowl-closer').animate(this.defaults.animateClose,this.defaults.speed,this.defaults.easing,function(){$(this).remove();});}},startup:function(e){this.element=$(e).addClass('jGrowl').append('
');this.interval=setInterval(function(){$(e).data('jGrowl.instance').update();},parseInt(this.defaults.check));if($.browser.msie&&parseInt($.browser.version)<7&&!window["XMLHttpRequest"]){$(this.element).addClass('ie6');}},shutdown:function(){$(this.element).removeClass('jGrowl').find('div.jGrowl-notification').remove();clearInterval(this.interval);},close:function(){$(this.element).find('div.jGrowl-notification').each(function(){$(this).trigger('jGrowl.beforeClose');});}});$.jGrowl.defaults=$.fn.jGrowl.prototype.defaults;})(jQuery); diff --git a/src/sunstone/public/vendor/jQuery/MIT-LICENSE.txt b/src/sunstone/public/vendor/jQuery/MIT-LICENSE.txt new file mode 100644 index 0000000000..532704636b --- /dev/null +++ b/src/sunstone/public/vendor/jQuery/MIT-LICENSE.txt @@ -0,0 +1,20 @@ +Copyright (c) 2011 John Resig, http://jquery.com/ + +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: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/sunstone/public/vendor/jQuery/NOTICE b/src/sunstone/public/vendor/jQuery/NOTICE new file mode 100644 index 0000000000..ba5558c085 --- /dev/null +++ b/src/sunstone/public/vendor/jQuery/NOTICE @@ -0,0 +1,6 @@ +THIRD-PARTY SOFTWARE + + * Author: John Resig (www.sprymedia.co.uk) + * Info: http://jquery.com/ + * Copyright: Copyright (c) 2011 John Resig, http://jquery.com/ + * License: MIT License: See MIT-LICENSE.txt diff --git a/src/sunstone/public/js/vendor/jquery-1.4.4.min.js b/src/sunstone/public/vendor/jQuery/jquery-1.4.4.min.js similarity index 100% rename from src/sunstone/public/js/vendor/jquery-1.4.4.min.js rename to src/sunstone/public/vendor/jQuery/jquery-1.4.4.min.js diff --git a/src/sunstone/public/vendor/jQueryLayout/NOTICE b/src/sunstone/public/vendor/jQueryLayout/NOTICE new file mode 100644 index 0000000000..f7781c6559 --- /dev/null +++ b/src/sunstone/public/vendor/jQueryLayout/NOTICE @@ -0,0 +1,9 @@ +THIRD-PARTY SOFTWARE + + * Authors: Fabrizio Balliano (http://www.fabrizioballiano.net) + Kevin Dalman (http://allpro.net) + * Info: http://layout.jquery-dev.net/ + * Copyright: Copyright (c) 2008 + Fabrizio Balliano (http://www.fabrizioballiano.net) + Kevin Dalman (http://allpro.net) + * License: MIT License: http://www.opensource.org/licenses/mit-license.php diff --git a/src/sunstone/public/js/vendor/jquery.layout.min-1.2.0.js b/src/sunstone/public/vendor/jQueryLayout/jquery.layout.min-1.2.0.js similarity index 100% rename from src/sunstone/public/js/vendor/jquery.layout.min-1.2.0.js rename to src/sunstone/public/vendor/jQueryLayout/jquery.layout.min-1.2.0.js diff --git a/src/sunstone/public/css/layout-default-latest.css b/src/sunstone/public/vendor/jQueryLayout/layout-default-latest.css similarity index 100% rename from src/sunstone/public/css/layout-default-latest.css rename to src/sunstone/public/vendor/jQueryLayout/layout-default-latest.css diff --git a/src/sunstone/public/vendor/jQueryUI/MIT-LICENSE.txt b/src/sunstone/public/vendor/jQueryUI/MIT-LICENSE.txt new file mode 100644 index 0000000000..532704636b --- /dev/null +++ b/src/sunstone/public/vendor/jQueryUI/MIT-LICENSE.txt @@ -0,0 +1,20 @@ +Copyright (c) 2011 John Resig, http://jquery.com/ + +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: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/sunstone/public/vendor/jQueryUI/NOTICE b/src/sunstone/public/vendor/jQueryUI/NOTICE new file mode 100644 index 0000000000..ba5558c085 --- /dev/null +++ b/src/sunstone/public/vendor/jQueryUI/NOTICE @@ -0,0 +1,6 @@ +THIRD-PARTY SOFTWARE + + * Author: John Resig (www.sprymedia.co.uk) + * Info: http://jquery.com/ + * Copyright: Copyright (c) 2011 John Resig, http://jquery.com/ + * License: MIT License: See MIT-LICENSE.txt diff --git a/src/sunstone/public/css/vendor/jquery-ui-1.8.7.custom.css b/src/sunstone/public/vendor/jQueryUI/jquery-ui-1.8.7.custom.css similarity index 100% rename from src/sunstone/public/css/vendor/jquery-ui-1.8.7.custom.css rename to src/sunstone/public/vendor/jQueryUI/jquery-ui-1.8.7.custom.css diff --git a/src/sunstone/public/js/vendor/jquery-ui-1.8.7.custom.min.js b/src/sunstone/public/vendor/jQueryUI/jquery-ui-1.8.7.custom.min.js similarity index 100% rename from src/sunstone/public/js/vendor/jquery-ui-1.8.7.custom.min.js rename to src/sunstone/public/vendor/jQueryUI/jquery-ui-1.8.7.custom.min.js diff --git a/src/sunstone/public/css/vendor/ui-bg_flat_0_575c5b_40x100.png b/src/sunstone/public/vendor/jQueryUI/ui-bg_flat_0_575c5b_40x100.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-bg_flat_0_575c5b_40x100.png rename to src/sunstone/public/vendor/jQueryUI/ui-bg_flat_0_575c5b_40x100.png diff --git a/src/sunstone/public/css/vendor/ui-bg_flat_0_8f9392_40x100.png b/src/sunstone/public/vendor/jQueryUI/ui-bg_flat_0_8f9392_40x100.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-bg_flat_0_8f9392_40x100.png rename to src/sunstone/public/vendor/jQueryUI/ui-bg_flat_0_8f9392_40x100.png diff --git a/src/sunstone/public/css/vendor/ui-bg_flat_0_aaaaaa_40x100.png b/src/sunstone/public/vendor/jQueryUI/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-bg_flat_0_aaaaaa_40x100.png rename to src/sunstone/public/vendor/jQueryUI/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/src/sunstone/public/css/vendor/ui-bg_flat_75_ffffff_40x100.png b/src/sunstone/public/vendor/jQueryUI/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-bg_flat_75_ffffff_40x100.png rename to src/sunstone/public/vendor/jQueryUI/ui-bg_flat_75_ffffff_40x100.png diff --git a/src/sunstone/public/css/vendor/ui-bg_glass_55_fbf9ee_1x400.png b/src/sunstone/public/vendor/jQueryUI/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-bg_glass_55_fbf9ee_1x400.png rename to src/sunstone/public/vendor/jQueryUI/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/src/sunstone/public/css/vendor/ui-bg_glass_65_ffffff_1x400.png b/src/sunstone/public/vendor/jQueryUI/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-bg_glass_65_ffffff_1x400.png rename to src/sunstone/public/vendor/jQueryUI/ui-bg_glass_65_ffffff_1x400.png diff --git a/src/sunstone/public/css/vendor/ui-bg_glass_75_dadada_1x400.png b/src/sunstone/public/vendor/jQueryUI/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-bg_glass_75_dadada_1x400.png rename to src/sunstone/public/vendor/jQueryUI/ui-bg_glass_75_dadada_1x400.png diff --git a/src/sunstone/public/css/vendor/ui-bg_glass_75_e6e6e6_1x400.png b/src/sunstone/public/vendor/jQueryUI/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-bg_glass_75_e6e6e6_1x400.png rename to src/sunstone/public/vendor/jQueryUI/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/src/sunstone/public/css/vendor/ui-bg_glass_95_fef1ec_1x400.png b/src/sunstone/public/vendor/jQueryUI/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-bg_glass_95_fef1ec_1x400.png rename to src/sunstone/public/vendor/jQueryUI/ui-bg_glass_95_fef1ec_1x400.png diff --git a/src/sunstone/public/css/vendor/ui-bg_highlight-soft_75_cccccc_1x100.png b/src/sunstone/public/vendor/jQueryUI/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-bg_highlight-soft_75_cccccc_1x100.png rename to src/sunstone/public/vendor/jQueryUI/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/src/sunstone/public/css/vendor/ui-icons_222222_256x240.png b/src/sunstone/public/vendor/jQueryUI/ui-icons_222222_256x240.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-icons_222222_256x240.png rename to src/sunstone/public/vendor/jQueryUI/ui-icons_222222_256x240.png diff --git a/src/sunstone/public/css/vendor/ui-icons_2e83ff_256x240.png b/src/sunstone/public/vendor/jQueryUI/ui-icons_2e83ff_256x240.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-icons_2e83ff_256x240.png rename to src/sunstone/public/vendor/jQueryUI/ui-icons_2e83ff_256x240.png diff --git a/src/sunstone/public/css/vendor/ui-icons_454545_256x240.png b/src/sunstone/public/vendor/jQueryUI/ui-icons_454545_256x240.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-icons_454545_256x240.png rename to src/sunstone/public/vendor/jQueryUI/ui-icons_454545_256x240.png diff --git a/src/sunstone/public/css/vendor/ui-icons_888888_256x240.png b/src/sunstone/public/vendor/jQueryUI/ui-icons_888888_256x240.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-icons_888888_256x240.png rename to src/sunstone/public/vendor/jQueryUI/ui-icons_888888_256x240.png diff --git a/src/sunstone/public/css/vendor/ui-icons_cd0a0a_256x240.png b/src/sunstone/public/vendor/jQueryUI/ui-icons_cd0a0a_256x240.png similarity index 100% rename from src/sunstone/public/css/vendor/ui-icons_cd0a0a_256x240.png rename to src/sunstone/public/vendor/jQueryUI/ui-icons_cd0a0a_256x240.png diff --git a/src/sunstone/templates/index.html b/src/sunstone/templates/index.html index dd119c2ca2..37abef4e23 100644 --- a/src/sunstone/templates/index.html +++ b/src/sunstone/templates/index.html @@ -1,30 +1,32 @@ - OpenNebula Admin Console - - - - - - - + OpenNebula Admin Console + - - - - - + + + + - - - + + + + + + + + + + + +
-
+
diff --git a/src/sunstone/templates/login.html b/src/sunstone/templates/login.html index 9d2b0bce48..ad1d895940 100644 --- a/src/sunstone/templates/login.html +++ b/src/sunstone/templates/login.html @@ -5,8 +5,8 @@ - - + + From 77abcbe0814674f758dc7e80b02972a9b2760c7e Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Mon, 28 Feb 2011 16:58:51 +0100 Subject: [PATCH 3/3] Run the main 'one' script with bash instead of sh --- share/scripts/one | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/scripts/one b/share/scripts/one index 803b20d60b..3b26c0e55c 100755 --- a/share/scripts/one +++ b/share/scripts/one @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/bash # -------------------------------------------------------------------------- # # Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) #