Merge remote branch 'origin/master' into hector

Conflicts:
	flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js
This commit is contained in:
Daniel Molina committed 2012-09-24 16:51:07 +02:00
commit 598089f3d4
16 files changed
+1106 -102

No files matched your search

+1 -2
View File
@@ -17,6 +17,5 @@
. ../install_lib.sh
copy_files "sunstone/public/images/*" "$SUNSTONE_LOCATION/public/images"
copy_files "sunstone/public/js/user-plugins/*" "$SUNSTONE_LOCATION/public/js/user-plugins"
copy_files "share/*" "$SHARE_LOCATION"
File diff suppressed because it is too large. Load diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

@@ -1,77 +0,0 @@
//--------------------------------------------------------------------------//
// Copyright 2010-2012, C12G Labs S.L. //
// //
// Licensed under the C12G Commercial Open-source License (the //
// "License"); you may not use this file except in compliance //
// with the License. You may obtain a copy of the License as part //
// of the software distribution. //
// //
// Unless 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 License. //
//--------------------------------------------------------------------------//
var apptools_dashboard_tmpl = '\
<table class="dashboard_table" id="apptools_dashboard">\
<tr>\
<td style="width:50%">\
<table style="width:100%">\
<tr>\
<td>\
<div class="panel">\
<h3>' + tr("AppTools") + '</h3>\
<div class="panel_info">\
\
<p class="dashboard_p"><img src="images/apptools_icon.png" height="80px" style="float:right;margin:15px 15px;" alt="apptools logo"/>AppTools is a group of tools for users and administrators of OpenNebula to simplify and optimize cloud application management. With AppTools you can configure the software stack in the applications, manage multi-tiered applications, and build your own private market to distribute applications across several OpenNebula instances.</p>\
</div>\
</div>\
</td>\
</tr>\
</table>\
</td>\
<td style="width:50%">\
<table id="table_right" style="width:100%">\
<tr>\
<td>\
<div class="panel">\
<h3>' + tr("AppEnv - A tool to manage environments") + '</h3>\
<div class="panel_info">\
\
<p class="dashboard_p"><img src="images/appenv_icon.png" height="64px" style="float:right;margin:15px 63px 15px 15px;" alt="appenv logo"/>AppEnv performs the automatic installation and configuration of the software stack that constitutes an application environment. With AppEnv you can easily define software configurations for your VMs and share them with other users.</p>\
</div>\
</div>\
</td>\
</tr>\
<tr>\
<td>\
<div class="panel">\
<h3>' + tr("AppFlow - Service deployment") + '</h3>\
<div class="panel_info">\
<p class="dashboard_p"><img src="images/appflow_icon.png" height="64px" style="float:right;margin:15px 63px 15px 15px;" alt="appflow logo"/>AppFlow enables the automatic execution of multi-tiered applications. With AppFlow you can define multi-tier applications composed of interconnected VMs and manage them as a single entity.</p>\
</div>\
</div>\
</td>\
</tr>\
<tr>\
<td>\
<div class="panel">\
<h3>' + tr("AppMarket - Image repository") + '</h3>\
<div class="panel_info">\
<p class="dashboard_p"><img src="images/appmarket_icon.png" height="64px" style="float:right;margin:15px 15px;" alt="appflow logo"/>AppMarket builds a centralized catalog of cloud applications. With AppMarket you can build a private repository to share and distribute virtual appliances across OpenNebula instances.</p>\
</div>\
</div>\
</td>\
</tr>\
</table>\
</td>\
</tr></table>';
var apptools_tab = {
title: '<i class="icon-briefcase"></i>AppTools',
content: apptools_dashboard_tmpl,
}
Sunstone.addMainTab('apptools_tab',apptools_tab);
+1
View File
@@ -21,4 +21,5 @@ copy_files "lib/* cli/*" "$LIB_LOCATION/env"
copy_files "bin/*" "$BIN_LOCATION"
copy_files "share/packages/*" "$PACKAGES_LOCATION"
copy_files "sunstone/public/js/user-plugins/*" "$SUNSTONE_LOCATION/public/js/user-plugins"
copy_files "sunstone/public/images/*" "$SUNSTONE_LOCATION/public/images"
copy_files "sunstone/routes/*" "$SUNSTONE_LOCATION/routes"
File renamed without changes.
+3 -3
View File
@@ -323,7 +323,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
Service.perform_actions(args[0]) { |service_id|
params = Hash.new
params['gid'] = args[1].to_i
params['group_id'] = args[1].to_i
json_action = Service.build_json_action('chgrp', params)
@@ -344,8 +344,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
Service.perform_actions(args[0]) { |service_id|
params = Hash.new
params['uid'] = args[1]
params['gid'] = args[2] if args[2]
params['owner_id'] = args[1]
params['group_id'] = args[2] if args[2]
json_action = Service.build_json_action('chown', params)
+5 -5
View File
@@ -319,10 +319,10 @@ post '/service_template/:id/action' do
body service.to_json
when 'chown'
if opts && opts['uid']
if opts && opts['owner_id']
args = Array.new
args << opts['uid'].to_i
args << (opts['gid'].to_i || -1)
args << opts['owner_id'].to_i
args << (opts['group_id'].to_i || -1)
service_template.chown(*args)
else
@@ -330,8 +330,8 @@ post '/service_template/:id/action' do
"You have to specify a UID")
end
when 'chgrp'
if opts && opts['gid']
service_template.chown(-1, opts['gid'].to_i)
if opts && opts['group_id']
service_template.chown(-1, opts['group_id'].to_i)
else
OpenNebula::Error.new("Action #{action['perform']}: " <<
"You have to specify a GID")
+8 -2
View File
@@ -23,6 +23,10 @@ else
LOG_LOCATION="$ROOT/var/appflow"
fi
DIRECTORIES="$LIB_LOCATION $BIN_LOCATION $ETC_LOCATION $LOG_LOCATION"
create_dirs $DIRECTORIES
## Client files
copy_files "client/lib/*" "$LIB_LOCATION/flow"
copy_files "client/bin/*" "$BIN_LOCATION"
@@ -40,11 +44,13 @@ copy_files "lib/* models.rb config.ru Gemfile Gemfile.lock \
Rakefile" "$LIB_LOCATION/flow"
# Sunstone
copy_files "sunstone/public/js/user-plugins/*" \
"$SUNSTONE_LOCATION/public/js/user-plugins"
copy_files "sunstone/public/js/user-plugins/*" "$SUNSTONE_LOCATION/public/js/user-plugins"
copy_files "sunstone/public/images/*" "$SUNSTONE_LOCATION/public/images"
copy_files "sunstone/routes/*" "$SUNSTONE_LOCATION/routes"
# Do not link the ETC files
LINK="no"
copy_files "sunstone/etc/sunstone-appflow.conf" "$ETC_LOCATION"
copy_files "config/appflow-server.conf" "$ETC_LOCATION"
change_ownership $LOG_LOCATION
+4 -6
View File
@@ -243,12 +243,10 @@ class Validator
#
#
def validate_integer(body, schema_array, schema_key)
if body.is_a?(Integer)
body
else
raise ParseException, "KEY: '#{schema_key}' must be an Integer;"\
" SCHEMA: #{schema_array}"
end
Integer(body)
rescue ArgumentError
raise ParseException, "KEY: '#{schema_key}' must be an Integer;"\
" SCHEMA: #{schema_array}"
end
# Validate an null type
@@ -643,7 +643,7 @@ function setupCreateServiceTemplateDialog(){
var role = {
name : name,
cardinality: cardinality,
template: template,
vm_template: template,
parents: parents
};
@@ -663,7 +663,7 @@ function setupCreateServiceTemplateDialog(){
$('input[name="cardinality"]', context).val("1");
//unselect selected parents
$('select[name="parents"] option[clicked="clicked"]').trigger('click');
}
}
else
notifyError(tr("There is already a role with this name!"));
+1 -1
View File
@@ -115,4 +115,4 @@ post '/service_template' do
resp = client.post('/service_template', request.body.read)
af_format_response(resp)
end
end
+24 -2
View File
@@ -15,7 +15,8 @@
usage() {
echo
echo "Usage: install.sh [-d ONE_LOCATION] [-l] [-h]"
echo "Usage: install.sh [-u install_user] [-g install_group]"
echo " [-d ONE_LOCATION] [-l] [-h]"
echo
echo "-d: target installation directory, if not defined it'd be root. Must be"
echo " an absolute path."
@@ -23,7 +24,7 @@ usage() {
echo "-h: prints this help"
}
TEMP_OPT=`getopt -o hld: -n 'install.sh' -- "$@"`
TEMP_OPT=`getopt -o hlu:g:d: -n 'install.sh' -- "$@"`
if [ $? != 0 ] ; then
usage
@@ -33,6 +34,8 @@ fi
eval set -- "$TEMP_OPT"
LINK="no"
ONEADMIN_USER=`id -u`
ONEADMIN_GROUP=`id -g`
SRC_DIR=$PWD
while true ; do
@@ -40,6 +43,8 @@ while true ; do
-h) usage; exit 0;;
-d) ROOT="$2" ; shift 2 ;;
-l) LINK="yes" ; shift ;;
-u) ONEADMIN_USER="$2" ; shift 2;;
-g) ONEADMIN_GROUP="$2"; shift 2;;
--) shift ; break ;;
*) usage; exit 1 ;;
esac
@@ -49,12 +54,14 @@ if [ -z "$ROOT" ]; then
LIB_LOCATION="/usr/lib/one/ruby/apptools"
BIN_LOCATION="/usr/bin"
PACKAGES_LOCATION="/usr/share/one/apptools"
SHARE_LOCATION="/usr/share/one/apptools"
ETC_LOCATION="/etc/one"
SUNSTONE_LOCATION="/usr/lib/one/sunstone"
else
LIB_LOCATION="$ROOT/lib/ruby/apptools"
BIN_LOCATION="$ROOT/bin"
PACKAGES_LOCATION="$ROOT/share/apptools"
SHARE_LOCATION="$ROOT/share/apptools"
ETC_LOCATION="$ROOT/etc"
SUNSTONE_LOCATION="$ROOT/lib/sunstone"
fi
@@ -82,3 +89,18 @@ copy_files() {
done
}
create_dirs() {
DIRS=$*
for d in $DIRS; do
dir=$DESTDIR$d
mkdir -p $dir
done
}
change_ownership() {
DIRS=$*
for d in $DIRS; do
chown -R $ONEADMIN_USER:$ONEADMIN_GROUP $DESTDIR$d
done
}
+2 -2
View File
@@ -34,8 +34,8 @@ copy_files "lib/* models.rb config.ru Gemfile Gemfile.lock \
Rakefile config/init.rb" "$LIB_LOCATION/market"
# Sunstone
copy_files "sunstone/public/js/user-plugins/*" \
"$SUNSTONE_LOCATION/public/js/user-plugins"
copy_files "sunstone/public/js/user-plugins/*" "$SUNSTONE_LOCATION/public/js/user-plugins"
copy_files "sunstone/public/images/*" "$SUNSTONE_LOCATION/public/images"
copy_files "sunstone/routes/*" "$SUNSTONE_LOCATION/routes"
# Do not link the ETC files