Update docs with the new version

Author: dmamolina

README.md

@@ -35,12 +35,13 @@ Please consider that, although AppMArket is widely used by the OpenNebula users,
 
 * [Installation & Configuration](doc/installation_and_configuration.md)
 * [Usage](doc/usage.md)
-* [Release Notes](doc/release_notes/appmarket-2.0.3.md)
+* [Release Notes](doc/release_notes/appmarket-2.1.0.md)
 
 ### All Releases
 
 |      Version      |        Date          |                               Release Notes                               |
 | ----------------- | -------------------- | ------------------------------------------------------------------------- |
+| 2.1.0             | November, 2015       | [Release Notes 2.1.0](doc/release_notes/appmarket-2.1.0.md)               |
 | 2.0.3             | November 19th, 2014  | [Release Notes 2.0.3](doc/release_notes/appmarket-2.0.3.md)               |
 | 2.0.2             | September 18th, 2014 | [Release Notes 2.0.2](doc/release_notes/appmarket-2.0.2.md)               |
 | 2.0.1             | May 22nd, 2014       | [Release Notes 2.0.1](doc/release_notes/appmarket-2.0.1.md)               |
@@ -51,7 +52,12 @@ Please consider that, although AppMArket is widely used by the OpenNebula users,
 
 ## Compatibility
 
-This add-on is compatible with OpenNebula >= 4.14.2.
+This add-on is compatible with:
+
+| AppMarket Version | OpenNebula Version |
+| ----------------- | ------------------ |
+| 2.1.0             | 4.14.2             |
+| <= 2.0.3          | 4.10, 4.12         |
 
 ## Development
 

doc/installation_and_configuration.md

@@ -8,9 +8,6 @@ AppMarket requires:
 
 * [MongoDB](http://www.mongodb.org/display/DOCS/Quickstart)
 * ruby and rubygems installed.
-* ''opennebula-common'' package.
-
-If you want to create appliances from an OVA file or convert the format of the appliance you will need to configure at least one AppMarket Worker.
 
 Install AppMarket
 -----------------
@@ -56,6 +53,8 @@ The following commands are necessary in any of the previous cases to install the
         gem 'bcrypt-ruby'
         gem 'opennebula-cli'
 
+If you find problems installing nokogiri in your distribution, check the following [guide](http://www.nokogiri.org/tutorials/installing_nokogiri.html)
+
 Upgrade AppMarket
 -----------------
 

gen_all_packages.sh

@@ -16,7 +16,7 @@
 # limitations under the License.                                               #
 #------------------------------------------------------------------------------#
 
-export VERSION=${VERSION:-4.14.2}
+export VERSION=${VERSION:-2.1.0}
 export SCRIPTS_DIR=$(cd `dirname $0`; pwd)/packages
 
 rm -rf  $SCRIPTS_DIR; mkdir -p $SCRIPTS_DIR

gen_package.sh

@@ -16,7 +16,7 @@
 # limitations under the License.                                               #
 #------------------------------------------------------------------------------#
 
-VERSION=${VERSION:-2.0.3}
+VERSION=${VERSION:-2.1.0}
 MAINTAINER=${MAINTAINER:-OpenNebula Systems <contact@opennebula.systems>}
 LICENSE=${LICENSE:-Apache}
 VENDOR=${VENDOR:-OpenNebula Systems}
@@ -53,6 +53,7 @@ done
 
 SCRIPTS_DIR=${SCRIPTS_DIR:-PWD}
 
+[ $PACKAGE_TYPE = rpm ] && PKGARGS="--rpm-os linux"
 NAME="${PACKAGE_NAME}_${VERSION}.${PACKAGE_TYPE}"
 rm $NAME
 
@@ -72,7 +73,7 @@ cp init-scripts/${INIT_SCRIPT}.${PACKAGE_TYPE} $DESTDIR/etc/init.d/${INIT_SCRIPT
 
 cd tmp
 
-fpm -n "$PACKAGE_NAME" -t "$PACKAGE_TYPE" -s dir --vendor "$VENDOR" \
+fpm -n "$PACKAGE_NAME" -t "$PACKAGE_TYPE" $PKGARGS -s dir --vendor "$VENDOR" \
     --license "$LICENSE" --description "$DESCRIPTION" --url "$URL" \
     -m "$MAINTAINER" -v "$VERSION" \
     $DEP_STRING \

src/bin/appmarket-db

@@ -44,7 +44,7 @@ require 'init'
 ##############################################################################
 ##############################################################################
 
-UPGRADE_SCRIPTS = [10980, 10985, 10990, 20000, 20001, 20002, 20003]
+UPGRADE_SCRIPTS = [10980, 10985, 10990, 20000, 20001, 20002, 20003, 200100]
 
 module Version10985
     VERSION = "1.9.85"
@@ -128,6 +128,13 @@ module Version20003
     end
 end
 
+module Version200100
+    VERSION = "2.1.0"
+    VERSION_CODE = 200100
+    def self.upgrade
+    end
+end
+
 def call_upgrade_script(script_name)
     puts "Applying [#{script_name}] upgrade"
     module_name = Object.const_get("Version"+script_name.to_s)

src/config/appmarket_version.rb

@@ -1,7 +1,7 @@
 module AppMarket
-    VERSION = "2.0.3"
+    VERSION = "2.1.0"
 
-    VERSION_CODE = 20003
+    VERSION_CODE = 200100
 
     VERSION_TEXT = <<EOT
 AppMarket #{AppMarket::VERSION}

src/version.rb

@@ -17,11 +17,11 @@
 module OneApps
 
     # OpenNebula version
-    VERSION = '4.14.2'
+    VERSION = '2.1.0'
 
     VERSION_TEXT = <<EOT
 AppMarket #{OneApps::VERSION}
-Copyright 2002-2015, OpenNebula Project (OpenNebula.org), OpenNebula Systems
+Copyright 2002-2015, OpenNebula Project, OpenNebula Systems
 
 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