Merging differences back from 1.4 branch

git-svn-id: http://svn.opennebula.org/one/trunk@940 3034c82b-c49b-4eb3-8279-a7acafdc01c0

AUTHORS

@@ -0,0 +1,16 @@
+OpenNebula: The open source cloud toolkit
+-----------------------------------------
+
+You can find  more information about the project, relase notes and documentation at www.opennebula.org 
+
+AUTHORS
+
+- Ruben Santiago Montero ([email protected])
+- Ignacio Martín Llorente ([email protected])
+
+ACKNOWLEDGEMENTS
+
+The following people have contributed to the development of the technology
+- Javier Fontán Muiños ([email protected])
+- Contantino Vázquez Blanco ([email protected])
+- Jaime Melis Bayo ([email protected])

include/Nebula.h

@@ -223,7 +223,7 @@ class Nebula
 
     static string version()
     {
-        return "OpenNebula 1.3.85";   
+        return "OpenNebula 1.4.0";   
     };
 
     void start();

install.sh

@@ -96,18 +96,19 @@ if [ -z "$ROOT" ] ; then
     LOG_LOCATION="/var/log/one"
     VAR_LOCATION="/var/lib/one"
     RUN_LOCATION="/var/run/one"
+    LOCK_LOCATION="/var/lock/one"
     INCLUDE_LOCATION="/usr/include"
     SHARE_LOCATION="/usr/share/doc/opennebula"
 
     if [ "$CLIENT" = "no" ]; then
         MAKE_DIRS="$BIN_LOCATION $LIB_LOCATION $ETC_LOCATION $VAR_LOCATION \
                    $INCLUDE_LOCATION $SHARE_LOCATION \
-                   $LOG_LOCATION $RUN_LOCATION"
+                   $LOG_LOCATION $RUN_LOCATION $LOCK_LOCATION"
 
         DELETE_DIRS="$LIB_LOCATION $ETC_LOCATION $LOG_LOCATION $VAR_LOCATION \
                      $RUN_LOCATION $SHARE_DIRS"
 
-        CHOWN_DIRS="$LOG_LOCATION $VAR_LOCATION $RUN_LOCATION"
+        CHOWN_DIRS="$LOG_LOCATION $VAR_LOCATION $RUN_LOCATION $LOCK_LOCATION"
     else
         MAKE_DIRS="$BIN_LOCATION $LIB_LOCATION"
 
@@ -617,7 +618,7 @@ if [ "$UNINSTALL" = "no" ] ; then
         ln -s $DESTDIR$LIB_LOCATION/liboneapi.so \
               $DESTDIR$LIB_LOCATION/liboneapi.so.1
         ln -s $DESTDIR$LIB_LOCATION/liboneapi.so.1 \
-              $DESTDIR$LIB_LOCATION/liboneapi.so.1.3
+              $DESTDIR$LIB_LOCATION/liboneapi.so.1.4
     fi
 else
     for d in `echo $DELETE_DIRS | awk '{for (i=NF;i>=1;i--) printf $i" "}'`; do

share/scripts/one

@@ -26,7 +26,7 @@ if [ -z "$ONE_LOCATION" ]; then
     ONED=/usr/bin/oned
     ONE_SCHEDULER=/usr/bin/mm_sched
 
-    LOCK_FILE=/var/lock/one
+    LOCK_FILE=/var/lock/one/one
 else
     ONE_PID=$ONE_LOCATION/var/oned.pid
     ONE_SCHEDPID=$ONE_LOCATION/var/sched.pid

src/client/ruby/command_parse.rb

@@ -33,7 +33,7 @@ class CommandParse
 EOT
 
     ONE_VERSION=<<-EOT
-OpenNebula 1.3.85
+OpenNebula 1.4.0
 Copyright 2002-2009, Distributed Systems Architecture Group, Universidad
 Complutense de Madrid (dsa-research.org)
 

src/cloud/ec2/bin/econe-describe-instances

@@ -3,12 +3,11 @@
 # == Synopsis
 # econe-describe-instances 
 # 
-# List and describe previously uploaded images of a user for use 
-# with an OpenNebula Cloud.
+# List and describe running instances
 #
 # == Usage
 #
-# econe-describe-images [OPTIONS]
+# econe-describe-instances [OPTIONS]
 #
 # -h, --help:
 #    show help

src/cloud/ec2/bin/econe-run-instances

@@ -3,12 +3,11 @@
 # == Synopsis
 # econe-run-instances 
 # 
-# List and describe previously uploaded images of a user for use 
-# with an OpenNebula Cloud.
+# Runs an instance of a particular image
 #
 # == Usage
 #
-# econe-describe-images [OPTIONS]
+# econe-run-instances [OPTIONS]
 #
 # -h, --help:
 #    show help

src/cloud/ec2/bin/econe-server

@@ -19,19 +19,21 @@
 
 if [ -z "$ONE_LOCATION" ]; then 
     ECONE_PID=/var/run/one/econe-server.pid
-    ECONE_SERVER=/usr/lib/ruby/cloud/econe/econe-server.rb
-    ECONE_LOCK_FILE=/var/lock/.econe.lock
+    ECONE_SERVER=/usr/lib/one/ruby/cloud/econe/econe-server.rb
+    ECONE_LOCK_FILE=/var/lock/one/.econe.lock
     ECONE_LOG=/var/log/one/econe-server.log   
+    ECONE_ETC=/etc/one/econe.conf
 else
     ECONE_PID=$ONE_LOCATION/var/econe-server.pid
     ECONE_SERVER=$ONE_LOCATION/lib/ruby/cloud/econe/econe-server.rb
     ECONE_LOCK_FILE=$ONE_LOCATION/var/.econe.lock
     ECONE_LOG=$ONE_LOCATION/var/econe-server.log
+    ECONE_ETC=$ONE_LOCATION/etc/econe.conf
 fi 
 
 setup()
 {
-    eval `grep ^IMAGE_DIR= $ONE_LOCATION/etc/econe.conf `
+    eval `grep ^IMAGE_DIR= $ECONE_ETC`
     export TMPDIR=$IMAGE_DIR/tmp
     mkdir -p $TMPDIR
 
@@ -92,7 +94,7 @@ stop()
 
 	# Kill the econe-server daemon
 
-	kill `cat $ECONE_PID` > /dev/null 2>&1
+	kill -INT `cat $ECONE_PID` > /dev/null 2>&1
 
 	# Remove pid files
 

src/cloud/occi/bin/occi-server

@@ -19,19 +19,21 @@
 
 if [ -z "$ONE_LOCATION" ]; then 
     OCCI_PID=/var/run/one/occi-server.pid
-    OCCI_SERVER=/usr/lib/ruby/cloud/occi/occi-server.rb
-    OCCI_LOCK_FILE=/var/lock/.occi.lock
+    OCCI_SERVER=/usr/lib/one/ruby/cloud/occi/occi-server.rb
+    OCCI_LOCK_FILE=/var/lock/one/.occi.lock
     OCCI_LOG=/var/log/one/occi-server.log   
+    OCCI_ETC=/etc/one/occi-server.conf
 else
     OCCI_PID=$ONE_LOCATION/var/occi-server.pid
     OCCI_SERVER=$ONE_LOCATION/lib/ruby/cloud/occi/occi-server.rb
     OCCI_LOCK_FILE=$ONE_LOCATION/var/.occi.lock
     OCCI_LOG=$ONE_LOCATION/var/occi-server.log
+    OCCI_ETC=$ONE_LOCATION/etc/occi-server.conf
 fi 
 
 setup()
 {
-    eval `grep ^IMAGE_DIR= $ONE_LOCATION/etc/occi-server.conf `
+    eval `grep ^IMAGE_DIR= $OCCI_ETC `
     export TMPDIR=$IMAGE_DIR/tmp
     mkdir -p $TMPDIR
 
@@ -92,10 +94,9 @@ stop()
 
 	# Kill the occi-server daemon
 
-	kill `cat $OCCI_PID` > /dev/null 2>&1
+	kill -INT `cat $OCCI_PID` > /dev/null 2>&1
 
 	# Remove pid files
-
 	rm -f $OCCI_PID > /dev/null 2>&1
 
 	echo "occi-server stopped"

src/nebula/oned.cc

@@ -115,7 +115,7 @@ int main(int argc, char **argv)
     if (nl == 0) // OpenNebula in root of FSH
     {
     	var_location = "/var/lib/one/"; 
-    	lockfile 	 = "/var/lock/one";
+    	lockfile 	 = "/var/lock/one/one";
     }
     else
     {