From c588ce82fe69114b9bc0216b8196a0516104ba2b Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 11 Jan 2013 15:03:20 +0100 Subject: [PATCH 1/7] Bad path ins postinstall --- oneapps/postinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oneapps/postinstall.sh b/oneapps/postinstall.sh index d70a8fed12..14237ace97 100755 --- a/oneapps/postinstall.sh +++ b/oneapps/postinstall.sh @@ -3,7 +3,7 @@ SUNSTONE_PLUGINS=/etc/one/sunstone-plugins.yaml SUNSTONE_SERVER=/etc/one/sunstone-server.conf OPENNEBULA_JS=/usr/lib/one/sunstone/public/js/opennebula.js -OPENNEBULA_JS_NEW=/usr/share/one/oneapps/sunstone/public/js/opennebula.js +OPENNEBULA_JS_NEW=/usr/share/one/oneapps/public/js/opennebula.js SUNSTONE_AUTH="/var/lib/one/.one/sunstone_auth" APPFLOW_AUTH="/var/lib/one/.one/appflow_auth" From 22dbfca99d11d1643752c323709805d18943ee71 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 11 Jan 2013 10:38:58 -0600 Subject: [PATCH 2/7] Change directories for debian/ubuntu packages --- gen_package.sh | 17 ++++++++++++++--- install_lib.sh | 33 +++++++++++++++++++++++++-------- oneapps/postinstall.sh | 27 +++++++++++++++++++++------ 3 files changed, 60 insertions(+), 17 deletions(-) diff --git a/gen_package.sh b/gen_package.sh index 394bc1bb34..d92cd30847 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -36,16 +36,27 @@ DIRS="oneapps stage flow market" export DESTDIR=$PWD/tmp if [ "$(id -u)" = "0" ]; then - OWNER_FLAGS='-u oneadmin -g oneadmin' + FLAGS='-u oneadmin -g oneadmin' fi +FLAVOR="other" +if [ "$PACKAGE_TYPE" = "deb" ]; then + FLAGS="$FLAGS -f debian" + FLAVOR="debian" +fi + +# Generate postinstall +sed "s/#FLAVOR#/$FLAVOR/" < $SCRIPTS_DIR/oneapps/postinstall.sh > \ + $SCRIPTS_DIR/oneapps/postinstall +chmod +x $SCRIPTS_DIR/oneapps/postinstall + rm -rf $DESTDIR mkdir $DESTDIR for TOOL in $DIRS; do ( cd $TOOL - ./install.sh $OWNER_FLAGS + ./install.sh $FLAGS ) done @@ -54,7 +65,7 @@ cd tmp fpm -n "$PACKAGE_NAME" -t "$PACKAGE_TYPE" -s dir --vendor "$VENDOR" \ --license "$LICENSE" --description "$DESCRIPTION" --url "$URL" \ -m "$MAINTAINER" -v "$VERSION" \ - --after-install $SCRIPTS_DIR/oneapps/postinstall.sh \ + --after-install $SCRIPTS_DIR/oneapps/postinstall \ -a all -p $SCRIPTS_DIR/$NAME * diff --git a/install_lib.sh b/install_lib.sh index ce62f12be7..fa468711f4 100644 --- a/install_lib.sh +++ b/install_lib.sh @@ -15,16 +15,17 @@ usage() { echo - echo "Usage: install.sh [-u install_user] [-g install_group]" + echo "Usage: install.sh [-u install_user] [-g install_group] [-f flavour]" echo " [-d ONE_LOCATION] [-l] [-h]" echo + echo "-f: distribution, debian or other" echo "-d: target installation directory, if not defined it'd be root. Must be" echo " an absolute path." echo "-l: creates symlinks instead of copying files, useful for development" echo "-h: prints this help" } -TEMP_OPT=`getopt -o hlu:g:d: -n 'install.sh' -- "$@"` +TEMP_OPT=`getopt -o hlu:g:d:f: -n 'install.sh' -- "$@"` if [ $? != 0 ] ; then usage @@ -37,6 +38,7 @@ LINK="no" ONEADMIN_USER=`id -u` ONEADMIN_GROUP=`id -g` SRC_DIR=$PWD +FLAVOR="other" while true ; do case "$1" in @@ -45,18 +47,33 @@ while true ; do -l) LINK="yes" ; shift ;; -u) ONEADMIN_USER="$2" ; shift 2;; -g) ONEADMIN_GROUP="$2"; shift 2;; + -f) FLAVOR="$2"; shift 2;; --) shift ; break ;; *) usage; exit 1 ;; esac done +echo $FLAVOR + if [ -z "$ROOT" ]; then - LIB_LOCATION="/usr/lib/one/ruby/oneapps" - BIN_LOCATION="/usr/bin" - PACKAGES_LOCATION="/usr/share/one/oneapps" - SHARE_LOCATION="/usr/share/one/oneapps" - ETC_LOCATION="/etc/one" - SUNSTONE_LOCATION="/usr/lib/one/sunstone" + case "$FLAVOR" in + "debian") + LIB_LOCATION="/usr/lib/one/ruby/oneapps" + BIN_LOCATION="/usr/bin" + PACKAGES_LOCATION="/usr/share/opennebula/oneapps" + SHARE_LOCATION="/usr/share/opennebula/oneapps" + ETC_LOCATION="/etc/one" + SUNSTONE_LOCATION="/usr/share/opennebula/sunstone" + ;; + *) + LIB_LOCATION="/usr/lib/one/ruby/oneapps" + BIN_LOCATION="/usr/bin" + PACKAGES_LOCATION="/usr/share/one/oneapps" + SHARE_LOCATION="/usr/share/one/oneapps" + ETC_LOCATION="/etc/one" + SUNSTONE_LOCATION="/usr/lib/one/sunstone" + ;; + esac else LIB_LOCATION="$ROOT/lib/ruby/oneapps" BIN_LOCATION="$ROOT/bin" diff --git a/oneapps/postinstall.sh b/oneapps/postinstall.sh index 14237ace97..e48f54a9a3 100755 --- a/oneapps/postinstall.sh +++ b/oneapps/postinstall.sh @@ -1,11 +1,26 @@ #!/bin/bash -SUNSTONE_PLUGINS=/etc/one/sunstone-plugins.yaml -SUNSTONE_SERVER=/etc/one/sunstone-server.conf -OPENNEBULA_JS=/usr/lib/one/sunstone/public/js/opennebula.js -OPENNEBULA_JS_NEW=/usr/share/one/oneapps/public/js/opennebula.js -SUNSTONE_AUTH="/var/lib/one/.one/sunstone_auth" -APPFLOW_AUTH="/var/lib/one/.one/appflow_auth" +FLAVOR="#FLAVOR#" + +case "$FLAVOR" in; +debian) + SUNSTONE_PLUGINS=/etc/one/sunstone-plugins.yaml + SUNSTONE_SERVER=/etc/one/sunstone-server.conf + OPENNEBULA_JS=/usr/share/opennebula/sunstone/public/js/opennebula.js + OPENNEBULA_JS_NEW=/usr/share/opennebula/oneapps/public/js/opennebula.js + SUNSTONE_AUTH="/var/lib/one/.one/sunstone_auth" + APPFLOW_AUTH="/var/lib/one/.one/appflow_auth" + ;; + +*) + SUNSTONE_PLUGINS=/etc/one/sunstone-plugins.yaml + SUNSTONE_SERVER=/etc/one/sunstone-server.conf + OPENNEBULA_JS=/usr/lib/one/sunstone/public/js/opennebula.js + OPENNEBULA_JS_NEW=/usr/share/one/oneapps/public/js/opennebula.js + SUNSTONE_AUTH="/var/lib/one/.one/sunstone_auth" + APPFLOW_AUTH="/var/lib/one/.one/appflow_auth" + ;; +esac function print_install_message() { cat < Date: Fri, 11 Jan 2013 10:39:59 -0600 Subject: [PATCH 3/7] Bump version --- gen_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen_package.sh b/gen_package.sh index d92cd30847..5450c4b802 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -16,7 +16,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -VERSION=${VERSION:-3.8.2} +VERSION=${VERSION:-3.8.3} MAINTAINER=${MAINTAINER:-C12G Labs } LICENSE=${LICENSE:-Apache} PACKAGE_NAME=${PACKAGE_NAME:-oneapps} From f94ec58d021cf19e46e04da88d7eda036edc55f7 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 11 Jan 2013 11:42:14 -0600 Subject: [PATCH 4/7] Bug in postinstall --- oneapps/postinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oneapps/postinstall.sh b/oneapps/postinstall.sh index e48f54a9a3..39807e6a13 100755 --- a/oneapps/postinstall.sh +++ b/oneapps/postinstall.sh @@ -2,7 +2,7 @@ FLAVOR="#FLAVOR#" -case "$FLAVOR" in; +case "$FLAVOR" in debian) SUNSTONE_PLUGINS=/etc/one/sunstone-plugins.yaml SUNSTONE_SERVER=/etc/one/sunstone-server.conf From 851689c32ecfa17cdd3c234495553901f2537e04 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 23 Jan 2013 12:44:19 +0100 Subject: [PATCH 5/7] Change license --- flow/Rakefile | 20 +- flow/bin/appflow-server | 19 +- flow/client/bin/appflow | 19 +- flow/client/bin/appflow-template | 19 +- flow/client/lib/appflow_client.rb | 19 +- flow/config.ru | 19 +- flow/config/appflow-server.conf | 19 +- flow/controllers/appflow-server.rb | 19 +- flow/install.sh | 19 +- flow/lcm/LifeCycleManager.rb | 19 +- flow/lcm/strategy.rb | 19 +- flow/lcm/strategy/straight.rb | 19 +- flow/lib/log.rb | 19 +- flow/lib/validator.rb | 19 +- flow/models.rb | 19 +- flow/models/Role.rb | 19 +- flow/models/Service.rb | 19 +- flow/models/ServicePool.rb | 19 +- flow/models/ServiceTemplate.rb | 19 +- flow/models/ServiceTemplatePool.rb | 19 +- flow/sunstone/etc/sunstone-appflow.conf | 19 +- .../apptools.appflow-dashboard.js | 23 +- .../user-plugins/apptools.appflow.services.js | 23 +- .../apptools.appflow.templates.js | 23 +- flow/sunstone/routes/appflow.rb | 19 +- gen_package.sh | 2 +- install_lib.sh | 19 +- market/Gemfile | 19 +- market/Rakefile | 19 +- market/bin/appmarket-server | 2 +- market/client/bin/appmarket | 19 +- market/client/bin/appmarket-user | 19 +- market/client/lib/appmarket_client.rb | 19 +- market/config.ru | 19 +- market/config/appmarket-server.conf | 19 +- market/config/init.rb | 19 +- market/controllers/appmarket-server.rb | 19 +- market/install.sh | 19 +- market/lib/mailer.rb | 19 +- market/lib/parser.rb | 19 +- market/lib/session.rb | 19 +- market/lib/validator.rb | 19 +- market/models.rb | 19 +- market/models/appliance.rb | 19 +- market/models/user.rb | 19 +- market/sunstone/etc/sunstone-appmarket.conf | 19 +- .../apptools.appmarket-dashboard.js | 23 +- .../apptools.appmarket.appliances.js | 30 +- market/sunstone/routes/appmarket.rb | 19 +- market/views/app_form.haml | 23 +- market/views/appliance_index.haml | 23 +- market/views/appliance_show.haml | 23 +- market/views/custom/banner.haml | 23 +- market/views/custom/footer.haml | 25 +- market/views/custom/logos.haml | 23 +- market/views/custom/terms_of_use.haml | 23 +- market/views/custom/tittle.haml | 23 +- market/views/layout.haml | 23 +- market/views/nav_login.haml | 23 +- market/views/user_form.haml | 23 +- market/views/user_index.haml | 23 +- market/views/user_show.haml | 23 +- oneapps/gen_man | 19 +- oneapps/install.sh | 19 +- oneapps/share/LICENSE | 273 +++++++++++------- .../share/sunstone/public/js/opennebula.js | 30 +- oneapps/share/version.rb | 8 +- stage/bin/appstage | 19 +- stage/cli/appstage_helper.rb | 19 +- stage/install.sh | 19 +- stage/lib/onecast.rb | 19 +- stage/lib/onechef.rb | 19 +- .../share/guest/etc/one-context.d/99-one-chef | 19 +- .../apptools.appstage-dashboard.js | 23 +- .../js/user-plugins/apptools.appstage.js | 23 +- stage/sunstone/routes/appstage.rb | 19 +- 76 files changed, 948 insertions(+), 806 deletions(-) diff --git a/flow/Rakefile b/flow/Rakefile index 633bffa619..d9976e887c 100644 --- a/flow/Rakefile +++ b/flow/Rakefile @@ -1,16 +1,18 @@ #!/usr/bin/env rake + # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/bin/appflow-server b/flow/bin/appflow-server index dce651e03b..2ce6653c78 100755 --- a/flow/bin/appflow-server +++ b/flow/bin/appflow-server @@ -1,17 +1,18 @@ #! /bin/sh # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/client/bin/appflow b/flow/client/bin/appflow index 34ed6ebc21..d011d694d9 100755 --- a/flow/client/bin/appflow +++ b/flow/client/bin/appflow @@ -1,17 +1,18 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/client/bin/appflow-template b/flow/client/bin/appflow-template index 6670873433..bf1912e6f1 100755 --- a/flow/client/bin/appflow-template +++ b/flow/client/bin/appflow-template @@ -1,17 +1,18 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/client/lib/appflow_client.rb b/flow/client/lib/appflow_client.rb index 8b9580af61..4d3fcc9d8b 100644 --- a/flow/client/lib/appflow_client.rb +++ b/flow/client/lib/appflow_client.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/config.ru b/flow/config.ru index 84e4ce2f37..36be3de671 100644 --- a/flow/config.ru +++ b/flow/config.ru @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/config/appflow-server.conf b/flow/config/appflow-server.conf index a47f0c4587..2f04058fc8 100644 --- a/flow/config/appflow-server.conf +++ b/flow/config/appflow-server.conf @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/controllers/appflow-server.rb b/flow/controllers/appflow-server.rb index 0efca35d09..7b868ccd62 100644 --- a/flow/controllers/appflow-server.rb +++ b/flow/controllers/appflow-server.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/install.sh b/flow/install.sh index 9368bed704..9d28ede07e 100755 --- a/flow/install.sh +++ b/flow/install.sh @@ -1,17 +1,18 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/lcm/LifeCycleManager.rb b/flow/lcm/LifeCycleManager.rb index f3ca6c4061..0557a0ae33 100644 --- a/flow/lcm/LifeCycleManager.rb +++ b/flow/lcm/LifeCycleManager.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/lcm/strategy.rb b/flow/lcm/strategy.rb index d057884e00..58997ad346 100644 --- a/flow/lcm/strategy.rb +++ b/flow/lcm/strategy.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/lcm/strategy/straight.rb b/flow/lcm/strategy/straight.rb index cfe03d8bf0..06dba65108 100644 --- a/flow/lcm/strategy/straight.rb +++ b/flow/lcm/strategy/straight.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/lib/log.rb b/flow/lib/log.rb index d340d0d8bf..7435d4245c 100644 --- a/flow/lib/log.rb +++ b/flow/lib/log.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/lib/validator.rb b/flow/lib/validator.rb index 9590f1a4a0..0b0cfcda73 100644 --- a/flow/lib/validator.rb +++ b/flow/lib/validator.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/models.rb b/flow/models.rb index 6a8f30bcca..cf1bd02c5e 100644 --- a/flow/models.rb +++ b/flow/models.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 3bf0def768..87904cf029 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/models/Service.rb b/flow/models/Service.rb index 320b10de48..da539be259 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/models/ServicePool.rb b/flow/models/ServicePool.rb index cf646b5efd..d7ebf9cb31 100644 --- a/flow/models/ServicePool.rb +++ b/flow/models/ServicePool.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/models/ServiceTemplate.rb b/flow/models/ServiceTemplate.rb index cb79a98fcd..000932d33e 100644 --- a/flow/models/ServiceTemplate.rb +++ b/flow/models/ServiceTemplate.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/models/ServiceTemplatePool.rb b/flow/models/ServiceTemplatePool.rb index 31c675a909..4eeb2fcf78 100644 --- a/flow/models/ServiceTemplatePool.rb +++ b/flow/models/ServiceTemplatePool.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/sunstone/etc/sunstone-appflow.conf b/flow/sunstone/etc/sunstone-appflow.conf index 2b66ee924b..d9a1c9454e 100644 --- a/flow/sunstone/etc/sunstone-appflow.conf +++ b/flow/sunstone/etc/sunstone-appflow.conf @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/flow/sunstone/public/js/user-plugins/apptools.appflow-dashboard.js b/flow/sunstone/public/js/user-plugins/apptools.appflow-dashboard.js index 0699e81ab9..60546ff742 100644 --- a/flow/sunstone/public/js/user-plugins/apptools.appflow-dashboard.js +++ b/flow/sunstone/public/js/user-plugins/apptools.appflow-dashboard.js @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // function updateAppFlowDashboard(what, json_info){ var db = $('#appflow_dashboard_tab',main_tabs_context); diff --git a/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js b/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js index d111a24023..f61555a287 100644 --- a/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js +++ b/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // var Service = { "resource" : 'DOCUMENT', diff --git a/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js b/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js index 470dbe578d..e8ecb5296f 100644 --- a/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js +++ b/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // var ServiceTemplate = { "resource" : 'DOCUMENT', diff --git a/flow/sunstone/routes/appflow.rb b/flow/sunstone/routes/appflow.rb index 3a1932052f..aa131ef6e8 100644 --- a/flow/sunstone/routes/appflow.rb +++ b/flow/sunstone/routes/appflow.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/gen_package.sh b/gen_package.sh index 5450c4b802..f31b4195fa 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/install_lib.sh b/install_lib.sh index fa468711f4..a18511ea3d 100644 --- a/install_lib.sh +++ b/install_lib.sh @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/Gemfile b/market/Gemfile index 92a322c9ad..5ebbf6725c 100644 --- a/market/Gemfile +++ b/market/Gemfile @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/Rakefile b/market/Rakefile index 0a27807db9..e2a78bfbd2 100644 --- a/market/Rakefile +++ b/market/Rakefile @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/bin/appmarket-server b/market/bin/appmarket-server index 85bb43841d..eaf138108d 100755 --- a/market/bin/appmarket-server +++ b/market/bin/appmarket-server @@ -1,7 +1,7 @@ #! /bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) # +# Copyright 2010-2013, C12G Labs S.L. # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/market/client/bin/appmarket b/market/client/bin/appmarket index 09c6c64d21..2c99d0d6a9 100755 --- a/market/client/bin/appmarket +++ b/market/client/bin/appmarket @@ -1,17 +1,18 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/client/bin/appmarket-user b/market/client/bin/appmarket-user index a8c927517c..2d21f7ac41 100755 --- a/market/client/bin/appmarket-user +++ b/market/client/bin/appmarket-user @@ -1,17 +1,18 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/client/lib/appmarket_client.rb b/market/client/lib/appmarket_client.rb index b58a3378bb..ef0a6aa26b 100644 --- a/market/client/lib/appmarket_client.rb +++ b/market/client/lib/appmarket_client.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/config.ru b/market/config.ru index 5cccbbd51f..e46c82fadf 100644 --- a/market/config.ru +++ b/market/config.ru @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/config/appmarket-server.conf b/market/config/appmarket-server.conf index cd9d300310..eebf8fc1ef 100644 --- a/market/config/appmarket-server.conf +++ b/market/config/appmarket-server.conf @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/config/init.rb b/market/config/init.rb index fd46e3227f..60d2ff968a 100644 --- a/market/config/init.rb +++ b/market/config/init.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/controllers/appmarket-server.rb b/market/controllers/appmarket-server.rb index 36db0a4d4e..5a49631c49 100644 --- a/market/controllers/appmarket-server.rb +++ b/market/controllers/appmarket-server.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/install.sh b/market/install.sh index c1dcec144e..a365f05a07 100755 --- a/market/install.sh +++ b/market/install.sh @@ -1,17 +1,18 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/lib/mailer.rb b/market/lib/mailer.rb index 25fa2d018e..2681fbdd34 100644 --- a/market/lib/mailer.rb +++ b/market/lib/mailer.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/lib/parser.rb b/market/lib/parser.rb index 6ff302dc25..bdbd66eb87 100644 --- a/market/lib/parser.rb +++ b/market/lib/parser.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/lib/session.rb b/market/lib/session.rb index 524cb5cf41..85a79e4ea9 100644 --- a/market/lib/session.rb +++ b/market/lib/session.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/lib/validator.rb b/market/lib/validator.rb index 9590f1a4a0..0b0cfcda73 100644 --- a/market/lib/validator.rb +++ b/market/lib/validator.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/models.rb b/market/models.rb index c02fe76ec1..25c631dba8 100644 --- a/market/models.rb +++ b/market/models.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/models/appliance.rb b/market/models/appliance.rb index 077b9c70c4..3fb7aa5158 100644 --- a/market/models/appliance.rb +++ b/market/models/appliance.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/models/user.rb b/market/models/user.rb index d5c3da7905..75556f5245 100644 --- a/market/models/user.rb +++ b/market/models/user.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/sunstone/etc/sunstone-appmarket.conf b/market/sunstone/etc/sunstone-appmarket.conf index f907793d39..a2ff846d58 100644 --- a/market/sunstone/etc/sunstone-appmarket.conf +++ b/market/sunstone/etc/sunstone-appmarket.conf @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/sunstone/public/js/user-plugins/apptools.appmarket-dashboard.js b/market/sunstone/public/js/user-plugins/apptools.appmarket-dashboard.js index a59c44d38b..28dc59ce3b 100644 --- a/market/sunstone/public/js/user-plugins/apptools.appmarket-dashboard.js +++ b/market/sunstone/public/js/user-plugins/apptools.appmarket-dashboard.js @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // function updateAppMarketDashboard(what, json_info){ var db = $('#appmarket_dashboard_tab',main_tabs_context); diff --git a/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js b/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js index dfafe288b6..1caf48e078 100644 --- a/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js +++ b/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js @@ -1,18 +1,18 @@ -/* -------------------------------------------------------------------------- */ -/* Copyright 2010-2012, C12G Labs S.L */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); you may */ -/* not use this file 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 License. */ -/* -------------------------------------------------------------------------- */ +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // +// // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file 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 License. // +//------------------------------------------------------------------------- // /* Marketpplace tab plugin */ var dataTable_appmarket; diff --git a/market/sunstone/routes/appmarket.rb b/market/sunstone/routes/appmarket.rb index e6e1c86df7..49124f91a3 100644 --- a/market/sunstone/routes/appmarket.rb +++ b/market/sunstone/routes/appmarket.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/market/views/app_form.haml b/market/views/app_form.haml index 0d2d099e60..79b05a2f80 100644 --- a/market/views/app_form.haml +++ b/market/views/app_form.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %fieldset .control-group diff --git a/market/views/appliance_index.haml b/market/views/appliance_index.haml index 11f06afb7a..980846ff00 100644 --- a/market/views/appliance_index.haml +++ b/market/views/appliance_index.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // .navbar.navbar-static .navbar-inner diff --git a/market/views/appliance_show.haml b/market/views/appliance_show.haml index 2be5279569..17ee3b27a9 100644 --- a/market/views/appliance_show.haml +++ b/market/views/appliance_show.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // .navbar.navbar-static .navbar-inner diff --git a/market/views/custom/banner.haml b/market/views/custom/banner.haml index 5f242917f9..91373c6dc0 100644 --- a/market/views/custom/banner.haml +++ b/market/views/custom/banner.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // .row-fluid .span4 diff --git a/market/views/custom/footer.haml b/market/views/custom/footer.haml index 1e16ade778..c1c9b5c9cc 100644 --- a/market/views/custom/footer.haml +++ b/market/views/custom/footer.haml @@ -1,20 +1,21 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %p - © 2012 C12G Labs S.L. All Rights Reserved. + © 2013 C12G Labs S.L. All Rights Reserved. %a{'href' => "http://www.c12g.com/legal-notice"} Legal Notice. Please send comments to %a{'href' => "mailto:marketplace@opennebula.org"} webmaster. diff --git a/market/views/custom/logos.haml b/market/views/custom/logos.haml index 5f4b8b55e3..e92de76522 100644 --- a/market/views/custom/logos.haml +++ b/market/views/custom/logos.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %a.span4{'href' => "http://www.opennebula.org/"} %img{'src' => "/img/opennebula_gray.png"} diff --git a/market/views/custom/terms_of_use.haml b/market/views/custom/terms_of_use.haml index 5a0d556322..ef43e4883c 100644 --- a/market/views/custom/terms_of_use.haml +++ b/market/views/custom/terms_of_use.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // Accept %a{'href' => 'http://www.c12g.com//marketplace-terms-of-use', 'target' => 'blank'} Terms of Use \ No newline at end of file diff --git a/market/views/custom/tittle.haml b/market/views/custom/tittle.haml index 1671958df0..be3d2a8f97 100644 --- a/market/views/custom/tittle.haml +++ b/market/views/custom/tittle.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %i.icon-shopping-cart.icon-white OpenNebula AppMarket \ No newline at end of file diff --git a/market/views/layout.haml b/market/views/layout.haml index 27f241b42f..4465ad5df4 100644 --- a/market/views/layout.haml +++ b/market/views/layout.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // !!! %html{:lang => "en"} diff --git a/market/views/nav_login.haml b/market/views/nav_login.haml index f4d94a19a5..ce13b0a1a0 100644 --- a/market/views/nav_login.haml +++ b/market/views/nav_login.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %ul.nav.pull-right.nav-pills %li.divider-vertical diff --git a/market/views/user_form.haml b/market/views/user_form.haml index 71a68cccbb..b051edec00 100644 --- a/market/views/user_form.haml +++ b/market/views/user_form.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %fieldset .control-group diff --git a/market/views/user_index.haml b/market/views/user_index.haml index 28ccd3165a..9bb21587aa 100644 --- a/market/views/user_index.haml +++ b/market/views/user_index.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // .navbar.navbar-static .navbar-inner diff --git a/market/views/user_show.haml b/market/views/user_show.haml index 676aa20513..ad97ded82d 100644 --- a/market/views/user_show.haml +++ b/market/views/user_show.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, 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. // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file except in compliance with the License. You may obtain // +// a copy of the License at // // // -// 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 // +// 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 License. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // .navbar.navbar-static .navbar-inner diff --git a/oneapps/gen_man b/oneapps/gen_man index f9e3e4b37a..8118e3e161 100755 --- a/oneapps/gen_man +++ b/oneapps/gen_man @@ -1,17 +1,18 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/oneapps/install.sh b/oneapps/install.sh index 75d8ccddfd..5837e8da4a 100755 --- a/oneapps/install.sh +++ b/oneapps/install.sh @@ -1,17 +1,18 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, 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. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # # # -# 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 # +# 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 License. # #--------------------------------------------------------------------------- # diff --git a/oneapps/share/LICENSE b/oneapps/share/LICENSE index 7159e3a03e..d645695673 100644 --- a/oneapps/share/LICENSE +++ b/oneapps/share/LICENSE @@ -1,131 +1,202 @@ -C12G Software License -February 2011 - REV20110201 + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -This "License Agreement" is between C12G Labs S.L. ("C12G"), and the -Organization ("Licensee") accessing and otherwise using this software in -source or binary form and its associated documentation ("Product"). + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -1. Definitions + 1. Definitions. -"Channel Partner" means an authorized C12G partner to distribute an -Integrated Solution as permitted in a current Partner Agreement. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -"Customer" means an authorized C12G customer to use the Product as permitted -in a current Subscription Agreement. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. -The "Product" covered under this License Agreement includes without -limitation, all object code, source code, help files, publications, -documentation and other programs, products or tools owned by C12G that are -listed on the "Proof of Authorization". + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. -"Integrated Solution" means the solution resulting from integrating a copy -of the Product within a Channel Partner Solution. + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. -"End User" means an end user of a Partner’s Integrated Solution that -includes the Product. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. -The "Proof of Authorization" for the Product is the written and signed -Entire Agreement between the Licensee and C12G for C12G Partners and -Customers, or between the Licensee and a Channel Partner for End Users, -providing evidence of the extent of authorizations the Licensee has acquired -to use the Product. + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. -2. License Grant + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). -Subject to the terms and conditions of this License Agreement, C12G hereby -grants Licensee a non-exclusive, non-transferable license to use and -distribute the Product to the extent of authorizations Licensee has acquired -through Proof of Authorization. Licensee shall reproduce this License -Agreement and any other legends of ownership on each copy, or partial copy, -of the Product. + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. -Licensee will ensure that anyone who uses the Product does so only in -compliance with the terms of this License Agreement. Licensee shall not + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." -Use, copy, install, compile, modify or distribute the Product except as -provided in the Proof of Authorization Copy Product onto any public or -distributed network or otherwise distribute or disclose Product to any third -parties; or change any proprietary rights notices which appear in Product -Rent, sublicense or lease the Product. + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. -3. Authorizations + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. -The extent of authorization depends on the ownership of a Proof of -Authorization for the Product. Usage of the Product for any other purpose -not explicitly covered by this License Agreement or granted by the Proof of -Authorization is not permitted and requires the written prior permission -from C12G. + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. -4. Support + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: -Support shall be subject to the terms of this Agreement and the terms of the -Proof of Authorization for the Product. Any C12G support for the Product -will solely be provided directly to Partners and Customers in the context of -the C12G Network. C12G shall not be obligated to support any Product -distributed through Channel Partner. Partner shall be responsible for -providing support to End Users. + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and -5. Disclaimer of Warranty + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and -SOFTWARE IS PROVIDED ON "AS IS" BASIS, WITHOUT ANY WARRANTIES OF ANY KIND, -INCLUDING, BUT NOT LIMITED TO, WARRANTIES CONCERNING THE INSTALLATION, USE -OR PERFORMANCE OF PRODUCT. C12G AND ITS SUPPLIERS DISCLAIM ANY AND ALL -WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY -WARRANTY OF MERCHANTABILITY FITNESS FOR A PARTICULAR PURPOSE AND/OR -NON-INFRINGEMENT. C12G AND ITS SUPPLIERS DO NOT WARRANT THAT PRODUCT WILL -MEET USER'S REQUIREMENTS OR THAT THE OPERATION THEREOF WILL BE UNINTERRUPTED -OR ERROR-FREE, OR THAT ERRORS WILL BE CORRECTED. YOU ARE SOLELY RESPONSIBLE -FOR DETERMINING THE APPROPRIATENESS OF USING THE WORK AND ASSUME ANY RISKS -ASSOCIATED WITH YOUR EXERCISE OF PERMISSIONS UNDER THIS LICENSE. + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and -6. Limitation of Liability + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL C12G BE -LIABLE TO LICENSEE OR ANY OTHER USERS OF THE PRODUCT FOR ANY INCIDENTAL, -SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS (INCLUDING, WITHOUT LIMITATION, -DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF -BUSINESS INFORMATION, OR OTHER PECUNIARY LOSS) AS A RESULT OF USING, -MODIFYING OR DISTRIBUTING THE PRODUCT, OR ANY DERIVATIVE THEREOF, EVEN IF -ADVISED OF THE POSSIBILITY THEREOF. + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. -7. Indemnification + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. -Licensee hereby agrees to indemnify C12G against and hold harmless C12G from -any claims, lawsuits or other losses that arise out of Licensee’s breach of -any provision of this Agreement. + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. -8.Third Party Rights + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. -Any software or documentation in source or binary form provided along with -the Product that is associated with a separate license agreement is licensed -to Licensee under the terms of that license agreement. This License -Agreement does not apply to those portions of the Integrated Solution. -Copies of the third party licenses are included in the Distribution.Licensee -agrees that C12G will not be liable for any claims or damages arising from -the use of the Product, or any software, tool, process, or service that was -developed using the Product, in such applications. + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. -9. General + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. -Nothing in this License Agreement affects any statutory rights of consumers -that cannot be waived or limited by contract. Nothing in this License -Agreement shall be deemed to create any relationship of agency, partnership, -or joint venture between C12G and Licensee.If any provision of this License -Agreement shall be unlawful, void, or for any reason unenforceable, such -provision shall be modified to the extent necessary to render it enforceable -without losing its intent, or, if no such modification is possible, be -severed from this License Agreement and shall not affect the validity and -enforceability of the remaining provisions of this License Agreement. + END OF TERMS AND CONDITIONS -This License Agreement does not grant permission to use C12G trademarks or -trade names in a trademark sense to endorse or promote products or services -of Licensee, or any third party. The controlling language of this License -Agreement is English. If Licensee has received a translation into another -language, it has been provided for Licensee’s convenience only. + APPENDIX: How to apply the Apache License to your work. -10. Agreement + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. -By downloading, copying, installing, distributing or otherwise using the -Software, Licensee agrees to be bound by the terms and conditions of this -License Agreement. + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file 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 License. diff --git a/oneapps/share/sunstone/public/js/opennebula.js b/oneapps/share/sunstone/public/js/opennebula.js index 571364a855..986a305241 100644 --- a/oneapps/share/sunstone/public/js/opennebula.js +++ b/oneapps/share/sunstone/public/js/opennebula.js @@ -1,18 +1,18 @@ -/* -------------------------------------------------------------------------- */ -/* Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); you may */ -/* not use this file 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 License. */ -/* -------------------------------------------------------------------------- */ +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // +// // +// Licensed under the Apache License, Version 2.0 (the "License"); you may // +// not use this file 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 License. // +//------------------------------------------------------------------------- // var OpenNebula = { diff --git a/oneapps/share/version.rb b/oneapps/share/version.rb index 041f3b203d..0a2d45cfa3 100644 --- a/oneapps/share/version.rb +++ b/oneapps/share/version.rb @@ -5,10 +5,10 @@ module OneApps VERSION_TEXT = < Date: Wed, 23 Jan 2013 09:16:22 -0600 Subject: [PATCH 6/7] Add NOTICE file --- oneapps/install.sh | 2 +- oneapps/share/NOTICE | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 oneapps/share/NOTICE diff --git a/oneapps/install.sh b/oneapps/install.sh index 5837e8da4a..14234ae7e5 100755 --- a/oneapps/install.sh +++ b/oneapps/install.sh @@ -18,6 +18,6 @@ . ../install_lib.sh -copy_files "share/sunstone/* share/LICENSE" "$SHARE_LOCATION" +copy_files "share/sunstone/* share/LICENSE share/NOTICE" "$SHARE_LOCATION" copy_files "share/version.rb" "$LIB_LOCATION" diff --git a/oneapps/share/NOTICE b/oneapps/share/NOTICE new file mode 100644 index 0000000000..f21bb25430 --- /dev/null +++ b/oneapps/share/NOTICE @@ -0,0 +1,21 @@ +OpenNebulaApps +-------------------------------------------------------------------------------- +Copyright 2010-2013, C12G Labs S.L. (C12G.com) +-------------------------------------------------------------------------------- + +You can find more information about the software, release notes and +documentation at www.OpenNebula.org and docs.OpenNebula.pro + +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. From 8117ccd69da7d411b375504eb95d987b29e47985 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 24 Jan 2013 10:54:35 -0600 Subject: [PATCH 7/7] Bump version --- oneapps/share/version.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oneapps/share/version.rb b/oneapps/share/version.rb index 0a2d45cfa3..c52db4105e 100644 --- a/oneapps/share/version.rb +++ b/oneapps/share/version.rb @@ -1,7 +1,7 @@ module OneApps # OpenNebula version - VERSION = '3.8.2' + VERSION = '3.8.3' VERSION_TEXT = <