diff --git a/NOTICE b/NOTICE index 0e12ebb88f..d36f3dcb87 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,6 @@ OpenNebula Open Source Project -------------------------------------------------------------------------------- -Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs -------------------------------------------------------------------------------- You can find more information about the project, release notes and diff --git a/README.md b/README.md index c62d9de941..d04c965c89 100644 --- a/README.md +++ b/README.md @@ -166,7 +166,7 @@ Support: http://opennebula.org/support:support ## License -Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs 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/SConstruct b/SConstruct index 39e42a3e07..2c8a7931a4 100644 --- a/SConstruct +++ b/SConstruct @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/include/AclManager.h b/include/AclManager.h index 502eb5eeb2..c7e410d6e9 100644 --- a/include/AclManager.h +++ b/include/AclManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/AclRule.h b/include/AclRule.h index bccd6a51d8..966f77477f 100644 --- a/include/AclRule.h +++ b/include/AclRule.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/ActionManager.h b/include/ActionManager.h index 741843fe3d..d5055c56ad 100644 --- a/include/ActionManager.h +++ b/include/ActionManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Attribute.h b/include/Attribute.h index b0e93f3c70..174612a6c4 100644 --- a/include/Attribute.h +++ b/include/Attribute.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/AuthManager.h b/include/AuthManager.h index 04b9391656..8beef51de0 100644 --- a/include/AuthManager.h +++ b/include/AuthManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/AuthManagerDriver.h b/include/AuthManagerDriver.h index f018808ba6..507dacae19 100644 --- a/include/AuthManagerDriver.h +++ b/include/AuthManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/AuthRequest.h b/include/AuthRequest.h index b32bb2784c..0185234208 100644 --- a/include/AuthRequest.h +++ b/include/AuthRequest.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Callbackable.h b/include/Callbackable.h index 474aa833b7..b12952c6c3 100644 --- a/include/Callbackable.h +++ b/include/Callbackable.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Cluster.h b/include/Cluster.h index f6134a76fe..3513a56819 100644 --- a/include/Cluster.h +++ b/include/Cluster.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/ClusterPool.h b/include/ClusterPool.h index 40cae8c662..13d6e52527 100644 --- a/include/ClusterPool.h +++ b/include/ClusterPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -141,12 +141,14 @@ public: * query * @param oss the output stream to dump the pool contents * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination * * @return 0 on success */ - int dump(ostringstream& oss, const string& where) + int dump(ostringstream& oss, const string& where, const string& limit) { - return PoolSQL::dump(oss, "CLUSTER_POOL", Cluster::table, where); + return PoolSQL::dump(oss, "CLUSTER_POOL", Cluster::table, where, + limit); }; private: diff --git a/include/ClusterTemplate.h b/include/ClusterTemplate.h index e05d253d30..23c00a5ecb 100644 --- a/include/ClusterTemplate.h +++ b/include/ClusterTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Clusterable.h b/include/Clusterable.h index 93723c28a9..7d050f1cce 100644 --- a/include/Clusterable.h +++ b/include/Clusterable.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Datastore.h b/include/Datastore.h index 90ea071d53..d18b404dd3 100644 --- a/include/Datastore.h +++ b/include/Datastore.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/DatastorePool.h b/include/DatastorePool.h index 0892c8bd9a..43ba985554 100644 --- a/include/DatastorePool.h +++ b/include/DatastorePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -168,12 +168,14 @@ public: * query * @param oss the output stream to dump the pool contents * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination * * @return 0 on success */ - int dump(ostringstream& oss, const string& where) + int dump(ostringstream& oss, const string& where, const string& limit) { - return PoolSQL::dump(oss, "DATASTORE_POOL", Datastore::table, where); + return PoolSQL::dump(oss, "DATASTORE_POOL", Datastore::table, where, + limit); }; /** diff --git a/include/DatastoreTemplate.h b/include/DatastoreTemplate.h index 3f283f0a23..1619ad86d5 100644 --- a/include/DatastoreTemplate.h +++ b/include/DatastoreTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/DefaultQuotas.h b/include/DefaultQuotas.h index eaad86273b..0a35d4525d 100644 --- a/include/DefaultQuotas.h +++ b/include/DefaultQuotas.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/DispatchManager.h b/include/DispatchManager.h index 57a93c821e..762d542e8d 100644 --- a/include/DispatchManager.h +++ b/include/DispatchManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Document.h b/include/Document.h index d6d61a6808..eefc0637b4 100644 --- a/include/Document.h +++ b/include/Document.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/DocumentPool.h b/include/DocumentPool.h index 4665ca3f87..e6b0c2695b 100644 --- a/include/DocumentPool.h +++ b/include/DocumentPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -93,12 +93,14 @@ public: * query * @param oss the output stream to dump the pool contents * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination * * @return 0 on success */ - int dump(ostringstream& oss, const string& where) + int dump(ostringstream& oss, const string& where, const string& limit) { - return PoolSQL::dump(oss, "DOCUMENT_POOL",Document::table,where); + return PoolSQL::dump(oss, "DOCUMENT_POOL", Document::table, where, + limit); }; /** diff --git a/include/FixedLeases.h b/include/FixedLeases.h index 52169dcbb4..dae1e947a0 100644 --- a/include/FixedLeases.h +++ b/include/FixedLeases.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Group.h b/include/Group.h index 8d3474f043..4e0e26de21 100644 --- a/include/Group.h +++ b/include/Group.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/GroupPool.h b/include/GroupPool.h index c31cc39dbb..f3f9e74555 100644 --- a/include/GroupPool.h +++ b/include/GroupPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -152,10 +152,24 @@ public: * query * @param oss the output stream to dump the pool contents * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination * * @return 0 on success */ - int dump(ostringstream& oss, const string& where); + int dump(ostringstream& oss, const string& where, const string& limit) + { + return PoolSQL::dump(oss, "GROUP_POOL", Group::table, where, limit); + }; + +protected: + + /** + * Adds the default quotas xml element, right after all the + * pool objects + * + * @param oss The output stream to dump the xml contents + */ + virtual void add_extra_xml(ostringstream& oss); private: diff --git a/include/History.h b/include/History.h index 40f4860587..a1cad8e6ed 100644 --- a/include/History.h +++ b/include/History.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Hook.h b/include/Hook.h index 5dd29a8f90..625e817aef 100644 --- a/include/Hook.h +++ b/include/Hook.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/HookManager.h b/include/HookManager.h index 6d19b36f30..ac3b062896 100644 --- a/include/HookManager.h +++ b/include/HookManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/HookManagerDriver.h b/include/HookManagerDriver.h index af0d8c6fef..c68f57d599 100644 --- a/include/HookManagerDriver.h +++ b/include/HookManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Host.h b/include/Host.h index 384f13d7db..35261e3f65 100644 --- a/include/Host.h +++ b/include/Host.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/HostHook.h b/include/HostHook.h index eca6c21ef2..94658e58ea 100644 --- a/include/HostHook.h +++ b/include/HostHook.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/HostPool.h b/include/HostPool.h index 8ccb539097..177a99bf38 100644 --- a/include/HostPool.h +++ b/include/HostPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -178,12 +178,13 @@ public: * query * @param oss the output stream to dump the pool contents * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination * * @return 0 on success */ - int dump(ostringstream& oss, const string& where) + int dump(ostringstream& oss, const string& where, const string& limit) { - return PoolSQL::dump(oss, "HOST_POOL", Host::table, where); + return PoolSQL::dump(oss, "HOST_POOL", Host::table, where, limit); }; /** diff --git a/include/HostShare.h b/include/HostShare.h index b2977d4b76..386993a329 100644 --- a/include/HostShare.h +++ b/include/HostShare.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/HostTemplate.h b/include/HostTemplate.h index 90a2e6afde..6c9eeeb810 100644 --- a/include/HostTemplate.h +++ b/include/HostTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Image.h b/include/Image.h index ca2fc37d40..6306c11609 100644 --- a/include/Image.h +++ b/include/Image.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/ImageManager.h b/include/ImageManager.h index ad29897b0e..3e9668b73b 100644 --- a/include/ImageManager.h +++ b/include/ImageManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/ImageManagerDriver.h b/include/ImageManagerDriver.h index 847998fb7f..ca4039b245 100644 --- a/include/ImageManagerDriver.h +++ b/include/ImageManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/ImagePool.h b/include/ImagePool.h index bad9d59ab1..234db68bd7 100644 --- a/include/ImagePool.h +++ b/include/ImagePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -138,11 +138,13 @@ public: * query * @param oss the output stream to dump the pool contents * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination + * * @return 0 on success */ - int dump(ostringstream& oss, const string& where) + int dump(ostringstream& oss, const string& where, const string& limit) { - return PoolSQL::dump(oss, "IMAGE_POOL", Image::table, where); + return PoolSQL::dump(oss, "IMAGE_POOL", Image::table, where, limit); } /** diff --git a/include/ImageTemplate.h b/include/ImageTemplate.h index 21f2b5aca1..0374f3cb4b 100644 --- a/include/ImageTemplate.h +++ b/include/ImageTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/InformationManager.h b/include/InformationManager.h index 5563b63394..b14b9c9827 100644 --- a/include/InformationManager.h +++ b/include/InformationManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/InformationManagerDriver.h b/include/InformationManagerDriver.h index 02c65f85f7..c2bb1ab684 100644 --- a/include/InformationManagerDriver.h +++ b/include/InformationManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Leases.h b/include/Leases.h index 575c6b15b6..d5760ad112 100644 --- a/include/Leases.h +++ b/include/Leases.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/LibVirtDriver.h b/include/LibVirtDriver.h index 3970076ebd..26ce7db732 100644 --- a/include/LibVirtDriver.h +++ b/include/LibVirtDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/LifeCycleManager.h b/include/LifeCycleManager.h index 488abed28b..d71eeab413 100644 --- a/include/LifeCycleManager.h +++ b/include/LifeCycleManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Log.h b/include/Log.h index 5af87440bb..8ba9ea56d9 100644 --- a/include/Log.h +++ b/include/Log.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Mad.h b/include/Mad.h index c8eb987d9e..7a950a7055 100644 --- a/include/Mad.h +++ b/include/Mad.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/MadManager.h b/include/MadManager.h index 5a09a516cd..c342520283 100644 --- a/include/MadManager.h +++ b/include/MadManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/MonitorThread.h b/include/MonitorThread.h index 765a8084fd..c8911d87f7 100644 --- a/include/MonitorThread.h +++ b/include/MonitorThread.h @@ -1,6 +1,6 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/MySqlDB.h b/include/MySqlDB.h index df3beea811..aad74dafa1 100644 --- a/include/MySqlDB.h +++ b/include/MySqlDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Nebula.h b/include/Nebula.h index 486c3332ee..ffe04dc37b 100644 --- a/include/Nebula.h +++ b/include/Nebula.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -363,12 +363,12 @@ public: */ static string version() { - return "OpenNebula 4.4.0"; + return "OpenNebula 4.5.0"; }; static string db_version() { - return "4.4.0"; + return "4.5.0"; } /** diff --git a/include/NebulaLog.h b/include/NebulaLog.h index 8e28924fe9..102baa92c7 100644 --- a/include/NebulaLog.h +++ b/include/NebulaLog.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/NebulaTemplate.h b/include/NebulaTemplate.h index c264942ef9..9998cdf0dc 100644 --- a/include/NebulaTemplate.h +++ b/include/NebulaTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -20,7 +20,7 @@ #include "Template.h" #include -/** +/** * This class provides the basic abstraction for OpenNebula configuration files */ class NebulaTemplate : public Template @@ -33,7 +33,7 @@ public: { conf_file = etc_location + _conf_name; } - + virtual ~NebulaTemplate(){}; // ----------------------------------------------------------------------- @@ -42,22 +42,22 @@ public: int get(const char * name, vector& values) const { string _name(name); - - return Template::get(_name,values); + + return Template::get(_name,values); }; - + void get(const char * name, string& values) const { string _name(name); - - Template::get(_name,values); + + Template::get(_name,values); }; - + void get(const char * name, int& values) const { string _name(name); - - Template::get(_name,values); + + Template::get(_name,values); }; void get(const char *name, unsigned int& values) const @@ -68,32 +68,32 @@ public: values = static_cast(ival); }; - + void get(const char * name, time_t& values) const { const SingleAttribute * sattr; vector attr; - + string _name(name); - + if ( Template::get(_name,attr) == 0 ) { values = 0; return; } - + sattr = dynamic_cast(attr[0]); - + if ( sattr != 0 ) { istringstream is; - + is.str(sattr->value()); is >> values; } else - values = 0; - }; + values = 0; + }; void get(const char *name, float& value) const { @@ -109,6 +109,13 @@ public: Template::get(_name,value); }; + void get(const char *name, long long& value) const + { + string _name(name); + + Template::get(_name,value); + } + // ----------------------------------------------------------------------- // ----------------------------------------------------------------------- @@ -119,10 +126,10 @@ public: protected: /** - * Full path to the configuration file + * Full path to the configuration file */ string conf_file; - + /** * Defaults for the configuration file */ @@ -138,13 +145,13 @@ protected: // ----------------------------------------------------------------------------- class OpenNebulaTemplate : public NebulaTemplate -{ +{ public: OpenNebulaTemplate(const string& etc_location, const string& _var_location): NebulaTemplate(etc_location, conf_name), var_location(_var_location) {}; - + ~OpenNebulaTemplate(){}; private: @@ -157,7 +164,7 @@ private: * Path for the var directory, for defaults */ string var_location; - + /** * Sets the defaults value for the template */ diff --git a/include/NebulaUtil.h b/include/NebulaUtil.h index 9b6af30552..6aca1ecfba 100644 --- a/include/NebulaUtil.h +++ b/include/NebulaUtil.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/ObjectCollection.h b/include/ObjectCollection.h index c621c9de39..f507f48e32 100644 --- a/include/ObjectCollection.h +++ b/include/ObjectCollection.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/ObjectSQL.h b/include/ObjectSQL.h index 0683d2f663..90d0d68c56 100644 --- a/include/ObjectSQL.h +++ b/include/ObjectSQL.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/ObjectXML.h b/include/ObjectXML.h index 04a5ad9a62..f87b78825e 100644 --- a/include/ObjectXML.h +++ b/include/ObjectXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/OneClient.h b/include/OneClient.h index dada53c852..0fa7a811b0 100644 --- a/include/OneClient.h +++ b/include/OneClient.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/PoolObjectAuth.h b/include/PoolObjectAuth.h index 3c1f3bcc8f..c7ba8d54aa 100644 --- a/include/PoolObjectAuth.h +++ b/include/PoolObjectAuth.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/PoolObjectSQL.h b/include/PoolObjectSQL.h index 0875886c7a..95df3c94fa 100644 --- a/include/PoolObjectSQL.h +++ b/include/PoolObjectSQL.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/PoolSQL.h b/include/PoolSQL.h index 8cee89c4fa..f1e73b9205 100644 --- a/include/PoolSQL.h +++ b/include/PoolSQL.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -171,7 +171,23 @@ public: * * @return 0 on success */ - virtual int dump(ostringstream& oss, const string& where) = 0; + int dump(ostringstream& oss, const string& where) + { + dump(oss, where, ""); + } + + /** + * Dumps the pool in XML format. A filter and limit can be also added + * to the query + * @param oss the output stream to dump the pool contents + * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination + * + * @return 0 on success + */ + + virtual int dump(ostringstream& oss, const string& where, + const string& limit) = 0; // ------------------------------------------------------------------------- // Function to generate dump filters @@ -244,6 +260,23 @@ protected: */ SqlDB * db; + /** + * Dumps the pool in XML format. A filter and limit can be also added + * to the query + * @param oss the output stream to dump the pool contents + * @param elem_name Name of the root xml pool name + * @param table Pool table name + * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination + * + * @return 0 on success + */ + int dump(ostringstream& oss, + const string& elem_name, + const char * table, + const string& where, + const string& limit); + /** * Dumps the pool in XML format. A filter can be also added to the * query @@ -257,7 +290,10 @@ protected: int dump(ostringstream& oss, const string& elem_name, const char * table, - const string& where); + const string& where) + { + dump(oss, elem_name, table, where, ""); + } /** * Dumps the output of the custom sql query into an xml diff --git a/include/Quota.h b/include/Quota.h index ad99b047b8..731cb38c9d 100644 --- a/include/Quota.h +++ b/include/Quota.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/QuotaDatastore.h b/include/QuotaDatastore.h index 2d7eb305b5..abffd3a4f2 100644 --- a/include/QuotaDatastore.h +++ b/include/QuotaDatastore.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/QuotaImage.h b/include/QuotaImage.h index 7a3e8e2f2f..e99632fc74 100644 --- a/include/QuotaImage.h +++ b/include/QuotaImage.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/QuotaNetwork.h b/include/QuotaNetwork.h index 57faad4806..b3ffba3bc7 100644 --- a/include/QuotaNetwork.h +++ b/include/QuotaNetwork.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/QuotaVirtualMachine.h b/include/QuotaVirtualMachine.h index ab3bc24ad9..bc9e3846fb 100644 --- a/include/QuotaVirtualMachine.h +++ b/include/QuotaVirtualMachine.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Quotas.h b/include/Quotas.h index 87df0b99f9..2a8edb1f9d 100644 --- a/include/Quotas.h +++ b/include/Quotas.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RangedLeases.h b/include/RangedLeases.h index df18f4b969..b71dd37770 100644 --- a/include/RangedLeases.h +++ b/include/RangedLeases.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Request.h b/include/Request.h index a98628f509..5bb39936a0 100644 --- a/include/Request.h +++ b/include/Request.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManager.h b/include/RequestManager.h index 7ceb537614..42d8bc1353 100644 --- a/include/RequestManager.h +++ b/include/RequestManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerAcl.h b/include/RequestManagerAcl.h index 02e1b96d0c..7ee8581b38 100644 --- a/include/RequestManagerAcl.h +++ b/include/RequestManagerAcl.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerAllocate.h b/include/RequestManagerAllocate.h index 89a0cff1ca..f3158f6c8c 100644 --- a/include/RequestManagerAllocate.h +++ b/include/RequestManagerAllocate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerChmod.h b/include/RequestManagerChmod.h index 754196a17a..b6779cad9f 100644 --- a/include/RequestManagerChmod.h +++ b/include/RequestManagerChmod.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerChown.h b/include/RequestManagerChown.h index 64382a3eac..35212f7022 100644 --- a/include/RequestManagerChown.h +++ b/include/RequestManagerChown.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerClone.h b/include/RequestManagerClone.h index 9ef0c54a8f..0cad867228 100644 --- a/include/RequestManagerClone.h +++ b/include/RequestManagerClone.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerCluster.h b/include/RequestManagerCluster.h index 44175d64b6..1fda711e01 100644 --- a/include/RequestManagerCluster.h +++ b/include/RequestManagerCluster.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerDelete.h b/include/RequestManagerDelete.h index d6a6135563..2a387708a4 100644 --- a/include/RequestManagerDelete.h +++ b/include/RequestManagerDelete.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerGroup.h b/include/RequestManagerGroup.h index b93161d4cb..f4e8eb752e 100644 --- a/include/RequestManagerGroup.h +++ b/include/RequestManagerGroup.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerHost.h b/include/RequestManagerHost.h index f21bfc943d..88e9c28a10 100644 --- a/include/RequestManagerHost.h +++ b/include/RequestManagerHost.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerImage.h b/include/RequestManagerImage.h index 4582694a18..2edeb3f93e 100644 --- a/include/RequestManagerImage.h +++ b/include/RequestManagerImage.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerInfo.h b/include/RequestManagerInfo.h index b0226b60f2..e3303f17b8 100644 --- a/include/RequestManagerInfo.h +++ b/include/RequestManagerInfo.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerPoolInfoFilter.h b/include/RequestManagerPoolInfoFilter.h index b9c92ed9d5..cdc25eac3c 100644 --- a/include/RequestManagerPoolInfoFilter.h +++ b/include/RequestManagerPoolInfoFilter.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerRename.h b/include/RequestManagerRename.h index 51919145dd..5470458646 100644 --- a/include/RequestManagerRename.h +++ b/include/RequestManagerRename.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerSystem.h b/include/RequestManagerSystem.h index 75e32d3788..629550b95d 100644 --- a/include/RequestManagerSystem.h +++ b/include/RequestManagerSystem.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerUpdateTemplate.h b/include/RequestManagerUpdateTemplate.h index 4becb3a47e..c82ac89a16 100644 --- a/include/RequestManagerUpdateTemplate.h +++ b/include/RequestManagerUpdateTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerUser.h b/include/RequestManagerUser.h index b4ff2648ab..7f3c78bd92 100644 --- a/include/RequestManagerUser.h +++ b/include/RequestManagerUser.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerVMTemplate.h b/include/RequestManagerVMTemplate.h index 1c9baefe87..531e1a8f67 100644 --- a/include/RequestManagerVMTemplate.h +++ b/include/RequestManagerVMTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerVirtualMachine.h b/include/RequestManagerVirtualMachine.h index cbbcd8ce30..e752a79818 100644 --- a/include/RequestManagerVirtualMachine.h +++ b/include/RequestManagerVirtualMachine.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/RequestManagerVirtualNetwork.h b/include/RequestManagerVirtualNetwork.h index dec48c9ff0..ad8c6a39d5 100644 --- a/include/RequestManagerVirtualNetwork.h +++ b/include/RequestManagerVirtualNetwork.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/SqlDB.h b/include/SqlDB.h index b0e9552d0e..38028cd7dd 100644 --- a/include/SqlDB.h +++ b/include/SqlDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/SqliteDB.h b/include/SqliteDB.h index 43c7476310..8bd10ed2d6 100644 --- a/include/SqliteDB.h +++ b/include/SqliteDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/SyncRequest.h b/include/SyncRequest.h index 64fb490439..c1a8d72b9e 100644 --- a/include/SyncRequest.h +++ b/include/SyncRequest.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/SystemDB.h b/include/SystemDB.h index a5e442b5af..c9a4757176 100644 --- a/include/SystemDB.h +++ b/include/SystemDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/Template.h b/include/Template.h index 77e9d3e669..7a448ff35a 100644 --- a/include/Template.h +++ b/include/Template.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/TransferManager.h b/include/TransferManager.h index 9e28e05087..e8e55b59b2 100644 --- a/include/TransferManager.h +++ b/include/TransferManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/TransferManagerDriver.h b/include/TransferManagerDriver.h index 97e3f28726..690471e6a5 100644 --- a/include/TransferManagerDriver.h +++ b/include/TransferManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/User.h b/include/User.h index 33cabd1c72..58d170f3a5 100644 --- a/include/User.h +++ b/include/User.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/UserPool.h b/include/UserPool.h index aa2a9edec8..3bbf6415d5 100644 --- a/include/UserPool.h +++ b/include/UserPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -152,10 +152,14 @@ public: * query * @param oss the output stream to dump the pool contents * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination * * @return 0 on success */ - int dump(ostringstream& oss, const string& where); + int dump(ostringstream& oss, const string& where, const string& limit) + { + return PoolSQL::dump(oss, "USER_POOL", User::table, where, limit); + }; /** * Name for the OpenNebula core authentication process diff --git a/include/UserTemplate.h b/include/UserTemplate.h index 6149d90458..2eb92ad639 100644 --- a/include/UserTemplate.h +++ b/include/UserTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/VMTemplate.h b/include/VMTemplate.h index 16b86330e8..43e633ace3 100644 --- a/include/VMTemplate.h +++ b/include/VMTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/VMTemplatePool.h b/include/VMTemplatePool.h index 1ac5e52751..026dca5458 100644 --- a/include/VMTemplatePool.h +++ b/include/VMTemplatePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -98,12 +98,14 @@ public: * query * @param oss the output stream to dump the pool contents * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination * * @return 0 on success */ - int dump(ostringstream& oss, const string& where) + int dump(ostringstream& oss, const string& where, const string& limit) { - return PoolSQL::dump(oss, "VMTEMPLATE_POOL",VMTemplate::table,where); + return PoolSQL::dump(oss, "VMTEMPLATE_POOL", VMTemplate::table, where, + limit); }; /** diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h index caa7ad2dd8..e4bdd94441 100644 --- a/include/VirtualMachine.h +++ b/include/VirtualMachine.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/VirtualMachineHook.h b/include/VirtualMachineHook.h index 9c96872a7f..3780cef30c 100644 --- a/include/VirtualMachineHook.h +++ b/include/VirtualMachineHook.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/VirtualMachineManager.h b/include/VirtualMachineManager.h index 9a7f188fb6..5d6048a442 100644 --- a/include/VirtualMachineManager.h +++ b/include/VirtualMachineManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/VirtualMachineManagerDriver.h b/include/VirtualMachineManagerDriver.h index 0fa295d622..eecb941043 100644 --- a/include/VirtualMachineManagerDriver.h +++ b/include/VirtualMachineManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/VirtualMachinePool.h b/include/VirtualMachinePool.h index d6f5696d74..c83998551c 100644 --- a/include/VirtualMachinePool.h +++ b/include/VirtualMachinePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -196,12 +196,14 @@ public: * pool * @param oss the output stream to dump the pool contents * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination * * @return 0 on success */ - int dump(ostringstream& oss, const string& where) + int dump(ostringstream& oss, const string& where, const string& limit) { - return PoolSQL::dump(oss, "VM_POOL", VirtualMachine::table, where); + return PoolSQL::dump(oss, "VM_POOL", VirtualMachine::table, where, + limit); }; /** diff --git a/include/VirtualMachineTemplate.h b/include/VirtualMachineTemplate.h index c637f48168..67651f9e53 100644 --- a/include/VirtualMachineTemplate.h +++ b/include/VirtualMachineTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/VirtualNetwork.h b/include/VirtualNetwork.h index 7096a8ebb6..8a041e5d4f 100644 --- a/include/VirtualNetwork.h +++ b/include/VirtualNetwork.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/VirtualNetworkPool.h b/include/VirtualNetworkPool.h index fbd694265f..772e8ceae6 100644 --- a/include/VirtualNetworkPool.h +++ b/include/VirtualNetworkPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -138,12 +138,14 @@ public: * to the query * @param oss the output stream to dump the pool contents * @param where filter for the objects, defaults to all + * @param limit parameters used for pagination * * @return 0 on success */ - int dump(ostringstream& oss, const string& where) + int dump(ostringstream& oss, const string& where, const string& limit) { - return PoolSQL::dump(oss, "VNET_POOL", VirtualNetwork::table,where); + return PoolSQL::dump(oss, "VNET_POOL", VirtualNetwork::table, where, + limit); } /** diff --git a/include/VirtualNetworkTemplate.h b/include/VirtualNetworkTemplate.h index 0f4d453638..8259c9fd14 100644 --- a/include/VirtualNetworkTemplate.h +++ b/include/VirtualNetworkTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/XMLDriver.h b/include/XMLDriver.h index dfb6d66ba2..e284920882 100644 --- a/include/XMLDriver.h +++ b/include/XMLDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/XenDriver.h b/include/XenDriver.h index 9d01e74f7a..207a52c950 100644 --- a/include/XenDriver.h +++ b/include/XenDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/include/mem_collector.h b/include/mem_collector.h index 144f386012..38a47cf47b 100644 --- a/include/mem_collector.h +++ b/include/mem_collector.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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.sh b/install.sh index fd5edb9e13..7c552533a9 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/doc/xsd/test.sh b/share/doc/xsd/test.sh index f61bb2d152..4ca7d30414 100755 --- a/share/doc/xsd/test.sh +++ b/share/doc/xsd/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/etc/defaultrc b/share/etc/defaultrc index bbdaca8c98..2d0f90bac0 100644 --- a/share/etc/defaultrc +++ b/share/etc/defaultrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/etc/oned.conf b/share/etc/oned.conf index 5978dfc04d..665d9050e7 100644 --- a/share/etc/oned.conf +++ b/share/etc/oned.conf @@ -117,13 +117,17 @@ FEDERATION = [ # # TIMEOUT: Maximum time in seconds the server will wait for the client to # do anything while processing an RPC +# +# RPC_LOG: Create a separated log file for xml-rpc requests, in +# "/var/log/one/one_xmlrpc.log". #******************************************************************************* -#MAX_CONN = 15 -#MAX_CONN_BACKLOG = 15 -#KEEPALIVE_TIMEOUT = 15 -#KEEPALIVE_MAX_CONN = 30 -#TIMEOUT = 15 +#MAX_CONN = 15 +#MAX_CONN_BACKLOG = 15 +#KEEPALIVE_TIMEOUT = 15 +#KEEPALIVE_MAX_CONN = 30 +#TIMEOUT = 15 +#RPC_LOG = NO #******************************************************************************* # Physical Networks configuration diff --git a/share/hooks/host_error.rb b/share/hooks/host_error.rb index 8bed96edf4..12fafcf708 100755 --- a/share/hooks/host_error.rb +++ b/share/hooks/host_error.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/install_gems/install_gems b/share/install_gems/install_gems index 18765a067e..784588d4d2 100755 --- a/share/install_gems/install_gems +++ b/share/install_gems/install_gems @@ -3,7 +3,7 @@ require 'pp' -DEFAULT=%w{sunstone quota cloud ozones_server auth_ldap vmware oneflow ec2_hybrid} +DEFAULT=%w{sunstone quota cloud ozones_server auth_ldap vmware oneflow ec2_hybrid oca} if defined?(RUBY_VERSION) && RUBY_VERSION>="1.8.7" SQLITE='sqlite3' @@ -30,7 +30,8 @@ GROUPS={ :auth_ldap => 'net-ldap', :vmware => %w{builder trollop}, :oneflow => %w{sinatra json treetop parse-cron}, - :ec2_hybrid => 'aws-sdk' + :ec2_hybrid => 'aws-sdk', + :oca => 'ox' } PACKAGES=GROUPS.keys diff --git a/share/man/SConstruct b/share/man/SConstruct index 639bea0e2f..58a72d26e6 100644 --- a/share/man/SConstruct +++ b/share/man/SConstruct @@ -1,7 +1,7 @@ # SConstruct for share/man # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/router/vmcontext.rb b/share/router/vmcontext.rb index 49871dffef..e66345dd22 100644 --- a/share/router/vmcontext.rb +++ b/share/router/vmcontext.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/rubygems/SConstruct b/share/rubygems/SConstruct index 0a2dcd197f..5662d36b0c 100644 --- a/share/rubygems/SConstruct +++ b/share/rubygems/SConstruct @@ -1,7 +1,7 @@ # SConstruct for share/scripts/rubygems # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/rubygems/generate b/share/rubygems/generate index 5e239b65c4..af1520fb93 100755 --- a/share/rubygems/generate +++ b/share/rubygems/generate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -21,7 +21,7 @@ require 'tmpdir' DEFAULTS={ - :version => "4.4.0", + :version => "4.5.0", :date => Time.now.strftime("%Y-%m-%d"), :dependencies => [] } diff --git a/share/scons/get_xmlrpc_config b/share/scons/get_xmlrpc_config index 1f658e7ea1..4b6b8eff2d 100755 --- a/share/scons/get_xmlrpc_config +++ b/share/scons/get_xmlrpc_config @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scons/lex_bison.py b/share/scons/lex_bison.py index 48b59cff1d..ecabaa7090 100644 --- a/share/scons/lex_bison.py +++ b/share/scons/lex_bison.py @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scons/po2json.rb b/share/scons/po2json.rb index 347362ce64..cce739fd60 100755 --- a/share/scons/po2json.rb +++ b/share/scons/po2json.rb @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/centos-5/context/init.sh b/share/scripts/centos-5/context/init.sh index 2e9f7be97e..d9f4b34b4a 100644 --- a/share/scripts/centos-5/context/init.sh +++ b/share/scripts/centos-5/context/init.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/centos-5/net-vmcontext/vmcontext b/share/scripts/centos-5/net-vmcontext/vmcontext index 5e7966d70b..e0e44f000e 100755 --- a/share/scripts/centos-5/net-vmcontext/vmcontext +++ b/share/scripts/centos-5/net-vmcontext/vmcontext @@ -4,7 +4,7 @@ # description: network reconfigure # # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/context-packages/SConstruct b/share/scripts/context-packages/SConstruct index 2c6324e31f..362c985dc4 100644 --- a/share/scripts/context-packages/SConstruct +++ b/share/scripts/context-packages/SConstruct @@ -1,7 +1,7 @@ # SConstruct for share/scripts/context-packages # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/context-packages/base/etc/init.d/vmcontext b/share/scripts/context-packages/base/etc/init.d/vmcontext index 30deb54a7b..1e020a6d73 100755 --- a/share/scripts/context-packages/base/etc/init.d/vmcontext +++ b/share/scripts/context-packages/base/etc/init.d/vmcontext @@ -4,7 +4,7 @@ # description: network reconfigure # # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L. # +# Copyright 2010-2014, 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/share/scripts/context-packages/base/etc/one-context.d/01-dns b/share/scripts/context-packages/base/etc/one-context.d/01-dns index d0336addad..ee13101213 100755 --- a/share/scripts/context-packages/base/etc/one-context.d/01-dns +++ b/share/scripts/context-packages/base/etc/one-context.d/01-dns @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L. # +# Copyright 2010-2014, 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/share/scripts/context-packages/base/etc/one-context.d/02-ssh_public_key b/share/scripts/context-packages/base/etc/one-context.d/02-ssh_public_key index c87c96a430..cb83b2de5d 100755 --- a/share/scripts/context-packages/base/etc/one-context.d/02-ssh_public_key +++ b/share/scripts/context-packages/base/etc/one-context.d/02-ssh_public_key @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L. # +# Copyright 2010-2014, 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/share/scripts/context-packages/base_deb/etc/one-context.d/00-network b/share/scripts/context-packages/base_deb/etc/one-context.d/00-network index c10af1acb1..7a7398ccba 100755 --- a/share/scripts/context-packages/base_deb/etc/one-context.d/00-network +++ b/share/scripts/context-packages/base_deb/etc/one-context.d/00-network @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L. # +# Copyright 2010-2014, 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/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network b/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network index 92f4e7e2ed..74149b6299 100755 --- a/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network +++ b/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L. # +# Copyright 2010-2014, 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/share/scripts/context-packages/generate.sh b/share/scripts/context-packages/generate.sh index d8854b8f7c..a114c397bb 100755 --- a/share/scripts/context-packages/generate.sh +++ b/share/scripts/context-packages/generate.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L. # +# Copyright 2010-2014, 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 # @@ -16,7 +16,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -VERSION=${VERSION:-4.4.0} +VERSION=${VERSION:-4.5.0} MAINTAINER=${MAINTAINER:-C12G Labs } LICENSE=${LICENSE:-Apache 2.0} PACKAGE_NAME=${PACKAGE_NAME:-one-context} diff --git a/share/scripts/context-packages/postinstall b/share/scripts/context-packages/postinstall index 11d0e38192..b692d2fa37 100755 --- a/share/scripts/context-packages/postinstall +++ b/share/scripts/context-packages/postinstall @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L. # +# Copyright 2010-2014, 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/share/scripts/debian/context/init.sh b/share/scripts/debian/context/init.sh index e7eccbb4eb..76ca3570ce 100644 --- a/share/scripts/debian/context/init.sh +++ b/share/scripts/debian/context/init.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/debian/net-vmcontext/vmcontext b/share/scripts/debian/net-vmcontext/vmcontext index 72d9076cb2..de8618135e 100755 --- a/share/scripts/debian/net-vmcontext/vmcontext +++ b/share/scripts/debian/net-vmcontext/vmcontext @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/one b/share/scripts/one index e889eeca54..d7b4cede81 100755 --- a/share/scripts/one +++ b/share/scripts/one @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/onegate_metrics.sh b/share/scripts/onegate_metrics.sh index 2ad33567e1..4e06b20a32 100755 --- a/share/scripts/onegate_metrics.sh +++ b/share/scripts/onegate_metrics.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/openSUSE/context/init.sh b/share/scripts/openSUSE/context/init.sh index 11d90e95cf..4c62d4d146 100644 --- a/share/scripts/openSUSE/context/init.sh +++ b/share/scripts/openSUSE/context/init.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/openSUSE/net-vmcontext/vmcontext b/share/scripts/openSUSE/net-vmcontext/vmcontext index 3d17da24f6..2b69e77da1 100755 --- a/share/scripts/openSUSE/net-vmcontext/vmcontext +++ b/share/scripts/openSUSE/net-vmcontext/vmcontext @@ -4,7 +4,7 @@ # description: network reconfigure # # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/ttylinux/context/init.sh b/share/scripts/ttylinux/context/init.sh index 335316cf0d..5e24ed3392 100644 --- a/share/scripts/ttylinux/context/init.sh +++ b/share/scripts/ttylinux/context/init.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/ttylinux/net-vmcontext/vmcontexttty b/share/scripts/ttylinux/net-vmcontext/vmcontexttty index f5f7075b93..6a98601577 100755 --- a/share/scripts/ttylinux/net-vmcontext/vmcontexttty +++ b/share/scripts/ttylinux/net-vmcontext/vmcontexttty @@ -4,7 +4,7 @@ # description: network reconfigure # # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/ubuntu/context/init.sh b/share/scripts/ubuntu/context/init.sh index 33385d508c..474b360d27 100644 --- a/share/scripts/ubuntu/context/init.sh +++ b/share/scripts/ubuntu/context/init.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/ubuntu/net-vmcontext/README b/share/scripts/ubuntu/net-vmcontext/README index 6cff01b10a..e0a20f404a 100755 --- a/share/scripts/ubuntu/net-vmcontext/README +++ b/share/scripts/ubuntu/net-vmcontext/README @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/ubuntu/net-vmcontext/vmcontext b/share/scripts/ubuntu/net-vmcontext/vmcontext index 72d9076cb2..de8618135e 100755 --- a/share/scripts/ubuntu/net-vmcontext/vmcontext +++ b/share/scripts/ubuntu/net-vmcontext/vmcontext @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/scripts/vmcontext.sh b/share/scripts/vmcontext.sh index fa9b311744..cbace7d8fb 100755 --- a/share/scripts/vmcontext.sh +++ b/share/scripts/vmcontext.sh @@ -14,7 +14,7 @@ ### END INIT INFO # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/share/sudoers/sudo_commands.rb b/share/sudoers/sudo_commands.rb index dc80f62681..51e6366ee9 100644 --- a/share/sudoers/sudo_commands.rb +++ b/share/sudoers/sudo_commands.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/acl/AclManager.cc b/src/acl/AclManager.cc index c54636cc13..d514b023b2 100644 --- a/src/acl/AclManager.cc +++ b/src/acl/AclManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/acl/AclRule.cc b/src/acl/AclRule.cc index f17bd43a38..935bc7ee72 100644 --- a/src/acl/AclRule.cc +++ b/src/acl/AclRule.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/acl/SConstruct b/src/acl/SConstruct index 568bd3499f..d86aa9370d 100644 --- a/src/acl/SConstruct +++ b/src/acl/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/authm # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm/AuthManager.cc b/src/authm/AuthManager.cc index 91f2401d45..454c39afaf 100644 --- a/src/authm/AuthManager.cc +++ b/src/authm/AuthManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/authm/AuthManagerDriver.cc b/src/authm/AuthManagerDriver.cc index b270e9ddbc..98cf630be3 100644 --- a/src/authm/AuthManagerDriver.cc +++ b/src/authm/AuthManagerDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/authm/SConstruct b/src/authm/SConstruct index 1d11fafa0d..465b29c475 100644 --- a/src/authm/SConstruct +++ b/src/authm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/authm # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/one_auth_mad b/src/authm_mad/one_auth_mad index 492970da97..f21e8f42eb 100755 --- a/src/authm_mad/one_auth_mad +++ b/src/authm_mad/one_auth_mad @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/one_auth_mad.rb b/src/authm_mad/one_auth_mad.rb index 8d8f92000f..b35e38c6f1 100755 --- a/src/authm_mad/one_auth_mad.rb +++ b/src/authm_mad/one_auth_mad.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/remotes/dummy/authenticate b/src/authm_mad/remotes/dummy/authenticate index d0c9c24dc2..dc1b9d3688 100755 --- a/src/authm_mad/remotes/dummy/authenticate +++ b/src/authm_mad/remotes/dummy/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/remotes/ldap/authenticate b/src/authm_mad/remotes/ldap/authenticate index cefa855e88..8a01485974 100755 --- a/src/authm_mad/remotes/ldap/authenticate +++ b/src/authm_mad/remotes/ldap/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/authm_mad/remotes/ldap/ldap_auth.conf b/src/authm_mad/remotes/ldap/ldap_auth.conf index 77304697cf..f4241781f5 100644 --- a/src/authm_mad/remotes/ldap/ldap_auth.conf +++ b/src/authm_mad/remotes/ldap/ldap_auth.conf @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/authm_mad/remotes/ldap/ldap_auth.rb b/src/authm_mad/remotes/ldap/ldap_auth.rb index b6d965f1b0..5c6345a59e 100644 --- a/src/authm_mad/remotes/ldap/ldap_auth.rb +++ b/src/authm_mad/remotes/ldap/ldap_auth.rb @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/authm_mad/remotes/ldap/test/ldap_auth_spec.rb b/src/authm_mad/remotes/ldap/test/ldap_auth_spec.rb index 5fb8b5cbc7..d058ea6045 100644 --- a/src/authm_mad/remotes/ldap/test/ldap_auth_spec.rb +++ b/src/authm_mad/remotes/ldap/test/ldap_auth_spec.rb @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/authm_mad/remotes/plain/authenticate b/src/authm_mad/remotes/plain/authenticate index 8981d7b265..80e78bcef9 100755 --- a/src/authm_mad/remotes/plain/authenticate +++ b/src/authm_mad/remotes/plain/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/remotes/server_cipher/authenticate b/src/authm_mad/remotes/server_cipher/authenticate index 812932bf2a..05f5180931 100755 --- a/src/authm_mad/remotes/server_cipher/authenticate +++ b/src/authm_mad/remotes/server_cipher/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/remotes/server_cipher/server_cipher_auth.rb b/src/authm_mad/remotes/server_cipher/server_cipher_auth.rb index 78476efa7d..2bba6cffa6 100644 --- a/src/authm_mad/remotes/server_cipher/server_cipher_auth.rb +++ b/src/authm_mad/remotes/server_cipher/server_cipher_auth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/remotes/server_x509/authenticate b/src/authm_mad/remotes/server_x509/authenticate index bcb789ab7f..cdea6a899e 100755 --- a/src/authm_mad/remotes/server_x509/authenticate +++ b/src/authm_mad/remotes/server_x509/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/remotes/server_x509/server_x509_auth.rb b/src/authm_mad/remotes/server_x509/server_x509_auth.rb index 6799e43fd6..5b01b834df 100644 --- a/src/authm_mad/remotes/server_x509/server_x509_auth.rb +++ b/src/authm_mad/remotes/server_x509/server_x509_auth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/remotes/ssh/authenticate b/src/authm_mad/remotes/ssh/authenticate index e93e1abf02..ad34099d3a 100755 --- a/src/authm_mad/remotes/ssh/authenticate +++ b/src/authm_mad/remotes/ssh/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/remotes/ssh/ssh_auth.rb b/src/authm_mad/remotes/ssh/ssh_auth.rb index db06978984..77361ed5f8 100644 --- a/src/authm_mad/remotes/ssh/ssh_auth.rb +++ b/src/authm_mad/remotes/ssh/ssh_auth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/remotes/x509/authenticate b/src/authm_mad/remotes/x509/authenticate index ffa2d95c7e..564a814a7a 100755 --- a/src/authm_mad/remotes/x509/authenticate +++ b/src/authm_mad/remotes/x509/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/authm_mad/remotes/x509/x509_auth.rb b/src/authm_mad/remotes/x509/x509_auth.rb index 24ff82d63f..53673d717e 100644 --- a/src/authm_mad/remotes/x509/x509_auth.rb +++ b/src/authm_mad/remotes/x509/x509_auth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/cli_helper.rb b/src/cli/cli_helper.rb index 2b32b97b3d..5034b8b3a5 100644 --- a/src/cli/cli_helper.rb +++ b/src/cli/cli_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -176,11 +176,11 @@ module CLIHelper begin while true + data = block.call + CLIHelper.scr_cls CLIHelper.scr_move(0,0) - data = block.call - show(data, options) sleep delay end @@ -216,8 +216,8 @@ module CLIHelper end begin - print res_data.collect{|l| - (0..ncolumns-1).collect{ |i| + res_data.each{|l| + puts (0..ncolumns-1).collect{ |i| dat=l[i] col=@default_columns[i] @@ -225,8 +225,8 @@ module CLIHelper str=CLIHelper.color_state(str) if i==stat_column str - }.join(' ') - }.join("\n").gsub(/ *$/, '') + }.join(' ').rstrip + } rescue Errno::EPIPE end diff --git a/src/cli/command_parser.rb b/src/cli/command_parser.rb index 23c9f6b770..d9bc504ef6 100644 --- a/src/cli/command_parser.rb +++ b/src/cli/command_parser.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/one_helper.rb b/src/cli/one_helper.rb index f75eb7fdff..0200d8b4f8 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -22,7 +22,7 @@ include OpenNebula module OpenNebulaHelper ONE_VERSION=<<-EOT OpenNebula #{OpenNebula::VERSION} -Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs 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 @@ -418,21 +418,26 @@ EOT pool = factory_pool(filter_flag) - rc = pool.info - return -1, rc.message if OpenNebula.is_error?(rc) - if options[:xml] + # TODO: use paginated functions + rc=pool.info + return -1, rc.message if OpenNebula.is_error?(rc) return 0, pool.to_xml(true) else table = format_pool(options) if top table.top(options) { - pool.info - pool_to_array(pool) + array=pool_to_array(pool.get_hash) + if OpenNebula.is_error?(array) + STDERR.puts array.mesage + exit(-1) + end + array } else - array=pool_to_array(pool) + array=pool_to_array(pool.get_hash) + return -1, array.message if OpenNebula.is_error?(array) if options[:ids] array=array.select do |element| diff --git a/src/cli/one_helper/oneacct_helper.rb b/src/cli/one_helper/oneacct_helper.rb index f5c78b99a6..f3048e3aa5 100644 --- a/src/cli/one_helper/oneacct_helper.rb +++ b/src/cli/one_helper/oneacct_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/one_helper/oneacl_helper.rb b/src/cli/one_helper/oneacl_helper.rb index 74013464ae..c34c68dc0c 100644 --- a/src/cli/one_helper/oneacl_helper.rb +++ b/src/cli/one_helper/oneacl_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/one_helper/onecluster_helper.rb b/src/cli/one_helper/onecluster_helper.rb index f21313dad0..f0b2df0b9a 100644 --- a/src/cli/one_helper/onecluster_helper.rb +++ b/src/cli/one_helper/onecluster_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/one_helper/onedatastore_helper.rb b/src/cli/one_helper/onedatastore_helper.rb index d89e9d2891..7bbee9e5c1 100644 --- a/src/cli/one_helper/onedatastore_helper.rb +++ b/src/cli/one_helper/onedatastore_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/one_helper/onegroup_helper.rb b/src/cli/one_helper/onegroup_helper.rb index 5705a282ec..28e1a60570 100644 --- a/src/cli/one_helper/onegroup_helper.rb +++ b/src/cli/one_helper/onegroup_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index a02ac25fe4..dc28109958 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/one_helper/onequota_helper.rb b/src/cli/one_helper/onequota_helper.rb index 947b959f3c..7fa9cf9d2c 100644 --- a/src/cli/one_helper/onequota_helper.rb +++ b/src/cli/one_helper/onequota_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index 4bb5d24904..2e113c752d 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index 38b6f25015..d81d9a25ab 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index 4b9cce9352..7755f6036c 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index d56c89433f..84c6b99931 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/oneacct b/src/cli/oneacct index ee10867ece..0aca436c03 100755 --- a/src/cli/oneacct +++ b/src/cli/oneacct @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/oneacl b/src/cli/oneacl index d0d474d616..e134bbbe66 100755 --- a/src/cli/oneacl +++ b/src/cli/oneacl @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/onecluster b/src/cli/onecluster index 5624ec649b..bb2057371c 100755 --- a/src/cli/onecluster +++ b/src/cli/onecluster @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/onedatastore b/src/cli/onedatastore index 7c09d0cb16..a06ecb613f 100755 --- a/src/cli/onedatastore +++ b/src/cli/onedatastore @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/oneflow b/src/cli/oneflow index 6c3d1f4d07..be1900d4df 100755 --- a/src/cli/oneflow +++ b/src/cli/oneflow @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L. # +# Copyright 2010-2014, 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/src/cli/oneflow-template b/src/cli/oneflow-template index 81ef339794..7110a3dba8 100755 --- a/src/cli/oneflow-template +++ b/src/cli/oneflow-template @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L. # +# Copyright 2010-2014, 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/src/cli/onegroup b/src/cli/onegroup index 580bf63a23..c7503169da 100755 --- a/src/cli/onegroup +++ b/src/cli/onegroup @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/onehost b/src/cli/onehost index 3eb139d505..7813046590 100755 --- a/src/cli/onehost +++ b/src/cli/onehost @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/oneimage b/src/cli/oneimage index 838abb9bd4..e033932539 100755 --- a/src/cli/oneimage +++ b/src/cli/oneimage @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/onetemplate b/src/cli/onetemplate index d9f53c5f1b..2ea926be62 100755 --- a/src/cli/onetemplate +++ b/src/cli/onetemplate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/oneuser b/src/cli/oneuser index 4a5bf032e7..b74176ef3d 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/onevm b/src/cli/onevm index 951ee830a1..0f0eea01f6 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cli/onevnet b/src/cli/onevnet index d7e4ce017a..4c5ee447e2 100755 --- a/src/cli/onevnet +++ b/src/cli/onevnet @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cloud/common/CloudAuth.rb b/src/cloud/common/CloudAuth.rb index 74f3bc9370..cbc0e5bd49 100644 --- a/src/cloud/common/CloudAuth.rb +++ b/src/cloud/common/CloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cloud/common/CloudAuth/EC2CloudAuth.rb b/src/cloud/common/CloudAuth/EC2CloudAuth.rb index 8326caf846..028dfff238 100644 --- a/src/cloud/common/CloudAuth/EC2CloudAuth.rb +++ b/src/cloud/common/CloudAuth/EC2CloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cloud/common/CloudAuth/OCCICloudAuth.rb b/src/cloud/common/CloudAuth/OCCICloudAuth.rb index 015d96e6a6..487e3493f1 100644 --- a/src/cloud/common/CloudAuth/OCCICloudAuth.rb +++ b/src/cloud/common/CloudAuth/OCCICloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cloud/common/CloudAuth/OneGateCloudAuth.rb b/src/cloud/common/CloudAuth/OneGateCloudAuth.rb index f36aca7cfc..954a8db5ef 100644 --- a/src/cloud/common/CloudAuth/OneGateCloudAuth.rb +++ b/src/cloud/common/CloudAuth/OneGateCloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb b/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb index 911ec3dc86..33dee8161a 100644 --- a/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb +++ b/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cloud/common/CloudAuth/SunstoneCloudAuth.rb b/src/cloud/common/CloudAuth/SunstoneCloudAuth.rb index 39f495afcf..e746c8a9f3 100644 --- a/src/cloud/common/CloudAuth/SunstoneCloudAuth.rb +++ b/src/cloud/common/CloudAuth/SunstoneCloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cloud/common/CloudAuth/X509CloudAuth.rb b/src/cloud/common/CloudAuth/X509CloudAuth.rb index cdae1f3893..e58f26acc2 100644 --- a/src/cloud/common/CloudAuth/X509CloudAuth.rb +++ b/src/cloud/common/CloudAuth/X509CloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/cloud/common/CloudClient.rb b/src/cloud/common/CloudClient.rb index 72e1007ad1..555e6a308e 100644 --- a/src/cloud/common/CloudClient.rb +++ b/src/cloud/common/CloudClient.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -50,7 +50,7 @@ end module CloudClient # OpenNebula version - VERSION = '4.4.0' + VERSION = '4.5.0' # ######################################################################### # Default location for the authentication file @@ -201,7 +201,7 @@ module CloudCLI def version_text version=<get("PORT", rm_port); nebula_configuration->get("MAX_CONN", max_conn); @@ -1007,10 +1010,15 @@ void Nebula::start(bool bootstrap_only) nebula_configuration->get("KEEPALIVE_TIMEOUT", keepalive_timeout); nebula_configuration->get("KEEPALIVE_MAX_CONN", keepalive_max_conn); nebula_configuration->get("TIMEOUT", timeout); + nebula_configuration->get("RPC_LOG", rpc_log); + + if (rpc_log) + { + rpc_filename = log_location + "one_xmlrpc.log"; + } rm = new RequestManager(rm_port, max_conn, max_conn_backlog, - keepalive_timeout, keepalive_max_conn, timeout, - log_location + "one_xmlrpc.log"); + keepalive_timeout, keepalive_max_conn, timeout, rpc_filename); } catch (bad_alloc&) { diff --git a/src/nebula/NebulaTemplate.cc b/src/nebula/NebulaTemplate.cc index fd53bb6e1c..9f8031bb85 100644 --- a/src/nebula/NebulaTemplate.cc +++ b/src/nebula/NebulaTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -208,6 +208,7 @@ void OpenNebulaTemplate::set_conf_default() # KEEPALIVE_TIMEOUT # KEEPALIVE_MAX_CONN # TIMEOUT +# RPC_LOG #******************************************************************************* */ // MAX_CONN @@ -240,6 +241,11 @@ void OpenNebulaTemplate::set_conf_default() attribute = new SingleAttribute("TIMEOUT",value); conf_default.insert(make_pair(attribute->name(),attribute)); + // RPC_LOG + value = "NO"; + + attribute = new SingleAttribute("RPC_LOG",value); + conf_default.insert(make_pair(attribute->name(),attribute)); /* #******************************************************************************* # Physical Networks configuration diff --git a/src/nebula/SConstruct b/src/nebula/SConstruct index ac93fa2d0c..fdb9e0d35f 100644 --- a/src/nebula/SConstruct +++ b/src/nebula/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/nebula # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/nebula/SystemDB.cc b/src/nebula/SystemDB.cc index 38d98b44f7..9b8eb1622f 100644 --- a/src/nebula/SystemDB.cc +++ b/src/nebula/SystemDB.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/nebula/oned.cc b/src/nebula/oned.cc index 5cfeda178f..5a3e7b90a2 100644 --- a/src/nebula/oned.cc +++ b/src/nebula/oned.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -45,7 +45,7 @@ static const char * susage = static void print_license() { - cout<< "Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs\n\n" + cout<< "Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs\n\n" << Nebula::version() << " is distributed and licensed for use under the" << " terms of the\nApache License, Version 2.0 " << "(http://www.apache.org/licenses/LICENSE-2.0).\n"; diff --git a/src/oca/java/build.sh b/src/oca/java/build.sh index b5e07edf11..f1180886a1 100755 --- a/src/oca/java/build.sh +++ b/src/oca/java/build.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -87,7 +87,7 @@ do_documentation() -doctitle 'OpenNebula Cloud API Specification' \ -header 'OpenNebula
Cloud API' \ -bottom 'Visit OpenNebula.org
Copyright 2002-2013 © +href="http://opennebula.org/">OpenNebula.org
Copyright 2002-2014 © OpenNebula Project (OpenNebula.org), C12G Labs.' } diff --git a/src/oca/java/share/examples/SessionInit.java b/src/oca/java/share/examples/SessionInit.java index 6d9fd2a088..14877db406 100644 --- a/src/oca/java/share/examples/SessionInit.java +++ b/src/oca/java/share/examples/SessionInit.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/share/examples/UserSample.java b/src/oca/java/share/examples/UserSample.java index 4154d9462a..97cca2d1d1 100644 --- a/src/oca/java/share/examples/UserSample.java +++ b/src/oca/java/share/examples/UserSample.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/share/examples/VMachineSample.java b/src/oca/java/share/examples/VMachineSample.java index aaedce071a..36799f40ff 100644 --- a/src/oca/java/share/examples/VMachineSample.java +++ b/src/oca/java/share/examples/VMachineSample.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/Client.java b/src/oca/java/src/org/opennebula/client/Client.java index 1c0233a605..5a364bb267 100644 --- a/src/oca/java/src/org/opennebula/client/Client.java +++ b/src/oca/java/src/org/opennebula/client/Client.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/ClientConfigurationException.java b/src/oca/java/src/org/opennebula/client/ClientConfigurationException.java index fa8a1d76d8..7febbfc2d1 100644 --- a/src/oca/java/src/org/opennebula/client/ClientConfigurationException.java +++ b/src/oca/java/src/org/opennebula/client/ClientConfigurationException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/OneException.java b/src/oca/java/src/org/opennebula/client/OneException.java index 509efcd34b..8774755247 100644 --- a/src/oca/java/src/org/opennebula/client/OneException.java +++ b/src/oca/java/src/org/opennebula/client/OneException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/OneResponse.java b/src/oca/java/src/org/opennebula/client/OneResponse.java index b5242ebe2d..5ae0e48db6 100644 --- a/src/oca/java/src/org/opennebula/client/OneResponse.java +++ b/src/oca/java/src/org/opennebula/client/OneResponse.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/OneSystem.java b/src/oca/java/src/org/opennebula/client/OneSystem.java index ef2701dfa7..a6413fa309 100644 --- a/src/oca/java/src/org/opennebula/client/OneSystem.java +++ b/src/oca/java/src/org/opennebula/client/OneSystem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ public class OneSystem private static final String GROUP_QUOTA_INFO = "groupquota.info"; private static final String GROUP_QUOTA_UPDATE = "groupquota.update"; - public static final String VERSION = "4.4.0"; + public static final String VERSION = "4.5.0"; public OneSystem(Client client) { diff --git a/src/oca/java/src/org/opennebula/client/Pool.java b/src/oca/java/src/org/opennebula/client/Pool.java index 49472a15ae..274957f570 100644 --- a/src/oca/java/src/org/opennebula/client/Pool.java +++ b/src/oca/java/src/org/opennebula/client/Pool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/PoolElement.java b/src/oca/java/src/org/opennebula/client/PoolElement.java index c5caf3a5b5..0ecdeb595c 100644 --- a/src/oca/java/src/org/opennebula/client/PoolElement.java +++ b/src/oca/java/src/org/opennebula/client/PoolElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/acl/Acl.java b/src/oca/java/src/org/opennebula/client/acl/Acl.java index fc3658f3ae..bcc9281c98 100644 --- a/src/oca/java/src/org/opennebula/client/acl/Acl.java +++ b/src/oca/java/src/org/opennebula/client/acl/Acl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/acl/AclPool.java b/src/oca/java/src/org/opennebula/client/acl/AclPool.java index 1ce82b07d0..c28b74d0a9 100644 --- a/src/oca/java/src/org/opennebula/client/acl/AclPool.java +++ b/src/oca/java/src/org/opennebula/client/acl/AclPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/acl/RuleParseException.java b/src/oca/java/src/org/opennebula/client/acl/RuleParseException.java index d2df808e26..113c3edd0f 100644 --- a/src/oca/java/src/org/opennebula/client/acl/RuleParseException.java +++ b/src/oca/java/src/org/opennebula/client/acl/RuleParseException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/cluster/Cluster.java b/src/oca/java/src/org/opennebula/client/cluster/Cluster.java index 094016ae1a..1f62c9a395 100644 --- a/src/oca/java/src/org/opennebula/client/cluster/Cluster.java +++ b/src/oca/java/src/org/opennebula/client/cluster/Cluster.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/cluster/ClusterPool.java b/src/oca/java/src/org/opennebula/client/cluster/ClusterPool.java index 5b3f0a073f..f685b04a2c 100644 --- a/src/oca/java/src/org/opennebula/client/cluster/ClusterPool.java +++ b/src/oca/java/src/org/opennebula/client/cluster/ClusterPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/datastore/Datastore.java b/src/oca/java/src/org/opennebula/client/datastore/Datastore.java index f68b42303f..156cf71586 100644 --- a/src/oca/java/src/org/opennebula/client/datastore/Datastore.java +++ b/src/oca/java/src/org/opennebula/client/datastore/Datastore.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/datastore/DatastorePool.java b/src/oca/java/src/org/opennebula/client/datastore/DatastorePool.java index 01e0739ba6..feaf849919 100644 --- a/src/oca/java/src/org/opennebula/client/datastore/DatastorePool.java +++ b/src/oca/java/src/org/opennebula/client/datastore/DatastorePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/document/Document.java b/src/oca/java/src/org/opennebula/client/document/Document.java index a564447295..86025d598c 100644 --- a/src/oca/java/src/org/opennebula/client/document/Document.java +++ b/src/oca/java/src/org/opennebula/client/document/Document.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/document/DocumentPool.java b/src/oca/java/src/org/opennebula/client/document/DocumentPool.java index 31ae5e55b5..6b92b3e2c1 100644 --- a/src/oca/java/src/org/opennebula/client/document/DocumentPool.java +++ b/src/oca/java/src/org/opennebula/client/document/DocumentPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/group/Group.java b/src/oca/java/src/org/opennebula/client/group/Group.java index 956b1d4c19..8b3edb2705 100644 --- a/src/oca/java/src/org/opennebula/client/group/Group.java +++ b/src/oca/java/src/org/opennebula/client/group/Group.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/group/GroupPool.java b/src/oca/java/src/org/opennebula/client/group/GroupPool.java index 0bcb4468f3..106fd6b130 100644 --- a/src/oca/java/src/org/opennebula/client/group/GroupPool.java +++ b/src/oca/java/src/org/opennebula/client/group/GroupPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/host/Host.java b/src/oca/java/src/org/opennebula/client/host/Host.java index f9aba9eb8f..fa1a486464 100644 --- a/src/oca/java/src/org/opennebula/client/host/Host.java +++ b/src/oca/java/src/org/opennebula/client/host/Host.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/host/HostPool.java b/src/oca/java/src/org/opennebula/client/host/HostPool.java index fb8247708b..7d3f8251a5 100644 --- a/src/oca/java/src/org/opennebula/client/host/HostPool.java +++ b/src/oca/java/src/org/opennebula/client/host/HostPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/image/Image.java b/src/oca/java/src/org/opennebula/client/image/Image.java index ebbe9b7a37..dc4653207b 100644 --- a/src/oca/java/src/org/opennebula/client/image/Image.java +++ b/src/oca/java/src/org/opennebula/client/image/Image.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/image/ImagePool.java b/src/oca/java/src/org/opennebula/client/image/ImagePool.java index d54244eb92..fe2a798f69 100644 --- a/src/oca/java/src/org/opennebula/client/image/ImagePool.java +++ b/src/oca/java/src/org/opennebula/client/image/ImagePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/template/Template.java b/src/oca/java/src/org/opennebula/client/template/Template.java index 84ad1342f1..5d0960d1bd 100644 --- a/src/oca/java/src/org/opennebula/client/template/Template.java +++ b/src/oca/java/src/org/opennebula/client/template/Template.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/template/TemplatePool.java b/src/oca/java/src/org/opennebula/client/template/TemplatePool.java index 8141ffe312..17b414613c 100644 --- a/src/oca/java/src/org/opennebula/client/template/TemplatePool.java +++ b/src/oca/java/src/org/opennebula/client/template/TemplatePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/user/User.java b/src/oca/java/src/org/opennebula/client/user/User.java index e4e4a34883..b55e9cc92e 100644 --- a/src/oca/java/src/org/opennebula/client/user/User.java +++ b/src/oca/java/src/org/opennebula/client/user/User.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/user/UserPool.java b/src/oca/java/src/org/opennebula/client/user/UserPool.java index 5836c64831..ab2349d939 100644 --- a/src/oca/java/src/org/opennebula/client/user/UserPool.java +++ b/src/oca/java/src/org/opennebula/client/user/UserPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java index baa6da3b33..764b83201e 100644 --- a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java +++ b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vm/VirtualMachinePool.java b/src/oca/java/src/org/opennebula/client/vm/VirtualMachinePool.java index ec2655dc2f..2689f02762 100644 --- a/src/oca/java/src/org/opennebula/client/vm/VirtualMachinePool.java +++ b/src/oca/java/src/org/opennebula/client/vm/VirtualMachinePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vnet/VirtualNetwork.java b/src/oca/java/src/org/opennebula/client/vnet/VirtualNetwork.java index 775ab20ddb..85c1316601 100644 --- a/src/oca/java/src/org/opennebula/client/vnet/VirtualNetwork.java +++ b/src/oca/java/src/org/opennebula/client/vnet/VirtualNetwork.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vnet/VirtualNetworkPool.java b/src/oca/java/src/org/opennebula/client/vnet/VirtualNetworkPool.java index 29996b7324..9da86dc130 100644 --- a/src/oca/java/src/org/opennebula/client/vnet/VirtualNetworkPool.java +++ b/src/oca/java/src/org/opennebula/client/vnet/VirtualNetworkPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/test/AclTest.java b/src/oca/java/test/AclTest.java index ea23b597cc..ad564644b5 100644 --- a/src/oca/java/test/AclTest.java +++ b/src/oca/java/test/AclTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/test/DocumentTest.java b/src/oca/java/test/DocumentTest.java index cfaac7ad58..fdabdbd6c0 100644 --- a/src/oca/java/test/DocumentTest.java +++ b/src/oca/java/test/DocumentTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/test/GroupTest.java b/src/oca/java/test/GroupTest.java index 836ad587e4..7dc88d4585 100644 --- a/src/oca/java/test/GroupTest.java +++ b/src/oca/java/test/GroupTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/test/HostTest.java b/src/oca/java/test/HostTest.java index 03176212e1..f5443f35d4 100644 --- a/src/oca/java/test/HostTest.java +++ b/src/oca/java/test/HostTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/test/ImageTest.java b/src/oca/java/test/ImageTest.java index d124d5f624..24ecd564fd 100644 --- a/src/oca/java/test/ImageTest.java +++ b/src/oca/java/test/ImageTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/test/SessionTest.java b/src/oca/java/test/SessionTest.java index 177d3b3219..cc0bfaf1e6 100644 --- a/src/oca/java/test/SessionTest.java +++ b/src/oca/java/test/SessionTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/test/TemplateTest.java b/src/oca/java/test/TemplateTest.java index e225a7f0a8..fc5e04ab2d 100644 --- a/src/oca/java/test/TemplateTest.java +++ b/src/oca/java/test/TemplateTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/test/UserTest.java b/src/oca/java/test/UserTest.java index 64f966036f..ced5e18d9d 100644 --- a/src/oca/java/test/UserTest.java +++ b/src/oca/java/test/UserTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/test/VirtualMachineTest.java b/src/oca/java/test/VirtualMachineTest.java index 3edaa430dd..17a4081470 100644 --- a/src/oca/java/test/VirtualMachineTest.java +++ b/src/oca/java/test/VirtualMachineTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/test/VirtualNetworkTest.java b/src/oca/java/test/VirtualNetworkTest.java index 9a545644f5..50c66db3c9 100644 --- a/src/oca/java/test/VirtualNetworkTest.java +++ b/src/oca/java/test/VirtualNetworkTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs + * Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/test/all_tests.sh b/src/oca/java/test/all_tests.sh index c3887f26dd..ebc0c13a85 100755 --- a/src/oca/java/test/all_tests.sh +++ b/src/oca/java/test/all_tests.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/java/test/test.sh b/src/oca/java/test/test.sh index 03f10e87cf..3c15289f0b 100755 --- a/src/oca/java/test/test.sh +++ b/src/oca/java/test/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/deprecated/OpenNebula.rb b/src/oca/ruby/deprecated/OpenNebula.rb index 8a7f70471c..98e78f618a 100644 --- a/src/oca/ruby/deprecated/OpenNebula.rb +++ b/src/oca/ruby/deprecated/OpenNebula.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula.rb b/src/oca/ruby/opennebula.rb index 5c7b61237b..bb23d3163a 100644 --- a/src/oca/ruby/opennebula.rb +++ b/src/oca/ruby/opennebula.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -56,5 +56,5 @@ require 'opennebula/system' module OpenNebula # OpenNebula version - VERSION = '4.4.0' + VERSION = '4.5.0' end diff --git a/src/oca/ruby/opennebula/acl.rb b/src/oca/ruby/opennebula/acl.rb index b520fdde5d..e49cdec15c 100644 --- a/src/oca/ruby/opennebula/acl.rb +++ b/src/oca/ruby/opennebula/acl.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/acl_pool.rb b/src/oca/ruby/opennebula/acl_pool.rb index 02e4263e13..1a9759c416 100644 --- a/src/oca/ruby/opennebula/acl_pool.rb +++ b/src/oca/ruby/opennebula/acl_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/client.rb b/src/oca/ruby/opennebula/client.rb index 2e7d658048..16a9ca8bbb 100644 --- a/src/oca/ruby/opennebula/client.rb +++ b/src/oca/ruby/opennebula/client.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -15,9 +15,34 @@ #--------------------------------------------------------------------------- # require 'xmlrpc/client' +require 'bigdecimal' +require 'stringio' + module OpenNebula - if OpenNebula::NOKOGIRI + attr_accessor :pool_page_size + + if OpenNebula::OX + class OxStreamParser < XMLRPC::XMLParser::AbstractStreamParser + def initialize + @parser_class = OxParser + end + + class OxParser < Ox::Sax + include XMLRPC::XMLParser::StreamParserMixin + + alias :text :character + alias :end_element :endElement + alias :start_element :startElement + + def parse(str) + Ox.sax_parse(self, StringIO.new(str), + :symbolize => false, + :convert_special => true) + end + end + end + elsif OpenNebula::NOKOGIRI class NokogiriStreamParser < XMLRPC::XMLParser::AbstractStreamParser def initialize @parser_class = NokogiriParser @@ -39,6 +64,19 @@ module OpenNebula end end + DEFAULT_POOL_PAGE_SIZE = 2000 + + if size=ENV['ONE_POOL_PAGE_SIZE'] + if size.strip.match(/^\d+$/) && size.to_i >= 2 + @pool_page_size = size.to_i + else + @pool_page_size = nil + end + else + @pool_page_size = DEFAULT_POOL_PAGE_SIZE + end + + # The client class, represents the connection with the core and handles the # xml-rpc calls. class Client @@ -91,7 +129,9 @@ module OpenNebula @server = XMLRPC::Client.new2(@one_endpoint, nil, timeout) - if OpenNebula::NOKOGIRI + if defined?(OxStreamParser) + @server.set_parser(OxStreamParser.new) + elsif OpenNebula::NOKOGIRI @server.set_parser(NokogiriStreamParser.new) elsif XMLPARSER @server.set_parser(XMLRPC::XMLParser::XMLStreamParser.new) diff --git a/src/oca/ruby/opennebula/cluster.rb b/src/oca/ruby/opennebula/cluster.rb index 25c9d758f8..2b55dabac7 100644 --- a/src/oca/ruby/opennebula/cluster.rb +++ b/src/oca/ruby/opennebula/cluster.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/cluster_pool.rb b/src/oca/ruby/opennebula/cluster_pool.rb index 6cf024dec6..471480ccad 100644 --- a/src/oca/ruby/opennebula/cluster_pool.rb +++ b/src/oca/ruby/opennebula/cluster_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/datastore.rb b/src/oca/ruby/opennebula/datastore.rb index fe702abfaa..31424cd30d 100644 --- a/src/oca/ruby/opennebula/datastore.rb +++ b/src/oca/ruby/opennebula/datastore.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/datastore_pool.rb b/src/oca/ruby/opennebula/datastore_pool.rb index 25bfef832d..305b1785d3 100644 --- a/src/oca/ruby/opennebula/datastore_pool.rb +++ b/src/oca/ruby/opennebula/datastore_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/document.rb b/src/oca/ruby/opennebula/document.rb index 2a519ef1cb..7f411e2031 100644 --- a/src/oca/ruby/opennebula/document.rb +++ b/src/oca/ruby/opennebula/document.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/document_json.rb b/src/oca/ruby/opennebula/document_json.rb index fdbb680e1e..fd25330ce7 100644 --- a/src/oca/ruby/opennebula/document_json.rb +++ b/src/oca/ruby/opennebula/document_json.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/document_pool.rb b/src/oca/ruby/opennebula/document_pool.rb index dfd1c96943..a306c671fc 100644 --- a/src/oca/ruby/opennebula/document_pool.rb +++ b/src/oca/ruby/opennebula/document_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/document_pool_json.rb b/src/oca/ruby/opennebula/document_pool_json.rb index 8097dca44c..7b6dc72b06 100644 --- a/src/oca/ruby/opennebula/document_pool_json.rb +++ b/src/oca/ruby/opennebula/document_pool_json.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/error.rb b/src/oca/ruby/opennebula/error.rb index e3081b0782..dde4d3b2a7 100644 --- a/src/oca/ruby/opennebula/error.rb +++ b/src/oca/ruby/opennebula/error.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/group.rb b/src/oca/ruby/opennebula/group.rb index a1cac27475..f6f2077a2d 100644 --- a/src/oca/ruby/opennebula/group.rb +++ b/src/oca/ruby/opennebula/group.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/group_pool.rb b/src/oca/ruby/opennebula/group_pool.rb index bd5deee409..e2e72d58cc 100644 --- a/src/oca/ruby/opennebula/group_pool.rb +++ b/src/oca/ruby/opennebula/group_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/host.rb b/src/oca/ruby/opennebula/host.rb index 7476e01c9e..14304857e2 100644 --- a/src/oca/ruby/opennebula/host.rb +++ b/src/oca/ruby/opennebula/host.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/host_pool.rb b/src/oca/ruby/opennebula/host_pool.rb index c36ff0beb2..fa50f050ce 100644 --- a/src/oca/ruby/opennebula/host_pool.rb +++ b/src/oca/ruby/opennebula/host_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/image.rb b/src/oca/ruby/opennebula/image.rb index 05330ed4ac..de4e679587 100644 --- a/src/oca/ruby/opennebula/image.rb +++ b/src/oca/ruby/opennebula/image.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/image_pool.rb b/src/oca/ruby/opennebula/image_pool.rb index 545742d424..e2281ea7a2 100644 --- a/src/oca/ruby/opennebula/image_pool.rb +++ b/src/oca/ruby/opennebula/image_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/oca/ruby/opennebula/oneflow_client.rb b/src/oca/ruby/opennebula/oneflow_client.rb index d0a8d7f443..9e768f858a 100644 --- a/src/oca/ruby/opennebula/oneflow_client.rb +++ b/src/oca/ruby/opennebula/oneflow_client.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L. # +# Copyright 2010-2014, 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/src/oca/ruby/opennebula/pool.rb b/src/oca/ruby/opennebula/pool.rb index 59b832e96c..340dbee00c 100644 --- a/src/oca/ruby/opennebula/pool.rb +++ b/src/oca/ruby/opennebula/pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -24,6 +24,9 @@ module OpenNebula include Enumerable alias_method :each_with_xpath, :each + PAGINATED_POOLS=%w{VM_POOL IMAGE_POOL TEMPLATE_POOL VN_POOL + DOCUMENT_POOL} + protected #pool:: _String_ XML name of the root element #element:: _String_ XML name of the Pool elements @@ -156,5 +159,55 @@ module OpenNebula return str end + + # Gets a hash from a pool + # + # size:: nil => default page size + # < 2 => not paginated + # >=2 => page size + # + # The default page size can be changed with the environment variable + # ONE_POOL_PAGE_SIZE. Any value > 2 will set a page size, a non + # numeric value disables pagination. + def get_hash(size=nil) + allow_paginated = PAGINATED_POOLS.include?(@pool_name) + + if OpenNebula.pool_page_size && allow_paginated && + ( ( size && size >= 2 ) || !size ) + size = OpenNebula.pool_page_size if !size + { @pool_name => { @element_name => info_paginated(size) } } + else + rc=info + return rc if OpenNebula.is_error?(rc) + to_hash + end + end + + # Gets a pool in hash form using pagination + # + # size:: _Integer_ size of each page + def info_paginated(size) + array=Array.new + current=0 + + parser=ParsePoolSax.new(@pool_name, @element_name) + + while true + a=@client.call("#{@pool_name.delete('_').downcase}.info", + -2, current, -size, -1) + return a if OpenNebula.is_error?(a) + + a_array=parser.parse(a) + + array += a_array + current += size + break if !a || a_array.length false, + :convert_special => true) + end + + class PoolSax < Ox::Sax + include ParsePoolBase + + alias :text :characters + end + end + elsif NOKOGIRI + class ParsePoolSax < ParsePoolSaxBase + def initialize(pool_name, elem_name) + super(pool_name, elem_name) + @parser = Nokogiri::XML::SAX::Parser.new(@pool_sax) + end + + def sax_parse(str) + @parser.parse(str) + end + + class PoolSax < Nokogiri::XML::SAX::Document + include ParsePoolBase + + alias :cdata_block :characters + end + end + end end diff --git a/src/onedb/2.0_to_2.9.80.rb b/src/onedb/2.0_to_2.9.80.rb index 3be93d420b..e97fc76e70 100644 --- a/src/onedb/2.0_to_2.9.80.rb +++ b/src/onedb/2.0_to_2.9.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/2.9.80_to_2.9.85.rb b/src/onedb/2.9.80_to_2.9.85.rb index 52d4a2ca49..84085b5484 100644 --- a/src/onedb/2.9.80_to_2.9.85.rb +++ b/src/onedb/2.9.80_to_2.9.85.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/2.9.85_to_2.9.90.rb b/src/onedb/2.9.85_to_2.9.90.rb index a60f34120b..5523433816 100644 --- a/src/onedb/2.9.85_to_2.9.90.rb +++ b/src/onedb/2.9.85_to_2.9.90.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/2.9.90_to_3.0.0.rb b/src/onedb/2.9.90_to_3.0.0.rb index bf02ea017f..06825487b3 100644 --- a/src/onedb/2.9.90_to_3.0.0.rb +++ b/src/onedb/2.9.90_to_3.0.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.0.0_to_3.1.0.rb b/src/onedb/3.0.0_to_3.1.0.rb index 75bec2a248..62f0ed647d 100644 --- a/src/onedb/3.0.0_to_3.1.0.rb +++ b/src/onedb/3.0.0_to_3.1.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.1.0_to_3.1.80.rb b/src/onedb/3.1.0_to_3.1.80.rb index badbc54392..d05f4cb87d 100644 --- a/src/onedb/3.1.0_to_3.1.80.rb +++ b/src/onedb/3.1.0_to_3.1.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.1.80_to_3.2.0.rb b/src/onedb/3.1.80_to_3.2.0.rb index 44f3b608ab..e54ca567f6 100644 --- a/src/onedb/3.1.80_to_3.2.0.rb +++ b/src/onedb/3.1.80_to_3.2.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.2.0_to_3.2.1.rb b/src/onedb/3.2.0_to_3.2.1.rb index 6706bc5a50..c033616b18 100644 --- a/src/onedb/3.2.0_to_3.2.1.rb +++ b/src/onedb/3.2.0_to_3.2.1.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.2.1_to_3.3.0.rb b/src/onedb/3.2.1_to_3.3.0.rb index 6464d3d031..9e078cc6db 100644 --- a/src/onedb/3.2.1_to_3.3.0.rb +++ b/src/onedb/3.2.1_to_3.3.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.3.0_to_3.3.80.rb b/src/onedb/3.3.0_to_3.3.80.rb index 0b5e713d48..a7f1dc8b1b 100644 --- a/src/onedb/3.3.0_to_3.3.80.rb +++ b/src/onedb/3.3.0_to_3.3.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.3.80_to_3.4.0.rb b/src/onedb/3.3.80_to_3.4.0.rb index 16e271115b..ea26117aa3 100644 --- a/src/onedb/3.3.80_to_3.4.0.rb +++ b/src/onedb/3.3.80_to_3.4.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.4.0_to_3.4.1.rb b/src/onedb/3.4.0_to_3.4.1.rb index de5519d619..dec7759c47 100644 --- a/src/onedb/3.4.0_to_3.4.1.rb +++ b/src/onedb/3.4.0_to_3.4.1.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.4.1_to_3.5.80.rb b/src/onedb/3.4.1_to_3.5.80.rb index b314facbef..ba327801cc 100644 --- a/src/onedb/3.4.1_to_3.5.80.rb +++ b/src/onedb/3.4.1_to_3.5.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.5.80_to_3.6.0.rb b/src/onedb/3.5.80_to_3.6.0.rb index dffc0a9d1e..38f77ac0cf 100644 --- a/src/onedb/3.5.80_to_3.6.0.rb +++ b/src/onedb/3.5.80_to_3.6.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.6.0_to_3.7.80.rb b/src/onedb/3.6.0_to_3.7.80.rb index ff71bbd0b4..e2c1db5056 100644 --- a/src/onedb/3.6.0_to_3.7.80.rb +++ b/src/onedb/3.6.0_to_3.7.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.7.80_to_3.8.0.rb b/src/onedb/3.7.80_to_3.8.0.rb index 8809730d12..d0162abbe3 100644 --- a/src/onedb/3.7.80_to_3.8.0.rb +++ b/src/onedb/3.7.80_to_3.8.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.8.0_to_3.8.1.rb b/src/onedb/3.8.0_to_3.8.1.rb index d060e714ad..293c537a60 100644 --- a/src/onedb/3.8.0_to_3.8.1.rb +++ b/src/onedb/3.8.0_to_3.8.1.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.8.1_to_3.8.2.rb b/src/onedb/3.8.1_to_3.8.2.rb index 17598b9c79..81a33d2ecb 100644 --- a/src/onedb/3.8.1_to_3.8.2.rb +++ b/src/onedb/3.8.1_to_3.8.2.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.8.2_to_3.8.3.rb b/src/onedb/3.8.2_to_3.8.3.rb index 8dfeaa4507..a22825986a 100644 --- a/src/onedb/3.8.2_to_3.8.3.rb +++ b/src/onedb/3.8.2_to_3.8.3.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.8.3_to_3.8.4.rb b/src/onedb/3.8.3_to_3.8.4.rb index 9a43fddc4d..c17bd28db0 100644 --- a/src/onedb/3.8.3_to_3.8.4.rb +++ b/src/onedb/3.8.3_to_3.8.4.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.8.4_to_3.8.5.rb b/src/onedb/3.8.4_to_3.8.5.rb index 2f5bdf3e02..1d4e03cd51 100644 --- a/src/onedb/3.8.4_to_3.8.5.rb +++ b/src/onedb/3.8.4_to_3.8.5.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.8.5_to_3.9.80.rb b/src/onedb/3.8.5_to_3.9.80.rb index becdf9689b..aa61860e88 100644 --- a/src/onedb/3.8.5_to_3.9.80.rb +++ b/src/onedb/3.8.5_to_3.9.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.9.80_to_3.9.90.rb b/src/onedb/3.9.80_to_3.9.90.rb index fc4d7badb7..2c11a48328 100644 --- a/src/onedb/3.9.80_to_3.9.90.rb +++ b/src/onedb/3.9.80_to_3.9.90.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/3.9.90_to_4.0.0.rb b/src/onedb/3.9.90_to_4.0.0.rb index bd22dba1bf..776cdf2225 100644 --- a/src/onedb/3.9.90_to_4.0.0.rb +++ b/src/onedb/3.9.90_to_4.0.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/4.0.0_to_4.0.1.rb b/src/onedb/4.0.0_to_4.0.1.rb index a690bc24cb..6d5c710dfc 100644 --- a/src/onedb/4.0.0_to_4.0.1.rb +++ b/src/onedb/4.0.0_to_4.0.1.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/4.0.1_to_4.1.80.rb b/src/onedb/4.0.1_to_4.1.80.rb index 3d09001e50..f44fe554cf 100644 --- a/src/onedb/4.0.1_to_4.1.80.rb +++ b/src/onedb/4.0.1_to_4.1.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/4.1.80_to_4.2.0.rb b/src/onedb/4.1.80_to_4.2.0.rb index 286ea80137..aa370f9602 100644 --- a/src/onedb/4.1.80_to_4.2.0.rb +++ b/src/onedb/4.1.80_to_4.2.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/4.2.0_to_4.3.80.rb b/src/onedb/4.2.0_to_4.3.80.rb index 3b4418f34f..96ffc65e27 100644 --- a/src/onedb/4.2.0_to_4.3.80.rb +++ b/src/onedb/4.2.0_to_4.3.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/4.3.80_to_4.3.85.rb b/src/onedb/4.3.80_to_4.3.85.rb index 98d3b1bcee..588f4c5d14 100644 --- a/src/onedb/4.3.80_to_4.3.85.rb +++ b/src/onedb/4.3.80_to_4.3.85.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/4.3.85_to_4.3.90.rb b/src/onedb/4.3.85_to_4.3.90.rb index 9647e53255..85eb549ebe 100644 --- a/src/onedb/4.3.85_to_4.3.90.rb +++ b/src/onedb/4.3.85_to_4.3.90.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/4.3.90_to_4.4.0.rb b/src/onedb/4.3.90_to_4.4.0.rb index 102edc8955..8e86e8946e 100644 --- a/src/onedb/4.3.90_to_4.4.0.rb +++ b/src/onedb/4.3.90_to_4.4.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/fsck.rb b/src/onedb/fsck.rb index 1c235c16e6..aeb8964b15 100644 --- a/src/onedb/fsck.rb +++ b/src/onedb/fsck.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -20,7 +20,7 @@ require 'ipaddr' require 'set' module OneDBFsck - VERSION = "4.4.0" + VERSION = "4.5.0" def db_version VERSION diff --git a/src/onedb/onedb b/src/onedb/onedb index 6768e0af65..38a5458d5c 100755 --- a/src/onedb/onedb +++ b/src/onedb/onedb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/onedb.rb b/src/onedb/onedb.rb index fb0483d43a..ed95dbc0a2 100644 --- a/src/onedb/onedb.rb +++ b/src/onedb/onedb.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onedb/onedb_backend.rb b/src/onedb/onedb_backend.rb index e24bf97396..3f3471e57c 100644 --- a/src/onedb/onedb_backend.rb +++ b/src/onedb/onedb_backend.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onegate/bin/onegate-server b/src/onegate/bin/onegate-server index 43ce3bb3f3..7ad04a5be3 100755 --- a/src/onegate/bin/onegate-server +++ b/src/onegate/bin/onegate-server @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onegate/etc/onegate-server.conf b/src/onegate/etc/onegate-server.conf index b8dd21b915..67efa2f50b 100644 --- a/src/onegate/etc/onegate-server.conf +++ b/src/onegate/etc/onegate-server.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/onegate/onegate-server.rb b/src/onegate/onegate-server.rb index 33fa62b0bc..ea2b1221e9 100644 --- a/src/onegate/onegate-server.rb +++ b/src/onegate/onegate-server.rb @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/ozones/Client/bin/onevdc b/src/ozones/Client/bin/onevdc index 3b38c001ed..2eca8b0150 100755 --- a/src/ozones/Client/bin/onevdc +++ b/src/ozones/Client/bin/onevdc @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/ozones/Client/bin/onezone b/src/ozones/Client/bin/onezone index 4a36d16bd6..d7f6e9d0d4 100755 --- a/src/ozones/Client/bin/onezone +++ b/src/ozones/Client/bin/onezone @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/ozones/Client/lib/cli/ozones_helper.rb b/src/ozones/Client/lib/cli/ozones_helper.rb index 1a4afefbaf..29d4ea2bd9 100644 --- a/src/ozones/Client/lib/cli/ozones_helper.rb +++ b/src/ozones/Client/lib/cli/ozones_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/ozones/Client/lib/cli/ozones_helper/vdc_helper.rb b/src/ozones/Client/lib/cli/ozones_helper/vdc_helper.rb index 35bb6e687c..563e03a140 100644 --- a/src/ozones/Client/lib/cli/ozones_helper/vdc_helper.rb +++ b/src/ozones/Client/lib/cli/ozones_helper/vdc_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/ozones/Client/lib/zona.rb b/src/ozones/Client/lib/zona.rb index 1128c5ab76..f0f98190bf 100644 --- a/src/ozones/Client/lib/zona.rb +++ b/src/ozones/Client/lib/zona.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -47,7 +47,7 @@ module Zona # Should match server's oZones version. OZONES_VERSION = <
diff --git a/src/ozones/Server/templates/login.html b/src/ozones/Server/templates/login.html index 74b750cf64..dc784f8bd9 100644 --- a/src/ozones/Server/templates/login.html +++ b/src/ozones/Server/templates/login.html @@ -49,7 +49,7 @@
diff --git a/src/pool/ObjectCollection.cc b/src/pool/ObjectCollection.cc index 736fcff79d..91e5ceaf2d 100644 --- a/src/pool/ObjectCollection.cc +++ b/src/pool/ObjectCollection.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/pool/PoolObjectAuth.cc b/src/pool/PoolObjectAuth.cc index 5b3b8d437f..cdb1d510b8 100644 --- a/src/pool/PoolObjectAuth.cc +++ b/src/pool/PoolObjectAuth.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/pool/PoolObjectSQL.cc b/src/pool/PoolObjectSQL.cc index 59d1d1a0ef..0e7aa84603 100644 --- a/src/pool/PoolObjectSQL.cc +++ b/src/pool/PoolObjectSQL.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/pool/PoolSQL.cc b/src/pool/PoolSQL.cc index 8b6e1ee890..b3c300525e 100644 --- a/src/pool/PoolSQL.cc +++ b/src/pool/PoolSQL.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -488,7 +488,8 @@ int PoolSQL::dump_cb(void * _oss, int num, char **values, char **names) int PoolSQL::dump(ostringstream& oss, const string& elem_name, const char * table, - const string& where) + const string& where, + const string& limit) { ostringstream cmd; @@ -501,6 +502,11 @@ int PoolSQL::dump(ostringstream& oss, cmd << " ORDER BY oid"; + if ( !limit.empty() ) + { + cmd << " LIMIT " << limit; + } + return dump(oss, elem_name, cmd); } @@ -698,7 +704,7 @@ void PoolSQL::oid_filter(int start_id, { ostringstream idfilter; - if ( start_id != -1 ) + if ( end_id >= -1 && start_id != -1 ) { idfilter << "oid >= " << start_id; diff --git a/src/pool/SConstruct b/src/pool/SConstruct index fb1e0c03c9..1fa439a9fb 100644 --- a/src/pool/SConstruct +++ b/src/pool/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/pool # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/rm/Request.cc b/src/rm/Request.cc index 4ef20c155f..f63e20acef 100644 --- a/src/rm/Request.cc +++ b/src/rm/Request.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManager.cc b/src/rm/RequestManager.cc index f368353fc9..63c3382475 100644 --- a/src/rm/RequestManager.cc +++ b/src/rm/RequestManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -95,25 +95,25 @@ extern "C" void * rm_xml_server_loop(void *arg) //Start the server -#ifdef OLD_XMLRPC - rm->AbyssServer = new xmlrpc_c::serverAbyss(xmlrpc_c::serverAbyss::constrOpt() - .registryP(&rm->RequestManagerRegistry) - .logFileName(rm->xml_log_file) - .keepaliveTimeout(rm->keepalive_timeout) - .keepaliveMaxConn(rm->keepalive_max_conn) - .timeout(rm->timeout) - .socketFd(rm->socket_fd)); -#else - rm->AbyssServer = new xmlrpc_c::serverAbyss(xmlrpc_c::serverAbyss::constrOpt() - .registryP(&rm->RequestManagerRegistry) - .logFileName(rm->xml_log_file) - .maxConn(rm->max_conn) - .maxConnBacklog(rm->max_conn_backlog) - .keepaliveTimeout(rm->keepalive_timeout) - .keepaliveMaxConn(rm->keepalive_max_conn) - .timeout(rm->timeout) - .socketFd(rm->socket_fd)); -#endif /* OLD_XMLRPC */ + xmlrpc_c::serverAbyss::constrOpt opt = xmlrpc_c::serverAbyss::constrOpt(); + + opt.registryP(&rm->RequestManagerRegistry); + opt.keepaliveTimeout(rm->keepalive_timeout); + opt.keepaliveMaxConn(rm->keepalive_max_conn); + opt.timeout(rm->timeout); + opt.socketFd(rm->socket_fd); + + if (!rm->xml_log_file.empty()) + { + opt.logFileName(rm->xml_log_file); + } + +#ifndef OLD_XMLRPC + opt.maxConn(rm->max_conn); + opt.maxConnBacklog(rm->max_conn_backlog); +#endif + + rm->AbyssServer = new xmlrpc_c::serverAbyss(opt); rm->AbyssServer->run(); diff --git a/src/rm/RequestManagerAcl.cc b/src/rm/RequestManagerAcl.cc index 178ca59b01..4215cdfb47 100644 --- a/src/rm/RequestManagerAcl.cc +++ b/src/rm/RequestManagerAcl.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc index eb19343a8a..2500be1ce0 100644 --- a/src/rm/RequestManagerAllocate.cc +++ b/src/rm/RequestManagerAllocate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerChmod.cc b/src/rm/RequestManagerChmod.cc index 4e763b3a21..099f96fe9f 100644 --- a/src/rm/RequestManagerChmod.cc +++ b/src/rm/RequestManagerChmod.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerChown.cc b/src/rm/RequestManagerChown.cc index 5c60e65f4b..6d4842b65d 100644 --- a/src/rm/RequestManagerChown.cc +++ b/src/rm/RequestManagerChown.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerClone.cc b/src/rm/RequestManagerClone.cc index ab2b6b357d..53603d3805 100644 --- a/src/rm/RequestManagerClone.cc +++ b/src/rm/RequestManagerClone.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerCluster.cc b/src/rm/RequestManagerCluster.cc index a73a7ba549..4b5f3a1cfb 100644 --- a/src/rm/RequestManagerCluster.cc +++ b/src/rm/RequestManagerCluster.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerDelete.cc b/src/rm/RequestManagerDelete.cc index b29f5d7ee9..57ec0211a9 100644 --- a/src/rm/RequestManagerDelete.cc +++ b/src/rm/RequestManagerDelete.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerGroup.cc b/src/rm/RequestManagerGroup.cc index be380cb589..785c3d1d6b 100644 --- a/src/rm/RequestManagerGroup.cc +++ b/src/rm/RequestManagerGroup.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerHost.cc b/src/rm/RequestManagerHost.cc index 6c4d6576f4..b380b7fb3c 100644 --- a/src/rm/RequestManagerHost.cc +++ b/src/rm/RequestManagerHost.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerImage.cc b/src/rm/RequestManagerImage.cc index 747f0c53c4..39a50ccf58 100644 --- a/src/rm/RequestManagerImage.cc +++ b/src/rm/RequestManagerImage.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerInfo.cc b/src/rm/RequestManagerInfo.cc index 047f5d0a35..5e344c31a6 100644 --- a/src/rm/RequestManagerInfo.cc +++ b/src/rm/RequestManagerInfo.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerPoolInfoFilter.cc b/src/rm/RequestManagerPoolInfoFilter.cc index e75ee060a0..7f889b7278 100644 --- a/src/rm/RequestManagerPoolInfoFilter.cc +++ b/src/rm/RequestManagerPoolInfoFilter.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -353,7 +353,7 @@ void RequestManagerPoolInfoFilter::dump( const string& or_clause) { ostringstream oss; - string where_string; + string where_string, limit_clause; int rc; if ( filter_flag < MINE ) @@ -372,7 +372,14 @@ void RequestManagerPoolInfoFilter::dump( or_clause, where_string); - rc = pool->dump(oss, where_string); + if ( end_id < -1 ) + { + oss << start_id << "," << -end_id; + limit_clause = oss.str(); + oss.str(""); + } + + rc = pool->dump(oss, where_string, limit_clause); if ( rc != 0 ) { diff --git a/src/rm/RequestManagerRename.cc b/src/rm/RequestManagerRename.cc index 0685f3fa75..638bdea8e9 100644 --- a/src/rm/RequestManagerRename.cc +++ b/src/rm/RequestManagerRename.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerSystem.cc b/src/rm/RequestManagerSystem.cc index 0c0db004c7..a324569c58 100644 --- a/src/rm/RequestManagerSystem.cc +++ b/src/rm/RequestManagerSystem.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerUpdateTemplate.cc b/src/rm/RequestManagerUpdateTemplate.cc index 36e591c926..c4228deb7a 100644 --- a/src/rm/RequestManagerUpdateTemplate.cc +++ b/src/rm/RequestManagerUpdateTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerUser.cc b/src/rm/RequestManagerUser.cc index 331d30f1e0..03ab3f6316 100644 --- a/src/rm/RequestManagerUser.cc +++ b/src/rm/RequestManagerUser.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc index 40f85b4e78..3a24af050d 100644 --- a/src/rm/RequestManagerVMTemplate.cc +++ b/src/rm/RequestManagerVMTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc index 20eea298a2..53909ee225 100644 --- a/src/rm/RequestManagerVirtualMachine.cc +++ b/src/rm/RequestManagerVirtualMachine.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/RequestManagerVirtualNetwork.cc b/src/rm/RequestManagerVirtualNetwork.cc index 478cf2c6dd..971d18d6dd 100644 --- a/src/rm/RequestManagerVirtualNetwork.cc +++ b/src/rm/RequestManagerVirtualNetwork.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/rm/SConstruct b/src/rm/SConstruct index d54462e51f..300695d53c 100644 --- a/src/rm/SConstruct +++ b/src/rm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/rm # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/scheduler/SConstruct b/src/scheduler/SConstruct index b77977a13e..788e17ec79 100644 --- a/src/scheduler/SConstruct +++ b/src/scheduler/SConstruct @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/scheduler/etc/sched.conf b/src/scheduler/etc/sched.conf index c992f8d35b..05e5897b37 100644 --- a/src/scheduler/etc/sched.conf +++ b/src/scheduler/etc/sched.conf @@ -5,6 +5,8 @@ #******************************************************************************* # Daemon configuration attributes #------------------------------------------------------------------------------- +# MESSAGE_SIZE: Buffer size in bytes for XML-RPC responses. +# # ONED_PORT: Port to connect to the OpenNebula daemon (oned) # # SCHED_INTERVAL: Seconds between two scheduling actions @@ -57,6 +59,8 @@ # - debug_level: 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBU #******************************************************************************* +MESSAGE_SIZE = 1073741824 + ONED_PORT = 2633 SCHED_INTERVAL = 30 diff --git a/src/scheduler/include/AclXML.h b/src/scheduler/include/AclXML.h index 809fb7816c..0d60c74fb4 100644 --- a/src/scheduler/include/AclXML.h +++ b/src/scheduler/include/AclXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/Client.h b/src/scheduler/include/Client.h index 2a7ad2f632..a73036c2fc 100644 --- a/src/scheduler/include/Client.h +++ b/src/scheduler/include/Client.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -55,15 +55,15 @@ public: * @param endpoint Where the rpc server is listening, must be something * like "http://localhost:2633/RPC2". If not set, the endpoint will be set * to $ONE_XMLRPC. + * @param message_size for XML elements in the client library (in bytes) * @throws Exception if the authorization options are invalid */ - Client( string secret = "", - string endpoint = "") + Client(const string& secret, const string& endpoint, size_t message_size) { set_one_auth(secret); set_one_endpoint(endpoint); - xmlrpc_limit_set(XMLRPC_XML_SIZE_LIMIT_ID, 1024*MESSAGE_SIZE); + xmlrpc_limit_set(XMLRPC_XML_SIZE_LIMIT_ID, message_size); } const string& get_oneauth() @@ -76,17 +76,16 @@ public: return one_endpoint; } + size_t get_message_size() + { + return xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID); + } + //-------------------------------------------------------------------------- // PRIVATE ATTRIBUTES AND METHODS //-------------------------------------------------------------------------- private: - - /** - * Default message size for XML data off the network - */ - static const int MESSAGE_SIZE; - string one_auth; string one_endpoint; diff --git a/src/scheduler/include/ClusterPoolXML.h b/src/scheduler/include/ClusterPoolXML.h index f249a25177..c0ab75292b 100644 --- a/src/scheduler/include/ClusterPoolXML.h +++ b/src/scheduler/include/ClusterPoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2014, 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 */ diff --git a/src/scheduler/include/ClusterXML.h b/src/scheduler/include/ClusterXML.h index 6cc291e947..11c5a179e0 100644 --- a/src/scheduler/include/ClusterXML.h +++ b/src/scheduler/include/ClusterXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2014, 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 */ diff --git a/src/scheduler/include/DatastorePoolXML.h b/src/scheduler/include/DatastorePoolXML.h index b263fde1a7..1a8cf1c289 100644 --- a/src/scheduler/include/DatastorePoolXML.h +++ b/src/scheduler/include/DatastorePoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/DatastoreXML.h b/src/scheduler/include/DatastoreXML.h index 8da7f22845..43d3c3346a 100644 --- a/src/scheduler/include/DatastoreXML.h +++ b/src/scheduler/include/DatastoreXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/HostPoolXML.h b/src/scheduler/include/HostPoolXML.h index efa381c195..d2378b1a9e 100644 --- a/src/scheduler/include/HostPoolXML.h +++ b/src/scheduler/include/HostPoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/HostXML.h b/src/scheduler/include/HostXML.h index e9febf8966..3aabe433f4 100644 --- a/src/scheduler/include/HostXML.h +++ b/src/scheduler/include/HostXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/PoolXML.h b/src/scheduler/include/PoolXML.h index a25c96212c..97db2f6519 100644 --- a/src/scheduler/include/PoolXML.h +++ b/src/scheduler/include/PoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/RankPolicy.h b/src/scheduler/include/RankPolicy.h index cc6ef1dec6..a51dddaa19 100644 --- a/src/scheduler/include/RankPolicy.h +++ b/src/scheduler/include/RankPolicy.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/Resource.h b/src/scheduler/include/Resource.h index 8a05576a43..28c9a81fc2 100644 --- a/src/scheduler/include/Resource.h +++ b/src/scheduler/include/Resource.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/Scheduler.h b/src/scheduler/include/Scheduler.h index 441f84f7a8..591a4aab3f 100644 --- a/src/scheduler/include/Scheduler.h +++ b/src/scheduler/include/Scheduler.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/SchedulerPolicy.h b/src/scheduler/include/SchedulerPolicy.h index 4a79391ee6..ed0ee96926 100644 --- a/src/scheduler/include/SchedulerPolicy.h +++ b/src/scheduler/include/SchedulerPolicy.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/SchedulerTemplate.h b/src/scheduler/include/SchedulerTemplate.h index 3ce1d004c8..ca77429080 100644 --- a/src/scheduler/include/SchedulerTemplate.h +++ b/src/scheduler/include/SchedulerTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/VirtualMachinePoolXML.h b/src/scheduler/include/VirtualMachinePoolXML.h index d7143ed51c..1e4d97e119 100644 --- a/src/scheduler/include/VirtualMachinePoolXML.h +++ b/src/scheduler/include/VirtualMachinePoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/include/VirtualMachineXML.h b/src/scheduler/include/VirtualMachineXML.h index 67a957aa30..be03473aae 100644 --- a/src/scheduler/include/VirtualMachineXML.h +++ b/src/scheduler/include/VirtualMachineXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/src/client/Client.cc b/src/scheduler/src/client/Client.cc index 0c3e0327f5..01e50baa44 100644 --- a/src/scheduler/src/client/Client.cc +++ b/src/scheduler/src/client/Client.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -33,11 +33,6 @@ /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ -const int Client::MESSAGE_SIZE = 51200; -// -/* -------------------------------------------------------------------------- */ -/* -------------------------------------------------------------------------- */ - void Client::set_one_auth(string secret) { if (secret.empty()) diff --git a/src/scheduler/src/client/SConstruct b/src/scheduler/src/client/SConstruct index bd420479e5..1d8123849d 100644 --- a/src/scheduler/src/client/SConstruct +++ b/src/scheduler/src/client/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/pool # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/scheduler/src/pool/AclXML.cc b/src/scheduler/src/pool/AclXML.cc index 81a89ffb5d..e8a2048c6d 100644 --- a/src/scheduler/src/pool/AclXML.cc +++ b/src/scheduler/src/pool/AclXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/src/pool/ClusterPoolXML.cc b/src/scheduler/src/pool/ClusterPoolXML.cc index 3beb483f30..acd93ac1e4 100644 --- a/src/scheduler/src/pool/ClusterPoolXML.cc +++ b/src/scheduler/src/pool/ClusterPoolXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2014, 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 */ diff --git a/src/scheduler/src/pool/DatastorePoolXML.cc b/src/scheduler/src/pool/DatastorePoolXML.cc index 22ac66d644..1edd964c84 100644 --- a/src/scheduler/src/pool/DatastorePoolXML.cc +++ b/src/scheduler/src/pool/DatastorePoolXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/src/pool/DatastoreXML.cc b/src/scheduler/src/pool/DatastoreXML.cc index 1f1cef16c4..af14554bcf 100644 --- a/src/scheduler/src/pool/DatastoreXML.cc +++ b/src/scheduler/src/pool/DatastoreXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/src/pool/HostPoolXML.cc b/src/scheduler/src/pool/HostPoolXML.cc index 274edd625b..a55622b213 100644 --- a/src/scheduler/src/pool/HostPoolXML.cc +++ b/src/scheduler/src/pool/HostPoolXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/src/pool/HostXML.cc b/src/scheduler/src/pool/HostXML.cc index 01e8015317..748a2617fb 100644 --- a/src/scheduler/src/pool/HostXML.cc +++ b/src/scheduler/src/pool/HostXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/src/pool/SConstruct b/src/scheduler/src/pool/SConstruct index 0151784886..a15a97895a 100644 --- a/src/scheduler/src/pool/SConstruct +++ b/src/scheduler/src/pool/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/pool # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/scheduler/src/pool/VirtualMachinePoolXML.cc b/src/scheduler/src/pool/VirtualMachinePoolXML.cc index 9b997219b2..99258325fd 100644 --- a/src/scheduler/src/pool/VirtualMachinePoolXML.cc +++ b/src/scheduler/src/pool/VirtualMachinePoolXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/src/pool/VirtualMachineXML.cc b/src/scheduler/src/pool/VirtualMachineXML.cc index 826221a1ef..e942787ca5 100644 --- a/src/scheduler/src/pool/VirtualMachineXML.cc +++ b/src/scheduler/src/pool/VirtualMachineXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/scheduler/src/sched/SConstruct b/src/scheduler/src/sched/SConstruct index 1237f93c42..5fc550af65 100644 --- a/src/scheduler/src/sched/SConstruct +++ b/src/scheduler/src/sched/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/pool # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/scheduler/src/sched/Scheduler.cc b/src/scheduler/src/sched/Scheduler.cc index cd06de4f47..20a2d083ab 100644 --- a/src/scheduler/src/sched/Scheduler.cc +++ b/src/scheduler/src/sched/Scheduler.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -195,7 +195,18 @@ void Scheduler::start() try { - client = new Client("",url); + long long message_size; + + conf.get("MESSAGE_SIZE", message_size); + + client = new Client("", url, message_size); + + oss.str(""); + + oss << "XML-RPC client using " << client->get_message_size() + << " bytes for response buffer.\n"; + + NebulaLog::log("SCHED", Log::INFO, oss); } catch(runtime_error &) { diff --git a/src/scheduler/src/sched/SchedulerTemplate.cc b/src/scheduler/src/sched/SchedulerTemplate.cc index a419d5fe0e..e4d32e91e8 100644 --- a/src/scheduler/src/sched/SchedulerTemplate.cc +++ b/src/scheduler/src/sched/SchedulerTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -35,6 +35,7 @@ void SchedulerTemplate::set_conf_default() #******************************************************************************* # Daemon configuration attributes #------------------------------------------------------------------------------- +# XML_RPC_MESSAGE_SIZE # ONED_PORT # SCHED_INTERVAL # MAX_VM @@ -47,6 +48,12 @@ void SchedulerTemplate::set_conf_default() # LOG #------------------------------------------------------------------------------- */ + // XML_RPC_MESSAGE_SIZE + value = "1073741824"; + + attribute = new SingleAttribute("MESSAGE_SIZE",value); + conf_default.insert(make_pair(attribute->name(),attribute)); + // ONED_PORT value = "2633"; diff --git a/src/scheduler/src/sched/mm_sched.cc b/src/scheduler/src/sched/mm_sched.cc index 227dfb3d0a..3fa3a85d95 100644 --- a/src/scheduler/src/sched/mm_sched.cc +++ b/src/scheduler/src/sched/mm_sched.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sql/MySqlDB.cc b/src/sql/MySqlDB.cc index 90cccd1d3e..4e01982113 100644 --- a/src/sql/MySqlDB.cc +++ b/src/sql/MySqlDB.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sql/SConstruct b/src/sql/SConstruct index 21f3f61dff..21739cdc04 100644 --- a/src/sql/SConstruct +++ b/src/sql/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/pool # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sql/SqliteDB.cc b/src/sql/SqliteDB.cc index e629addf0d..a80cabb02b 100644 --- a/src/sql/SqliteDB.cc +++ b/src/sql/SqliteDB.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb index 2026cd0920..5e86212b22 100644 --- a/src/sunstone/OpenNebulaVNC.rb +++ b/src/sunstone/OpenNebulaVNC.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/bin/novnc-server b/src/sunstone/bin/novnc-server index 5f548d4968..0db6e6236f 100755 --- a/src/sunstone/bin/novnc-server +++ b/src/sunstone/bin/novnc-server @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/bin/sunstone-server b/src/sunstone/bin/sunstone-server index fdc8cf5161..a623d6d7d9 100755 --- a/src/sunstone/bin/sunstone-server +++ b/src/sunstone/bin/sunstone-server @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf index fa848d3eb3..25e6df23d7 100644 --- a/src/sunstone/etc/sunstone-server.conf +++ b/src/sunstone/etc/sunstone-server.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/locale/generate_messages_pot.sh b/src/sunstone/locale/generate_messages_pot.sh index 30546fda10..3500fb47d8 100755 --- a/src/sunstone/locale/generate_messages_pot.sh +++ b/src/sunstone/locale/generate_messages_pot.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -16,7 +16,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -COPYRIGHT_HOLDER="2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs" +COPYRIGHT_HOLDER="2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs" PACKAGE_NAME="OpenNebula" find ../public/js -name \*.js > file_list.txt diff --git a/src/sunstone/locale/languages/SConstruct b/src/sunstone/locale/languages/SConstruct index 6d07d15762..be02db935e 100755 --- a/src/sunstone/locale/languages/SConstruct +++ b/src/sunstone/locale/languages/SConstruct @@ -1,7 +1,7 @@ # SConstruct for share/man # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/locale/languages/ca.po b/src/sunstone/locale/languages/ca.po index dfdd49cca3..66e6793de2 100644 --- a/src/sunstone/locale/languages/ca.po +++ b/src/sunstone/locale/languages/ca.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/cs_CZ.po b/src/sunstone/locale/languages/cs_CZ.po index b0c4408c21..5c2c94f25f 100644 --- a/src/sunstone/locale/languages/cs_CZ.po +++ b/src/sunstone/locale/languages/cs_CZ.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/da.po b/src/sunstone/locale/languages/da.po index 0f7ce8df89..8efe870296 100644 --- a/src/sunstone/locale/languages/da.po +++ b/src/sunstone/locale/languages/da.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/de.po b/src/sunstone/locale/languages/de.po index dd7a4cf26a..e7aa66586c 100644 --- a/src/sunstone/locale/languages/de.po +++ b/src/sunstone/locale/languages/de.po @@ -1,9 +1,9 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Bastian Widmer , 2012-2013 +# Bastian Widmer , 2012-2014 # Bastian Widmer , 2012 # jules <>, 2012 # tuxmea , 2013 diff --git a/src/sunstone/locale/languages/el_GR.po b/src/sunstone/locale/languages/el_GR.po index cad7b472d9..51293d38e0 100644 --- a/src/sunstone/locale/languages/el_GR.po +++ b/src/sunstone/locale/languages/el_GR.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/en.po b/src/sunstone/locale/languages/en.po index f768e6fb81..04ae45c43d 100644 --- a/src/sunstone/locale/languages/en.po +++ b/src/sunstone/locale/languages/en.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/en_US.po b/src/sunstone/locale/languages/en_US.po index c0b6426a34..1a91b48ff0 100644 --- a/src/sunstone/locale/languages/en_US.po +++ b/src/sunstone/locale/languages/en_US.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # diff --git a/src/sunstone/locale/languages/es_ES.po b/src/sunstone/locale/languages/es_ES.po index 7d53bcd4b2..43d63e0970 100644 --- a/src/sunstone/locale/languages/es_ES.po +++ b/src/sunstone/locale/languages/es_ES.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/fa_IR.po b/src/sunstone/locale/languages/fa_IR.po index 220b8deafd..3ac449baa8 100644 --- a/src/sunstone/locale/languages/fa_IR.po +++ b/src/sunstone/locale/languages/fa_IR.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/fr_FR.po b/src/sunstone/locale/languages/fr_FR.po index 3bb0cc1892..c3b9f85815 100644 --- a/src/sunstone/locale/languages/fr_FR.po +++ b/src/sunstone/locale/languages/fr_FR.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/it_IT.po b/src/sunstone/locale/languages/it_IT.po index c23e5e6259..dfccb29a7c 100644 --- a/src/sunstone/locale/languages/it_IT.po +++ b/src/sunstone/locale/languages/it_IT.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: @@ -8,7 +8,7 @@ # cdaffara , 2013 # cdaffara , 2013 # gdefilippis , 2013 -# Giovanni Toraldo , 2012-2013 +# Giovanni Toraldo , 2012-2014 # Ivan Rossi , 2012 # marcello.lodi , 2013 # Vincenzo Reale , 2012-2013 diff --git a/src/sunstone/locale/languages/nl_NL.po b/src/sunstone/locale/languages/nl_NL.po index bf3a0f67dc..8953ea1d45 100644 --- a/src/sunstone/locale/languages/nl_NL.po +++ b/src/sunstone/locale/languages/nl_NL.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/pl.po b/src/sunstone/locale/languages/pl.po index 05b0c21d04..209c04ba6b 100644 --- a/src/sunstone/locale/languages/pl.po +++ b/src/sunstone/locale/languages/pl.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/pt_BR.po b/src/sunstone/locale/languages/pt_BR.po index f4e8458f8f..09c04933e4 100644 --- a/src/sunstone/locale/languages/pt_BR.po +++ b/src/sunstone/locale/languages/pt_BR.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/pt_PT.po b/src/sunstone/locale/languages/pt_PT.po index 290a4ab60c..280a84985a 100644 --- a/src/sunstone/locale/languages/pt_PT.po +++ b/src/sunstone/locale/languages/pt_PT.po @@ -1,10 +1,10 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: # André Monteiro , 2012 -# André Monteiro , 2012-2013 +# André Monteiro , 2012-2014 msgid "" msgstr "" "Project-Id-Version: OpenNebula\n" diff --git a/src/sunstone/locale/languages/ru_RU.po b/src/sunstone/locale/languages/ru_RU.po index efb388e096..3cbd1c786e 100644 --- a/src/sunstone/locale/languages/ru_RU.po +++ b/src/sunstone/locale/languages/ru_RU.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/sk_SK.po b/src/sunstone/locale/languages/sk_SK.po index 9f60c3b12a..b4b267470e 100644 --- a/src/sunstone/locale/languages/sk_SK.po +++ b/src/sunstone/locale/languages/sk_SK.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/zh_CN.po b/src/sunstone/locale/languages/zh_CN.po index 1b6a39aa75..4f254f008f 100644 --- a/src/sunstone/locale/languages/zh_CN.po +++ b/src/sunstone/locale/languages/zh_CN.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: diff --git a/src/sunstone/locale/languages/zh_TW.po b/src/sunstone/locale/languages/zh_TW.po index e1aef550d0..828594f27a 100644 --- a/src/sunstone/locale/languages/zh_TW.po +++ b/src/sunstone/locale/languages/zh_TW.po @@ -1,10 +1,10 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # # Translators: # Hsi En Yu , 2013 -# Hsi En Yu , 2012-2013 +# Hsi En Yu , 2012-2014 # simon8233 , 2013 # pellaeon , 2012 # Hsi En Yu , 2012 diff --git a/src/sunstone/locale/messages.pot b/src/sunstone/locale/messages.pot index c0b6426a34..1a91b48ff0 100644 --- a/src/sunstone/locale/messages.pot +++ b/src/sunstone/locale/messages.pot @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs +# Copyright (C) YEAR 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # diff --git a/src/sunstone/locale/upgrade_po_translations.sh b/src/sunstone/locale/upgrade_po_translations.sh index 2d2a0dd4ea..dbb80f8006 100755 --- a/src/sunstone/locale/upgrade_po_translations.sh +++ b/src/sunstone/locale/upgrade_po_translations.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON.rb b/src/sunstone/models/OpenNebulaJSON.rb index c006b9ffab..a94b1bd5ea 100644 --- a/src/sunstone/models/OpenNebulaJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/AclJSON.rb b/src/sunstone/models/OpenNebulaJSON/AclJSON.rb index cc1de188eb..42ece8895c 100644 --- a/src/sunstone/models/OpenNebulaJSON/AclJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/AclJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb b/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb index 8713d15574..6dbb3be5df 100644 --- a/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/DatastoreJSON.rb b/src/sunstone/models/OpenNebulaJSON/DatastoreJSON.rb index a17ad80f7e..d56b9462e0 100644 --- a/src/sunstone/models/OpenNebulaJSON/DatastoreJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/DatastoreJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/GroupJSON.rb b/src/sunstone/models/OpenNebulaJSON/GroupJSON.rb index 44e6ad1f5d..eae06612ff 100644 --- a/src/sunstone/models/OpenNebulaJSON/GroupJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/GroupJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/HostJSON.rb b/src/sunstone/models/OpenNebulaJSON/HostJSON.rb index 57adb5df10..441f399575 100644 --- a/src/sunstone/models/OpenNebulaJSON/HostJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/HostJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb b/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb index 6b60ca9005..4c96e5dd44 100644 --- a/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb b/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb index a2098d74bc..32d6b7dd22 100644 --- a/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb +++ b/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb b/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb index a8907d5a56..d7fcfa2b1e 100644 --- a/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb b/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb index d4dbfc423a..97a8cb7cc4 100644 --- a/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/UserJSON.rb b/src/sunstone/models/OpenNebulaJSON/UserJSON.rb index 3bd88c60d0..dc572cfb17 100644 --- a/src/sunstone/models/OpenNebulaJSON/UserJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/UserJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb index 359b82f56b..12e20ae57c 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb index 69790d8560..bba1722c73 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/models/SunstoneMarketplace.rb b/src/sunstone/models/SunstoneMarketplace.rb index 56f507e284..2f7d279c6d 100644 --- a/src/sunstone/models/SunstoneMarketplace.rb +++ b/src/sunstone/models/SunstoneMarketplace.rb @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb index de67334d2c..a5511db45d 100644 --- a/src/sunstone/models/SunstoneServer.rb +++ b/src/sunstone/models/SunstoneServer.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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 # @@ -66,12 +66,12 @@ class SunstoneServer < CloudServer return [404, error.to_json] end - rc = pool.info + rc = pool.get_hash if OpenNebula.is_error?(rc) return [500, rc.to_json] else - return [200, pool.to_json] + return [200, rc.to_json] end end diff --git a/src/sunstone/models/SunstoneViews.rb b/src/sunstone/models/SunstoneViews.rb index ce7797f529..2326a9975d 100644 --- a/src/sunstone/models/SunstoneViews.rb +++ b/src/sunstone/models/SunstoneViews.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/public/css/application.css b/src/sunstone/public/css/application.css index 4fbe14a66c..3ed76d6077 100644 --- a/src/sunstone/public/css/application.css +++ b/src/sunstone/public/css/application.css @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/css/layout.css b/src/sunstone/public/css/layout.css index 6981522560..05a0f09601 100644 --- a/src/sunstone/public/css/layout.css +++ b/src/sunstone/public/css/layout.css @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/css/login.css b/src/sunstone/public/css/login.css index 32049fe0c0..b5b2ba8ffd 100644 --- a/src/sunstone/public/css/login.css +++ b/src/sunstone/public/css/login.css @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/layout.js b/src/sunstone/public/js/layout.js index f257cef5d3..40122459e3 100644 --- a/src/sunstone/public/js/layout.js +++ b/src/sunstone/public/js/layout.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/locale.js b/src/sunstone/public/js/locale.js index d8c4fe61d5..bee7e1def7 100644 --- a/src/sunstone/public/js/locale.js +++ b/src/sunstone/public/js/locale.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/login.js b/src/sunstone/public/js/login.js index b681add977..0ceb3716cd 100644 --- a/src/sunstone/public/js/login.js +++ b/src/sunstone/public/js/login.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 4f894f4ec3..0eba45f476 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index 61f0d23648..045974ba62 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index a5d7f6716e..384e43e87c 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/config-tab.js b/src/sunstone/public/js/plugins/config-tab.js index 8c68f1e907..c1b805f6e4 100644 --- a/src/sunstone/public/js/plugins/config-tab.js +++ b/src/sunstone/public/js/plugins/config-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/dashboard-tab.js b/src/sunstone/public/js/plugins/dashboard-tab.js index 5ee76d19a7..d8479b8b4e 100644 --- a/src/sunstone/public/js/plugins/dashboard-tab.js +++ b/src/sunstone/public/js/plugins/dashboard-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 15fd182b64..71e207810f 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js index 7f78970fe5..58d01b7b47 100644 --- a/src/sunstone/public/js/plugins/files-tab.js +++ b/src/sunstone/public/js/plugins/files-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 1e6ca3e719..8531c4b0c9 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index ac73b18055..dbd14d552f 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index f8ea5c77a1..462f826a42 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/infra-tab.js b/src/sunstone/public/js/plugins/infra-tab.js index 0b1bb9820a..9d7975f70f 100644 --- a/src/sunstone/public/js/plugins/infra-tab.js +++ b/src/sunstone/public/js/plugins/infra-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/marketplace-tab.js b/src/sunstone/public/js/plugins/marketplace-tab.js index 77dab8142b..de36ea2a68 100644 --- a/src/sunstone/public/js/plugins/marketplace-tab.js +++ b/src/sunstone/public/js/plugins/marketplace-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2010-2013, C12G Labs S.L */ +/* Copyright 2010-2014, 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/src/sunstone/public/js/plugins/oneflow-dashboard.js b/src/sunstone/public/js/plugins/oneflow-dashboard.js index a55abdc1cb..c949fdcaf4 100644 --- a/src/sunstone/public/js/plugins/oneflow-dashboard.js +++ b/src/sunstone/public/js/plugins/oneflow-dashboard.js @@ -1,5 +1,5 @@ // ------------------------------------------------------------------------ // -// Copyright 2010-2013, C12G Labs S.L. // +// Copyright 2010-2014, 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/src/sunstone/public/js/plugins/oneflow-services.js b/src/sunstone/public/js/plugins/oneflow-services.js index dd132eb112..00f9d998c7 100644 --- a/src/sunstone/public/js/plugins/oneflow-services.js +++ b/src/sunstone/public/js/plugins/oneflow-services.js @@ -1,5 +1,5 @@ // ------------------------------------------------------------------------ // -// Copyright 2010-2013, C12G Labs S.L. // +// Copyright 2010-2014, 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/src/sunstone/public/js/plugins/oneflow-templates.js b/src/sunstone/public/js/plugins/oneflow-templates.js index 438269fab0..fd544c568f 100644 --- a/src/sunstone/public/js/plugins/oneflow-templates.js +++ b/src/sunstone/public/js/plugins/oneflow-templates.js @@ -1,5 +1,5 @@ // ------------------------------------------------------------------------ // -// Copyright 2010-2013, C12G Labs S.L. // +// Copyright 2010-2014, 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/src/sunstone/public/js/plugins/system-tab.js b/src/sunstone/public/js/plugins/system-tab.js index 6156c71b48..07a464d6b5 100644 --- a/src/sunstone/public/js/plugins/system-tab.js +++ b/src/sunstone/public/js/plugins/system-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 47f95b6172..75951232d5 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index 924eb9df8c..907c42c56c 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 2741840595..f12544e999 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index d6bfa0c7d2..1057715a84 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/plugins/vresources-tab.js b/src/sunstone/public/js/plugins/vresources-tab.js index a663c48748..914a748e43 100644 --- a/src/sunstone/public/js/plugins/vresources-tab.js +++ b/src/sunstone/public/js/plugins/vresources-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js index b5dcb2ad0e..7cb442c4c5 100644 --- a/src/sunstone/public/js/sunstone-util.js +++ b/src/sunstone/public/js/sunstone-util.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index b0029e382a..cbbce028ef 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/sunstone/routes/oneflow.rb b/src/sunstone/routes/oneflow.rb index 7c61adb353..0c62fff1b2 100644 --- a/src/sunstone/routes/oneflow.rb +++ b/src/sunstone/routes/oneflow.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L. # +# Copyright 2010-2014, 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/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index 6118ae90f5..4ce06877fe 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/test/spec/host_spec.rb b/src/sunstone/test/spec/host_spec.rb index a65529a877..35cca144b6 100644 --- a/src/sunstone/test/spec/host_spec.rb +++ b/src/sunstone/test/spec/host_spec.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/test/spec/image_spec.rb b/src/sunstone/test/spec/image_spec.rb index 45f8249d0a..694ea41176 100644 --- a/src/sunstone/test/spec/image_spec.rb +++ b/src/sunstone/test/spec/image_spec.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/test/spec/spec_helper.rb b/src/sunstone/test/spec/spec_helper.rb index 060b1d3ec3..2028efeb00 100644 --- a/src/sunstone/test/spec/spec_helper.rb +++ b/src/sunstone/test/spec/spec_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/test/spec/user_spec.rb b/src/sunstone/test/spec/user_spec.rb index e53b2e0d3d..e946c613d3 100644 --- a/src/sunstone/test/spec/user_spec.rb +++ b/src/sunstone/test/spec/user_spec.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/test/spec/vm_spec.rb b/src/sunstone/test/spec/vm_spec.rb index 1d04fff8fa..0f9c1ebfda 100644 --- a/src/sunstone/test/spec/vm_spec.rb +++ b/src/sunstone/test/spec/vm_spec.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/test/spec/vnet_spec.rb b/src/sunstone/test/spec/vnet_spec.rb index f155c9a9be..0f242e0404 100644 --- a/src/sunstone/test/spec/vnet_spec.rb +++ b/src/sunstone/test/spec/vnet_spec.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/test/test.sh b/src/sunstone/test/test.sh index 2029975552..1aa8696cbd 100755 --- a/src/sunstone/test/test.sh +++ b/src/sunstone/test/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index df723f8854..6ce658f032 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -88,7 +88,7 @@
diff --git a/src/sunstone/views/login.erb b/src/sunstone/views/login.erb index 034b773a74..00e721c351 100644 --- a/src/sunstone/views/login.erb +++ b/src/sunstone/views/login.erb @@ -26,7 +26,7 @@ diff --git a/src/template/SConstruct b/src/template/SConstruct index d424abbdb4..b7c4d65563 100644 --- a/src/template/SConstruct +++ b/src/template/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/template # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/template/Template.cc b/src/template/Template.cc index e9ab9d20f3..adcb71ce6f 100644 --- a/src/template/Template.cc +++ b/src/template/Template.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/template/template_parser.c b/src/template/template_parser.c index 2c473ec80d..1f4dc4cfed 100644 --- a/src/template/template_parser.c +++ b/src/template/template_parser.c @@ -522,7 +522,7 @@ int template__flex_debug = 0; char *template_text; #line 1 "template_parser.l" /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/template/template_parser.l b/src/template/template_parser.l index 84b1b16b5b..73832f435c 100644 --- a/src/template/template_parser.l +++ b/src/template/template_parser.l @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/template/template_syntax.y b/src/template/template_syntax.y index 103c886cb6..2d08f2ce1e 100644 --- a/src/template/template_syntax.y +++ b/src/template/template_syntax.y @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/tm/SConstruct b/src/tm/SConstruct index 1bce1446d8..b4e8ffbd2a 100644 --- a/src/tm/SConstruct +++ b/src/tm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm/TransferManager.cc b/src/tm/TransferManager.cc index c4f097914b..debc9bad34 100644 --- a/src/tm/TransferManager.cc +++ b/src/tm/TransferManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/tm/TransferManagerDriver.cc b/src/tm/TransferManagerDriver.cc index 6b01d2a889..7cec73e919 100644 --- a/src/tm/TransferManagerDriver.cc +++ b/src/tm/TransferManagerDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/tm_mad/ceph/clone b/src/tm_mad/ceph/clone index df419ff8ba..4ab9a63e0b 100755 --- a/src/tm_mad/ceph/clone +++ b/src/tm_mad/ceph/clone @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/ceph/cpds b/src/tm_mad/ceph/cpds index bd729f2e7a..08d1f0950e 100755 --- a/src/tm_mad/ceph/cpds +++ b/src/tm_mad/ceph/cpds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/ceph/delete b/src/tm_mad/ceph/delete index 3adff3d505..73e7c7581d 100755 --- a/src/tm_mad/ceph/delete +++ b/src/tm_mad/ceph/delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/ceph/ln b/src/tm_mad/ceph/ln index b9925ea312..cb9be29562 100755 --- a/src/tm_mad/ceph/ln +++ b/src/tm_mad/ceph/ln @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/ceph/mv b/src/tm_mad/ceph/mv index 2c409c7eac..6ae943159e 100755 --- a/src/tm_mad/ceph/mv +++ b/src/tm_mad/ceph/mv @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/ceph/mvds b/src/tm_mad/ceph/mvds index b777e5d3bb..df6b5f0b40 100755 --- a/src/tm_mad/ceph/mvds +++ b/src/tm_mad/ceph/mvds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/common/context b/src/tm_mad/common/context index 3e2c31e780..abe5f0b159 100755 --- a/src/tm_mad/common/context +++ b/src/tm_mad/common/context @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/common/delete b/src/tm_mad/common/delete index 58fe12ef61..0af0837e08 100755 --- a/src/tm_mad/common/delete +++ b/src/tm_mad/common/delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/common/dummy.sh b/src/tm_mad/common/dummy.sh index e9e0ad4f34..5e12625922 100755 --- a/src/tm_mad/common/dummy.sh +++ b/src/tm_mad/common/dummy.sh @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/common/mkimage b/src/tm_mad/common/mkimage index a7e151c38f..c6c286c520 100755 --- a/src/tm_mad/common/mkimage +++ b/src/tm_mad/common/mkimage @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/common/mkswap b/src/tm_mad/common/mkswap index 2b0939d90a..4b603b1033 100755 --- a/src/tm_mad/common/mkswap +++ b/src/tm_mad/common/mkswap @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/common/postmigrate b/src/tm_mad/common/postmigrate index 665b35d7ff..d26e8f302f 100755 --- a/src/tm_mad/common/postmigrate +++ b/src/tm_mad/common/postmigrate @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/common/premigrate b/src/tm_mad/common/premigrate index 9b5a196c7c..dd8c260ddc 100755 --- a/src/tm_mad/common/premigrate +++ b/src/tm_mad/common/premigrate @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/fs_lvm/clone b/src/tm_mad/fs_lvm/clone index 6515661dad..b624954ff6 100755 --- a/src/tm_mad/fs_lvm/clone +++ b/src/tm_mad/fs_lvm/clone @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/fs_lvm/cpds b/src/tm_mad/fs_lvm/cpds index a8f599006d..6056fdfb09 100755 --- a/src/tm_mad/fs_lvm/cpds +++ b/src/tm_mad/fs_lvm/cpds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/fs_lvm/delete b/src/tm_mad/fs_lvm/delete index bff56679fb..0b65a613ce 100755 --- a/src/tm_mad/fs_lvm/delete +++ b/src/tm_mad/fs_lvm/delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/fs_lvm/mvds b/src/tm_mad/fs_lvm/mvds index a68736dbf3..7c6433b207 100755 --- a/src/tm_mad/fs_lvm/mvds +++ b/src/tm_mad/fs_lvm/mvds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/lvm/clone b/src/tm_mad/lvm/clone index 89bc99d6a1..32aca2e3d0 100755 --- a/src/tm_mad/lvm/clone +++ b/src/tm_mad/lvm/clone @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/lvm/cpds b/src/tm_mad/lvm/cpds index f39c0b3667..cda16ae8ad 100755 --- a/src/tm_mad/lvm/cpds +++ b/src/tm_mad/lvm/cpds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/lvm/delete b/src/tm_mad/lvm/delete index f0967d4853..cd74d982cf 100755 --- a/src/tm_mad/lvm/delete +++ b/src/tm_mad/lvm/delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/lvm/ln b/src/tm_mad/lvm/ln index d525c809b5..059831c282 100755 --- a/src/tm_mad/lvm/ln +++ b/src/tm_mad/lvm/ln @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/lvm/mv b/src/tm_mad/lvm/mv index 2c409c7eac..6ae943159e 100755 --- a/src/tm_mad/lvm/mv +++ b/src/tm_mad/lvm/mv @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/lvm/mvds b/src/tm_mad/lvm/mvds index 6a7746e78f..b86caac500 100755 --- a/src/tm_mad/lvm/mvds +++ b/src/tm_mad/lvm/mvds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/one_tm b/src/tm_mad/one_tm index 396002b5dd..3c3f051c5c 100755 --- a/src/tm_mad/one_tm +++ b/src/tm_mad/one_tm @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/one_tm.rb b/src/tm_mad/one_tm.rb index 0a1cdf62f1..67c9f0b270 100755 --- a/src/tm_mad/one_tm.rb +++ b/src/tm_mad/one_tm.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/qcow2/clone b/src/tm_mad/qcow2/clone index b770f960fd..41b41958a7 100755 --- a/src/tm_mad/qcow2/clone +++ b/src/tm_mad/qcow2/clone @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/qcow2/cpds b/src/tm_mad/qcow2/cpds index 7150ce885c..31459802c1 100755 --- a/src/tm_mad/qcow2/cpds +++ b/src/tm_mad/qcow2/cpds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/qcow2/mvds b/src/tm_mad/qcow2/mvds index 8ee0a4cfcb..0ac9aeda04 100755 --- a/src/tm_mad/qcow2/mvds +++ b/src/tm_mad/qcow2/mvds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/shared/clone b/src/tm_mad/shared/clone index 476bbd1a3c..ae2cf27361 100755 --- a/src/tm_mad/shared/clone +++ b/src/tm_mad/shared/clone @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/shared/cpds b/src/tm_mad/shared/cpds index 208953823a..fe7b3405e7 100755 --- a/src/tm_mad/shared/cpds +++ b/src/tm_mad/shared/cpds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/shared/ln b/src/tm_mad/shared/ln index 81d6f0b949..88bc6ddfb2 100755 --- a/src/tm_mad/shared/ln +++ b/src/tm_mad/shared/ln @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/shared/mvds b/src/tm_mad/shared/mvds index add9b14d2b..fcbb45793b 100755 --- a/src/tm_mad/shared/mvds +++ b/src/tm_mad/shared/mvds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/ssh/clone b/src/tm_mad/ssh/clone index f26b9de79d..171d71b436 100755 --- a/src/tm_mad/ssh/clone +++ b/src/tm_mad/ssh/clone @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/ssh/cpds b/src/tm_mad/ssh/cpds index 1b603e22d5..5bdc7f5942 100755 --- a/src/tm_mad/ssh/cpds +++ b/src/tm_mad/ssh/cpds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/ssh/mv b/src/tm_mad/ssh/mv index 6df6a8a58e..a0a9461cdc 100755 --- a/src/tm_mad/ssh/mv +++ b/src/tm_mad/ssh/mv @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/ssh/mvds b/src/tm_mad/ssh/mvds index 636f559893..6c6ca27a52 100755 --- a/src/tm_mad/ssh/mvds +++ b/src/tm_mad/ssh/mvds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/tm_common.sh b/src/tm_mad/tm_common.sh index af1790440e..29fde470bb 100644 --- a/src/tm_mad/tm_common.sh +++ b/src/tm_mad/tm_common.sh @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/vmfs/clone b/src/tm_mad/vmfs/clone index f234de39d9..6e0b2de379 100755 --- a/src/tm_mad/vmfs/clone +++ b/src/tm_mad/vmfs/clone @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/vmfs/delete b/src/tm_mad/vmfs/delete index f4fd08c53a..ba8413a423 100755 --- a/src/tm_mad/vmfs/delete +++ b/src/tm_mad/vmfs/delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/vmfs/ln b/src/tm_mad/vmfs/ln index 26644f0a6b..bc23c00f5d 100755 --- a/src/tm_mad/vmfs/ln +++ b/src/tm_mad/vmfs/ln @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/vmfs/mkimage b/src/tm_mad/vmfs/mkimage index 017861a55a..b867cc6426 100755 --- a/src/tm_mad/vmfs/mkimage +++ b/src/tm_mad/vmfs/mkimage @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/tm_mad/vmfs/mvds b/src/tm_mad/vmfs/mvds index 83fdcc44c1..553113f2e6 100755 --- a/src/tm_mad/vmfs/mvds +++ b/src/tm_mad/vmfs/mvds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/um/DefaultQuotas.cc b/src/um/DefaultQuotas.cc index 8937adf204..56fd645944 100644 --- a/src/um/DefaultQuotas.cc +++ b/src/um/DefaultQuotas.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/um/Quota.cc b/src/um/Quota.cc index 767ac1fb17..003611ccf1 100644 --- a/src/um/Quota.cc +++ b/src/um/Quota.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/um/QuotaDatastore.cc b/src/um/QuotaDatastore.cc index 7fb3935a7f..7ce6772c25 100644 --- a/src/um/QuotaDatastore.cc +++ b/src/um/QuotaDatastore.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/um/QuotaImage.cc b/src/um/QuotaImage.cc index 6465416c0f..9459d9c04b 100644 --- a/src/um/QuotaImage.cc +++ b/src/um/QuotaImage.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/um/QuotaNetwork.cc b/src/um/QuotaNetwork.cc index a4d02c1dca..30123704e6 100644 --- a/src/um/QuotaNetwork.cc +++ b/src/um/QuotaNetwork.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/um/QuotaVirtualMachine.cc b/src/um/QuotaVirtualMachine.cc index d142b2ecb4..9071055aa1 100644 --- a/src/um/QuotaVirtualMachine.cc +++ b/src/um/QuotaVirtualMachine.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/um/Quotas.cc b/src/um/Quotas.cc index 217c7f70a7..f4eec6fd52 100644 --- a/src/um/Quotas.cc +++ b/src/um/Quotas.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/um/SConstruct b/src/um/SConstruct index d7941ebb49..d6e6d47531 100644 --- a/src/um/SConstruct +++ b/src/um/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/um/User.cc b/src/um/User.cc index 514520732c..6376d9bb0d 100644 --- a/src/um/User.cc +++ b/src/um/User.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/um/UserPool.cc b/src/um/UserPool.cc index b7603e77cf..15a007581e 100644 --- a/src/um/UserPool.cc +++ b/src/um/UserPool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vm/History.cc b/src/vm/History.cc index 6121a735e0..4aed70bba4 100644 --- a/src/vm/History.cc +++ b/src/vm/History.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vm/SConstruct b/src/vm/SConstruct index c203d310df..1cfd086c6d 100644 --- a/src/vm/SConstruct +++ b/src/vm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc index 6b4cf5bac2..27f2d3617e 100644 --- a/src/vm/VirtualMachine.cc +++ b/src/vm/VirtualMachine.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -1346,7 +1346,7 @@ int VirtualMachine::update_monitoring(SqlDB * db) goto error_xml; } - oss << "INSERT INTO " << monit_table << " ("<< monit_db_names <<") VALUES (" + oss << "REPLACE INTO " << monit_table << " ("<< monit_db_names <<") VALUES (" << oid << "," << last_poll << "," << "'" << sql_xml << "')"; diff --git a/src/vm/VirtualMachineHook.cc b/src/vm/VirtualMachineHook.cc index c10db1b8c3..4ac4f679c9 100644 --- a/src/vm/VirtualMachineHook.cc +++ b/src/vm/VirtualMachineHook.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vm/VirtualMachinePool.cc b/src/vm/VirtualMachinePool.cc index 693e1a65cf..361a27620f 100644 --- a/src/vm/VirtualMachinePool.cc +++ b/src/vm/VirtualMachinePool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vm/VirtualMachineTemplate.cc b/src/vm/VirtualMachineTemplate.cc index fee5310290..ff36febb5e 100644 --- a/src/vm/VirtualMachineTemplate.cc +++ b/src/vm/VirtualMachineTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vm/vm_file_var_syntax.y b/src/vm/vm_file_var_syntax.y index 59714d590b..7d7f08aa5f 100644 --- a/src/vm/vm_file_var_syntax.y +++ b/src/vm/vm_file_var_syntax.y @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vm/vm_var_parser.c b/src/vm/vm_var_parser.c index f3a5f4a8ae..332b909f99 100644 --- a/src/vm/vm_var_parser.c +++ b/src/vm/vm_var_parser.c @@ -505,7 +505,7 @@ int vm_var__flex_debug = 0; char *vm_var_text; #line 1 "vm_var_parser.l" /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vm/vm_var_parser.l b/src/vm/vm_var_parser.l index 9bcf0e75f7..672a750232 100644 --- a/src/vm/vm_var_parser.l +++ b/src/vm/vm_var_parser.l @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vm/vm_var_syntax.y b/src/vm/vm_var_syntax.y index 02c393790b..d3c924160b 100644 --- a/src/vm/vm_var_syntax.y +++ b/src/vm/vm_var_syntax.y @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vm_template/SConstruct b/src/vm_template/SConstruct index bb2e4e18c7..80016782d1 100644 --- a/src/vm_template/SConstruct +++ b/src/vm_template/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vm_template/VMTemplate.cc b/src/vm_template/VMTemplate.cc index 797e2d5523..59bdf4c424 100644 --- a/src/vm_template/VMTemplate.cc +++ b/src/vm_template/VMTemplate.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vm_template/VMTemplatePool.cc b/src/vm_template/VMTemplatePool.cc index 566d4cc0b4..5ea93fcf3f 100644 --- a/src/vm_template/VMTemplatePool.cc +++ b/src/vm_template/VMTemplatePool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index 4a3896f020..93e01caa85 100644 --- a/src/vmm/LibVirtDriverKVM.cc +++ b/src/vmm/LibVirtDriverKVM.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -361,11 +361,18 @@ int LibVirtDriver::deployment_description_kvm( << "\t\t\t" << endl; } - else if ( type == "RBD" ) + else if ( type == "RBD" || type == "RBD_CDROM" ) { - file << "\t\t" << endl - << "\t\t\t" << endl; + } + else + { + file << "\t\t" << endl; + } + + file << "\t\t\t" << endl - << "\t\t\t" << endl; - } else if ( type == "CDROM" ) { file << "\t\t" << endl diff --git a/src/vmm/LibVirtDriverVMware.cc b/src/vmm/LibVirtDriverVMware.cc index cc2135d866..4867aef601 100644 --- a/src/vmm/LibVirtDriverVMware.cc +++ b/src/vmm/LibVirtDriverVMware.cc @@ -1,7 +1,7 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vmm/SConstruct b/src/vmm/SConstruct index 419cfb4053..7a397687fa 100644 --- a/src/vmm/SConstruct +++ b/src/vmm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vmm # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc index d136cd5168..596c1bae87 100644 --- a/src/vmm/VirtualMachineManager.cc +++ b/src/vmm/VirtualMachineManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vmm/VirtualMachineManagerDriver.cc b/src/vmm/VirtualMachineManagerDriver.cc index dab8ffb177..39f836dcca 100644 --- a/src/vmm/VirtualMachineManagerDriver.cc +++ b/src/vmm/VirtualMachineManagerDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vmm/XMLDriver.cc b/src/vmm/XMLDriver.cc index bf41088bf5..e6eb31622e 100644 --- a/src/vmm/XMLDriver.cc +++ b/src/vmm/XMLDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vmm/XenDriver.cc b/src/vmm/XenDriver.cc index 298b81e740..c93104ed0d 100644 --- a/src/vmm/XenDriver.cc +++ b/src/vmm/XenDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */ @@ -45,6 +45,7 @@ int XenDriver::deployment_description( string bootloader = ""; string hvm = ""; string boot = ""; + int is_hvm = 0; vector boots; @@ -220,6 +221,7 @@ int XenDriver::deployment_description( } else //No kernel & no bootloader use hvm { + is_hvm = 1; file << "builder = \"hvm\"" << endl; if ( !boot.empty() ) @@ -337,9 +339,14 @@ int XenDriver::deployment_description( } file << vm->get_remote_system_dir() << "/disk." << disk_id << "," - << target << "," - << mode - << "'," << endl; + << target; + + if ( type == "CDROM" ) + { + file << ":cdrom"; + } + + file << "," << mode << "'," << endl; } attrs.clear(); @@ -476,11 +483,26 @@ int XenDriver::deployment_description( if ( type == "vnc" || type == "VNC" ) { - file << "vfb = ['type=vnc"; + if ( !is_hvm ) + { + file << "vfb = ['type=vnc"; + } else { + file << "vnc=1" << endl; + } if ( !listen.empty() ) { - file << ",vnclisten=" << listen; + if ( !is_hvm ) + { + file << ","; + } + + file << "vnclisten=" << listen; + + if ( is_hvm ) + { + file << endl; + } } if ( !port.empty() ) @@ -495,21 +517,55 @@ int XenDriver::deployment_description( goto error_vncdisplay; } - file << ",vncunused=0"; - file << ",vncdisplay=" << display - 5900; + if ( is_hvm ) + { + file << "vncunused=0" << endl; + } else { + file << ",vncunused=0,"; + } + + file << "vncdisplay=" << display - 5900; + + if ( is_hvm ) + { + file << endl; + } } if ( !passwd.empty() ) { - file << ",vncpasswd=" << passwd; + if ( !is_hvm ) + { + file << ","; + } + + file <<"vncpasswd=" << passwd; + + if ( is_hvm ) + { + file << endl; + } } if ( !keymap.empty() ) { - file << ",keymap=" << keymap ; + if ( !is_hvm ) + { + file << ","; + } + + file << "keymap=" << keymap ; + + if ( is_hvm ) + { + file << endl; + } } - file <<"']" << endl; + if ( !is_hvm ) + { + file <<"']" << endl; + } } else { diff --git a/src/vmm_mad/dummy/one_vmm_dummy b/src/vmm_mad/dummy/one_vmm_dummy index 1101efd057..a245ab6cc1 100755 --- a/src/vmm_mad/dummy/one_vmm_dummy +++ b/src/vmm_mad/dummy/one_vmm_dummy @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/dummy/one_vmm_dummy.rb b/src/vmm_mad/dummy/one_vmm_dummy.rb index e01f746d29..82a97a3dcb 100755 --- a/src/vmm_mad/dummy/one_vmm_dummy.rb +++ b/src/vmm_mad/dummy/one_vmm_dummy.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/exec/one_vmm_exec b/src/vmm_mad/exec/one_vmm_exec index 8054794732..f80d8b9ba8 100755 --- a/src/vmm_mad/exec/one_vmm_exec +++ b/src/vmm_mad/exec/one_vmm_exec @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb index 7d0a1174b0..7d54e3d562 100755 --- a/src/vmm_mad/exec/one_vmm_exec.rb +++ b/src/vmm_mad/exec/one_vmm_exec.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/exec/one_vmm_sh b/src/vmm_mad/exec/one_vmm_sh index 527bd607a8..f87e3dc19f 100755 --- a/src/vmm_mad/exec/one_vmm_sh +++ b/src/vmm_mad/exec/one_vmm_sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/exec/one_vmm_ssh b/src/vmm_mad/exec/one_vmm_ssh index 3a23ad9b06..2e44e6c9c2 100755 --- a/src/vmm_mad/exec/one_vmm_ssh +++ b/src/vmm_mad/exec/one_vmm_ssh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/exec/vmm_exec_kvm.conf b/src/vmm_mad/exec/vmm_exec_kvm.conf index a86d3f606a..8cf0b39f53 100644 --- a/src/vmm_mad/exec/vmm_exec_kvm.conf +++ b/src/vmm_mad/exec/vmm_exec_kvm.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/exec/vmm_exec_vmware.conf b/src/vmm_mad/exec/vmm_exec_vmware.conf index ae32897f94..7065fb2023 100644 --- a/src/vmm_mad/exec/vmm_exec_vmware.conf +++ b/src/vmm_mad/exec/vmm_exec_vmware.conf @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/exec/vmm_exec_xen3.conf b/src/vmm_mad/exec/vmm_exec_xen3.conf index ac65184248..79e129253b 100644 --- a/src/vmm_mad/exec/vmm_exec_xen3.conf +++ b/src/vmm_mad/exec/vmm_exec_xen3.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/exec/vmm_exec_xen4.conf b/src/vmm_mad/exec/vmm_exec_xen4.conf index 266eb6db35..77fd4624a0 100644 --- a/src/vmm_mad/exec/vmm_exec_xen4.conf +++ b/src/vmm_mad/exec/vmm_exec_xen4.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/exec/vmm_execrc b/src/vmm_mad/exec/vmm_execrc index 90c559ab5d..823c81beb5 100644 --- a/src/vmm_mad/exec/vmm_execrc +++ b/src/vmm_mad/exec/vmm_execrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/attach_disk b/src/vmm_mad/remotes/ec2/attach_disk index 110243efc2..8aeaf8eba5 100644 --- a/src/vmm_mad/remotes/ec2/attach_disk +++ b/src/vmm_mad/remotes/ec2/attach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/attach_nic b/src/vmm_mad/remotes/ec2/attach_nic index 110243efc2..8aeaf8eba5 100755 --- a/src/vmm_mad/remotes/ec2/attach_nic +++ b/src/vmm_mad/remotes/ec2/attach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/cancel b/src/vmm_mad/remotes/ec2/cancel index f8ca7af888..903b8bf967 100755 --- a/src/vmm_mad/remotes/ec2/cancel +++ b/src/vmm_mad/remotes/ec2/cancel @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/ec2/deploy b/src/vmm_mad/remotes/ec2/deploy index 1372e04315..a45049e600 100755 --- a/src/vmm_mad/remotes/ec2/deploy +++ b/src/vmm_mad/remotes/ec2/deploy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/ec2/detach_disk b/src/vmm_mad/remotes/ec2/detach_disk index 110243efc2..8aeaf8eba5 100755 --- a/src/vmm_mad/remotes/ec2/detach_disk +++ b/src/vmm_mad/remotes/ec2/detach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/detach_nic b/src/vmm_mad/remotes/ec2/detach_nic index 110243efc2..8aeaf8eba5 100755 --- a/src/vmm_mad/remotes/ec2/detach_nic +++ b/src/vmm_mad/remotes/ec2/detach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/ec2_driver.default b/src/vmm_mad/remotes/ec2/ec2_driver.default index 95673cffbe..9ce39481be 100644 --- a/src/vmm_mad/remotes/ec2/ec2_driver.default +++ b/src/vmm_mad/remotes/ec2/ec2_driver.default @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb index 897a903e2b..e028a228ee 100755 --- a/src/vmm_mad/remotes/ec2/ec2_driver.rb +++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/migrate b/src/vmm_mad/remotes/ec2/migrate index 110243efc2..8aeaf8eba5 100755 --- a/src/vmm_mad/remotes/ec2/migrate +++ b/src/vmm_mad/remotes/ec2/migrate @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/migrate_local b/src/vmm_mad/remotes/ec2/migrate_local index 110243efc2..8aeaf8eba5 100755 --- a/src/vmm_mad/remotes/ec2/migrate_local +++ b/src/vmm_mad/remotes/ec2/migrate_local @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/poll b/src/vmm_mad/remotes/ec2/poll index 92a334853f..21e8d3fa3b 100755 --- a/src/vmm_mad/remotes/ec2/poll +++ b/src/vmm_mad/remotes/ec2/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/ec2/reboot b/src/vmm_mad/remotes/ec2/reboot index 9f1bbe9859..9d134e8ca5 100755 --- a/src/vmm_mad/remotes/ec2/reboot +++ b/src/vmm_mad/remotes/ec2/reboot @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/ec2/reset b/src/vmm_mad/remotes/ec2/reset index 110243efc2..8aeaf8eba5 100755 --- a/src/vmm_mad/remotes/ec2/reset +++ b/src/vmm_mad/remotes/ec2/reset @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/restore b/src/vmm_mad/remotes/ec2/restore index 0ea0a72c14..af6eec3150 100755 --- a/src/vmm_mad/remotes/ec2/restore +++ b/src/vmm_mad/remotes/ec2/restore @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/ec2/save b/src/vmm_mad/remotes/ec2/save index 23f188943e..50289d0a3e 100755 --- a/src/vmm_mad/remotes/ec2/save +++ b/src/vmm_mad/remotes/ec2/save @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/ec2/shutdown b/src/vmm_mad/remotes/ec2/shutdown index 7352e20c52..e95aff495d 100755 --- a/src/vmm_mad/remotes/ec2/shutdown +++ b/src/vmm_mad/remotes/ec2/shutdown @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/ec2/snapshot_create b/src/vmm_mad/remotes/ec2/snapshot_create index 110243efc2..8aeaf8eba5 100755 --- a/src/vmm_mad/remotes/ec2/snapshot_create +++ b/src/vmm_mad/remotes/ec2/snapshot_create @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/snapshot_delete b/src/vmm_mad/remotes/ec2/snapshot_delete index 110243efc2..8aeaf8eba5 100755 --- a/src/vmm_mad/remotes/ec2/snapshot_delete +++ b/src/vmm_mad/remotes/ec2/snapshot_delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/ec2/snapshot_revert b/src/vmm_mad/remotes/ec2/snapshot_revert index 110243efc2..8aeaf8eba5 100755 --- a/src/vmm_mad/remotes/ec2/snapshot_revert +++ b/src/vmm_mad/remotes/ec2/snapshot_revert @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/attach_disk b/src/vmm_mad/remotes/kvm/attach_disk index 54a62727f4..02acba8da0 100755 --- a/src/vmm_mad/remotes/kvm/attach_disk +++ b/src/vmm_mad/remotes/kvm/attach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/attach_nic b/src/vmm_mad/remotes/kvm/attach_nic index d37ef7b05e..a14e0f590b 100755 --- a/src/vmm_mad/remotes/kvm/attach_nic +++ b/src/vmm_mad/remotes/kvm/attach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/cancel b/src/vmm_mad/remotes/kvm/cancel index 97598252d6..b038fd4613 100755 --- a/src/vmm_mad/remotes/kvm/cancel +++ b/src/vmm_mad/remotes/kvm/cancel @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/deploy b/src/vmm_mad/remotes/kvm/deploy index ebebc65eaa..af6696ae11 100755 --- a/src/vmm_mad/remotes/kvm/deploy +++ b/src/vmm_mad/remotes/kvm/deploy @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/detach_disk b/src/vmm_mad/remotes/kvm/detach_disk index e3441b1dab..0d73f3fc6a 100755 --- a/src/vmm_mad/remotes/kvm/detach_disk +++ b/src/vmm_mad/remotes/kvm/detach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/detach_nic b/src/vmm_mad/remotes/kvm/detach_nic index 0e3367f09a..884faabfae 100755 --- a/src/vmm_mad/remotes/kvm/detach_nic +++ b/src/vmm_mad/remotes/kvm/detach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/kvmrc b/src/vmm_mad/remotes/kvm/kvmrc index fda40ca1a2..7418d12432 100644 --- a/src/vmm_mad/remotes/kvm/kvmrc +++ b/src/vmm_mad/remotes/kvm/kvmrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/migrate b/src/vmm_mad/remotes/kvm/migrate index 2bd7847a82..a481283fc8 100755 --- a/src/vmm_mad/remotes/kvm/migrate +++ b/src/vmm_mad/remotes/kvm/migrate @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/migrate_local b/src/vmm_mad/remotes/kvm/migrate_local index 2dc5f4d9f8..b0f135d383 100755 --- a/src/vmm_mad/remotes/kvm/migrate_local +++ b/src/vmm_mad/remotes/kvm/migrate_local @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/reboot b/src/vmm_mad/remotes/kvm/reboot index 751c4a79a0..6be969276e 100755 --- a/src/vmm_mad/remotes/kvm/reboot +++ b/src/vmm_mad/remotes/kvm/reboot @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/reset b/src/vmm_mad/remotes/kvm/reset index f5ea191750..f00c52caf0 100755 --- a/src/vmm_mad/remotes/kvm/reset +++ b/src/vmm_mad/remotes/kvm/reset @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/restore b/src/vmm_mad/remotes/kvm/restore index bb4373c6da..db7e5042e9 100755 --- a/src/vmm_mad/remotes/kvm/restore +++ b/src/vmm_mad/remotes/kvm/restore @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/save b/src/vmm_mad/remotes/kvm/save index c94f6d4dd7..8fc2e2c461 100755 --- a/src/vmm_mad/remotes/kvm/save +++ b/src/vmm_mad/remotes/kvm/save @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/shutdown b/src/vmm_mad/remotes/kvm/shutdown index 9b837ea126..9e924c8048 100755 --- a/src/vmm_mad/remotes/kvm/shutdown +++ b/src/vmm_mad/remotes/kvm/shutdown @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/snapshot_create b/src/vmm_mad/remotes/kvm/snapshot_create index c45aa6d9ca..a42223470b 100755 --- a/src/vmm_mad/remotes/kvm/snapshot_create +++ b/src/vmm_mad/remotes/kvm/snapshot_create @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/snapshot_delete b/src/vmm_mad/remotes/kvm/snapshot_delete index 944dd56dc8..38abb73572 100755 --- a/src/vmm_mad/remotes/kvm/snapshot_delete +++ b/src/vmm_mad/remotes/kvm/snapshot_delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/kvm/snapshot_revert b/src/vmm_mad/remotes/kvm/snapshot_revert index 61447724c5..832a9e5697 100755 --- a/src/vmm_mad/remotes/kvm/snapshot_revert +++ b/src/vmm_mad/remotes/kvm/snapshot_revert @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/poll_xen_kvm.rb b/src/vmm_mad/remotes/poll_xen_kvm.rb index 42b5fe7f9f..7014461bf9 100755 --- a/src/vmm_mad/remotes/poll_xen_kvm.rb +++ b/src/vmm_mad/remotes/poll_xen_kvm.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/vmware/attach_disk b/src/vmm_mad/remotes/vmware/attach_disk index 03c0bc31e3..e3131f0d7a 100755 --- a/src/vmm_mad/remotes/vmware/attach_disk +++ b/src/vmm_mad/remotes/vmware/attach_disk @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/vmware/attach_nic b/src/vmm_mad/remotes/vmware/attach_nic index 885348a2ae..09cb9505d7 100755 --- a/src/vmm_mad/remotes/vmware/attach_nic +++ b/src/vmm_mad/remotes/vmware/attach_nic @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/vmware/cancel b/src/vmm_mad/remotes/vmware/cancel index aa5dc83af5..b11e8fee3f 100755 --- a/src/vmm_mad/remotes/vmware/cancel +++ b/src/vmm_mad/remotes/vmware/cancel @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/deploy b/src/vmm_mad/remotes/vmware/deploy index 7537b6ed0e..6f20281e74 100755 --- a/src/vmm_mad/remotes/vmware/deploy +++ b/src/vmm_mad/remotes/vmware/deploy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/detach_disk b/src/vmm_mad/remotes/vmware/detach_disk index cf9f1cefd8..c96a7f9df9 100755 --- a/src/vmm_mad/remotes/vmware/detach_disk +++ b/src/vmm_mad/remotes/vmware/detach_disk @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/vmware/detach_nic b/src/vmm_mad/remotes/vmware/detach_nic index 3d40eb2767..3f6bbaecec 100755 --- a/src/vmm_mad/remotes/vmware/detach_nic +++ b/src/vmm_mad/remotes/vmware/detach_nic @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/vmware/migrate b/src/vmm_mad/remotes/vmware/migrate index b6ab9a04e7..4232dfd9f3 100755 --- a/src/vmm_mad/remotes/vmware/migrate +++ b/src/vmm_mad/remotes/vmware/migrate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/poll b/src/vmm_mad/remotes/vmware/poll index b6e6c08611..62aba31f5d 100755 --- a/src/vmm_mad/remotes/vmware/poll +++ b/src/vmm_mad/remotes/vmware/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/reboot b/src/vmm_mad/remotes/vmware/reboot index abd91e2158..604ce4056c 100755 --- a/src/vmm_mad/remotes/vmware/reboot +++ b/src/vmm_mad/remotes/vmware/reboot @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/reset b/src/vmm_mad/remotes/vmware/reset index 6bf6011c60..dffa555600 100755 --- a/src/vmm_mad/remotes/vmware/reset +++ b/src/vmm_mad/remotes/vmware/reset @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/restore b/src/vmm_mad/remotes/vmware/restore index af840818eb..89c823d681 100755 --- a/src/vmm_mad/remotes/vmware/restore +++ b/src/vmm_mad/remotes/vmware/restore @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/save b/src/vmm_mad/remotes/vmware/save index 44446873e0..91cb647868 100755 --- a/src/vmm_mad/remotes/vmware/save +++ b/src/vmm_mad/remotes/vmware/save @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/scripts_common_sh.sh b/src/vmm_mad/remotes/vmware/scripts_common_sh.sh index 63da6c9128..4ef4af8bdd 100644 --- a/src/vmm_mad/remotes/vmware/scripts_common_sh.sh +++ b/src/vmm_mad/remotes/vmware/scripts_common_sh.sh @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/vmware/shutdown b/src/vmm_mad/remotes/vmware/shutdown index 3687989d4f..9541dbdcd9 100755 --- a/src/vmm_mad/remotes/vmware/shutdown +++ b/src/vmm_mad/remotes/vmware/shutdown @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/snapshot_create b/src/vmm_mad/remotes/vmware/snapshot_create index 43fa372fa5..e65f69cc89 100755 --- a/src/vmm_mad/remotes/vmware/snapshot_create +++ b/src/vmm_mad/remotes/vmware/snapshot_create @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/snapshot_delete b/src/vmm_mad/remotes/vmware/snapshot_delete index 636c9f33c9..9ca72867d5 100755 --- a/src/vmm_mad/remotes/vmware/snapshot_delete +++ b/src/vmm_mad/remotes/vmware/snapshot_delete @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/snapshot_revert b/src/vmm_mad/remotes/vmware/snapshot_revert index 16227305ad..bb3d65417f 100755 --- a/src/vmm_mad/remotes/vmware/snapshot_revert +++ b/src/vmm_mad/remotes/vmware/snapshot_revert @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/vi_driver.rb b/src/vmm_mad/remotes/vmware/vi_driver.rb index dc0c5f1516..632dc4ad11 100644 --- a/src/vmm_mad/remotes/vmware/vi_driver.rb +++ b/src/vmm_mad/remotes/vmware/vi_driver.rb @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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 # @@ -399,7 +399,7 @@ class VIHost # Datastores @free_ds_info.each{|k,v| used_space = v[:capacity].to_i - v[:free_space].to_i - str_info << "DS=[ID=#{k},USED_MB=#{used_space}," + str_info << "DS=[ID=\"#{k}\",USED_MB=#{used_space}," str_info << "TOTAL_MB=#{v[:capacity]}," str_info << "FREE_MB=#{v[:free_space]}]\n" } diff --git a/src/vmm_mad/remotes/vmware/vmware_driver.rb b/src/vmm_mad/remotes/vmware/vmware_driver.rb index 148d7c26a2..35fd18833a 100644 --- a/src/vmm_mad/remotes/vmware/vmware_driver.rb +++ b/src/vmm_mad/remotes/vmware/vmware_driver.rb @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/vmware/vmwarerc b/src/vmm_mad/remotes/vmware/vmwarerc index 1e4f70b1ad..71120ea16f 100644 --- a/src/vmm_mad/remotes/vmware/vmwarerc +++ b/src/vmm_mad/remotes/vmware/vmwarerc @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2010-2013, C12G Labs S.L # +# Copyright 2010-2014, 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/src/vmm_mad/remotes/xen/attach_disk b/src/vmm_mad/remotes/xen/attach_disk index a9ac9cea71..ede60bb8b6 100755 --- a/src/vmm_mad/remotes/xen/attach_disk +++ b/src/vmm_mad/remotes/xen/attach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/attach_nic b/src/vmm_mad/remotes/xen/attach_nic index 40592ebc51..f135c0dfc4 100755 --- a/src/vmm_mad/remotes/xen/attach_nic +++ b/src/vmm_mad/remotes/xen/attach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/cancel b/src/vmm_mad/remotes/xen/cancel index 9779678352..a3d13d6528 100755 --- a/src/vmm_mad/remotes/xen/cancel +++ b/src/vmm_mad/remotes/xen/cancel @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/deploy b/src/vmm_mad/remotes/xen/deploy index 9dc2fa71a7..c92f4f8aa5 100755 --- a/src/vmm_mad/remotes/xen/deploy +++ b/src/vmm_mad/remotes/xen/deploy @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/detach_disk b/src/vmm_mad/remotes/xen/detach_disk index 07131b2f24..4b5ffde19c 100755 --- a/src/vmm_mad/remotes/xen/detach_disk +++ b/src/vmm_mad/remotes/xen/detach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/detach_nic b/src/vmm_mad/remotes/xen/detach_nic index 00dd877458..2031c557f9 100755 --- a/src/vmm_mad/remotes/xen/detach_nic +++ b/src/vmm_mad/remotes/xen/detach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/reboot b/src/vmm_mad/remotes/xen/reboot index 52edfc0717..022f04133b 100755 --- a/src/vmm_mad/remotes/xen/reboot +++ b/src/vmm_mad/remotes/xen/reboot @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/reset b/src/vmm_mad/remotes/xen/reset index 4b59dc1ac7..bf1a078fdb 100755 --- a/src/vmm_mad/remotes/xen/reset +++ b/src/vmm_mad/remotes/xen/reset @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/restore b/src/vmm_mad/remotes/xen/restore index f7adb7c9b1..a4b486af3c 100755 --- a/src/vmm_mad/remotes/xen/restore +++ b/src/vmm_mad/remotes/xen/restore @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/save b/src/vmm_mad/remotes/xen/save index d0db6e4577..20b6a004f9 100755 --- a/src/vmm_mad/remotes/xen/save +++ b/src/vmm_mad/remotes/xen/save @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/shutdown b/src/vmm_mad/remotes/xen/shutdown index 0a41ed2eb0..faca5adf0a 100755 --- a/src/vmm_mad/remotes/xen/shutdown +++ b/src/vmm_mad/remotes/xen/shutdown @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/snapshot_create b/src/vmm_mad/remotes/xen/snapshot_create index 2e70947613..f48214cee0 100755 --- a/src/vmm_mad/remotes/xen/snapshot_create +++ b/src/vmm_mad/remotes/xen/snapshot_create @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/snapshot_delete b/src/vmm_mad/remotes/xen/snapshot_delete index 8ec8bfaf40..70d5b4e36c 100755 --- a/src/vmm_mad/remotes/xen/snapshot_delete +++ b/src/vmm_mad/remotes/xen/snapshot_delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/snapshot_revert b/src/vmm_mad/remotes/xen/snapshot_revert index 8ec8bfaf40..70d5b4e36c 100755 --- a/src/vmm_mad/remotes/xen/snapshot_revert +++ b/src/vmm_mad/remotes/xen/snapshot_revert @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/xen3/migrate b/src/vmm_mad/remotes/xen/xen3/migrate index 93f949a7b8..32e86d6708 100755 --- a/src/vmm_mad/remotes/xen/xen3/migrate +++ b/src/vmm_mad/remotes/xen/xen3/migrate @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/xen3/xenrc b/src/vmm_mad/remotes/xen/xen3/xenrc index 06405e8e72..89f583f052 100644 --- a/src/vmm_mad/remotes/xen/xen3/xenrc +++ b/src/vmm_mad/remotes/xen/xen3/xenrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/xen4/migrate b/src/vmm_mad/remotes/xen/xen4/migrate index 2784cde77c..f81a8c58c3 100755 --- a/src/vmm_mad/remotes/xen/xen4/migrate +++ b/src/vmm_mad/remotes/xen/xen4/migrate @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vmm_mad/remotes/xen/xen4/xenrc b/src/vmm_mad/remotes/xen/xen4/xenrc index d86373a8f6..30f1ddbe9a 100644 --- a/src/vmm_mad/remotes/xen/xen4/xenrc +++ b/src/vmm_mad/remotes/xen/xen4/xenrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm/FixedLeases.cc b/src/vnm/FixedLeases.cc index fa2d30e42d..42e54b87b7 100644 --- a/src/vnm/FixedLeases.cc +++ b/src/vnm/FixedLeases.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vnm/Leases.cc b/src/vnm/Leases.cc index 2dea794bdc..e000c69599 100644 --- a/src/vnm/Leases.cc +++ b/src/vnm/Leases.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vnm/RangedLeases.cc b/src/vnm/RangedLeases.cc index 52d7eae651..548d734ff6 100644 --- a/src/vnm/RangedLeases.cc +++ b/src/vnm/RangedLeases.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vnm/SConstruct b/src/vnm/SConstruct index 3d3f78bee0..17ecc14a63 100644 --- a/src/vnm/SConstruct +++ b/src/vnm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vnm # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc index cae8608d81..c880e39555 100644 --- a/src/vnm/VirtualNetwork.cc +++ b/src/vnm/VirtualNetwork.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc index 87734657dc..9d53dd2d6d 100644 --- a/src/vnm/VirtualNetworkPool.cc +++ b/src/vnm/VirtualNetworkPool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/vnm_mad/one_vnm.rb b/src/vnm_mad/one_vnm.rb index 3b6efe565f..45574c71db 100644 --- a/src/vnm_mad/one_vnm.rb +++ b/src/vnm_mad/one_vnm.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/802.1Q/HostManaged.rb b/src/vnm_mad/remotes/802.1Q/HostManaged.rb index 56199b4601..557b410c29 100644 --- a/src/vnm_mad/remotes/802.1Q/HostManaged.rb +++ b/src/vnm_mad/remotes/802.1Q/HostManaged.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/802.1Q/clean b/src/vnm_mad/remotes/802.1Q/clean index 16f2f7b6e1..e7cac108b9 100755 --- a/src/vnm_mad/remotes/802.1Q/clean +++ b/src/vnm_mad/remotes/802.1Q/clean @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/802.1Q/post b/src/vnm_mad/remotes/802.1Q/post index aaa01c1136..f14405d711 100755 --- a/src/vnm_mad/remotes/802.1Q/post +++ b/src/vnm_mad/remotes/802.1Q/post @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/802.1Q/pre b/src/vnm_mad/remotes/802.1Q/pre index 54cd1510e9..a3be35cc4d 100755 --- a/src/vnm_mad/remotes/802.1Q/pre +++ b/src/vnm_mad/remotes/802.1Q/pre @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/Firewall.rb b/src/vnm_mad/remotes/Firewall.rb index 16eaa0155d..feb7b1b84b 100644 --- a/src/vnm_mad/remotes/Firewall.rb +++ b/src/vnm_mad/remotes/Firewall.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/OpenNebulaNetwork.rb b/src/vnm_mad/remotes/OpenNebulaNetwork.rb index d0a7425d04..1b5a8e7209 100644 --- a/src/vnm_mad/remotes/OpenNebulaNetwork.rb +++ b/src/vnm_mad/remotes/OpenNebulaNetwork.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/OpenNebulaNic.rb b/src/vnm_mad/remotes/OpenNebulaNic.rb index 93dadcb55a..24b4ee7643 100644 --- a/src/vnm_mad/remotes/OpenNebulaNic.rb +++ b/src/vnm_mad/remotes/OpenNebulaNic.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/dummy/clean b/src/vnm_mad/remotes/dummy/clean index 9c5920a5dd..d240d61f7d 100755 --- a/src/vnm_mad/remotes/dummy/clean +++ b/src/vnm_mad/remotes/dummy/clean @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/dummy/post b/src/vnm_mad/remotes/dummy/post index 9c5920a5dd..d240d61f7d 100755 --- a/src/vnm_mad/remotes/dummy/post +++ b/src/vnm_mad/remotes/dummy/post @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/dummy/pre b/src/vnm_mad/remotes/dummy/pre index 9c5920a5dd..d240d61f7d 100755 --- a/src/vnm_mad/remotes/dummy/pre +++ b/src/vnm_mad/remotes/dummy/pre @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/ebtables/Ebtables.rb b/src/vnm_mad/remotes/ebtables/Ebtables.rb index 305fbcea74..4e48fd38ff 100644 --- a/src/vnm_mad/remotes/ebtables/Ebtables.rb +++ b/src/vnm_mad/remotes/ebtables/Ebtables.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/ebtables/clean b/src/vnm_mad/remotes/ebtables/clean index db185c03d7..f051b09504 100755 --- a/src/vnm_mad/remotes/ebtables/clean +++ b/src/vnm_mad/remotes/ebtables/clean @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/ebtables/post b/src/vnm_mad/remotes/ebtables/post index c2a85cf743..84b719c173 100755 --- a/src/vnm_mad/remotes/ebtables/post +++ b/src/vnm_mad/remotes/ebtables/post @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/ebtables/pre b/src/vnm_mad/remotes/ebtables/pre index 9c5920a5dd..d240d61f7d 100755 --- a/src/vnm_mad/remotes/ebtables/pre +++ b/src/vnm_mad/remotes/ebtables/pre @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/fw/clean b/src/vnm_mad/remotes/fw/clean index 16f2f7b6e1..e7cac108b9 100755 --- a/src/vnm_mad/remotes/fw/clean +++ b/src/vnm_mad/remotes/fw/clean @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/fw/post b/src/vnm_mad/remotes/fw/post index aaa01c1136..f14405d711 100755 --- a/src/vnm_mad/remotes/fw/post +++ b/src/vnm_mad/remotes/fw/post @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/fw/pre b/src/vnm_mad/remotes/fw/pre index 9c5920a5dd..d240d61f7d 100755 --- a/src/vnm_mad/remotes/fw/pre +++ b/src/vnm_mad/remotes/fw/pre @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb index 9cc03780e8..3645e7616e 100644 --- a/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb +++ b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/ovswitch/clean b/src/vnm_mad/remotes/ovswitch/clean index 0c6828efed..566e737e5e 100755 --- a/src/vnm_mad/remotes/ovswitch/clean +++ b/src/vnm_mad/remotes/ovswitch/clean @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/ovswitch/post b/src/vnm_mad/remotes/ovswitch/post index 02932942e6..6f21bf6c36 100755 --- a/src/vnm_mad/remotes/ovswitch/post +++ b/src/vnm_mad/remotes/ovswitch/post @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/ovswitch/pre b/src/vnm_mad/remotes/ovswitch/pre index 9c5920a5dd..d240d61f7d 100755 --- a/src/vnm_mad/remotes/ovswitch/pre +++ b/src/vnm_mad/remotes/ovswitch/pre @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/vmware/VMware.rb b/src/vnm_mad/remotes/vmware/VMware.rb index 6e11632dbf..53d38f3e76 100644 --- a/src/vnm_mad/remotes/vmware/VMware.rb +++ b/src/vnm_mad/remotes/vmware/VMware.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/vmware/clean b/src/vnm_mad/remotes/vmware/clean index e9e0ad4f34..5e12625922 100755 --- a/src/vnm_mad/remotes/vmware/clean +++ b/src/vnm_mad/remotes/vmware/clean @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/vmware/post b/src/vnm_mad/remotes/vmware/post index e9e0ad4f34..5e12625922 100755 --- a/src/vnm_mad/remotes/vmware/post +++ b/src/vnm_mad/remotes/vmware/post @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/vnm_mad/remotes/vmware/pre b/src/vnm_mad/remotes/vmware/pre index 3ed3852397..15ff79c918 100755 --- a/src/vnm_mad/remotes/vmware/pre +++ b/src/vnm_mad/remotes/vmware/pre @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/xml/ObjectXML.cc b/src/xml/ObjectXML.cc index 2e5cdac96b..8c1861614e 100644 --- a/src/xml/ObjectXML.cc +++ b/src/xml/ObjectXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/xml/SConstruct b/src/xml/SConstruct index 1d1b10f847..fdc1251a6a 100644 --- a/src/xml/SConstruct +++ b/src/xml/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/xml # -------------------------------------------------------------------------- # -# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs # # # # 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/src/xml/expr_arith.y b/src/xml/expr_arith.y index 97785086d1..5580b77047 100644 --- a/src/xml/expr_arith.y +++ b/src/xml/expr_arith.y @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/xml/expr_bool.y b/src/xml/expr_bool.y index 41fde2c94d..0b71eab87e 100644 --- a/src/xml/expr_bool.y +++ b/src/xml/expr_bool.y @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/xml/expr_parser.c b/src/xml/expr_parser.c index 78c4442e14..355f20a53c 100644 --- a/src/xml/expr_parser.c +++ b/src/xml/expr_parser.c @@ -496,7 +496,7 @@ int expr__flex_debug = 0; char *expr_text; #line 1 "expr_parser.l" /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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/src/xml/expr_parser.l b/src/xml/expr_parser.l index b79149bb0e..3116b7e798 100644 --- a/src/xml/expr_parser.l +++ b/src/xml/expr_parser.l @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* 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 */